Index: kernel/arch/mips32/include/asm.h
===================================================================
--- kernel/arch/mips32/include/asm.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/mips32/include/asm.h	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -36,5 +36,4 @@
 #define KERN_mips32_ASM_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <config.h>
Index: kernel/arch/mips32/include/context.h
===================================================================
--- kernel/arch/mips32/include/context.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/mips32/include/context.h	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -46,5 +46,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define context_set(ctx, pc, stack, size) \
Index: kernel/arch/mips32/include/cp0.h
===================================================================
--- kernel/arch/mips32/include/cp0.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/mips32/include/cp0.h	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -36,5 +36,5 @@
 #define KERN_mips32_CP0_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define cp0_status_ie_enabled_bit	(1 << 0)
Index: kernel/arch/mips32/include/cpu.h
===================================================================
--- kernel/arch/mips32/include/cpu.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/mips32/include/cpu.h	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -36,5 +36,5 @@
 #define KERN_mips32_CPU_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 
Index: kernel/arch/mips32/include/debugger.h
===================================================================
--- kernel/arch/mips32/include/debugger.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/mips32/include/debugger.h	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -37,5 +37,5 @@
 
 #include <arch/exception.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define BKPOINTS_MAX 10
Index: kernel/arch/mips32/include/exception.h
===================================================================
--- kernel/arch/mips32/include/exception.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/mips32/include/exception.h	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -36,5 +36,5 @@
 #define KERN_mips32_EXCEPTION_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/cp0.h>
 
Index: kernel/arch/mips32/include/faddr.h
===================================================================
--- kernel/arch/mips32/include/faddr.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/mips32/include/faddr.h	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -36,5 +36,5 @@
 #define KERN_mips32_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FADDR(fptr)		((uintptr_t) (fptr))
Index: kernel/arch/mips32/include/fpu_context.h
===================================================================
--- kernel/arch/mips32/include/fpu_context.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/mips32/include/fpu_context.h	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -36,5 +36,5 @@
 #define KERN_mips32_FPU_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FPU_CONTEXT_ALIGN    sizeof(unative_t)
Index: kernel/arch/mips32/include/mm/asid.h
===================================================================
--- kernel/arch/mips32/include/mm/asid.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/mips32/include/mm/asid.h	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -36,5 +36,5 @@
 #define KERN_mips32_ASID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define ASID_MAX_ARCH  255    /* 2^8 - 1 */
Index: kernel/arch/mips32/include/mm/tlb.h
===================================================================
--- kernel/arch/mips32/include/mm/tlb.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/mips32/include/mm/tlb.h	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -36,5 +36,4 @@
 #define KERN_mips32_TLB_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <arch/mm/asid.h>
Index: kernel/arch/mips32/include/types.h
===================================================================
--- kernel/arch/mips32/include/types.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/mips32/include/types.h	(revision 63f89665fc0283c1661274dc636d5a66e03d48b4)
@@ -36,14 +36,4 @@
 #define KERN_mips32_TYPES_H_
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed long int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned long uint32_t;
-typedef unsigned long long uint64_t;
-
 typedef uint32_t size_t;
 
@@ -60,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 "ld"	/**< 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 "ld"   /**< 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
