Index: kernel/arch/ia32/include/arch/arch.h
===================================================================
--- kernel/arch/ia32/include/arch/arch.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/arch.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -36,5 +36,5 @@
 #define KERN_ia32_ARCH_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 extern void ia32_pre_main(uint32_t, void *);
Index: kernel/arch/ia32/include/arch/boot/memmap.h
===================================================================
--- kernel/arch/ia32/include/arch/boot/memmap.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/boot/memmap.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -63,5 +63,5 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
+#include <stdint.h>
 
 extern e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS];
Index: kernel/arch/ia32/include/arch/cpuid.h
===================================================================
--- kernel/arch/ia32/include/arch/cpuid.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/cpuid.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -43,6 +43,6 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
 #include <arch/cpu.h>
+#include <stdint.h>
 
 typedef struct {
Index: kernel/arch/ia32/include/arch/fpu_context.h
===================================================================
--- kernel/arch/ia32/include/arch/fpu_context.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/fpu_context.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -36,5 +36,5 @@
 #define KERN_ia32_FPU_CONTEXT_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 #define FPU_CONTEXT_ALIGN  16
Index: kernel/arch/ia32/include/arch/interrupt.h
===================================================================
--- kernel/arch/ia32/include/arch/interrupt.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/interrupt.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -36,7 +36,7 @@
 #define KERN_ia32_INTERRUPT_H_
 
-#include <typedefs.h>
 #include <arch/istate.h>
 #include <arch/pm.h>
+#include <stdint.h>
 
 #define IVT_ITEMS  IDT_ITEMS
Index: kernel/arch/ia32/include/arch/mm/asid.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/asid.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/mm/asid.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -43,5 +43,5 @@
 #define KERN_ia32_ASID_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 typedef int32_t asid_t;
Index: kernel/arch/ia32/include/arch/mm/frame.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/frame.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/mm/frame.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -43,6 +43,4 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
-
 extern void frame_low_arch_init(void);
 extern void frame_high_arch_init(void);
Index: kernel/arch/ia32/include/arch/mm/page.h
===================================================================
--- kernel/arch/ia32/include/arch/mm/page.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/mm/page.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -146,5 +146,5 @@
 #include <mm/mm.h>
 #include <arch/interrupt.h>
-#include <typedefs.h>
+#include <stddef.h>
 
 /* Page fault error codes. */
Index: kernel/arch/ia32/include/arch/proc/task.h
===================================================================
--- kernel/arch/ia32/include/arch/proc/task.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/proc/task.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -36,5 +36,5 @@
 #define KERN_ia32_TASK_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <adt/bitmap.h>
 
Index: kernel/arch/ia32/include/arch/proc/thread.h
===================================================================
--- kernel/arch/ia32/include/arch/proc/thread.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/proc/thread.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -36,6 +36,4 @@
 #define KERN_ia32_THREAD_H_
 
-#include <typedefs.h>
-
 typedef struct {
 } thread_arch_t;
Index: kernel/arch/ia32/include/arch/smp/apic.h
===================================================================
--- kernel/arch/ia32/include/arch/smp/apic.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/smp/apic.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -41,6 +41,6 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
 #include <cpu.h>
+#include <stdint.h>
 
 #define FIXED  (0 << 0)
Index: kernel/arch/ia32/include/arch/smp/mps.h
===================================================================
--- kernel/arch/ia32/include/arch/smp/mps.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/smp/mps.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -36,5 +36,5 @@
 #define KERN_ia32_MPS_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 #include <synch/waitq.h>
 #include <config.h>
Index: kernel/arch/ia32/include/arch/smp/smp.h
===================================================================
--- kernel/arch/ia32/include/arch/smp/smp.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/smp/smp.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -36,5 +36,6 @@
 #define KERN_ia32_SMP_H_
 
-#include <typedefs.h>
+#include <stdbool.h>
+#include <stddef.h>
 
 /** SMP config opertaions interface. */
Index: kernel/arch/ia32/include/arch/vreg.h
===================================================================
--- kernel/arch/ia32/include/arch/vreg.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/include/arch/vreg.h	(revision 7367c312a2e6aa20171463840a60416c6f2d046c)
@@ -40,5 +40,5 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
+#include <stdint.h>
 
 extern uint32_t *vreg_ptr;