Untangled the vm.h include file spaghetti.

23 files changed, 165 insertions, 77 deletions

diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c
index afd483d..a3bd74c 100644
--- a/sys/vm/default_pager.c
+++ b/sys/vm/default_pager.c
@@ -28,17 +28,21 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: default_pager.c,v 1.2 1995/07/13 10:29:34 davidg Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/queue.h>
 
 #include <vm/vm.h>
-#include <vm/vm_pager.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/vm_object.h>
 #include <vm/vm_page.h>
+#include <vm/vm_pager.h>
 #include <vm/default_pager.h>
 #include <vm/swap_pager.h>
 
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index a892c99..2dd0345 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device_pager.c	8.1 (Berkeley) 6/11/93
- * $Id: device_pager.c,v 1.14 1995/12/03 12:18:30 bde Exp $
+ * $Id: device_pager.c,v 1.15 1995/12/03 18:59:55 bde Exp $
  */
 
 #include <sys/param.h>
@@ -45,9 +45,13 @@
 #include <sys/mman.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
+#include <sys/queue.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
 #include <vm/device_pager.h>
diff --git a/sys/vm/kern_lock.c b/sys/vm/kern_lock.c
index 409e784..2e984b0 100644
--- a/sys/vm/kern_lock.c
+++ b/sys/vm/kern_lock.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: kern_lock.c,v 1.8 1995/11/06 08:44:15 davidg Exp $
+ * $Id: kern_lock.c,v 1.9 1995/11/20 12:20:02 phk Exp $
  */
 
 /*
@@ -75,6 +75,9 @@
 #include <sys/proc.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
 
 /*
  *	Routine:	lock_init
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 482071f..a2cc738 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -39,7 +39,7 @@
  * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
- * $Id: swap_pager.c,v 1.51 1995/11/20 12:19:58 phk Exp $
+ * $Id: swap_pager.c,v 1.52 1995/12/03 12:18:33 bde Exp $
  */
 
 /*
@@ -56,16 +56,21 @@
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
+#include <sys/vmmeter.h>
 
 #include <miscfs/specfs/specdev.h>
 #include <sys/rlist.h>
 
 #include <vm/vm.h>
-#include <vm/vm_pager.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/vm_object.h>
 #include <vm/vm_page.h>
+#include <vm/vm_pager.h>
 #include <vm/vm_pageout.h>
 #include <vm/swap_pager.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_extern.h>
 
 #ifndef NPENDINGIO
 #define NPENDINGIO	10
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index e591b29..f56dd1b 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm.h	8.2 (Berkeley) 12/13/93
- * $Id: vm.h,v 1.6 1995/10/05 01:11:48 bde Exp $
+ * $Id: vm.h,v 1.7 1995/12/05 20:54:42 bde Exp $
  */
 
 #ifndef VM_H
 #define VM_H
 
 typedef char vm_inherit_t;	/* XXX: inheritance codes */
+typedef u_char vm_prot_t;	/* protection codes */
 
 union vm_map_object;
 typedef union vm_map_object vm_map_object_t;
@@ -60,38 +61,4 @@ struct vm_page;
 typedef struct vm_page *vm_page_t;
 #endif
 
-#include <sys/vmmeter.h>
-#include <sys/queue.h>
-#include <vm/vm_param.h>
-#include <vm/lock.h>
-#include <vm/vm_prot.h>
-#include <vm/vm_inherit.h>
-#include <vm/vm_map.h>
-#include <vm/vm_object.h>
-#include <vm/pmap.h>
-#include <vm/vm_extern.h>
-
-/*
- * Shareable process virtual address space.
- * May eventually be merged with vm_map.
- * Several fields are temporary (text, data stuff).
- */
-struct vmspace {
-	struct vm_map vm_map;	/* VM address map */
-	struct pmap vm_pmap;	/* private physical map */
-	int vm_refcnt;		/* number of references */
-	caddr_t vm_shm;		/* SYS5 shared memory private data XXX */
-/* we copy from vm_startcopy to the end of the structure on fork */
-#define vm_startcopy vm_rssize
-	segsz_t vm_rssize;	/* current resident set size in pages */
-	segsz_t vm_swrss;	/* resident set size before last swap */
-	segsz_t vm_tsize;	/* text size (pages) XXX */
-	segsz_t vm_dsize;	/* data size (pages) XXX */
-	segsz_t vm_ssize;	/* stack size (pages) */
-	caddr_t vm_taddr;	/* user virtual address of text XXX */
-	caddr_t vm_daddr;	/* user virtual address of data XXX */
-	caddr_t vm_maxsaddr;	/* user VA at max stack growth */
-	caddr_t vm_minsaddr;	/* user VA at max stack growth */
-};
-
 #endif				/* VM_H */
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index cb450d0..8352acb 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $Id: vm_extern.h,v 1.18 1995/08/28 09:19:21 julian Exp $
+ * $Id: vm_extern.h,v 1.19 1995/11/14 09:29:29 phk Exp $
  */
 
 #ifndef _VM_EXTERN_H_
