Index: kernel/arch/arm32/include/arch/arch.h
===================================================================
--- kernel/arch/arm32/include/arch/arch.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/arm32/include/arch/arch.h	(revision a961619fe2e6b4bae1d93421e351c775282e6c52)
@@ -42,5 +42,5 @@
 #define BOOTINFO_TASK_NAME_BUFLEN 32
 
-#include <typedefs.h>
+#include <stddef.h>
 
 typedef struct {
Index: kernel/arch/arm32/include/arch/cp15.h
===================================================================
--- kernel/arch/arm32/include/arch/cp15.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/arm32/include/arch/cp15.h	(revision a961619fe2e6b4bae1d93421e351c775282e6c52)
@@ -37,9 +37,5 @@
 #define KERN_arm32_CP15_H_
 
-#if defined(KERNEL) || defined(BOOT)
-#include <typedefs.h>
-#else
 #include <stdint.h>
-#endif
 
 /** See ARM Architecture reference manual ch. B3.17.1 page B3-1456
Index: kernel/arch/arm32/include/arch/cpu.h
===================================================================
--- kernel/arch/arm32/include/arch/cpu.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/arm32/include/arch/cpu.h	(revision a961619fe2e6b4bae1d93421e351c775282e6c52)
@@ -37,6 +37,6 @@
 #define KERN_arm32_CPU_H_
 
-#include <typedefs.h>
 #include <arch/asm.h>
+#include <stdint.h>
 
 enum {
Index: kernel/arch/arm32/include/arch/fpu_context.h
===================================================================
--- kernel/arch/arm32/include/arch/fpu_context.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/arm32/include/arch/fpu_context.h	(revision a961619fe2e6b4bae1d93421e351c775282e6c52)
@@ -38,5 +38,5 @@
 
 #include <stdbool.h>
-#include <typedefs.h>
+#include <stdint.h>
 
 #define FPU_CONTEXT_ALIGN    8
Index: kernel/arch/arm32/include/arch/mm/asid.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/asid.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/arm32/include/arch/mm/asid.h	(revision a961619fe2e6b4bae1d93421e351c775282e6c52)
@@ -39,5 +39,5 @@
 #define KERN_arm32_ASID_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 #define ASID_MAX_ARCH		3	/* minimal required number */
Index: kernel/arch/arm32/include/arch/mm/frame.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/frame.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/arm32/include/arch/mm/frame.h	(revision a961619fe2e6b4bae1d93421e351c775282e6c52)
@@ -44,6 +44,4 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
-
 #define BOOT_PAGE_TABLE_SIZE     0x4000
 
Index: kernel/arch/arm32/include/arch/mm/page_fault.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page_fault.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/arm32/include/arch/mm/page_fault.h	(revision a961619fe2e6b4bae1d93421e351c775282e6c52)
@@ -37,5 +37,5 @@
 #define KERN_arm32_PAGE_FAULT_H_
 
-#include <typedefs.h>
+#include <stdint.h>