Untangled the vm.h include file spaghetti.

31 files changed, 160 insertions, 35 deletions

diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 7d3fea5..2619bbe 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_aout.c,v 1.17 1995/11/06 12:52:29 davidg Exp $
+ *	$Id: imgact_aout.c,v 1.18 1995/12/02 16:31:59 bde Exp $
  */
 
 #include <sys/param.h>
@@ -42,6 +42,12 @@
 #include <sys/sysent.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_extern.h>
 
 static int	exec_aout_imgact __P((struct image_params *imgp));
 
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index 792f8d6..4fa24ef 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: imgact_gzip.c,v 1.15 1995/11/06 12:52:30 davidg Exp $
+ * $Id: imgact_gzip.c,v 1.16 1995/12/02 16:32:01 bde Exp $
  *
  * This module handles execution of a.out files which have been run through
  * "gzip".  This saves diskspace, but wastes cpu-cycles and VM.
@@ -33,7 +33,13 @@
 #include <sys/inflate.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_kern.h>
+#include <vm/vm_extern.h>
 
 struct imgact_gzip {
 	struct image_params *ip;
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 777baba..a2348d2 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.33 1995/12/02 17:10:29 bde Exp $
+ * $Id: init_main.c,v 1.34 1995/12/04 16:48:18 phk Exp $
  */
 
 #include <sys/param.h>
@@ -66,15 +66,21 @@
 #include <sys/reboot.h>
 #include <sys/sem.h>
 #include <sys/shm.h>
-#include <sys/user.h>
 #include <sys/sysproto.h>
+#include <sys/vmmeter.h>
 
 #include <ufs/ufs/quota.h>
 
 #include <machine/cpu.h>
 
 #include <vm/vm.h>
-#include <vm/vm_pageout.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_extern.h>
+#include <sys/user.h>
 
 extern struct linker_set	sysinit_set;	/* XXX */
 
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 77cdc09..a662efc 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.21 1995/12/04 16:48:20 phk Exp $
+ * $Id: kern_clock.c,v 1.22 1995/12/06 13:27:37 phk Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -66,6 +66,11 @@
 #include <sys/signalvar.h>
 #include <sys/timex.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 <sys/sysctl.h>
 
 #include <machine/cpu.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index c98b6f4..cc3ec92 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.18 1995/12/04 16:48:24 phk Exp $
+ * $Id: kern_descrip.c,v 1.19 1995/12/05 21:51:28 bde Exp $
  */
 
 #include <sys/param.h>
@@ -59,6 +59,8 @@
 #include <sys/resourcevar.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 
 #ifdef JREMOD
 #include <sys/conf.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 24a219c..2b01960 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_exec.c,v 1.26 1995/11/12 06:42:53 bde Exp $
+ *	$Id: kern_exec.c,v 1.27 1995/11/13 10:45:22 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -49,7 +49,13 @@
 #include <sys/shm.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_kern.h>
+#include <vm/vm_extern.h>
 
 #include <machine/reg.h>
 
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index d296f1c..0f46758 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.19 1995/10/23 19:44:38 swallace Exp $
+ * $Id: kern_exit.c,v 1.20 1995/11/11 05:49:22 bde Exp $
  */
 
 #include <sys/param.h>
@@ -68,6 +68,11 @@
 #endif
 
 #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_kern.h>
 
 static int wait1 __P((struct proc *, struct wait_args *, int [], int));
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 285cb6f..037fd01 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_fork.c	8.6 (Berkeley) 4/8/94
- * $Id: kern_fork.c,v 1.13 1995/10/08 00:06:05 swallace Exp $
+ * $Id: kern_fork.c,v 1.14 1995/11/12 06:42:54 bde Exp $
  */
 
 #include <sys/param.h>
@@ -53,6 +53,8 @@
 #include <sys/ktrace.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 
 static int fork1(struct proc *, int, int *);
 
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 9b2c46e..bcebe68 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_lkm.c,v 1.21 1995/11/29 14:40:34 julian Exp $
+ * $Id: kern_lkm.c,v 1.22 1995/11/29 17:45:59 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -53,6 +53,7 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_extern.h>
 
 #ifdef JREMOD
 #ifdef DEVFS
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index f317006..900b2c7 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_malloc.c	8.3 (Berkeley) 1/4/94
- * $Id: kern_malloc.c,v 1.14 1995/09/09 18:10:03 davidg Exp $
+ * $Id: kern_malloc.c,v 1.15 1995/12/02 17:10:34 bde Exp $
  */
 
 #include <sys/param.h>
@@ -39,9 +39,12 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_extern.h>
 
 static void kmeminit __P((void *));
 SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL)
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index 47e0e7b..36f1c14 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: kern_physio.c,v 1.13 1995/11/28 02:40:38 peter Exp $
+ * $Id: kern_physio.c,v 1.14 1995/12/02 18:58:48 bde Exp $
  */
 
 #include <sys/param.h>
