Index: kernel/arch/ppc64/include/cpu.h
===================================================================
--- kernel/arch/ppc64/include/cpu.h	(revision 0f3fc9b4dfadc676e3337514570c32d8d8c9b162)
+++ kernel/arch/ppc64/include/cpu.h	(revision b612ded6869749a0541d697ef85dc33bce820bd5)
@@ -36,5 +36,5 @@
 #define KERN_ppc64_CPU_H_
 
-#include <typedefs.h>
+#include <arch/asm.h>
 
 typedef struct {
Index: kernel/arch/ppc64/include/drivers/pic.h
===================================================================
--- kernel/arch/ppc64/include/drivers/pic.h	(revision 0f3fc9b4dfadc676e3337514570c32d8d8c9b162)
+++ kernel/arch/ppc64/include/drivers/pic.h	(revision b612ded6869749a0541d697ef85dc33bce820bd5)
@@ -36,4 +36,6 @@
 #define KERN_ppc64_PIC_H_
 
+#include <arch/types.h>
+
 #define PIC_PENDING_LOW    8
 #define PIC_PENDING_HIGH   4
Index: kernel/arch/ppc64/include/exception.h
===================================================================
--- kernel/arch/ppc64/include/exception.h	(revision 0f3fc9b4dfadc676e3337514570c32d8d8c9b162)
+++ kernel/arch/ppc64/include/exception.h	(revision b612ded6869749a0541d697ef85dc33bce820bd5)
@@ -37,7 +37,6 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
 
-struct istate {
+typedef struct {
 	uint64_t r0;
 	uint64_t r2;
@@ -78,5 +77,5 @@
 	uint64_t r12;
 	uint64_t sp;
-};
+} istate_t;
 
 static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
Index: kernel/arch/ppc64/include/mm/as.h
===================================================================
--- kernel/arch/ppc64/include/mm/as.h	(revision 0f3fc9b4dfadc676e3337514570c32d8d8c9b162)
+++ kernel/arch/ppc64/include/mm/as.h	(revision b612ded6869749a0541d697ef85dc33bce820bd5)
@@ -43,8 +43,10 @@
 #define USER_ADDRESS_SPACE_END_ARCH		((unsigned long) 0x7fffffff)
 
-#define USTACK_ADDRESS_ARCH	(0x7fffffff-(PAGE_SIZE-1))
+#define USTACK_ADDRESS_ARCH	(0x7fffffff - (PAGE_SIZE - 1))
 
 typedef struct {
 } as_arch_t;
+
+#include <genarch/mm/as_pt.h>
 
 #define as_constructor_arch(as, flags)		(as != as)
Index: kernel/arch/ppc64/include/mm/memory_init.h
===================================================================
--- kernel/arch/ppc64/include/mm/memory_init.h	(revision 0f3fc9b4dfadc676e3337514570c32d8d8c9b162)
+++ kernel/arch/ppc64/include/mm/memory_init.h	(revision b612ded6869749a0541d697ef85dc33bce820bd5)
@@ -36,6 +36,4 @@
 #define KERN_ppc64_MEMORY_INIT_H_
 
-#include <typedefs.h>
-
 size_t get_memory_size(void);
 
Index: kernel/arch/ppc64/include/mm/page.h
===================================================================
--- kernel/arch/ppc64/include/mm/page.h	(revision 0f3fc9b4dfadc676e3337514570c32d8d8c9b162)
+++ kernel/arch/ppc64/include/mm/page.h	(revision b612ded6869749a0541d697ef85dc33bce820bd5)
@@ -105,7 +105,6 @@
 #ifndef __ASM__
 
-#include <mm/page.h>
-#include <arch/mm/frame.h>
-#include <arch/types.h>
+#include <mm/mm.h>
+#include <arch/interrupt.h>
 
 static inline int get_pt_flags(pte_t *pt, index_t i)
Index: kernel/arch/ppc64/include/types.h
===================================================================
--- kernel/arch/ppc64/include/types.h	(revision 0f3fc9b4dfadc676e3337514570c32d8d8c9b162)
+++ kernel/arch/ppc64/include/types.h	(revision b612ded6869749a0541d697ef85dc33bce820bd5)
@@ -37,4 +37,6 @@
 
 #define NULL 0
+#define false 0
+#define true 1
 
 typedef signed char int8_t;
@@ -48,4 +50,8 @@
 typedef unsigned long uint64_t;
 
+typedef uint64_t size_t;
+typedef uint64_t count_t;
+typedef uint64_t index_t;
+
 typedef uint64_t uintptr_t;
 typedef uint64_t pfn_t;
@@ -54,4 +60,12 @@
 
 typedef uint64_t unative_t;
+typedef int64_t native_t;
+
+typedef uint8_t bool;
+typedef uint64_t task_id_t;
+typedef uint32_t context_id_t;
+
+typedef int32_t inr_t;
+typedef int32_t devno_t;
 
 /** Page Table Entry. */