@@ -91,7 +91,9 @@ void vm_fault_copy_entry __P((vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t
 void vm_fault_unwire __P((vm_map_t, vm_offset_t, vm_offset_t));
 int vm_fault_wire __P((vm_map_t, vm_offset_t, vm_offset_t));
 int vm_fork __P((struct proc *, struct proc *, int));
+void vm_map_print __P((/* db_expr_t */ int, boolean_t, /* db_expr_t */ int, char *));
 int vm_mmap __P((vm_map_t, vm_offset_t *, vm_size_t, vm_prot_t, vm_prot_t, int, caddr_t, vm_offset_t));
+void vm_object_print __P((/* db_expr_t */ int, boolean_t, /* db_expr_t */ int, char *));
 vm_offset_t vm_page_alloc_contig __P((vm_offset_t, vm_offset_t, vm_offset_t, vm_offset_t));
 void vm_set_page_size __P((void));
 void vmmeter __P((void));
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 2413054..bd75361 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -66,7 +66,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_fault.c,v 1.36 1995/11/05 20:45:58 dyson Exp $
+ * $Id: vm_fault.c,v 1.37 1995/11/20 12:19:53 phk Exp $
  */
 
 /*
@@ -80,14 +80,22 @@
 #include <sys/resource.h>
 #include <sys/signalvar.h>
 #include <sys/resourcevar.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
+#include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_pager.h>
 #include <vm/vnode_pager.h>
 #include <vm/swap_pager.h>
+#include <vm/vm_extern.h>
 
 int vm_fault_additional_pages __P((vm_page_t, int, int, vm_page_t *, int *));
 
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index ae340ef..90dee12 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,7 +59,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.30 1995/11/05 20:45:59 dyson Exp $
+ * $Id: vm_glue.c,v 1.31 1995/12/02 17:11:18 bde Exp $
  */
 
 #include <sys/param.h>
@@ -68,15 +68,24 @@
 #include <sys/resourcevar.h>
 #include <sys/buf.h>
 #include <sys/shm.h>
-#include <sys/user.h>
+#include <sys/vmmeter.h>
 
 #include <sys/kernel.h>
 #include <sys/dkstat.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_inherit.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_extern.h>
+
+#include <sys/user.h>
 
 #include <machine/stdarg.h>
 #include <machine/cpu.h>
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index 8c15825..a3ad636 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_init.c,v 1.9 1995/09/09 18:10:36 davidg Exp $
+ * $Id: vm_init.c,v 1.10 1995/12/02 17:11:20 bde Exp $
  */
 
 /*
@@ -71,11 +71,18 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/queue.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
+#include <vm/vm_object.h>
 #include <vm/vm_page.h>
+#include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_pager.h>
+#include <vm/vm_extern.h>
 
 /*
  * System initialization
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index f8b9b0b..15a1fde 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.c,v 1.16 1995/09/03 20:40:39 dyson Exp $
+ * $Id: vm_kern.c,v 1.17 1995/11/13 10:53:38 davidg Exp $
  */
 
 /*
@@ -74,8 +74,16 @@
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
+#include <sys/queue.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
+#include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_kern.h>
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 98ac230..04f2d38 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.c,v 1.26 1995/11/12 08:58:58 davidg Exp $
+ * $Id: vm_map.c,v 1.27 1995/11/20 12:19:49 phk Exp $
  */
 
 /*
@@ -72,12 +72,21 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
+#include <sys/queue.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/vm_inherit.h>
+#include <vm/lock.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_pager.h>
+#include <vm/vm_extern.h>
 
 /*
  *	Virtual memory maps provide for the mapping, protection,
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index 07c17c0..93d07b9 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.h,v 1.6 1995/07/13 08:48:28 davidg Exp $
+ * $Id: vm_map.h,v 1.7 1995/08/26 23:18:37 bde Exp $
  */
 
 /*
@@ -138,6 +138,30 @@ struct vm_map {
 #define max_offset		header.end
 };
 
+/* 
+ * Shareable process virtual address space.
+ * May eventually be merged with vm_map.
+ * Several fields are temporary (text, data stuff).
+ */
+struct vmspace {
+	struct vm_map vm_map;	/* VM address map */
+	struct pmap vm_pmap;	/* private physical map */
+	int vm_refcnt;		/* number of references */
+	caddr_t vm_shm;		/* SYS5 shared memory private data XXX */
+/* we copy from vm_startcopy to the end of the structure on fork */
+#define vm_startcopy vm_rssize
+	segsz_t vm_rssize;	/* current resident set size in pages */
+	segsz_t vm_swrss;	/* resident set size before last swap */
+	segsz_t vm_tsize;	/* text size (pages) XXX */
+	segsz_t vm_dsize;	/* data size (pages) XXX */
+	segsz_t vm_ssize;	/* stack size (pages) */
+	caddr_t vm_taddr;	/* user virtual address of text XXX */
+	caddr_t vm_daddr;	/* user virtual address of data XXX */
+	caddr_t vm_maxsaddr;	/* user VA at max stack growth */
+	caddr_t vm_minsaddr;	/* user VA at max stack growth */
+};
+
+
 /*
  *	Map versions are used to validate a previous lookup attempt.
  *
@@ -204,10 +228,6 @@ void vm_map_lookup_done __P((vm_map_t, vm_map_entry_t));
 boolean_t vm_map_lookup_entry __P((vm_map_t, vm_offset_t, vm_map_entry_t *));
 int vm_map_pageable __P((vm_map_t, vm_offset_t, vm_offset_t, boolean_t));
 int vm_map_clean __P((vm_map_t, vm_offset_t, vm_offset_t, boolean_t, boolean_t));
-#ifdef DDB
-void vm_map_print __P((/* db_expr_t */ int, boolean_t, /* db_expr_t */ int,
-		       char *));
-#endif
 int vm_map_protect __P((vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t, boolean_t));
 void vm_map_reference __P((vm_map_t));
 int vm_map_remove __P((vm_map_t, vm_offset_t, vm_offset_t));
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index e262ce9..1dea61b 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -31,14 +31,23 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_meter.c	8.4 (Berkeley) 1/4/94
- * $Id: vm_meter.c,v 1.9 1995/11/14 09:29:34 phk Exp $
+ * $Id: vm_meter.c,v 1.10 1995/12/04 16:48:58 phk Exp $
  */
 
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/vmmeter.h>
+#include <sys/queue.h>
+
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
+#include <vm/vm_object.h>
 #include <sys/sysctl.h>
 
 struct loadavg averunnable =
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index f14a470..2514754 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
- * $Id: vm_mmap.c,v 1.29 1995/11/12 06:43:24 bde Exp $
+ * $Id: vm_mmap.c,v 1.30 1995/12/03 12:18:35 bde Exp $
  */
 
 /*
@@ -55,13 +55,21 @@
 #include <sys/file.h>
 #include <sys/mman.h>
 #include <sys/conf.h>
+#include <sys/vmmeter.h>
 
 #include <miscfs/specfs/specdev.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/vm_inherit.h>
+#include <vm/lock.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
+#include <vm/vm_object.h>
 #include <vm/vm_pager.h>
 #include <vm/vm_pageout.h>
-#include <vm/vm_prot.h>
+#include <vm/vm_extern.h>
 
 extern void	pmap_object_init_pt __P((pmap_t pmap, vm_offset_t addr,
 					 vm_object_t object, vm_offset_t offset,
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index c3cb783..4627685 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.c,v 1.56 1995/11/20 12:19:41 phk Exp $
+ * $Id: vm_object.c,v 1.57 1995/12/03 12:18:37 bde Exp $
  */
 
 /*
@@ -75,13 +75,21 @@
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
+#include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_pager.h>
 #include <vm/swap_pager.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_extern.h>
 
 #ifdef DDB
 extern void	vm_object_check __P((void));
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 8b02609..287471b 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.h,v 1.22 1995/08/26 23:19:49 bde Exp $
+ * $Id: vm_object.h,v 1.23 1995/11/05 20:46:01 dyson Exp $
  */
 
 /*
@@ -172,10 +172,6 @@ void vm_object_page_clean __P((vm_object_t, vm_offset_t, vm_offset_t, boolean_t,
 void vm_object_page_remove __P((vm_object_t, vm_offset_t, vm_offset_t, boolean_t));
 void vm_object_pmap_copy __P((vm_object_t, vm_offset_t, vm_offset_t));
 void vm_object_pmap_remove __P((vm_object_t, vm_offset_t, vm_offset_t));
-#ifdef DDB
-void vm_object_print __P((/* db_expr_t */ int, boolean_t, /* db_expr_t */ int,
-			  char *));
-#endif
 void vm_object_reference __P((vm_object_t));
 void vm_object_shadow __P((vm_object_t *, vm_offset_t *, vm_size_t));
 void vm_object_terminate __P((vm_object_t));
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 12150e1..6b61358 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_page.c	7.4 (Berkeley) 5/7/91
- *	$Id: vm_page.c,v 1.38 1995/11/20 12:19:34 phk Exp $
+ *	$Id: vm_page.c,v 1.39 1995/12/03 12:18:39 bde Exp $
  */
 
 /*
@@ -71,12 +71,19 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <sys/queue.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 #include <vm/vm_pageout.h>
+#include <vm/vm_extern.h>
 
 #ifdef DDB
 extern void	print_page_info __P((void));
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index f2b5b31..561be29 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,7 +65,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.c,v 1.59 1995/11/05 20:46:02 dyson Exp $
+ * $Id: vm_pageout.c,v 1.60 1995/11/20 12:19:26 phk Exp $
  */
 
 /*
@@ -81,13 +81,20 @@
 #include <sys/kernel.h>
 #include <sys/signalvar.h>
 #include <sys/vnode.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/lock.h>
+#include <vm/vm_object.h>
 #include <vm/vm_page.h>
+#include <vm/vm_map.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_pager.h>
 #include <vm/swap_pager.h>
+#include <vm/vm_extern.h>
 
 /*
  * System initialization
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 82b5628..ea508eb 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pager.c,v 1.17 1995/07/29 11:44:29 bde Exp $
+ * $Id: vm_pager.c,v 1.18 1995/11/20 12:19:19 phk Exp $
  */
 
 /*
@@ -77,9 +77,13 @@
 #include <sys/ucred.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_pager.h>
+#include <vm/vm_extern.h>
 
 extern struct pagerops defaultpagerops;
 extern struct pagerops swappagerops;
diff --git a/sys/vm/vm_prot.h b/sys/vm/vm_prot.h
index 36079a0..c6d55d5 100644
--- a/sys/vm/vm_prot.h
+++ b/sys/vm/vm_prot.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_prot.h,v 1.3 1994/08/02 07:55:38 davidg Exp $
+ * $Id: vm_prot.h,v 1.4 1995/01/09 16:05:57 davidg Exp $
  */
 
 /*
@@ -72,14 +72,6 @@
 #define	_VM_PROT_
 
 /*
- *	Types defined:
- *
- *	vm_prot_t		VM protection values.
- */
-
-typedef u_char vm_prot_t;
-
-/*
  *	Protection values, defined as bits within the vm_prot_t type
  */
 
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 76f0c28..c91b10e 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $Id: vm_swap.c,v 1.26 1995/11/29 10:49:16 julian Exp $
+ * $Id: vm_swap.c,v 1.27 1995/11/29 14:41:20 julian Exp $
  */
 
 #include <sys/param.h>
