diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index 862418bbcd5..d5d570f4a0b 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -7,7 +7,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: inflate.c,v 1.4 1994/10/22 11:40:28 phk Exp $
+ * $Id: inflate.c,v 1.5 1995/04/15 06:54:13 phk Exp $
  *
  *
  */
@@ -20,11 +20,6 @@
 #include <sys/mman.h>
 #include <sys/malloc.h>
 
-#ifdef KERNEL
-#include <vm/vm.h>
-#include <vm/vm_kern.h>
-#endif
-
 /* needed to make inflate() work */
 #define	uch u_char
 #define	ush u_short
diff --git a/sys/kern/kern_devconf.c b/sys/kern/kern_devconf.c
index b7370421b98..af0152b75dc 100644
--- a/sys/kern/kern_devconf.c
+++ b/sys/kern/kern_devconf.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_devconf.c,v 1.10 1995/05/30 08:05:23 rgrimes Exp $
+ *	$Id: kern_devconf.c,v 1.11 1995/11/20 12:42:01 phk Exp $
  */
 
 /*
@@ -35,7 +35,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
-#include <vm/vm.h>		/* needed for sysctl.h */
 #include <sys/sysctl.h>
 #include <sys/devconf.h>
 
diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c
index 799b7bf5672..c9dd983bf88 100644
--- a/sys/kern/kern_ntptime.c
+++ b/sys/kern/kern_ntptime.c
@@ -49,7 +49,6 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/timex.h>
-#include <vm/vm.h>
 #include <sys/sysctl.h>
 
 /*
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index 901c728bd10..173b33d82f0 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_xxx.c	8.2 (Berkeley) 11/14/93
- * $Id: kern_xxx.c,v 1.20 1995/11/20 12:14:40 phk Exp $
+ * $Id: kern_xxx.c,v 1.21 1995/12/02 18:58:50 bde Exp $
  */
 
 #include <sys/param.h>
@@ -40,7 +40,6 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
-#include <vm/vm.h>
 #include <sys/sysctl.h>
 #include <sys/utsname.h>
 #include <sys/signalvar.h>
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 54216dfe358..f3708b3c599 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prof.c	8.3 (Berkeley) 9/23/93
- * $Id: subr_prof.c,v 1.11 1995/11/20 12:42:06 phk Exp $
+ * $Id: subr_prof.c,v 1.12 1995/12/02 17:10:37 bde Exp $
  */
 
 #include <sys/param.h>
@@ -39,9 +39,8 @@
 #include <sys/sysproto.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
-#include <vm/vm.h>
+#include <sys/resourcevar.h>
 #include <sys/sysctl.h>
-#include <sys/user.h>
 
 #include <machine/cpu.h>
 
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 5c2c3521ecf..f66acc1c2d1 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_icmp.c,v 1.12 1995/11/18 13:25:41 bde Exp $
+ * $Id: ip_icmp.c,v 1.13 1995/12/05 17:45:59 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,6 @@
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
-#include <vm/vm.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index b3df6fec610..f43f02687b9 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.27 1995/11/01 17:18:27 wollman Exp $
+ * $Id: ip_input.c,v 1.28 1995/11/14 20:34:14 phk Exp $
  */
 
 #include <sys/param.h>
@@ -45,8 +45,6 @@
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
-
-#include <vm/vm.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index be2cfc1f498..a4bfba763d6 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- *	$Id: tcp_usrreq.c,v 1.19 1995/11/09 20:23:09 phk Exp $
+ *	$Id: tcp_usrreq.c,v 1.20 1995/11/14 20:34:47 phk Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,6 @@
 #include <sys/protosw.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
-#include <vm/vm.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 1034af833a1..b15ff86bb1d 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
- *	$Id: udp_usrreq.c,v 1.15 1995/11/14 20:34:51 phk Exp $
+ *	$Id: udp_usrreq.c,v 1.16 1995/11/16 09:51:02 bde Exp $
  */
 
 #include <sys/param.h>
@@ -44,7 +44,6 @@
 #include <sys/errno.h>
 #include <sys/stat.h>
 #include <sys/queue.h>
-#include <vm/vm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>