32 files changed, 12 insertions, 42 deletions

diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index e2fdcfa4aa9d..53de00e7306c 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -27,7 +27,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/acct.h>
 #include <sys/resourcevar.h>
 #include <sys/exec.h>
 #include <sys/fcntl.h>
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index e31d90b08781..dc55fa9b763d 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -32,7 +32,6 @@
 #include "opt_rlimit.h"
 
 #include <sys/param.h>
-#include <sys/acct.h>
 #include <sys/exec.h>
 #include <sys/fcntl.h>
 #include <sys/imgact.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 364b42346c98..21875b823d15 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -51,7 +51,6 @@
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 #include <sys/proc.h>
-#include <sys/kthread.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index e8ac386a075f..7df638fe0fec 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -53,7 +53,6 @@
 #include <sys/socketvar.h>
 #include <sys/stat.h>
 #include <sys/filio.h>
-#include <sys/ttycom.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/unistd.h>
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index fb5d71fd075e..527bb1f120ff 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -41,7 +41,6 @@
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/libkern.h>
-#include <machine/bootinfo.h>
 
 char	*kern_envp;
 
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index c02dadf2f94a..2fb15cfcf8bb 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -63,7 +63,6 @@
 #include <vm/vm_extern.h>
 #include <vm/vm_zone.h>
 
-#include <machine/frame.h>
 #include <sys/user.h>
 
 static int	fast_vfork = 1;
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 1e46c79059b3..dd4b7c985c83 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -31,7 +31,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/errno.h>
 
 #include <machine/ipl.h>
 
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index 8d8ec0014871..f5b0c1d74606 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -28,13 +28,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
 #include <sys/unistd.h>
 #include <sys/wait.h>
 
-#include <machine/cpu.h>
 #include <machine/stdarg.h>
 
 /*
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 8feb119b6285..9262e54f3e2a 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -36,11 +36,8 @@
 #include <sys/sysent.h>
 #include <sys/proc.h>
 #include <sys/lock.h>
-#include <machine/cpu.h>
-#include <machine/bootinfo.h>
 #include <sys/module.h>
 #include <sys/linker.h>
-#include <sys/unistd.h>
 #include <sys/fcntl.h>
 #include <sys/libkern.h>
 #include <sys/namei.h>
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index 91940022e488..506ce8627ff8 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -46,7 +46,6 @@
 #include <sys/sysctl.h>
 #include <sys/proc.h>
 #include <sys/jail.h>
-#include <sys/unistd.h>
 
 #if defined(SMP)
 #include <machine/smp.h>
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 5c2635046a4c..63d4346c2694 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -52,7 +52,6 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
-#include <sys/unistd.h>
 #include <sys/pioctl.h>
 
 static MALLOC_DEFINE(M_CRED, "cred", "credentials");
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 813a978534df..d3bbcb1b26e0 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -45,7 +45,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
-#include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/resourcevar.h>
 #include <sys/malloc.h>
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 432ed93cda63..0ea2ddc4ebeb 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -51,7 +51,6 @@
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/queue.h>
diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c
index 3ba15ad4502a..72b01c86428e 100644
--- a/sys/kern/kern_syscalls.c
+++ b/sys/kern/kern_syscalls.c
@@ -27,15 +27,10 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/sysproto.h>
 #include <sys/sysent.h>
 #include <sys/syscall.h>
 #include <sys/module.h>
-#include <sys/linker.h>
-#include <sys/proc.h>
 
 /*
  * Acts like "nosys" but can be identified in sysent for dynamic call 
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index e481e2cfbbb0..9556209663a4 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -38,12 +38,16 @@
 #include <machine/elf.h>
 
 #include <vm/vm.h>
+#ifdef SPARSE_MAPPING
 #include <vm/vm_prot.h>
+#endif
 #include <vm/vm_param.h>
 #include <sys/lock.h>
+#ifdef SPARSE_MAPPING
 #include <vm/vm_object.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
+#endif
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index e481e2cfbbb0..9556209663a4 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -38,12 +38,16 @@
 #include <machine/elf.h>
 
 #include <vm/vm.h>
+#ifdef SPARSE_MAPPING
 #include <vm/vm_prot.h>
+#endif
 #include <vm/vm_param.h>
 #include <sys/lock.h>
+#ifdef SPARSE_MAPPING
 #include <vm/vm_object.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
+#endif
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 24de7912daa5..a11515168a27 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -26,20 +26,22 @@
  * $FreeBSD$
  */
 
