Index: include/mm/page.h
===================================================================
--- include/mm/page.h	(revision 76cec1e21a9510de8780a546f59799bc82003d87)
+++ include/mm/page.h	(revision a8f9a8291c201ef23ba4a707a7a7ceacc7c60ae1)
@@ -107,6 +107,4 @@
 #define SET_FRAME_FLAGS(ptl3, i, x)	SET_FRAME_FLAGS_ARCH(ptl3, i, x)
 
-#include <arch/mm/page.h>
-
 extern void page_init(void);
 extern void map_page_to_frame(__address page, __address frame, int flags, __address root);
Index: include/mm/vm.h
===================================================================
--- include/mm/vm.h	(revision 76cec1e21a9510de8780a546f59799bc82003d87)
+++ include/mm/vm.h	(revision a8f9a8291c201ef23ba4a707a7a7ceacc7c60ae1)
@@ -77,5 +77,5 @@
 };
 
-extern vm_t * vm_create(void);
+extern vm_t * vm_create(pte_t *ptl0);
 extern void vm_destroy(vm_t *m);
 
@@ -83,6 +83,6 @@
 extern void vm_area_destroy(vm_area_t *a);
 
-extern void vm_area_map(vm_area_t *a);
-extern void vm_area_unmap(vm_area_t *a);
+extern void vm_area_map(vm_area_t *a, vm_t *m);
+extern void vm_area_unmap(vm_area_t *a, vm_t *m);
 
 extern void vm_install(vm_t *m);