Index: kernel/arch/ia32/src/bios/bios.c
===================================================================
--- kernel/arch/ia32/src/bios/bios.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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 a000878c0dee83a08f032207ffd800c201fca95b)
+++ 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>