Index: kernel/arch/abs32le/include/asm.h
===================================================================
--- kernel/arch/abs32le/include/asm.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/include/asm.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,4 @@
 #define KERN_abs32le_ASM_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <config.h>
Index: kernel/arch/abs32le/include/atomic.h
===================================================================
--- kernel/arch/abs32le/include/atomic.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/include/atomic.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_abs32le_ATOMIC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/barrier.h>
 #include <preemption.h>
Index: kernel/arch/abs32le/include/faddr.h
===================================================================
--- kernel/arch/abs32le/include/faddr.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/include/faddr.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_abs32le_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FADDR(fptr)  ((uintptr_t) (fptr))
Index: kernel/arch/abs32le/include/fpu_context.h
===================================================================
--- kernel/arch/abs32le/include/fpu_context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/include/fpu_context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_abs32le_FPU_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FPU_CONTEXT_ALIGN  16
Index: kernel/arch/abs32le/include/interrupt.h
===================================================================
--- kernel/arch/abs32le/include/interrupt.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/include/interrupt.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_abs32le_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define IVT_ITEMS  0
Index: kernel/arch/abs32le/include/mm/asid.h
===================================================================
--- kernel/arch/abs32le/include/mm/asid.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/include/mm/asid.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -34,5 +34,5 @@
 #define KERN_abs32le_ASID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef uint32_t asid_t;
Index: kernel/arch/abs32le/include/mm/frame.h
===================================================================
--- kernel/arch/abs32le/include/mm/frame.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/include/mm/frame.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -41,5 +41,5 @@
 #ifdef KERNEL
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern void frame_arch_init(void);
Index: kernel/arch/abs32le/include/mm/page.h
===================================================================
--- kernel/arch/abs32le/include/mm/page.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/include/mm/page.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -119,5 +119,4 @@
 #include <mm/mm.h>
 #include <arch/interrupt.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/abs32le/include/proc/task.h
===================================================================
--- kernel/arch/abs32le/include/proc/task.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/include/proc/task.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_abs32le_TASK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/bitmap.h>
 