+#include "opt_bus.h"
+
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#ifdef DEVICE_SYSCTLS
 #include <sys/sysctl.h>
+#endif
 #include <sys/bus_private.h>
 #include <sys/systm.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/stdarg.h>	/* for device_printf() */
 
-#include "opt_bus.h"
-
 MALLOC_DEFINE(M_BUS, "bus", "Bus data structures");
 
 #ifdef BUS_DEBUG
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index cde5a2c6d846..b68948ed6c09 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -18,7 +18,6 @@
 #include <sys/conf.h>
 #include <sys/disk.h>
 #include <sys/malloc.h>
-#include <sys/vnode.h>
 #include <machine/md_var.h>
 
 MALLOC_DEFINE(M_DISK, "disk", "disk data");
diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c
index 15df73bbf1e1..70e0e5f48d23 100644
--- a/sys/kern/subr_module.c
+++ b/sys/kern/subr_module.c
@@ -27,7 +27,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/linker.h>
 
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index ed9c0d8b77e3..dc72ede202dc 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -37,10 +37,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
-#include <sys/sysctl.h>
 
 #include <machine/cpu.h>
 
diff --git a/sys/kern/subr_scanf.c b/sys/kern/subr_scanf.c
index ea3c03df6743..275277f9a0ab 100644
--- a/sys/kern/subr_scanf.c
+++ b/sys/kern/subr_scanf.c
@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <machine/limits.h>
 
 /*
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 1371f441c0b6..8eb0efeb2740 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -46,7 +46,6 @@
 #include <sys/sysproto.h>
 #include <sys/filedesc.h>
 #include <sys/filio.h>
-#include <sys/ttycom.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/proc.h>
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 8a40fb4eb339..6280666b814b 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -45,7 +45,6 @@
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
-#include <vm/vm_extern.h>
 
 #include <sys/user.h>
 #include <miscfs/procfs/procfs.h>
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index d114feef1a41..ac01aafe781c 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -42,7 +42,6 @@
 #include <sys/queue.h>
 #include <sys/sysctl.h>
 #include <sys/un.h>
-#include <sys/unpcb.h>
 
 #include <net/raw_cb.h>
 
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 8048cdb8e18a..705dacf061c3 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -65,11 +65,9 @@
 #include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
-#include <vm/vm_pager.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
-#include <machine/limits.h>
 
 static void sf_buf_init(void *arg);
 SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL)
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 83a7831572ac..5aea71af6f92 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -42,7 +42,6 @@
 #include <sys/malloc.h>		/* XXX must be before <sys/file.h> */
 #include <sys/file.h>
 #include <sys/filedesc.h>
-#include <sys/lock.h>
 #include <sys/mbuf.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index f5a0d58b3f68..c1e7d9a1e0cf 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -38,15 +38,12 @@
 #include <sys/conf.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_zone.h>
 #include <sys/aio.h>
-#include <sys/shm.h>
 
-#include <machine/cpu.h>
 #include <machine/limits.h>
 
 static	long jobrefid;
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 1a2c09d7fc72..34953b05e5b4 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -30,7 +30,6 @@
 #define VMIO
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/proc.h>
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 5e2e483c2fe3..62851f936828 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -64,7 +64,6 @@
 #include <machine/limits.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 50684bb315a8..9e3efbb118d9 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -65,7 +65,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>
-#include <vm/vm_extern.h>
 #include <vm/vm_zone.h>
 #include <sys/sysctl.h>
 
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 5e2e483c2fe3..62851f936828 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -64,7 +64,6 @@
 #include <machine/limits.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 50684bb315a8..9e3efbb118d9 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -65,7 +65,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>
-#include <vm/vm_extern.h>
 #include <vm/vm_zone.h>
 #include <sys/sysctl.h>