@@ -25,6 +25,8 @@
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 
 static void	physwakeup __P((struct buf *bp));
 
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 0b2343b..03f921f 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,14 +31,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.4 (Berkeley) 1/4/94
- * $Id: kern_proc.c,v 1.11 1995/11/14 09:16:27 phk Exp $
+ * $Id: kern_proc.c,v 1.12 1995/12/02 18:58:49 bde Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/acct.h>
@@ -51,6 +50,13 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/signalvar.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 <sys/user.h>
 
 struct prochd qs[NQS];		/* as good a place as any... */
 struct prochd rtqs[NQS];	/* Space for REALTIME queues too */
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index b604513..eb6633d 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_resource.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_resource.c,v 1.15 1995/11/11 01:48:17 bde Exp $
+ * $Id: kern_resource.c,v 1.16 1995/11/12 06:42:59 bde Exp $
  */
 
 #include <sys/param.h>
@@ -49,6 +49,11 @@
 #include <sys/proc.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>
 
 int	donice __P((struct proc *, struct proc *, int));
 int	dosetrlimit __P((struct proc *, u_int, struct rlimit *));
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index c46d56c..bee3f8a 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
- * $Id: kern_sig.c,v 1.13 1995/11/12 06:43:00 bde Exp $
+ * $Id: kern_sig.c,v 1.14 1995/11/18 10:01:38 bde Exp $
  */
 
 #define	SIGPROP		/* include signal properties table */
@@ -62,6 +62,11 @@
 #include <machine/cpu.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 <sys/user.h>		/* for coredump */
 
 extern int killpg1	__P((struct proc *cp, int signum, int pgid, int all));
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 34ef802..27fce76 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_synch.c	8.6 (Berkeley) 1/21/94
- * $Id: kern_synch.c,v 1.14 1995/12/02 17:10:35 bde Exp $
+ * $Id: kern_synch.c,v 1.15 1995/12/02 18:58:40 bde Exp $
  */
 
 #include <sys/param.h>
@@ -47,7 +47,10 @@
 #include <sys/signalvar.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
+#include <sys/vmmeter.h>
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 8e75157..b258bb4 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
- * $Id: kern_sysctl.c,v 1.54 1995/12/05 21:51:33 bde Exp $
+ * $Id: kern_sysctl.c,v 1.55 1995/12/06 13:27:38 phk Exp $
  */
 
 #include <sys/param.h>
@@ -49,8 +49,11 @@
 #include <sys/conf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
+#include <sys/proc.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_extern.h>
 
 /*
  * Locking and stats
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 77cdc09..a662efc 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.21 1995/12/04 16:48:20 phk Exp $
+ * $Id: kern_clock.c,v 1.22 1995/12/06 13:27:37 phk Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -66,6 +66,11 @@
 #include <sys/signalvar.h>
 #include <sys/timex.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 <sys/sysctl.h>
 
 #include <machine/cpu.h>
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 77cdc09..a662efc 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.21 1995/12/04 16:48:20 phk Exp $
+ * $Id: kern_clock.c,v 1.22 1995/12/06 13:27:37 phk Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -66,6 +66,11 @@
 #include <sys/signalvar.h>
 #include <sys/timex.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 <sys/sysctl.h>
 
 #include <machine/cpu.h>
diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c
index 814239e..cffeb54 100644
--- a/sys/kern/subr_rlist.c
+++ b/sys/kern/subr_rlist.c
@@ -54,7 +54,7 @@
  * functioning of this software, nor does the author assume any responsibility
  * for damages incurred with its use.
  *
- *	$Id: subr_rlist.c,v 1.11 1995/10/21 08:38:13 davidg Exp $
+ *	$Id: subr_rlist.c,v 1.12 1995/12/02 18:58:53 bde Exp $
  */
 
 #include <sys/param.h>
@@ -63,7 +63,9 @@
 #include <sys/rlist.h>
 #include <sys/proc.h>
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_extern.h>
 
 /*
  * Resource lists.
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 1b92567..5c8a647 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.61 1995/10/09 04:36:01 bde Exp $
+ *	$Id: trap.c,v 1.62 1995/10/28 15:38:32 phk Exp $
  */
 
 /*
@@ -45,20 +45,27 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/acct.h>
 #include <sys/kernel.h>
 #include <sys/syscall.h>
 #include <sys/sysent.h>
+#include <sys/queue.h>
+#include <sys/vmmeter.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
 
+#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_kern.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
+#include <vm/vm_extern.h>
+
+#include <sys/user.h>
 
 #include <machine/cpu.h>
 #include <machine/md_var.h>
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index e7e48b3..ceb4612 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sys_process.c,v 1.15 1995/11/12 06:43:06 bde Exp $
+ *	$Id: sys_process.c,v 1.16 1995/11/14 09:05:34 phk Exp $
  */
 
 #include <sys/param.h>