Index: kernel/arch/abs32le/include/proc/thread.h
===================================================================
--- kernel/arch/abs32le/include/proc/thread.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/include/proc/thread.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_abs32le_THREAD_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef struct {
Index: kernel/arch/abs32le/include/types.h
===================================================================
--- kernel/arch/abs32le/include/types.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/include/types.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,14 +35,4 @@
 #ifndef KERN_abs32le_TYPES_H_
 #define KERN_abs32le_TYPES_H_
-
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed long int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned long uint32_t;
-typedef unsigned long long uint64_t;
 
 typedef uint32_t size_t;
Index: kernel/arch/abs32le/src/abs32le.c
===================================================================
--- kernel/arch/abs32le/src/abs32le.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/src/abs32le.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -34,5 +34,5 @@
 
 #include <arch.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/interrupt.h>
 #include <arch/asm.h>
Index: kernel/arch/abs32le/src/cpu/cpu.c
===================================================================
--- kernel/arch/abs32le/src/cpu/cpu.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/src/cpu/cpu.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,5 @@
 #include <arch/cpu.h>
 #include <arch.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <print.h>
 #include <fpu_context.h>
Index: kernel/arch/abs32le/src/ddi/ddi.c
===================================================================
--- kernel/arch/abs32le/src/ddi/ddi.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/src/ddi/ddi.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Enable I/O space range for task.
Index: kernel/arch/abs32le/src/debug/stacktrace.c
===================================================================
--- kernel/arch/abs32le/src/debug/stacktrace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/src/debug/stacktrace.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,4 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/abs32le/src/mm/page.c
===================================================================
--- kernel/arch/abs32le/src/mm/page.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/src/mm/page.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -39,5 +39,5 @@
 #include <mm/page.h>
 #include <mm/as.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <config.h>
Index: kernel/arch/abs32le/src/mm/tlb.c
===================================================================
--- kernel/arch/abs32le/src/mm/tlb.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/src/mm/tlb.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -34,5 +34,5 @@
 #include <arch/mm/asid.h>
 #include <arch/asm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 void tlb_invalidate_all(void)
Index: kernel/arch/abs32le/src/userspace.c
===================================================================
--- kernel/arch/abs32le/src/userspace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/abs32le/src/userspace.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -34,5 +34,5 @@
 
 #include <userspace.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <proc/uarg.h>
Index: kernel/arch/amd64/include/asm.h
===================================================================
--- kernel/arch/amd64/include/asm.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/include/asm.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,4 @@
 
 #include <config.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/amd64/include/atomic.h
===================================================================
--- kernel/arch/amd64/include/atomic.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/include/atomic.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_amd64_ATOMIC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/barrier.h>
 #include <preemption.h>
Index: kernel/arch/amd64/include/context.h
===================================================================
--- kernel/arch/amd64/include/context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/include/context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,5 @@
 #ifdef KERNEL
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /* According to ABI the stack MUST be aligned on 
Index: kernel/arch/amd64/include/cpuid.h
===================================================================
--- kernel/arch/amd64/include/cpuid.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/include/cpuid.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -48,5 +48,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef struct {
Index: kernel/arch/amd64/include/debugger.h
===================================================================
--- kernel/arch/amd64/include/debugger.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/include/debugger.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_amd64_DEBUGGER_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define BKPOINTS_MAX 4
Index: kernel/arch/amd64/include/faddr.h
===================================================================
--- kernel/arch/amd64/include/faddr.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/include/faddr.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_amd64_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FADDR(fptr)		((uintptr_t) (fptr))
Index: kernel/arch/amd64/include/interrupt.h
===================================================================
--- kernel/arch/amd64/include/interrupt.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/include/interrupt.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_amd64_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/pm.h>
 
Index: kernel/arch/amd64/include/mm/frame.h
===================================================================
--- kernel/arch/amd64/include/mm/frame.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/include/mm/frame.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 
 #ifndef __ASM__
-#include <arch/types.h>
+#include <typedefs.h>
 #endif /* __ASM__ */
 
Index: kernel/arch/amd64/include/mm/page.h
===================================================================
--- kernel/arch/amd64/include/mm/page.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/include/mm/page.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -57,5 +57,5 @@
 #ifndef __ASM__
 #	include <mm/mm.h>
-#	include <arch/types.h>
+#	include <typedefs.h>
 #	include <arch/interrupt.h>
 
Index: kernel/arch/amd64/include/pm.h
===================================================================
--- kernel/arch/amd64/include/pm.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/include/pm.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 
 #ifndef __ASM__
-	#include <arch/types.h>
+	#include <typedefs.h>
 	#include <arch/context.h>
 #endif
Index: kernel/arch/amd64/include/proc/task.h
===================================================================
--- kernel/arch/amd64/include/proc/task.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/include/proc/task.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_amd64_TASK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/bitmap.h>
 
Index: kernel/arch/amd64/include/types.h
===================================================================
--- kernel/arch/amd64/include/types.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/include/types.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,14 +36,4 @@
 #define KERN_amd64_TYPES_H_
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-
 typedef uint64_t size_t;
 
@@ -61,25 +51,25 @@
 
 /**< Formats for uintptr_t, size_t */
-#define PRIp "llx"
-#define PRIs "llu"
+#define PRIp  "llx"
+#define PRIs  "llu"
 
 /**< Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
-#define PRId8 "d"
-#define PRId16 "d"
-#define PRId32 "d"
-#define PRId64 "lld"
-#define PRIdn "lld"
+#define PRId8   "d"
+#define PRId16  "d"
+#define PRId32  "d"
+#define PRId64  "lld"
+#define PRIdn   "lld"
 
-#define PRIu8 "u"
-#define PRIu16 "u"
-#define PRIu32 "u"
-#define PRIu64 "llu"
-#define PRIun "llu"
+#define PRIu8   "u"
+#define PRIu16  "u"
+#define PRIu32  "u"
+#define PRIu64  "llu"
+#define PRIun   "llu"
 
-#define PRIx8 "x"
-#define PRIx16 "x"
-#define PRIx32 "x"
-#define PRIx64 "llx"
-#define PRIxn "llx"
+#define PRIx8   "x"
+#define PRIx16  "x"
+#define PRIx32  "x"
+#define PRIx64  "llx"
+#define PRIxn   "llx"
 
 #endif
Index: kernel/arch/amd64/src/amd64.c
===================================================================
--- kernel/arch/amd64/src/amd64.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/src/amd64.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,5 @@
 #include <arch.h>
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #include <config.h>
Index: kernel/arch/amd64/src/cpu/cpu.c
===================================================================
--- kernel/arch/amd64/src/cpu/cpu.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/src/cpu/cpu.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -39,5 +39,5 @@
 
 #include <arch.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <print.h>
 #include <fpu_context.h>
Index: kernel/arch/amd64/src/ddi/ddi.c
===================================================================
--- kernel/arch/amd64/src/ddi/ddi.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/src/ddi/ddi.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #include <arch/ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/bitmap.h>
 #include <mm/slab.h>
Index: kernel/arch/amd64/src/debug/stacktrace.c
===================================================================
--- kernel/arch/amd64/src/debug/stacktrace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/src/debug/stacktrace.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,4 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/amd64/src/proc/task.c
===================================================================
--- kernel/arch/amd64/src/proc/task.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/src/proc/task.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,5 @@
 #include <proc/task.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Perform amd64 specific task initialization.
Index: kernel/arch/amd64/src/userspace.c
===================================================================
--- kernel/arch/amd64/src/userspace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/amd64/src/userspace.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #include <arch/cpu.h>
 #include <arch/pm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <proc/uarg.h>
Index: kernel/arch/arm32/include/asm.h
===================================================================
--- kernel/arch/arm32/include/asm.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/asm.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,4 @@
 
 #include <typedefs.h>
-#include <arch/types.h>
 #include <arch/stack.h>
 #include <config.h>
Index: kernel/arch/arm32/include/context.h
===================================================================
--- kernel/arch/arm32/include/context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -52,5 +52,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Thread context containing registers that must be preserved across function
Index: kernel/arch/arm32/include/cpu.h
===================================================================
--- kernel/arch/arm32/include/cpu.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/cpu.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 #define KERN_arm32_CPU_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 
Index: kernel/arch/arm32/include/exception.h
===================================================================
--- kernel/arch/arm32/include/exception.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/exception.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,5 @@
 #define KERN_arm32_EXCEPTION_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/regutils.h>
 
Index: kernel/arch/arm32/include/faddr.h
===================================================================
--- kernel/arch/arm32/include/faddr.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/faddr.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 #define KERN_arm32_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Calculate absolute address of function referenced by fptr pointer.
Index: kernel/arch/arm32/include/fpu_context.h
===================================================================
--- kernel/arch/arm32/include/fpu_context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/fpu_context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -39,5 +39,5 @@
 #define KERN_arm32_FPU_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FPU_CONTEXT_ALIGN    0
Index: kernel/arch/arm32/include/interrupt.h
===================================================================
--- kernel/arch/arm32/include/interrupt.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/interrupt.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 #define KERN_arm32_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/exception.h>
 
Index: kernel/arch/arm32/include/machine_func.h
===================================================================
--- kernel/arch/arm32/include/machine_func.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/machine_func.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -43,5 +43,5 @@
 
 #include <console/console.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/exception.h>
 
Index: kernel/arch/arm32/include/mm/asid.h
===================================================================
--- kernel/arch/arm32/include/mm/asid.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/mm/asid.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -39,5 +39,5 @@
 #define KERN_arm32_ASID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define ASID_MAX_ARCH		3	/* minimal required number */
Index: kernel/arch/arm32/include/mm/frame.h
===================================================================
--- kernel/arch/arm32/include/mm/frame.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/mm/frame.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -43,5 +43,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define BOOT_PAGE_TABLE_SIZE     0x4000
Index: kernel/arch/arm32/include/mm/page_fault.h
===================================================================
--- kernel/arch/arm32/include/mm/page_fault.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/mm/page_fault.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 #define KERN_arm32_PAGE_FAULT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 
Index: kernel/arch/arm32/include/ras.h
===================================================================
--- kernel/arch/arm32/include/ras.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/ras.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,5 @@
 
 #include <arch/exception.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define RAS_START	0
Index: kernel/arch/arm32/include/types.h
===================================================================
--- kernel/arch/arm32/include/types.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/include/types.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -43,14 +43,4 @@
 #endif
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed long int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned long uint32_t;
-typedef unsigned long long uint64_t;
-
 typedef uint32_t size_t;
 
@@ -67,24 +57,24 @@
 } fncptr_t;
 
-#define PRIp "x"	/**< Format for uintptr_t. */
-#define PRIs "u"	/**< Format for size_t. */
+#define PRIp "x"  /**< Format for uintptr_t. */
+#define PRIs "u"  /**< Format for size_t. */
 
-#define PRId8 "d"	/**< Format for int8_t. */
-#define PRId16 "d"	/**< Format for int16_t. */
-#define PRId32 "d"	/**< Format for int32_t. */
-#define PRId64 "lld"	/**< Format for int64_t. */
-#define PRIdn "d"	/**< Format for native_t. */
+#define PRId8 "d"     /**< Format for int8_t. */
+#define PRId16 "d"    /**< Format for int16_t. */
+#define PRId32 "d"    /**< Format for int32_t. */
+#define PRId64 "lld"  /**< Format for int64_t. */
+#define PRIdn "d"     /**< Format for native_t. */
 
-#define PRIu8 "u"	/**< Format for uint8_t. */
-#define PRIu16 "u"	/**< Format for uint16_t. */
-#define PRIu32 "u"	/**< Format for uint32_t. */
-#define PRIu64 "llu"	/**< Format for uint64_t. */
-#define PRIun "u"	/**< Format for unative_t. */
+#define PRIu8 "u"     /**< Format for uint8_t. */
+#define PRIu16 "u"    /**< Format for uint16_t. */
+#define PRIu32 "u"    /**< Format for uint32_t. */
+#define PRIu64 "llu"  /**< Format for uint64_t. */
+#define PRIun "u"     /**< Format for unative_t. */
 
