Index: kernel/generic/include/mm/as.h
===================================================================
--- kernel/generic/include/mm/as.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/mm/as.h	(revision 5814ef7188cf75fcd57922f03a3bde3d4c78975f)
@@ -37,7 +37,7 @@
 
 #ifdef KERNEL
-#include <arch/types.h>
+	#include <typedefs.h>
 #else
-#include <sys/types.h>
+	#include <sys/types.h>
 #endif
 
@@ -65,5 +65,5 @@
 #include <arch/mm/as.h>
 #include <arch/mm/asid.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
Index: kernel/generic/include/mm/buddy.h
===================================================================
--- kernel/generic/include/mm/buddy.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/mm/buddy.h	(revision 5814ef7188cf75fcd57922f03a3bde3d4c78975f)
@@ -36,5 +36,5 @@
 #define KERN_BUDDY_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 
Index: kernel/generic/include/mm/frame.h
===================================================================
--- kernel/generic/include/mm/frame.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/mm/frame.h	(revision 5814ef7188cf75fcd57922f03a3bde3d4c78975f)
@@ -37,5 +37,5 @@
 #define KERN_FRAME_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <mm/buddy.h>
Index: kernel/generic/include/mm/page.h
===================================================================
--- kernel/generic/include/mm/page.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/mm/page.h	(revision 5814ef7188cf75fcd57922f03a3bde3d4c78975f)
@@ -36,5 +36,5 @@
 #define KERN_PAGE_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
 #include <memstr.h>
Index: kernel/generic/include/mm/tlb.h
===================================================================
--- kernel/generic/include/mm/tlb.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/mm/tlb.h	(revision 5814ef7188cf75fcd57922f03a3bde3d4c78975f)
@@ -37,5 +37,5 @@
 
 #include <arch/mm/asid.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /**