Replace inclusion of <vm/foo.h> with the correct <uvm/bar.h> when necessary.

(Look ma, I might have broken the tree)

35 files changed, 53 insertions, 87 deletions

diff --git a/sys/kern/exec_aout.c b/sys/kern/exec_aout.c
index f955081ae2b..202ee8f3af8 100644
--- a/sys/kern/exec_aout.c
+++ b/sys/kern/exec_aout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_aout.c,v 1.5 1999/09/10 22:11:49 art Exp $	*/
+/*	$OpenBSD: exec_aout.c,v 1.6 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: exec_aout.c,v 1.14 1996/02/04 02:15:01 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/resourcevar.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #if defined(_KERN_DO_AOUT)
 
diff --git a/sys/kern/exec_ecoff.c b/sys/kern/exec_ecoff.c
index 8a9260b2e74..5e0d343adff 100644
--- a/sys/kern/exec_ecoff.c
+++ b/sys/kern/exec_ecoff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_ecoff.c,v 1.7 2001/06/22 14:14:07 deraadt Exp $	*/
+/*	$OpenBSD: exec_ecoff.c,v 1.8 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: exec_ecoff.c,v 1.8 1996/05/19 20:36:06 jonathan Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/resourcevar.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #if defined(_KERN_DO_ECOFF)
 
diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c
index 8a879c45253..889b150ce29 100644
--- a/sys/kern/exec_elf.c
+++ b/sys/kern/exec_elf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_elf.c,v 1.35 2001/09/19 13:28:43 art Exp $	*/
+/*	$OpenBSD: exec_elf.c,v 1.36 2001/11/06 19:53:20 miod Exp $	*/
 
 /*
  * Copyright (c) 1996 Per Fogelstrom
@@ -48,7 +48,7 @@
 #include <sys/stat.h>
 
 #include <sys/mman.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>
 #include <machine/reg.h>
diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c
index ee852e32222..7f8dc558f2a 100644
--- a/sys/kern/exec_script.c
+++ b/sys/kern/exec_script.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_script.c,v 1.14 2001/10/26 12:03:27 art Exp $	*/
+/*	$OpenBSD: exec_script.c,v 1.15 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: exec_script.c,v 1.13 1996/02/04 02:15:06 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #include <sys/filedesc.h>
 #include <sys/exec.h>
 #include <sys/resourcevar.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <sys/exec_script.h>
 
diff --git a/sys/kern/exec_subr.c b/sys/kern/exec_subr.c
index ce252a8cc15..54247d51ac7 100644
--- a/sys/kern/exec_subr.c
+++ b/sys/kern/exec_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_subr.c,v 1.12 2001/06/27 04:49:40 art Exp $	*/
+/*	$OpenBSD: exec_subr.c,v 1.13 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: exec_subr.c,v 1.9 1994/12/04 03:10:42 mycroft Exp $	*/
 
 /*
@@ -41,8 +41,6 @@
 #include <sys/mman.h>
 #include <sys/resourcevar.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm.h>
 
 #ifdef DEBUG
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 4d7f4265c74..25c2c8d4bb5 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.81 2001/11/06 18:41:10 art Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.82 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $	*/
 
 /*
@@ -84,8 +84,6 @@
 
 #include <machine/cpu.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm.h>
 
 #include <net/if.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 3e3c0b7efc3..b120e6a8b6b 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_clock.c,v 1.28 2001/08/19 06:10:09 art Exp $	*/
+/*	$OpenBSD: kern_clock.c,v 1.29 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $	*/
 
 /*-
@@ -49,7 +49,7 @@
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 #include <sys/timex.h>
 #include <sys/sched.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index bc84186b4ca..4e4d9f655cc 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_descrip.c,v 1.41 2001/11/05 02:03:58 art Exp $	*/