-#define PRIx8 "x"	/**< Format for hexadecimal (u)int8_t. */
-#define PRIx16 "x"	/**< Format for hexadecimal (u)int16_t. */
-#define PRIx32 "x"	/**< Format for hexadecimal (u)uint32_t. */
-#define PRIx64 "llx"	/**< Format for hexadecimal (u)int64_t. */
-#define PRIxn "x"	/**< Format for hexadecimal (u)native_t. */
+#define PRIx8 "x"     /**< Format for hexadecimal (u)int8_t. */
+#define PRIx16 "x"    /**< Format for hexadecimal (u)int16_t. */
+#define PRIx32 "x"    /**< Format for hexadecimal (u)uint32_t. */
+#define PRIx64 "llx"  /**< Format for hexadecimal (u)int64_t. */
+#define PRIxn "x"     /**< Format for hexadecimal (u)native_t. */
 
 #endif
Index: kernel/arch/arm32/src/ddi/ddi.c
===================================================================
--- kernel/arch/arm32/src/ddi/ddi.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/src/ddi/ddi.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Enable I/O space range for task.
Index: kernel/arch/arm32/src/debug/stacktrace.c
===================================================================
--- kernel/arch/arm32/src/debug/stacktrace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/src/debug/stacktrace.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,4 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/arm32/src/mm/page.c
===================================================================
--- kernel/arch/arm32/src/mm/page.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/src/mm/page.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -41,5 +41,4 @@
 #include <arch/exception.h>
 #include <typedefs.h>
-#include <arch/types.h>
 #include <interrupt.h>
 #include <arch/mm/frame.h>
Index: kernel/arch/arm32/src/mm/tlb.c
===================================================================
--- kernel/arch/arm32/src/mm/tlb.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/src/mm/tlb.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 #include <arch/mm/asid.h>
 #include <arch/asm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/mm/page.h>
 
Index: kernel/arch/arm32/src/ras.c
===================================================================
--- kernel/arch/arm32/src/ras.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/arm32/src/ras.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -44,5 +44,5 @@
 #include <arch.h>
 #include <memstr.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 uintptr_t *ras_page = NULL;
Index: kernel/arch/ia32/include/asm.h
===================================================================
--- kernel/arch/ia32/include/asm.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/asm.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,4 @@
 
 #include <arch/pm.h>
-#include <arch/types.h>
 #include <typedefs.h>
 #include <config.h>
Index: kernel/arch/ia32/include/atomic.h
===================================================================
--- kernel/arch/ia32/include/atomic.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/atomic.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia32_ATOMIC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/barrier.h>
 #include <preemption.h>
