Index: kernel/arch/mips32/include/arch/arch.h
===================================================================
--- kernel/arch/mips32/include/arch/arch.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/mips32/include/arch/arch.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
@@ -36,5 +36,6 @@
 #define KERN_mips32_ARCH_H_
 
-#include <typedefs.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #define TASKMAP_MAX_RECORDS        32
Index: kernel/arch/mips32/include/arch/context.h
===================================================================
--- kernel/arch/mips32/include/arch/context.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/mips32/include/arch/context.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
@@ -39,5 +39,4 @@
 #include <arch/stack.h>
 #include <arch/context_struct.h>
-#include <typedefs.h>
 
 /*
Index: kernel/arch/mips32/include/arch/cp0.h
===================================================================
--- kernel/arch/mips32/include/arch/cp0.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/mips32/include/arch/cp0.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
@@ -35,4 +35,6 @@
 #ifndef KERN_mips32_CP0_H_
 #define KERN_mips32_CP0_H_
+
+#include <stdint.h>
 
 #define cp0_status_ie_enabled_bit     (1 << 0)
Index: kernel/arch/mips32/include/arch/cpu.h
===================================================================
--- kernel/arch/mips32/include/arch/cpu.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/mips32/include/arch/cpu.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
@@ -36,6 +36,6 @@
 #define KERN_mips32_CPU_H_
 
-#include <typedefs.h>
 #include <arch/asm.h>
+#include <stdint.h>
 
 typedef struct {
Index: kernel/arch/mips32/include/arch/exception.h
===================================================================
--- kernel/arch/mips32/include/arch/exception.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/mips32/include/arch/exception.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
@@ -36,5 +36,4 @@
 #define KERN_mips32_EXCEPTION_H_
 
-#include <typedefs.h>
 #include <arch/istate.h>
 
Index: kernel/arch/mips32/include/arch/interrupt.h
===================================================================
--- kernel/arch/mips32/include/arch/interrupt.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/mips32/include/arch/interrupt.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
@@ -36,5 +36,4 @@
 #define KERN_mips32_INTERRUPT_H_
 
-#include <typedefs.h>
 #include <arch/exception.h>
 
Index: kernel/arch/mips32/include/arch/mm/asid.h
===================================================================
--- kernel/arch/mips32/include/arch/mm/asid.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/mips32/include/arch/mm/asid.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
@@ -36,5 +36,5 @@
 #define KERN_mips32_ASID_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 #define ASID_MAX_ARCH  255    /* 2^8 - 1 */
Index: kernel/arch/mips32/include/arch/smp/dorder.h
===================================================================
--- kernel/arch/mips32/include/arch/smp/dorder.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/mips32/include/arch/smp/dorder.h	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
@@ -36,5 +36,5 @@
 #define KERN_mips32_DORDER_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 extern uint32_t dorder_cpuid(void);
Index: kernel/arch/mips32/src/exception.c
===================================================================
--- kernel/arch/mips32/src/exception.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/mips32/src/exception.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
@@ -38,5 +38,4 @@
 #include <panic.h>
 #include <arch/cp0.h>
-#include <typedefs.h>
 #include <arch.h>
 #include <debug.h>
Index: kernel/arch/mips32/src/smp/dorder.c
===================================================================
--- kernel/arch/mips32/src/smp/dorder.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/mips32/src/smp/dorder.c	(revision aaae6d99cfb1bf857abad28a4671e0c97ea8eb06)
@@ -33,5 +33,5 @@
  */
 
-#include <typedefs.h>
+#include <stdint.h>
 #include <smp/ipi.h>
 #include <arch/smp/dorder.h>