--- Gnu-Mach/vm/vm_page.h	2020/09/02 04:42:54	1.1.1.2
+++ Gnu-Mach/vm/vm_page.h	2020/09/02 04:45:26	1.1.1.3
@@ -34,15 +34,13 @@
 #ifndef	_VM_VM_PAGE_H_
 #define _VM_VM_PAGE_H_
 
-#include <mach_vm_debug.h>
-
 #include <mach/boolean.h>
 #include <mach/vm_prot.h>
 #include <mach/vm_param.h>
 #include <vm/vm_object.h>
+#include <vm/vm_types.h>
 #include <kern/queue.h>
 #include <kern/lock.h>
-#include <kern/zalloc.h>
 
 #include <kern/macro_help.h>
 #include <kern/sched_prim.h>	/* definitions of wait/wakeup */
@@ -125,10 +123,6 @@ struct vm_page {
 	vm_prot_t	unlock_request;	/* Outstanding unlock request (O) */
 };
 
-typedef struct vm_page	*vm_page_t;
-
-#define VM_PAGE_NULL		((vm_page_t) 0)
-
 /*
  *	For debugging, this macro can be defined to perform
  *	some useful check on a page structure.