Index: kernel/arch/ia32/include/bios/bios.h
===================================================================
--- kernel/arch/ia32/include/bios/bios.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/bios/bios.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia32_BIOS_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define BIOS_EBDA_PTR	0x40e
Index: kernel/arch/ia32/include/boot/memmap.h
===================================================================
--- kernel/arch/ia32/include/boot/memmap.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/boot/memmap.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -61,5 +61,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef struct {
Index: kernel/arch/ia32/include/context.h
===================================================================
--- kernel/arch/ia32/include/context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,6 @@
 
 #ifdef KERNEL
-#include <arch/types.h>
+
+#include <typedefs.h>
 
 #define STACK_ITEM_SIZE	4
Index: kernel/arch/ia32/include/cpuid.h
===================================================================
--- kernel/arch/ia32/include/cpuid.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/cpuid.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -43,5 +43,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef struct {
Index: kernel/arch/ia32/include/drivers/i8254.h
===================================================================
--- kernel/arch/ia32/include/drivers/i8254.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/drivers/i8254.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,6 +36,4 @@
 #define KERN_ia32_I8254_H_
 
-#include <arch/types.h>
-
 extern void i8254_init(void);
 extern void i8254_calibrate_delay_loop(void);
Index: kernel/arch/ia32/include/drivers/i8259.h
===================================================================
--- kernel/arch/ia32/include/drivers/i8259.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/drivers/i8259.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia32_I8259_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/interrupt.h>
 
Index: kernel/arch/ia32/include/drivers/vesa.h
===================================================================
--- kernel/arch/ia32/include/drivers/vesa.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/drivers/vesa.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia32_VESA_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern bool vesa_init(void);
Index: kernel/arch/ia32/include/faddr.h
===================================================================
--- kernel/arch/ia32/include/faddr.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/faddr.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32	
+/** @addtogroup ia32
  * @{
  */
@@ -36,7 +36,7 @@
 #define KERN_ia32_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
-#define FADDR(fptr)		((uintptr_t) (fptr))
+#define FADDR(fptr)  ((uintptr_t) (fptr))
 
 #endif
Index: kernel/arch/ia32/include/fpu_context.h
===================================================================
--- kernel/arch/ia32/include/fpu_context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/fpu_context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia32_FPU_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FPU_CONTEXT_ALIGN 16
Index: kernel/arch/ia32/include/interrupt.h
===================================================================
--- kernel/arch/ia32/include/interrupt.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/interrupt.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia32_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/pm.h>
 
Index: kernel/arch/ia32/include/mm/asid.h
===================================================================
--- kernel/arch/ia32/include/mm/asid.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/mm/asid.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -43,5 +43,5 @@
 #define KERN_ia32_ASID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef int32_t asid_t;
Index: kernel/arch/ia32/include/mm/frame.h
===================================================================
--- kernel/arch/ia32/include/mm/frame.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/mm/frame.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -42,5 +42,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern uintptr_t last_frame;
Index: kernel/arch/ia32/include/mm/page.h
===================================================================
--- kernel/arch/ia32/include/mm/page.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/mm/page.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -127,5 +127,4 @@
 #include <mm/mm.h>
 #include <arch/interrupt.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/ia32/include/pm.h
===================================================================
--- kernel/arch/ia32/include/pm.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/pm.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -80,5 +80,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 
Index: kernel/arch/ia32/include/proc/task.h
===================================================================
--- kernel/arch/ia32/include/proc/task.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/proc/task.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia32_TASK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/bitmap.h>
 
Index: kernel/arch/ia32/include/proc/thread.h
===================================================================
--- kernel/arch/ia32/include/proc/thread.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/proc/thread.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia32_THREAD_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef struct {
@@ -42,6 +42,6 @@
 } thread_arch_t;
 
-#define thr_constructor_arch(t)
-#define thr_destructor_arch(t)
+#define thr_constructor_arch(thr)
+#define thr_destructor_arch(thr)
 
 #endif
Index: kernel/arch/ia32/include/smp/apic.h
===================================================================
--- kernel/arch/ia32/include/smp/apic.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/smp/apic.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia32_APIC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <cpu.h>
 
Index: kernel/arch/ia32/include/smp/mps.h
===================================================================
--- kernel/arch/ia32/include/smp/mps.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/smp/mps.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia32_MPS_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/waitq.h>
 #include <config.h>
Index: kernel/arch/ia32/include/smp/smp.h
===================================================================
--- kernel/arch/ia32/include/smp/smp.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/smp/smp.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia32_SMP_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** SMP config opertaions interface. */
Index: kernel/arch/ia32/include/types.h
===================================================================
--- kernel/arch/ia32/include/types.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/include/types.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,6 +36,4 @@
 #define KERN_ia32_TYPES_H_
 
-#include <arch/common.h>
-
 typedef uint32_t size_t;
 
@@ -52,24 +50,24 @@
 } fncptr_t;
 
-#define PRIp "x"	/**< Format for uintptr_t. */
-#define PRIs "u"	/**< Format for size_t. */
+#define PRIp "x"  /**< Format for uintptr_t. */
+#define PRIs "u"  /**< Format for size_t. */
 
-#define PRId8 "d"	/**< Format for int8_t. */
-#define PRId16 "d"	/**< Format for int16_t. */
-#define PRId32 "d"	/**< Format for int32_t. */
-#define PRId64 "lld"	/**< Format for int64_t. */
-#define PRIdn "d"	/**< Format for native_t. */
+#define PRId8 "d"     /**< Format for int8_t. */
+#define PRId16 "d"    /**< Format for int16_t. */
+#define PRId32 "d"    /**< Format for int32_t. */
+#define PRId64 "lld"  /**< Format for int64_t. */
+#define PRIdn "d"     /**< Format for native_t. */
 
-#define PRIu8 "u"	/**< Format for uint8_t. */
-#define PRIu16 "u"	/**< Format for uint16_t. */
-#define PRIu32 "u"	/**< Format for uint32_t. */
-#define PRIu64 "llu"	/**< Format for uint64_t. */
-#define PRIun "u"	/**< Format for unative_t. */
+#define PRIu8 "u"     /**< Format for uint8_t. */
+#define PRIu16 "u"    /**< Format for uint16_t. */
+#define PRIu32 "u"    /**< Format for uint32_t. */
+#define PRIu64 "llu"  /**< Format for uint64_t. */
+#define PRIun "u"     /**< Format for unative_t. */
 
-#define PRIx8 "x"	/**< Format for hexadecimal (u)int8_t. */
-#define PRIx16 "x"	/**< Format for hexadecimal (u)int16_t. */
-#define PRIx32 "x"	/**< Format for hexadecimal (u)uint32_t. */
-#define PRIx64 "llx"	/**< Format for hexadecimal (u)int64_t. */
-#define PRIxn "x"	/**< Format for hexadecimal (u)native_t. */
+#define PRIx8 "x"     /**< Format for hexadecimal (u)int8_t. */
+#define PRIx16 "x"    /**< Format for hexadecimal (u)int16_t. */
+#define PRIx32 "x"    /**< Format for hexadecimal (u)uint32_t. */
+#define PRIx64 "llx"  /**< Format for hexadecimal (u)int64_t. */
+#define PRIxn "x"     /**< Format for hexadecimal (u)native_t. */
 
 #endif
Index: kernel/arch/ia32/src/bios/bios.c
===================================================================
--- kernel/arch/ia32/src/bios/bios.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/bios/bios.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -34,5 +34,5 @@
 
 #include <arch/bios/bios.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 uintptr_t ebda = 0;
Index: kernel/arch/ia32/src/cpu/cpu.c
===================================================================
--- kernel/arch/ia32/src/cpu/cpu.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/cpu/cpu.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,5 @@
 
 #include <arch.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <print.h>
 #include <fpu_context.h>
Index: kernel/arch/ia32/src/ddi/ddi.c
===================================================================
--- kernel/arch/ia32/src/ddi/ddi.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/ddi/ddi.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #include <arch/ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/bitmap.h>
 #include <mm/slab.h>
Index: kernel/arch/ia32/src/debug/stacktrace.c
===================================================================
--- kernel/arch/ia32/src/debug/stacktrace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/debug/stacktrace.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,4 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/ia32/src/drivers/i8254.c
===================================================================
--- kernel/arch/ia32/src/drivers/i8254.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/drivers/i8254.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
  */
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <time/clock.h>
 #include <time/delay.h>
Index: kernel/arch/ia32/src/drivers/i8259.c
===================================================================
--- kernel/arch/ia32/src/drivers/i8259.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/drivers/i8259.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -39,5 +39,5 @@
 #include <arch/drivers/i8259.h>
 #include <cpu.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 #include <arch.h>
Index: kernel/arch/ia32/src/drivers/vesa.c
===================================================================
--- kernel/arch/ia32/src/drivers/vesa.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/drivers/vesa.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -49,5 +49,5 @@
 #include <synch/spinlock.h>
 #include <arch/asm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <memstr.h>
 #include <bitops.h>
Index: kernel/arch/ia32/src/ia32.c
===================================================================
--- kernel/arch/ia32/src/ia32.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/ia32.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 #include <arch.h>
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #include <arch/pm.h>
Index: kernel/arch/ia32/src/mm/page.c
===================================================================
--- kernel/arch/ia32/src/mm/page.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/mm/page.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -39,5 +39,5 @@
 #include <mm/page.h>
 #include <mm/as.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <config.h>
Index: kernel/arch/ia32/src/mm/tlb.c
===================================================================
--- kernel/arch/ia32/src/mm/tlb.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/mm/tlb.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 #include <arch/mm/asid.h>
 #include <arch/asm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Invalidate all entries in TLB. */
Index: kernel/arch/ia32/src/pm.c
===================================================================
--- kernel/arch/ia32/src/pm.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/pm.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,5 @@
 #include <arch/pm.h>
 #include <config.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/interrupt.h>
 #include <arch/asm.h>
Index: kernel/arch/ia32/src/proc/task.c
===================================================================
--- kernel/arch/ia32/src/proc/task.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/proc/task.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -34,5 +34,5 @@
 
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/bitmap.h>
 #include <mm/slab.h>
Index: kernel/arch/ia32/src/smp/apic.c
===================================================================
--- kernel/arch/ia32/src/smp/apic.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/smp/apic.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -33,5 +33,5 @@
  */
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/smp/apic.h>
 #include <arch/smp/ap.h>
Index: kernel/arch/ia32/src/smp/mps.c
===================================================================
--- kernel/arch/ia32/src/smp/mps.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/smp/mps.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -42,5 +42,5 @@
 #include <arch/smp/smp.h>
 #include <func.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <cpu.h>
 #include <arch/asm.h>
Index: kernel/arch/ia32/src/syscall.c
===================================================================
--- kernel/arch/ia32/src/syscall.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/syscall.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia32	
+/** @addtogroup ia32
  * @{
  */
@@ -36,5 +36,5 @@
 #include <arch/cpu.h>
 #include <arch/asm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/pm.h>
 
Index: kernel/arch/ia32/src/userspace.c
===================================================================
--- kernel/arch/ia32/src/userspace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia32/src/userspace.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,5 @@
 #include <userspace.h>
 #include <arch/pm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <proc/uarg.h>
Index: kernel/arch/ia64/include/asm.h
===================================================================
--- kernel/arch/ia64/include/asm.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/asm.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,5 @@
 #include <config.h>
 #include <typedefs.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 
Index: kernel/arch/ia64/include/bootinfo.h
===================================================================
--- kernel/arch/ia64/include/bootinfo.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/bootinfo.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -67,5 +67,5 @@
 	unsigned int memmap_items;
 
-	unsigned long * sapic;
+	unative_t *sapic;
 	unsigned long sys_freq;
 	unsigned long freq_scale;
Index: kernel/arch/ia64/include/context.h
===================================================================
--- kernel/arch/ia64/include/context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia64_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 #include <align.h>
Index: kernel/arch/ia64/include/cpu.h
===================================================================
--- kernel/arch/ia64/include/cpu.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/cpu.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia64_CPU_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 #include <arch/asm.h>
Index: kernel/arch/ia64/include/faddr.h
===================================================================
--- kernel/arch/ia64/include/faddr.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/faddr.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia64_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /**
Index: kernel/arch/ia64/include/fpu_context.h
===================================================================
--- kernel/arch/ia64/include/fpu_context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/fpu_context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,5 @@
 #define FPU_CONTEXT_ALIGN 16
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FRS 96
Index: kernel/arch/ia64/include/interrupt.h
===================================================================
--- kernel/arch/ia64/include/interrupt.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/interrupt.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ia64_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 
Index: kernel/arch/ia64/include/mm/asid.h
===================================================================
--- kernel/arch/ia64/include/mm/asid.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/mm/asid.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef uint16_t asid_t;
Index: kernel/arch/ia64/include/mm/frame.h
===================================================================
--- kernel/arch/ia64/include/mm/frame.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/mm/frame.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -42,5 +42,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern uintptr_t last_frame;
Index: kernel/arch/ia64/include/mm/page.h
===================================================================
--- kernel/arch/ia64/include/mm/page.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/mm/page.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -108,5 +108,5 @@
 #include <arch/barrier.h>
 #include <arch/mm/asid.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 
Index: kernel/arch/ia64/include/mm/tlb.h
===================================================================
--- kernel/arch/ia64/include/mm/tlb.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/mm/tlb.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -39,5 +39,5 @@
 #include <arch/mm/asid.h>
 #include <arch/interrupt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Data and instruction Translation Register indices. */
Index: kernel/arch/ia64/include/register.h
===================================================================
--- kernel/arch/ia64/include/register.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/register.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -142,5 +142,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Processor Status Register. */
Index: kernel/arch/ia64/include/types.h
===================================================================
--- kernel/arch/ia64/include/types.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/types.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,22 +36,4 @@
 #define KERN_ia64_TYPES_H_
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-typedef signed long int64_t;
-typedef struct {
-	int64_t lo;
-	int64_t hi;
-} int128_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long uint64_t;
-typedef struct {
-	uint64_t lo;
-	uint64_t hi;
-} uint128_t;
-
 typedef uint64_t size_t;
 
@@ -70,24 +52,24 @@
 } __attribute__((may_alias)) fncptr_t;
 
