Index: kernel/arch/ia32/include/asm.h
===================================================================
--- kernel/arch/ia32/include/asm.h	(revision 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/asm.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/atomic.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/bios/bios.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/boot/memmap.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/context.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/cpuid.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/drivers/i8254.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/drivers/i8259.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/drivers/vesa.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/faddr.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/fpu_context.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/interrupt.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/mm/asid.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/mm/frame.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/mm/page.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/pm.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/proc/task.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/proc/thread.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/smp/apic.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/smp/mps.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/smp/smp.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/include/types.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/bios/bios.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/cpu/cpu.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/ddi/ddi.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/debug/stacktrace.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/drivers/i8254.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/drivers/i8259.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/drivers/vesa.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/ia32.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/mm/page.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/mm/tlb.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/pm.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/proc/task.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/smp/apic.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/smp/mps.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/syscall.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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 4e9aaf55e64f360630cc088883c7493ac073deef)
+++ kernel/arch/ia32/src/userspace.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -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>