diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index f37ee4041901..32563491d0da 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -54,7 +54,6 @@
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/dirent.h>
-#include <sys/socketvar.h>
 #include <sys/conf.h>
 #include <miscfs/fdesc/fdesc.h>
 
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index 9a74aa32101a..d96bcb34d1d4 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -49,7 +49,6 @@
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>
-#include <vm/vm_extern.h>
 
 #ifndef FIX_SSTEP
 #define FIX_SSTEP(p)
diff --git a/sys/fs/procfs/procfs_dbregs.c b/sys/fs/procfs/procfs_dbregs.c
index 0df1c3e529cc..158c3f4ab269 100644
--- a/sys/fs/procfs/procfs_dbregs.c
+++ b/sys/fs/procfs/procfs_dbregs.c
@@ -49,7 +49,6 @@
 #include <machine/reg.h>
 #include <miscfs/procfs/procfs.h>
 #include <vm/vm.h>
-#include <vm/vm_extern.h>
 
 int
 procfs_dodbregs(curp, p, pfs, uio)
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index d4a4cfee5390..353b52bcac82 100644
--- a/sys/fs/procfs/procfs_fpregs.c
+++ b/sys/fs/procfs/procfs_fpregs.c
@@ -46,7 +46,6 @@
 #include <machine/reg.h>
 #include <miscfs/procfs/procfs.h>
 #include <vm/vm.h>
-#include <vm/vm_extern.h>
 
 int
 procfs_dofpregs(curp, p, pfs, uio)
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index e075a7adbc81..8b785bf708af 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -58,7 +58,6 @@
 #include <vm/vm_kern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
-#include <vm/vm_extern.h>
 #include <sys/user.h>
 #include <sys/ptrace.h>
 
diff --git a/sys/fs/procfs/procfs_rlimit.c b/sys/fs/procfs/procfs_rlimit.c
index 5f00aafd072e..361f6f6e9d7d 100644
--- a/sys/fs/procfs/procfs_rlimit.c
+++ b/sys/fs/procfs/procfs_rlimit.c
@@ -49,7 +49,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/tty.h>
 #include <sys/resourcevar.h>
 #include <sys/resource.h>
 #include <sys/types.h>
diff --git a/sys/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c
index 9f51a3ca9b9f..05337644ad8f 100644
--- a/sys/fs/procfs/procfs_vfsops.c
+++ b/sys/fs/procfs/procfs_vfsops.c
@@ -47,7 +47,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
-#include <sys/syslog.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <miscfs/procfs/procfs.h>
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 9a8ad4536a5a..4f8488eebb54 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -44,17 +44,13 @@
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
-#include <sys/disklabel.h>
 #include <sys/vmmeter.h>
-#include <sys/sysctl.h>
 #include <sys/tty.h>
 
 #include <vm/vm.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>
 
 static int	spec_advlock __P((struct vop_advlock_args *));  
 static int	spec_bmap __P((struct vop_bmap_args *));
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 7f214f7ea2c0..08763ce5259b 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -58,8 +58,6 @@
 
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
-#include <vm/vm_pager.h>
-#include <vm/vm_extern.h>
 
 int uniondebug = 0;
 
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index 54d14d485dca..52cff5caa27f 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -33,7 +33,6 @@
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
-#include <sys/disklabel.h>
 #include <sys/lock.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
@@ -48,8 +47,6 @@
 #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>
 
 
 /*
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index f37ee4041901..32563491d0da 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -54,7 +54,6 @@
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/dirent.h>
-#include <sys/socketvar.h>
 #include <sys/conf.h>
 #include <miscfs/fdesc/fdesc.h>
 
diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c
index 9a74aa32101a..d96bcb34d1d4 100644
--- a/sys/miscfs/procfs/procfs_ctl.c
+++ b/sys/miscfs/procfs/procfs_ctl.c
@@ -49,7 +49,6 @@
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>
-#include <vm/vm_extern.h>
 
 #ifndef FIX_SSTEP
 #define FIX_SSTEP(p)
diff --git a/sys/miscfs/procfs/procfs_dbregs.c b/sys/miscfs/procfs/procfs_dbregs.c
index 0df1c3e529cc..158c3f4ab269 100644
--- a/sys/miscfs/procfs/procfs_dbregs.c
+++ b/sys/miscfs/procfs/procfs_dbregs.c
@@ -49,7 +49,6 @@
 #include <machine/reg.h>
 #include <miscfs/procfs/procfs.h>
 #include <vm/vm.h>
-#include <vm/vm_extern.h>
 
 int
 procfs_dodbregs(curp, p, pfs, uio)
diff --git a/sys/miscfs/procfs/procfs_fpregs.c b/sys/miscfs/procfs/procfs_fpregs.c
index d4a4cfee5390..353b52bcac82 100644
--- a/sys/miscfs/procfs/procfs_fpregs.c
+++ b/sys/miscfs/procfs/procfs_fpregs.c
@@ -46,7 +46,6 @@
 #include <machine/reg.h>
 #include <miscfs/procfs/procfs.h>
 #include <vm/vm.h>
-#include <vm/vm_extern.h>
 
 int
 procfs_dofpregs(curp, p, pfs, uio)
diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c
index e075a7adbc81..8b785bf708af 100644
--- a/sys/miscfs/procfs/procfs_mem.c
+++ b/sys/miscfs/procfs/procfs_mem.c
@@ -58,7 +58,6 @@
 #include <vm/vm_kern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
-#include <vm/vm_extern.h>
 #include <sys/user.h>
 #include <sys/ptrace.h>
 
diff --git a/sys/miscfs/procfs/procfs_rlimit.c b/sys/miscfs/procfs/procfs_rlimit.c
index 5f00aafd072e..361f6f6e9d7d 100644
--- a/sys/miscfs/procfs/procfs_rlimit.c
+++ b/sys/miscfs/procfs/procfs_rlimit.c
@@ -49,7 +49,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/tty.h>
 #include <sys/resourcevar.h>
 #include <sys/resource.h>
 #include <sys/types.h>
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 9f51a3ca9b9f..05337644ad8f 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -47,7 +47,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
-#include <sys/syslog.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <miscfs/procfs/procfs.h>
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 9a8ad4536a5a..4f8488eebb54 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -44,17 +44,13 @@
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
-#include <sys/disklabel.h>
 #include <sys/vmmeter.h>
-#include <sys/sysctl.h>
 #include <sys/tty.h>
 
 #include <vm/vm.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>
 
 static int	spec_advlock __P((struct vop_advlock_args *));  
 static int	spec_bmap __P((struct vop_bmap_args *));
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index 7f214f7ea2c0..08763ce5259b 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -58,8 +58,6 @@
 
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
-#include <vm/vm_pager.h>
-#include <vm/vm_extern.h>
 
 int uniondebug = 0;