-#define PRIp "lx"	/**< Format for uintptr_t. */
-#define PRIs "lu"	/**< Format for size_t. */
+#define PRIp "lx"  /**< Format for uintptr_t. */
+#define PRIs "lu"  /**< Format for size_t. */
 
-#define PRId8 "d"	/**< Format for int8_t. */
-#define PRId16 "d"	/**< Format for int16_t. */
-#define PRId32 "d"	/**< Format for int32_t. */
-#define PRId64 "ld"	/**< Format for int64_t. */
-#define PRIdn "d"	/**< Format for native_t. */
+#define PRId8 "d"    /**< Format for int8_t. */
+#define PRId16 "d"   /**< Format for int16_t. */
+#define PRId32 "d"   /**< Format for int32_t. */
+#define PRId64 "ld"  /**< Format for int64_t. */
+#define PRIdn "d"    /**< Format for native_t. */
 
-#define PRIu8 "u"	/**< Format for uint8_t. */
-#define PRIu16 "u"	/**< Format for uint16_t. */
-#define PRIu32 "u"	/**< Format for uint32_t. */
-#define PRIu64 "lu"	/**< Format for uint64_t. */
-#define PRIun "u"	/**< Format for unative_t. */
+#define PRIu8 "u"    /**< Format for uint8_t. */
+#define PRIu16 "u"   /**< Format for uint16_t. */
+#define PRIu32 "u"   /**< Format for uint32_t. */
+#define PRIu64 "lu"  /**< Format for uint64_t. */
+#define PRIun "u"    /**< Format for unative_t. */
 
-#define PRIx8 "x"	/**< Format for hexadecimal (u)int8_t. */
-#define PRIx16 "x"	/**< Format for hexadecimal (u)int16_t. */
-#define PRIx32 "x"	/**< Format for hexadecimal (u)uint32_t. */
-#define PRIx64 "lx"	/**< Format for hexadecimal (u)int64_t. */
-#define PRIxn "x"	/**< Format for hexadecimal (u)native_t. */
+#define PRIx8 "x"    /**< Format for hexadecimal (u)int8_t. */
+#define PRIx16 "x"   /**< Format for hexadecimal (u)int16_t. */
+#define PRIx32 "x"   /**< Format for hexadecimal (u)uint32_t. */
+#define PRIx64 "lx"  /**< Format for hexadecimal (u)int64_t. */
+#define PRIxn "x"    /**< Format for hexadecimal (u)native_t. */
 
 #endif
Index: kernel/arch/ia64/src/ddi/ddi.c
===================================================================
--- kernel/arch/ia64/src/ddi/ddi.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/ddi/ddi.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/slab.h>
 #include <errno.h>
Index: kernel/arch/ia64/src/debug/stacktrace.c
===================================================================
--- kernel/arch/ia64/src/debug/stacktrace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/debug/stacktrace.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,4 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/ia64/src/drivers/ski.c
===================================================================
--- kernel/arch/ia64/src/drivers/ski.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/drivers/ski.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 #include <console/chardev.h>
 #include <sysinfo/sysinfo.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <proc/thread.h>
 #include <synch/spinlock.h>
Index: kernel/arch/ia64/src/ia64.c
===================================================================
--- kernel/arch/ia64/src/ia64.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/ia64.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -40,5 +40,5 @@
 #include <arch/asm.h>
 #include <arch/register.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 #include <arch/stack.h>
Index: kernel/arch/ia64/src/interrupt.c
===================================================================
--- kernel/arch/ia64/src/interrupt.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/interrupt.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -41,5 +41,5 @@
 #include <debug.h>
 #include <console/console.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 #include <arch/barrier.h>
Index: kernel/arch/ia64/src/mm/page.c
===================================================================
--- kernel/arch/ia64/src/mm/page.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/mm/page.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -39,5 +39,5 @@
 #include <arch/mm/asid.h>
 #include <arch/mm/vhpt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <print.h>
 #include <mm/page.h>
Index: kernel/arch/ia64/src/smp/smp.c
===================================================================
--- kernel/arch/ia64/src/smp/smp.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/smp/smp.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -40,5 +40,5 @@
 #include <arch/asm.h>
 #include <arch/register.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 #include <arch/stack.h>
Index: kernel/arch/mips32/include/asm.h
===================================================================
--- kernel/arch/mips32/include/asm.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/include/asm.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,4 @@
 #define KERN_mips32_ASM_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <config.h>
Index: kernel/arch/mips32/include/context.h
===================================================================
--- kernel/arch/mips32/include/context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/include/context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -46,5 +46,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define context_set(ctx, pc, stack, size) \
Index: kernel/arch/mips32/include/cp0.h
===================================================================
--- kernel/arch/mips32/include/cp0.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/include/cp0.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_mips32_CP0_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define cp0_status_ie_enabled_bit	(1 << 0)
Index: kernel/arch/mips32/include/cpu.h
===================================================================
--- kernel/arch/mips32/include/cpu.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/include/cpu.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_mips32_CPU_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 
Index: kernel/arch/mips32/include/debugger.h
===================================================================
--- kernel/arch/mips32/include/debugger.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/include/debugger.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 
 #include <arch/exception.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define BKPOINTS_MAX 10