@@ -38,12 +38,20 @@
 #include <sys/vnode.h>
 #include <sys/ptrace.h>
 #include <sys/errno.h>
+#include <sys/queue.h>
 
 #include <machine/reg.h>
 #include <machine/psl.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_kern.h>
+#include <vm/vm_extern.h>
 
 #include <sys/user.h>
 
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 1b35285..78e7f0a 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_shm.c,v 1.11 1995/11/30 07:58:50 julian Exp $ */
+/*	$Id: sysv_shm.c,v 1.12 1995/12/04 02:26:53 jkh Exp $ */
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 
 /*
@@ -43,8 +43,13 @@
 #include <sys/sysent.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_kern.h>
+#include <vm/vm_extern.h>
 
 struct shmat_args;
 extern int shmat __P((struct proc *p, struct shmat_args *uap, int *retval));
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index d9c24e8..8756a0b 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.70 1995/09/10 11:48:13 bde Exp $
+ * $Id: tty.c,v 1.71 1995/10/31 19:27:50 bde Exp $
  */
 
 /*-
@@ -91,6 +91,11 @@
 #endif
 
 #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>
 
 static int	proc_compare __P((struct proc *p1, struct proc *p2));
 static int	ttnread __P((struct tty *tp));
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 7e10b01..027ad19 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $Id: uipc_mbuf.c,v 1.14 1995/12/02 17:10:41 bde Exp $
+ * $Id: uipc_mbuf.c,v 1.15 1995/12/02 18:58:42 bde Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,9 @@
 #include <sys/protosw.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_kern.h>
+#include <vm/vm_extern.h>
 
 static void mbinit __P((void *));
 SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbinit, NULL)
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 1394ed1..4a9a905 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: vfs_bio.c,v 1.73 1995/12/02 18:58:44 bde Exp $
+ * $Id: vfs_bio.c,v 1.74 1995/12/04 16:48:32 phk Exp $
  */
 
 /*
@@ -40,11 +40,15 @@
 #include <sys/sysctl.h>
 #include <sys/proc.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/vm_kern.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
+#include <vm/vm_extern.h>
 #include <sys/buf.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index bc4172f..157baa8 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cluster.c	8.7 (Berkeley) 2/13/94
- * $Id: vfs_cluster.c,v 1.27 1995/11/20 03:55:48 dyson Exp $
+ * $Id: vfs_cluster.c,v 1.28 1995/11/20 04:53:45 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -47,6 +47,8 @@
 #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_object.h>
 #include <vm/vm_page.h>
 
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 9d5a5f5..76851ff 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
- * $Id: vfs_subr.c,v 1.45 1995/12/02 18:58:56 bde Exp $
+ * $Id: vfs_subr.c,v 1.46 1995/12/06 13:27:39 phk Exp $
  */
 
 /*
@@ -61,6 +61,9 @@
 #include <sys/mbuf.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_object.h>
+#include <vm/vm_extern.h>
 #include <sys/sysctl.h>
 
 #include <miscfs/specfs/specdev.h>
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 31b955a..68715c8 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.40 1995/11/14 09:19:16 phk Exp $
+ * $Id: vfs_syscalls.c,v 1.41 1995/11/18 11:35:05 bde Exp $
  */
 
 #include <sys/param.h>
@@ -59,6 +59,9 @@
 #endif
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_object.h>
+#include <vm/vm_extern.h>
 #include <sys/sysctl.h>
 
 static int change_dir	__P((struct nameidata *ndp, struct proc *p));
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 9d5a5f5..76851ff 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
- * $Id: vfs_subr.c,v 1.45 1995/12/02 18:58:56 bde Exp $
+ * $Id: vfs_subr.c,v 1.46 1995/12/06 13:27:39 phk Exp $
  */
 
 /*
@@ -61,6 +61,9 @@
 #include <sys/mbuf.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_object.h>
+#include <vm/vm_extern.h>
 #include <sys/sysctl.h>
 
 #include <miscfs/specfs/specdev.h>
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 31b955a..68715c8 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.40 1995/11/14 09:19:16 phk Exp $
+ * $Id: vfs_syscalls.c,v 1.41 1995/11/18 11:35:05 bde Exp $
  */
 
 #include <sys/param.h>
@@ -59,6 +59,9 @@
 #endif
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_object.h>
+#include <vm/vm_extern.h>
 #include <sys/sysctl.h>
 
 static int change_dir	__P((struct nameidata *ndp, struct proc *p));
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 46e897f..de25632 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
- * $Id: vfs_vnops.c,v 1.18 1995/10/06 09:43:32 phk Exp $
+ * $Id: vfs_vnops.c,v 1.19 1995/10/22 09:32:29 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -52,6 +52,8 @@
 #include <sys/ioctl.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_object.h>
 #include <vm/vnode_pager.h>
 
 struct 	fileops vnops =