+/*	$OpenBSD: kern_descrip.c,v 1.42 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $	*/
 
 /*
@@ -64,7 +64,7 @@
 #include <sys/event.h>
 #include <sys/pool.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <sys/pipe.h>
 
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index ca619f10f2a..846af9b8fe7 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exec.c,v 1.58 2001/10/26 12:03:27 art Exp $	*/
+/*	$OpenBSD: kern_exec.c,v 1.59 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $	*/
 
 /*-
@@ -58,7 +58,6 @@
 
 #include <sys/syscallargs.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 #include <machine/cpu.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index c68702d3d45..37c7da7480e 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exit.c,v 1.35 2001/09/11 20:05:25 miod Exp $	*/
+/*	$OpenBSD: kern_exit.c,v 1.36 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $	*/
 
 /*
@@ -77,8 +77,6 @@
 
 #include <machine/cpu.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 void proc_zap __P((struct proc *));
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index e3db4cdc4d5..9cc881f6b5e 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_fork.c,v 1.46 2001/11/06 18:41:10 art Exp $	*/
+/*	$OpenBSD: kern_fork.c,v 1.47 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $	*/
 
 /*
@@ -62,7 +62,6 @@
 
 #include <sys/syscallargs.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_map.h>
 
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 55788dd59a7..456fc6c9316 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_ktrace.c,v 1.24 2001/06/26 06:27:38 aaron Exp $	*/
+/*	$OpenBSD: kern_ktrace.c,v 1.25 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $	*/
 
 /*
@@ -51,7 +51,7 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 void ktrinitheader __P((struct ktr_header *, struct proc *, int));
 int ktrops __P((struct proc *, struct proc *, int, int, struct vnode *));
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 0bf07fdc3fa..7bbf892743b 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_lkm.c,v 1.33 2001/09/19 20:50:58 mickey Exp $	*/
+/*	$OpenBSD: kern_lkm.c,v 1.34 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_lkm.c,v 1.31 1996/03/31 21:40:27 christos Exp $	*/
 
 /*
@@ -59,7 +59,6 @@
 #include <sys/lkm.h>
 #include <sys/syscall.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 #ifdef DDB
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 96b81397dce..69354571140 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_malloc.c,v 1.39 2001/09/19 20:50:58 mickey Exp $	*/
+/*	$OpenBSD: kern_malloc.c,v 1.40 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $	*/
 
 /*
@@ -44,7 +44,6 @@
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 static struct vm_map_intrsafe kmem_map_store;
diff --git a/sys/kern/kern_malloc_debug.c b/sys/kern/kern_malloc_debug.c
index ac88d6725b5..dab61b5ac40 100644
--- a/sys/kern/kern_malloc_debug.c
+++ b/sys/kern/kern_malloc_debug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_malloc_debug.c,v 1.13 2001/09/19 20:50:58 mickey Exp $	*/
+/*	$OpenBSD: kern_malloc_debug.c,v 1.14 2001/11/06 19:53:20 miod Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Artur Grabowski <art@openbsd.org>
@@ -60,7 +60,6 @@
 #include <sys/systm.h>
 #include <sys/pool.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm.h>
 
 /*
diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c
index 896e6aa80fb..bf8ba50fb94 100644
--- a/sys/kern/kern_ntptime.c
+++ b/sys/kern/kern_ntptime.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_ntptime.c,v 1.10 2001/07/04 23:00:58 espie Exp $	*/
+/*	$OpenBSD: kern_ntptime.c,v 1.11 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_ntptime.c,v 1.2 1996/03/07 14:31:20 christos Exp $	*/
 
 /******************************************************************************
@@ -62,7 +62,7 @@
 
 #include <machine/cpu.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 
 #ifdef NTP
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index a684e74201f..b9836263fc4 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_physio.c,v 1.13 2001/06/27 04:49:44 art Exp $	*/
+/*	$OpenBSD: kern_physio.c,v 1.14 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_physio.c,v 1.28 1997/05/19 10:43:28 pk Exp $	*/
 
 /*-
@@ -49,8 +49,6 @@
 #include <sys/proc.h>
 #include <sys/malloc.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 /*
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index b800439ab38..668c38f28be 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_resource.c,v 1.14 2001/06/27 04:49:44 art Exp $	*/
+/*	$OpenBSD: kern_resource.c,v 1.15 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_resource.c,v 1.38 1996/10/23 07:19:38 matthias Exp $	*/
 
 /*-
@@ -52,8 +52,6 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 /*
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 33749d3d38b..ce90734b25a 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sig.c,v 1.49 2001/09/21 21:36:48 deraadt Exp $	*/
+/*	$OpenBSD: kern_sig.c,v 1.50 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $	*/
 
 /*
@@ -72,10 +72,8 @@
 
 #include <machine/cpu.h>
 
-#include <vm/vm.h>
-#include <sys/user.h>		/* for coredump */
-
 #include <uvm/uvm_extern.h>