Index: kernel/arch/mips32/include/exception.h
===================================================================
--- kernel/arch/mips32/include/exception.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/include/exception.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_mips32_EXCEPTION_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/cp0.h>
 
Index: kernel/arch/mips32/include/faddr.h
===================================================================
--- kernel/arch/mips32/include/faddr.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/include/faddr.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_mips32_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FADDR(fptr)		((uintptr_t) (fptr))
Index: kernel/arch/mips32/include/fpu_context.h
===================================================================
--- kernel/arch/mips32/include/fpu_context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/include/fpu_context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_mips32_FPU_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FPU_CONTEXT_ALIGN    sizeof(unative_t)
Index: kernel/arch/mips32/include/mm/asid.h
===================================================================
--- kernel/arch/mips32/include/mm/asid.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/include/mm/asid.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_mips32_ASID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define ASID_MAX_ARCH  255    /* 2^8 - 1 */
Index: kernel/arch/mips32/include/mm/tlb.h
===================================================================
--- kernel/arch/mips32/include/mm/tlb.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/include/mm/tlb.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,4 @@
 #define KERN_mips32_TLB_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <arch/mm/asid.h>
Index: kernel/arch/mips32/include/types.h
===================================================================
--- kernel/arch/mips32/include/types.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/include/types.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,14 +36,4 @@
 #define KERN_mips32_TYPES_H_
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed long int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned long uint32_t;
-typedef unsigned long long uint64_t;
-
 typedef uint32_t size_t;
 
@@ -60,24 +50,24 @@
 } fncptr_t;
 
-#define PRIp "x"	/**< Format for uintptr_t. */
-#define PRIs "u"	/**< Format for size_t. */
+#define PRIp "x"  /**< Format for uintptr_t. */
+#define PRIs "u"  /**< Format for size_t. */
 
-#define PRId8 "d"	/**< Format for int8_t. */
-#define PRId16 "d"	/**< Format for int16_t. */
-#define PRId32 "ld"	/**< Format for int32_t. */
-#define PRId64 "lld"	/**< Format for int64_t. */
-#define PRIdn "d"	/**< Format for native_t. */
+#define PRId8 "d"     /**< Format for int8_t. */
+#define PRId16 "d"    /**< Format for int16_t. */
+#define PRId32 "ld"   /**< Format for int32_t. */
+#define PRId64 "lld"  /**< Format for int64_t. */
+#define PRIdn "d"     /**< Format for native_t. */
 
-#define PRIu8 "u"	/**< Format for uint8_t. */
-#define PRIu16 "u"	/**< Format for uint16_t. */
-#define PRIu32 "u"	/**< Format for uint32_t. */
-#define PRIu64 "llu"	/**< Format for uint64_t. */
-#define PRIun "u"	/**< Format for unative_t. */
+#define PRIu8 "u"     /**< Format for uint8_t. */
+#define PRIu16 "u"    /**< Format for uint16_t. */
+#define PRIu32 "u"    /**< Format for uint32_t. */
+#define PRIu64 "llu"  /**< Format for uint64_t. */
+#define PRIun "u"     /**< Format for unative_t. */
 
-#define PRIx8 "x"	/**< Format for hexadecimal (u)int8_t. */
-#define PRIx16 "x"	/**< Format for hexadecimal (u)int16_t. */
-#define PRIx32 "x"	/**< Format for hexadecimal (u)uint32_t. */
-#define PRIx64 "llx"	/**< Format for hexadecimal (u)int64_t. */
-#define PRIxn "x"	/**< Format for hexadecimal (u)native_t. */
+#define PRIx8 "x"     /**< Format for hexadecimal (u)int8_t. */
+#define PRIx16 "x"    /**< Format for hexadecimal (u)int16_t. */
+#define PRIx32 "x"    /**< Format for hexadecimal (u)uint32_t. */
+#define PRIx64 "llx"  /**< Format for hexadecimal (u)int64_t. */
+#define PRIxn "x"     /**< Format for hexadecimal (u)native_t. */
 
 #endif
Index: kernel/arch/mips32/src/ddi/ddi.c
===================================================================
--- kernel/arch/mips32/src/ddi/ddi.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/src/ddi/ddi.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,5 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <security/cap.h>
 #include <arch.h>
Index: kernel/arch/mips32/src/debug/stacktrace.c
===================================================================
--- kernel/arch/mips32/src/debug/stacktrace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/src/debug/stacktrace.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,4 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/mips32/src/exception.c
===================================================================
--- kernel/arch/mips32/src/exception.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/src/exception.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,5 @@
 #include <panic.h>
 #include <arch/cp0.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <debug.h>
Index: kernel/arch/mips32/src/interrupt.c
===================================================================
--- kernel/arch/mips32/src/interrupt.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/mips32/src/interrupt.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,5 @@
 #include <interrupt.h>
 #include <arch/interrupt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <arch/cp0.h>
Index: kernel/arch/ppc32/include/asm.h
===================================================================
--- kernel/arch/ppc32/include/asm.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/include/asm.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,4 @@
 #define KERN_ppc32_ASM_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <config.h>
