Index: kernel/genarch/include/mm/as_pt.h
===================================================================
--- kernel/genarch/include/mm/as_pt.h	(revision c09adc10434b7de65842eae8fc63537922e8c7d6)
+++ kernel/genarch/include/mm/as_pt.h	(revision be0d92e6873197a81ec024ec2645870af4009bac)
@@ -36,7 +36,5 @@
 #define KERN_AS_PT_H_
 
-#include <mm/mm.h>
 #include <arch/mm/page.h>
-#include <arch/types.h>
 
 #define AS_PAGE_TABLE
Index: kernel/genarch/include/mm/page_pt.h
===================================================================
--- kernel/genarch/include/mm/page_pt.h	(revision c09adc10434b7de65842eae8fc63537922e8c7d6)
+++ kernel/genarch/include/mm/page_pt.h	(revision be0d92e6873197a81ec024ec2645870af4009bac)
@@ -44,7 +44,8 @@
 #define KERN_PAGE_PT_H_
 
-#include <arch/types.h>
 #include <mm/as.h>
 #include <mm/page.h>
+#include <arch/mm/page.h>
+#include <arch/types.h>
 
 /*