@@ -47,6 +47,8 @@
 #include <sys/rlist.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 
 #include <miscfs/specfs/specdev.h>
 
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index 9d2668d..883e36d 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_unix.c 1.1 89/11/07$
  *
  *	@(#)vm_unix.c	8.1 (Berkeley) 6/11/93
- * $Id: vm_unix.c,v 1.7 1995/11/11 06:40:35 bde Exp $
+ * $Id: vm_unix.c,v 1.8 1995/11/12 06:43:28 bde Exp $
  */
 
 /*
@@ -51,6 +51,10 @@
 #include <sys/resourcevar.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/lock.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
 #include <vm/swap_pager.h>
 
 #ifndef _SYS_SYSPROTO_H_
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index a31aa68..c8401b9 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
- *	$Id: vnode_pager.c,v 1.52 1995/10/30 17:56:30 bde Exp $
+ *	$Id: vnode_pager.c,v 1.53 1995/11/20 12:19:11 phk Exp $
  */
 
 /*
@@ -60,11 +60,16 @@
 #include <sys/uio.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_prot.h>
+#include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
 #include <vm/vnode_pager.h>
+#include <vm/vm_extern.h>
 
 extern vm_offset_t vnode_pager_addr __P((struct vnode *vp, vm_offset_t address,
 					 int *run));