Index: kernel/arch/ppc32/include/boot/boot.h
===================================================================
--- kernel/arch/ppc32/include/boot/boot.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/include/boot/boot.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -47,5 +47,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <genarch/ofw/ofw_tree.h>
Index: kernel/arch/ppc32/include/context.h
===================================================================
--- kernel/arch/ppc32/include/context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/include/context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ppc32_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define SP_DELTA  16
Index: kernel/arch/ppc32/include/cpuid.h
===================================================================
--- kernel/arch/ppc32/include/cpuid.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/include/cpuid.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ppc32_CPUID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef struct {
Index: kernel/arch/ppc32/include/drivers/pic.h
===================================================================
--- kernel/arch/ppc32/include/drivers/pic.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/include/drivers/pic.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ppc32_PIC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/irq.h>
 
Index: kernel/arch/ppc32/include/exception.h
===================================================================
--- kernel/arch/ppc32/include/exception.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/include/exception.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ppc32_EXCEPTION_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/regutils.h>
 
Index: kernel/arch/ppc32/include/faddr.h
===================================================================
--- kernel/arch/ppc32/include/faddr.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/include/faddr.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ppc32_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FADDR(fptr)		((uintptr_t) (fptr))
Index: kernel/arch/ppc32/include/fpu_context.h
===================================================================
--- kernel/arch/ppc32/include/fpu_context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/include/fpu_context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 
 #ifndef KERN_ppc32_TYPES_H_
-# include <arch/types.h>
+	#include <typedefs.h>
 #endif
 
Index: kernel/arch/ppc32/include/mm/asid.h
===================================================================
--- kernel/arch/ppc32/include/mm/asid.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/include/mm/asid.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_ppc32_ASID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define ASID_MAX_ARCH		4096
Index: kernel/arch/ppc32/include/mm/frame.h
===================================================================
--- kernel/arch/ppc32/include/mm/frame.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/include/mm/frame.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -42,5 +42,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern uintptr_t last_frame;
Index: kernel/arch/ppc32/include/mm/tlb.h
===================================================================
--- kernel/arch/ppc32/include/mm/tlb.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/include/mm/tlb.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,4 @@
 
 #include <arch/interrupt.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/ppc32/include/types.h
===================================================================
--- kernel/arch/ppc32/include/types.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/include/types.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,14 +36,4 @@
 #define KERN_ppc32_TYPES_H_
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-
 typedef uint32_t size_t;
 
@@ -61,25 +51,25 @@
 
 /**< Formats for uintptr_t, size_t */
-#define PRIp "x"
-#define PRIs "u"
+#define PRIp  "x"
+#define PRIs  "u"
 
 /**< Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
-#define PRId8 "d"
-#define PRId16 "d"
-#define PRId32 "d"
-#define PRId64 "lld"
-#define PRIdn "d"
+#define PRId8   "d"
+#define PRId16  "d"
+#define PRId32  "d"
+#define PRId64  "lld"
+#define PRIdn   "d"
 
-#define PRIu8 "u"
-#define PRIu16 "u"
-#define PRIu32 "u"
-#define PRIu64 "llu"
-#define PRIun "u"
+#define PRIu8   "u"
+#define PRIu16  "u"
+#define PRIu32  "u"
+#define PRIu64  "llu"
+#define PRIun   "u"
 
-#define PRIx8 "x"
-#define PRIx16 "x"
-#define PRIx32 "x"
-#define PRIx64 "llx"
-#define PRIxn "x"
+#define PRIx8   "x"
+#define PRIx16  "x"
+#define PRIx32  "x"
+#define PRIx64  "llx"
+#define PRIxn   "x"
 
 #endif
Index: kernel/arch/ppc32/src/ddi/ddi.c
===================================================================
--- kernel/arch/ppc32/src/ddi/ddi.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/src/ddi/ddi.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,5 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Enable I/O space range for task.
Index: kernel/arch/ppc32/src/debug/stacktrace.c
===================================================================
--- kernel/arch/ppc32/src/debug/stacktrace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/src/debug/stacktrace.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,4 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/ppc32/src/interrupt.c
===================================================================
--- kernel/arch/ppc32/src/interrupt.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ppc32/src/interrupt.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #include <interrupt.h>
 #include <arch/interrupt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <time/clock.h>
Index: kernel/arch/sparc64/include/asm.h
===================================================================
--- kernel/arch/sparc64/include/asm.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/asm.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,4 @@
 
 #include <arch/arch.h>
-#include <arch/types.h>
 #include <typedefs.h>
 #include <align.h>
Index: kernel/arch/sparc64/include/atomic.h
===================================================================
--- kernel/arch/sparc64/include/atomic.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/atomic.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 
 #include <arch/barrier.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <preemption.h>
 
Index: kernel/arch/sparc64/include/boot/boot.h
===================================================================
--- kernel/arch/sparc64/include/boot/boot.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/boot/boot.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -43,5 +43,5 @@
 
 #include <config.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 
Index: kernel/arch/sparc64/include/context.h
===================================================================
--- kernel/arch/sparc64/include/context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 
 #include <arch/stack.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 
Index: kernel/arch/sparc64/include/cpu.h
===================================================================
--- kernel/arch/sparc64/include/cpu.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/cpu.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -54,5 +54,4 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <arch/register.h>
Index: kernel/arch/sparc64/include/drivers/fhc.h
===================================================================
--- kernel/arch/sparc64/include/drivers/fhc.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/drivers/fhc.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_FHC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 
Index: kernel/arch/sparc64/include/drivers/kbd.h
===================================================================
--- kernel/arch/sparc64/include/drivers/kbd.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/drivers/kbd.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_KBD_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 
Index: kernel/arch/sparc64/include/drivers/pci.h
===================================================================
--- kernel/arch/sparc64/include/drivers/pci.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/drivers/pci.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_PCI_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 #include <arch/arch.h>
Index: kernel/arch/sparc64/include/drivers/scr.h
===================================================================
--- kernel/arch/sparc64/include/drivers/scr.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/drivers/scr.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_SCR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 
Index: kernel/arch/sparc64/include/drivers/sgcn.h
===================================================================
--- kernel/arch/sparc64/include/drivers/sgcn.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/drivers/sgcn.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_SGCN_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <console/chardev.h>
 #include <proc/thread.h>
Index: kernel/arch/sparc64/include/faddr.h
===================================================================
--- kernel/arch/sparc64/include/faddr.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/faddr.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FADDR(fptr)		((uintptr_t) (fptr))
Index: kernel/arch/sparc64/include/fpu_context.h
===================================================================
--- kernel/arch/sparc64/include/fpu_context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/fpu_context.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_FPU_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FPU_CONTEXT_ALIGN	8
Index: kernel/arch/sparc64/include/interrupt.h
===================================================================
--- kernel/arch/sparc64/include/interrupt.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/interrupt.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 #define KERN_sparc64_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/regdef.h>
 
Index: kernel/arch/sparc64/include/mm/asid.h
===================================================================
--- kernel/arch/sparc64/include/mm/asid.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/asid.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_ASID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /*
Index: kernel/arch/sparc64/include/mm/sun4u/frame.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4u/frame.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4u/frame.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -55,5 +55,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 union frame_address {
Index: kernel/arch/sparc64/include/mm/sun4u/mmu.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4u/mmu.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4u/mmu.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -91,5 +91,5 @@
 #include <arch/asm.h>
 #include <arch/barrier.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 #if defined(US)
Index: kernel/arch/sparc64/include/mm/sun4u/tlb.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4u/tlb.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4u/tlb.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -99,5 +99,5 @@
 #include <arch/asm.h>
 #include <arch/barrier.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 #include <arch/cpu.h>
Index: kernel/arch/sparc64/include/mm/sun4u/tsb.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4u/tsb.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4u/tsb.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -54,5 +54,5 @@
 #include <arch/mm/tte.h>
 #include <arch/mm/mmu.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** TSB Base register. */
Index: kernel/arch/sparc64/include/mm/sun4u/tte.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4u/tte.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4u/tte.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -49,5 +49,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /* TTE tag's VA_tag field contains bits <63:VA_TAG_PAGE_SHIFT> of the VA */
Index: kernel/arch/sparc64/include/mm/sun4v/frame.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4v/frame.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4v/frame.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -45,5 +45,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern uintptr_t last_frame;
Index: kernel/arch/sparc64/include/mm/sun4v/tlb.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4v/tlb.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4v/tlb.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -48,5 +48,5 @@
 #include <arch/asm.h>
 #include <arch/barrier.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 #include <arch/cpu.h>
Index: kernel/arch/sparc64/include/mm/sun4v/tsb.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4v/tsb.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4v/tsb.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -53,5 +53,4 @@
 #include <arch/mm/tte.h>
 #include <arch/mm/mmu.h>
-#include <arch/types.h>
 
 /** TSB description, used in hypercalls */
Index: kernel/arch/sparc64/include/mm/sun4v/tte.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4v/tte.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4v/tte.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -50,5 +50,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Translation Table Entry - Data. */
Index: kernel/arch/sparc64/include/proc/thread.h
===================================================================
--- kernel/arch/sparc64/include/proc/thread.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/proc/thread.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_THREAD_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/arch.h>
 
Index: kernel/arch/sparc64/include/register.h
===================================================================
--- kernel/arch/sparc64/include/register.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/register.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 
 #include <arch/regdef.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Version Register. */
Index: kernel/arch/sparc64/include/sun4u/cpu.h
===================================================================
--- kernel/arch/sparc64/include/sun4u/cpu.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/sun4u/cpu.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -54,5 +54,4 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <arch/register.h>
Index: kernel/arch/sparc64/include/sun4v/hypercall.h
===================================================================
--- kernel/arch/sparc64/include/sun4v/hypercall.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/sun4v/hypercall.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -120,5 +120,4 @@
 
 #include <typedefs.h>
-#include <arch/types.h>
 
 /*
Index: kernel/arch/sparc64/include/sun4v/ipi.h
===================================================================
--- kernel/arch/sparc64/include/sun4v/ipi.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/sun4v/ipi.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,5 @@
 #define KERN_sparc64_sun4v_IPI_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern uint64_t ipi_brodcast_to(void (*)(void), uint16_t cpu_list[], uint64_t);
Index: kernel/arch/sparc64/include/sun4v/register.h
===================================================================
--- kernel/arch/sparc64/include/sun4v/register.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/sun4v/register.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -37,5 +37,5 @@
 
 #include <arch/regdef.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Processor State Register. */
Index: kernel/arch/sparc64/include/trap/trap_table.h
===================================================================
--- kernel/arch/sparc64/include/trap/trap_table.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/trap/trap_table.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -44,5 +44,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 struct trap_table_entry {
Index: kernel/arch/sparc64/include/types.h
===================================================================
--- kernel/arch/sparc64/include/types.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/types.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,14 +36,4 @@
 #define KERN_sparc64_TYPES_H_
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-typedef signed long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long uint64_t;
-
 typedef uint64_t size_t;
 
@@ -60,28 +50,28 @@
 } fncptr_t;
 
+typedef uint8_t asi_t;
+
 /**< Formats for uintptr_t, size_t */
-#define PRIp "llx"
-#define PRIs "llu"
+#define PRIp  "llx"
+#define PRIs  "llu"
 
 /**< Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
-#define PRId8 "d"
-#define PRId16 "d"
-#define PRId32 "d"
-#define PRId64 "lld"
-#define PRIdn "lld"
+#define PRId8   "d"
+#define PRId16  "d"
+#define PRId32  "d"
+#define PRId64  "lld"
+#define PRIdn   "lld"
 
-#define PRIu8 "u"
-#define PRIu16 "u"
-#define PRIu32 "u"
-#define PRIu64 "llu"
-#define PRIun "llu"
+#define PRIu8   "u"
+#define PRIu16  "u"
+#define PRIu32  "u"
+#define PRIu64  "llu"
+#define PRIun   "llu"
 
-#define PRIx8 "x"
-#define PRIx16 "x"
-#define PRIx32 "x"
-#define PRIx64 "llx"
-#define PRIxn "llx"
-
-typedef uint8_t asi_t;
+#define PRIx8   "x"
+#define PRIx16  "x"
+#define PRIx32  "x"
+#define PRIx64  "llx"
+#define PRIxn   "llx"
 
 #endif
Index: kernel/arch/sparc64/src/console.c
===================================================================
--- kernel/arch/sparc64/src/console.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/console.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -34,5 +34,5 @@
 
 #include <arch/console.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 #include <arch/drivers/scr.h>
Index: kernel/arch/sparc64/src/ddi/ddi.c
===================================================================
--- kernel/arch/sparc64/src/ddi/ddi.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/ddi/ddi.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,5 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Enable I/O space range for task.
Index: kernel/arch/sparc64/src/debug/stacktrace.c
===================================================================
--- kernel/arch/sparc64/src/debug/stacktrace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/debug/stacktrace.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -35,5 +35,4 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/sparc64/src/drivers/fhc.c
===================================================================
--- kernel/arch/sparc64/src/drivers/fhc.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/drivers/fhc.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -44,5 +44,5 @@
 #include <mm/page.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 #include <genarch/ofw/fhc.h>
Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -41,5 +41,5 @@
 #include <mm/page.h>
 #include <arch/mm/page.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <str.h>
Index: kernel/arch/sparc64/src/drivers/pci.c
===================================================================
--- kernel/arch/sparc64/src/drivers/pci.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/drivers/pci.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -41,5 +41,5 @@
 #include <mm/page.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <print.h>
Index: kernel/arch/sparc64/src/drivers/scr.c
===================================================================
--- kernel/arch/sparc64/src/drivers/scr.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/drivers/scr.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -42,5 +42,5 @@
 #include <console/chardev.h>
 #include <console/console.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <str.h>
 #include <align.h>
Index: kernel/arch/sparc64/src/mm/sun4u/frame.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/frame.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/mm/sun4u/frame.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #include <mm/frame.h>
 #include <arch/boot/boot.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <align.h>
Index: kernel/arch/sparc64/src/mm/sun4u/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -44,5 +44,5 @@
 #include <arch.h>
 #include <print.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <arch/trap/trap.h>
Index: kernel/arch/sparc64/src/mm/sun4u/tsb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/tsb.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/mm/sun4u/tsb.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,5 @@
 #include <arch/barrier.h>
 #include <mm/as.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <macros.h>
 #include <debug.h>
Index: kernel/arch/sparc64/src/mm/sun4v/frame.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/frame.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/mm/sun4v/frame.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #include <mm/frame.h>
 #include <arch/boot/boot.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <align.h>
Index: kernel/arch/sparc64/src/mm/sun4v/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -46,5 +46,5 @@
 #include <arch.h>
 #include <print.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <arch/trap/trap.h>
Index: kernel/arch/sparc64/src/mm/sun4v/tsb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/tsb.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/mm/sun4v/tsb.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -40,5 +40,5 @@
 #include <arch/barrier.h>
 #include <mm/as.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <macros.h>
 #include <debug.h>
Index: kernel/arch/sparc64/src/smp/sun4u/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -41,5 +41,5 @@
 #include <config.h>
 #include <macros.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/synch.h>
 #include <synch/waitq.h>
Index: kernel/arch/sparc64/src/smp/sun4v/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -44,5 +44,5 @@
 #include <macros.h>
 #include <func.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/synch.h>
 #include <synch/waitq.h>
Index: kernel/arch/sparc64/src/trap/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/interrupt.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/trap/interrupt.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -39,5 +39,5 @@
 #include <interrupt.h>
 #include <ddi/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <arch/asm.h>
Index: kernel/arch/sparc64/src/trap/sun4u/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/sun4u/interrupt.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/trap/sun4u/interrupt.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,5 @@
 #include <interrupt.h>
 #include <ddi/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <arch/asm.h>
Index: kernel/arch/sparc64/src/trap/sun4v/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/sun4v/interrupt.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/trap/sun4v/interrupt.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -38,5 +38,5 @@
 #include <interrupt.h>
 #include <ddi/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <arch/asm.h>
Index: kernel/arch/sparc64/src/trap/trap.c
===================================================================
--- kernel/arch/sparc64/src/trap/trap.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/trap/trap.c	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -43,5 +43,5 @@
 #include <memstr.h>
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/drivers/tick.h>