Index: kernel/arch/ppc32/include/asm.h
===================================================================
--- kernel/arch/ppc32/include/asm.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/ppc32/include/asm.h	(revision 371bd7d157f6602aa0ac4bd2e639fef084cecb89)
@@ -36,5 +36,4 @@
 #define KERN_ppc32_ASM_H_
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <config.h>
Index: kernel/arch/ppc32/include/boot/boot.h
===================================================================
--- kernel/arch/ppc32/include/boot/boot.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/ppc32/include/boot/boot.h	(revision 371bd7d157f6602aa0ac4bd2e639fef084cecb89)
@@ -47,5 +47,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <genarch/ofw/ofw_tree.h>
Index: kernel/arch/ppc32/include/context.h
===================================================================
--- kernel/arch/ppc32/include/context.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/ppc32/include/context.h	(revision 371bd7d157f6602aa0ac4bd2e639fef084cecb89)
@@ -36,5 +36,5 @@
 #define KERN_ppc32_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define SP_DELTA  16
Index: kernel/arch/ppc32/include/cpuid.h
===================================================================
--- kernel/arch/ppc32/include/cpuid.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/ppc32/include/cpuid.h	(revision 371bd7d157f6602aa0ac4bd2e639fef084cecb89)
@@ -36,5 +36,5 @@
 #define KERN_ppc32_CPUID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef struct {
Index: kernel/arch/ppc32/include/drivers/pic.h
===================================================================
--- kernel/arch/ppc32/include/drivers/pic.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/ppc32/include/drivers/pic.h	(revision 371bd7d157f6602aa0ac4bd2e639fef084cecb89)
@@ -36,5 +36,5 @@
 #define KERN_ppc32_PIC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/irq.h>
 
Index: kernel/arch/ppc32/include/exception.h
===================================================================
--- kernel/arch/ppc32/include/exception.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/ppc32/include/exception.h	(revision 371bd7d157f6602aa0ac4bd2e639fef084cecb89)
@@ -36,5 +36,5 @@
 #define KERN_ppc32_EXCEPTION_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/regutils.h>
 
Index: kernel/arch/ppc32/include/faddr.h
===================================================================
--- kernel/arch/ppc32/include/faddr.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/ppc32/include/faddr.h	(revision 371bd7d157f6602aa0ac4bd2e639fef084cecb89)
@@ -36,5 +36,5 @@
 #define KERN_ppc32_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FADDR(fptr)		((uintptr_t) (fptr))
Index: kernel/arch/ppc32/include/fpu_context.h
===================================================================
--- kernel/arch/ppc32/include/fpu_context.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/ppc32/include/fpu_context.h	(revision 371bd7d157f6602aa0ac4bd2e639fef084cecb89)
@@ -37,5 +37,5 @@
 
 #ifndef KERN_ppc32_TYPES_H_
-# include <arch/types.h>
+	#include <typedefs.h>
 #endif
 
Index: kernel/arch/ppc32/include/mm/asid.h
===================================================================
--- kernel/arch/ppc32/include/mm/asid.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/ppc32/include/mm/asid.h	(revision 371bd7d157f6602aa0ac4bd2e639fef084cecb89)
@@ -36,5 +36,5 @@
 #define KERN_ppc32_ASID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define ASID_MAX_ARCH		4096
Index: kernel/arch/ppc32/include/mm/frame.h
===================================================================
--- kernel/arch/ppc32/include/mm/frame.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/ppc32/include/mm/frame.h	(revision 371bd7d157f6602aa0ac4bd2e639fef084cecb89)
@@ -42,5 +42,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern uintptr_t last_frame;
Index: kernel/arch/ppc32/include/mm/tlb.h
===================================================================
--- kernel/arch/ppc32/include/mm/tlb.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/ppc32/include/mm/tlb.h	(revision 371bd7d157f6602aa0ac4bd2e639fef084cecb89)
@@ -37,5 +37,4 @@
 
 #include <arch/interrupt.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/ppc32/include/types.h
===================================================================
--- kernel/arch/ppc32/include/types.h	(revision 228666c006a3414de772f08f77335c546dd21aab)
+++ kernel/arch/ppc32/include/types.h	(revision 371bd7d157f6602aa0ac4bd2e639fef084cecb89)
@@ -36,14 +36,4 @@
 #define KERN_ppc32_TYPES_H_
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-
 typedef uint32_t size_t;
 
@@ -61,25 +51,25 @@
 
 /**< Formats for uintptr_t, size_t */
-#define PRIp "x"
-#define PRIs "u"
+#define PRIp  "x"
+#define PRIs  "u"
 
 /**< Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
-#define PRId8 "d"
-#define PRId16 "d"
-#define PRId32 "d"
-#define PRId64 "lld"
-#define PRIdn "d"
+#define PRId8   "d"
+#define PRId16  "d"
+#define PRId32  "d"
+#define PRId64  "lld"
+#define PRIdn   "d"
 
-#define PRIu8 "u"
-#define PRIu16 "u"
-#define PRIu32 "u"
-#define PRIu64 "llu"
-#define PRIun "u"
+#define PRIu8   "u"
+#define PRIu16  "u"
+#define PRIu32  "u"
+#define PRIu64  "llu"
+#define PRIun   "u"
 
-#define PRIx8 "x"
-#define PRIx16 "x"
-#define PRIx32 "x"
-#define PRIx64 "llx"
-#define PRIxn "x"
+#define PRIx8   "x"
+#define PRIx16  "x"
+#define PRIx32  "x"
+#define PRIx64  "llx"
+#define PRIxn   "x"
 
 #endif