+#include <sys/user.h>		/* for coredump */
 
 int	filt_sigattach(struct knote *kn);
 void	filt_sigdetach(struct knote *kn);
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 0441d05b95b..57c9e4c6b2e 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_synch.c,v 1.38 2001/09/13 14:41:50 art Exp $	*/
+/*	$OpenBSD: kern_synch.c,v 1.39 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $	*/
 
 /*-
@@ -48,12 +48,10 @@
 #include <sys/buf.h>
 #include <sys/signalvar.h>
 #include <sys/resourcevar.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <sys/sched.h>
 #include <sys/timeout.h>
 
-#include <uvm/uvm_extern.h>
-
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index a316e271f56..4c4a911d690 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sysctl.c,v 1.58 2001/09/28 01:42:54 millert Exp $	*/
+/*	$OpenBSD: kern_sysctl.c,v 1.59 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $	*/
 
 /*-
@@ -57,15 +57,13 @@
 #include <sys/tty.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 #include <sys/msgbuf.h>
 #include <sys/dkstat.h>
 #include <sys/vmmeter.h>
 #include <sys/namei.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <dev/rndvar.h>
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index d3e88367c7f..86916a64e2f 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_xxx.c,v 1.4 1996/08/26 09:16:01 deraadt Exp $	*/
+/*	$OpenBSD: kern_xxx.c,v 1.5 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: kern_xxx.c,v 1.32 1996/04/22 01:38:41 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index d196084ea80..fa985f0e10c 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_pool.c,v 1.13 2001/09/19 20:50:58 mickey Exp $	*/
+/*	$OpenBSD: subr_pool.c,v 1.14 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: subr_pool.c,v 1.59 2001/06/05 18:51:04 thorpej Exp $	*/
 
 /*-
@@ -49,7 +49,6 @@
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm.h>
 
 /*
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index d9772d607f0..a18c39c2df1 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_prof.c,v 1.8 2001/09/19 20:50:59 mickey Exp $	*/
+/*	$OpenBSD: subr_prof.c,v 1.9 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: subr_prof.c,v 1.12 1996/04/22 01:38:50 christos Exp $	*/
 
 /*-
@@ -49,7 +49,6 @@
 #ifdef GPROF
 #include <sys/malloc.h>
 #include <sys/gmon.h>
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 /*
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 48290fb70dd..39bc68dfc84 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_pipe.c,v 1.39 2001/10/26 12:03:27 art Exp $	*/
+/*	$OpenBSD: sys_pipe.c,v 1.40 2001/11/06 19:53:20 miod Exp $	*/
 
 /*
  * Copyright (c) 1996 John S. Dyson
@@ -47,7 +47,6 @@
 #include <sys/event.h>
 #include <sys/lock.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 #include <sys/pipe.h>
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 084bce95af1..31f9b475e51 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_process.c,v 1.13 2001/06/27 04:49:47 art Exp $	*/
+/*	$OpenBSD: sys_process.c,v 1.14 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: sys_process.c,v 1.55 1996/05/15 06:17:47 tls Exp $	*/
 
 /*-
@@ -65,7 +65,6 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 #include <machine/reg.h>
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 7902a10549a..c63455509ba 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysv_shm.c,v 1.20 2001/08/12 22:50:12 millert Exp $	*/
+/*	$OpenBSD: sysv_shm.c,v 1.21 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: sysv_shm.c,v 1.50 1998/10/21 22:24:29 tron Exp $	*/
 
 /*
@@ -46,7 +46,6 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#include <vm/vm.h>
 #include <uvm/uvm_extern.h>
 
 struct shminfo shminfo;
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 4c60990ed1e..62c3451121d 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty.c,v 1.47 2001/10/07 22:27:01 art Exp $	*/
+/*	$OpenBSD: tty.c,v 1.48 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $	*/
 
 /*-
@@ -62,7 +62,7 @@
 
 #include <sys/namei.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <dev/rndvar.h>
 
 static int ttnread __P((struct tty *));
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index d2394908b6f..aff438d6597 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_domain.c,v 1.11 2000/09/12 16:39:14 deraadt Exp $	*/
+/*	$OpenBSD: uipc_domain.c,v 1.12 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $	*/
 
 /*
@@ -45,7 +45,7 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 #include <sys/timeout.h>
 
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index a5f473ddbb1..2553a1661cd 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_mbuf.c,v 1.41 2001/09/12 00:23:33 art Exp $	*/
+/*	$OpenBSD: uipc_mbuf.c,v 1.42 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $	*/
 
 /*
@@ -63,8 +63,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 
 #include <machine/cpu.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 struct	pool mbpool;		/* mbuf pool */
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index e724172f51e..7c5eba3914c 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_bio.c,v 1.47 2001/10/28 19:19:00 deraadt Exp $	*/
+/*	$OpenBSD: vfs_bio.c,v 1.48 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $	*/
 
 /*-
@@ -60,7 +60,7 @@
 #include <sys/conf.h>
 #include <sys/kernel.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 #include <miscfs/specfs/specdev.h>
 
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 9de90d5920f..88ac3faf875 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_cluster.c,v 1.25 2001/06/22 14:14:10 deraadt Exp $	*/
+/*	$OpenBSD: vfs_cluster.c,v 1.26 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $	*/
 
 /*-
@@ -45,7 +45,7 @@
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 
 /*
  * Local declarations
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 588d6988b1e..68ce8bd211a 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.68 2001/10/02 17:21:02 csapuntz Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.69 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -64,13 +64,11 @@
 #include <sys/syscallargs.h>
 #include <sys/pool.h>
 
-#include <vm/vm.h>
+#include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 
 #include <miscfs/specfs/specdev.h>
 
-#include <uvm/uvm_extern.h>
-
 enum vtype iftovt_tab[16] = {
 	VNON, VFIFO, VCHR, VNON, VDIR, VNON, VBLK, VNON,
 	VREG, VNON, VLNK, VNON, VSOCK, VNON, VNON, VBAD,
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 36f606fe474..284fad0fbda 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_syscalls.c,v 1.81 2001/10/26 12:03:27 art Exp $	*/
+/*	$OpenBSD: vfs_syscalls.c,v 1.82 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $	*/
 
 /*
@@ -57,10 +57,8 @@
 
 #include <sys/syscallargs.h>
 
-#include <vm/vm.h>
-#include <sys/sysctl.h>
-
 #include <uvm/uvm_extern.h>
+#include <sys/sysctl.h>
 
 extern int suid_clear;
 int	usermount = 0;		/* sysctl: by default, users may not mount */
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 6db663d3eaf..a6a4971a36b 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_vnops.c,v 1.33 2001/07/16 18:25:43 millert Exp $	*/
+/*	$OpenBSD: vfs_vnops.c,v 1.34 2001/11/06 19:53:20 miod Exp $	*/
 /*	$NetBSD: vfs_vnops.c,v 1.20 1996/02/04 02:18:41 christos Exp $	*/
 
 /*
@@ -55,8 +55,6 @@
 #include <sys/tty.h>
 #include <sys/cdio.h>
 
-#include <vm/vm.h>
-
 #include <uvm/uvm_extern.h>
 
 int	vn_read __P((struct file *fp, off_t *off, struct uio *uio,