diff --git a/sys/arch/mac68k/mac68k/macrom.c b/sys/arch/mac68k/mac68k/macrom.c
index d01c886e003e..25625fb2ab98 100644
--- a/sys/arch/mac68k/mac68k/macrom.c
+++ b/sys/arch/mac68k/mac68k/macrom.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: macrom.c,v 1.44 1999/06/12 00:21:13 ender Exp $	*/
+/*	$NetBSD: macrom.c,v 1.45 2000/06/25 13:26:23 mrg Exp $	*/
 
 /*-
  * Copyright (C) 1994	Bradley A. Grantham
@@ -55,9 +55,6 @@
 #include <sys/queue.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
 
 #include <machine/cpu.h>
 #include <machine/frame.h>
diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c
index 4dc6f58fbc65..22dbc3849a40 100644
--- a/sys/arch/sparc/sparc/pmap.c
+++ b/sys/arch/sparc/sparc/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.170 2000/06/20 12:04:22 pk Exp $ */
+/*	$NetBSD: pmap.c,v 1.171 2000/06/25 13:26:24 mrg Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -73,8 +73,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_prot.h>
-#include <vm/vm_page.h>
 
 #include <uvm/uvm.h>
 
diff --git a/sys/arch/sun3/sun3/pmap.c b/sys/arch/sun3/sun3/pmap.c
index 13b6bf07b731..531e88cb7791 100644
--- a/sys/arch/sun3/sun3/pmap.c
+++ b/sys/arch/sun3/sun3/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.116 1999/11/13 00:32:18 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.117 2000/06/25 13:26:26 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -98,8 +98,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
-#include <vm/vm_prot.h>
-#include <vm/vm_page.h>
 
 #include <uvm/uvm.h>
 
diff --git a/sys/compat/common/vm_43.c b/sys/compat/common/vm_43.c
index 4dc11820f564..96bbe8d84795 100644
--- a/sys/compat/common/vm_43.c
+++ b/sys/compat/common/vm_43.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_43.c,v 1.4 2000/03/30 11:27:15 augustss Exp $	*/
+/*	$NetBSD: vm_43.c,v 1.5 2000/06/25 13:26:22 mrg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -61,7 +61,6 @@
 #include <miscfs/specfs/specdev.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 
 /* ARGSUSED */
 int
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 4dd33d2a055e..f7be81fb5f55 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.125 2000/05/02 00:00:00 augustss Exp $	*/
+/*	$NetBSD: audio.c,v 1.126 2000/06/25 13:26:19 mrg Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -83,7 +83,6 @@
 #include <dev/audiovar.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 
 #include <machine/endian.h>
 
diff --git a/sys/miscfs/procfs/procfs_map.c b/sys/miscfs/procfs/procfs_map.c
index 0f8d944c7197..5cc72a1973f3 100644
--- a/sys/miscfs/procfs/procfs_map.c
+++ b/sys/miscfs/procfs/procfs_map.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_map.c,v 1.5 1999/04/10 14:00:38 drochner Exp $	*/
+/*	$NetBSD: procfs_map.c,v 1.6 2000/06/25 13:26:22 mrg Exp $	*/
 
 /*
  * Copyright (c) 1993 Jan-Simon Pendry
@@ -48,11 +48,8 @@
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
-#include <vm/vm_map.h>
-#include <vm/vm_page.h>
 
 #include <uvm/uvm.h>
 
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index 82144aa6da18..093b7bc61379 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ntfs_vfsops.c,v 1.27 2000/03/30 12:47:02 augustss Exp $	*/
+/*	$NetBSD: ntfs_vfsops.c,v 1.28 2000/06/25 13:26:21 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 Semen Ustimenko
@@ -43,11 +43,7 @@
 #include <sys/device.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_prot.h>
-#include <vm/vm_page.h>
 #include <vm/vm_object.h>
-#include <vm/vm_extern.h>
 
 #include <miscfs/specfs/specdev.h>
 
diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c
index 9b6dc8cc33c1..c49d6f892efd 100644
--- a/sys/ntfs/ntfs_vnops.c
+++ b/sys/ntfs/ntfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ntfs_vnops.c,v 1.24 2000/03/30 12:47:02 augustss Exp $	*/
+/*	$NetBSD: ntfs_vnops.c,v 1.25 2000/06/25 13:26:21 mrg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -53,15 +53,11 @@
 #include <sys/dirent.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_prot.h>
-#include <vm/vm_page.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
 #if defined(__FreeBSD__)
 #include <vm/vnode_pager.h>
 #endif
-#include <vm/vm_extern.h>
 
 #include <sys/sysctl.h>