diff --git a/sys/amd64/amd64/amd64_mem.c b/sys/amd64/amd64/amd64_mem.c
index 33342b92227c..4be3d13dd7a8 100644
--- a/sys/amd64/amd64/amd64_mem.c
+++ b/sys/amd64/amd64/amd64_mem.c
@@ -31,7 +31,6 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/ioccom.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 
@@ -39,7 +38,7 @@
 #include <machine/specialreg.h>
 
 #ifdef SMP
-#include "machine/smp.h"
+#include <machine/smp.h>
 #endif
 
 /*
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 5dbbeddb81f9..e76758f5ead7 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -62,7 +62,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
-#include <sys/sysctl.h>
 #include <sys/cons.h>
 
 #include <machine/bootinfo.h>
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index 0f22bb31c3f7..b66d87212226 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -32,7 +32,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
@@ -41,7 +40,6 @@
 #include <machine/md_var.h>
 #include <machine/segments.h>
 #include <machine/stdarg.h>
-#include <machine/tss.h>
 #include <machine/vmparam.h>
 #include <machine/pc/bios.h>
 #include <isa/pnpreg.h>
diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c
index 51a2e77541f6..4369925be8da 100644
--- a/sys/amd64/amd64/elf_machdep.c
+++ b/sys/amd64/amd64/elf_machdep.c
@@ -26,13 +26,7 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/namei.h>
-#include <sys/fcntl.h>
-#include <sys/vnode.h>
 #include <sys/linker.h>
 #include <machine/elf.h>
 
diff --git a/sys/amd64/amd64/legacy.c b/sys/amd64/amd64/legacy.c
index d4637f41128a..c707b0510ad4 100644
--- a/sys/amd64/amd64/legacy.c
+++ b/sys/amd64/amd64/legacy.c
@@ -46,7 +46,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <machine/bus.h>
@@ -57,7 +56,6 @@
 #include <vm/pmap.h>
 #include <machine/pmap.h>
 
-#include <machine/ipl.h>
 #include <machine/resource.h>
 #ifdef APIC_IO
 #include <machine/smp.h>
@@ -69,7 +67,6 @@
 #else
 #include <i386/isa/isa.h>
 #endif
-#include <i386/isa/icu.h>
 #include <i386/isa/intr_machdep.h>
 
 static struct rman irq_rman, drq_rman, port_rman, mem_rman;
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index 999837942dd6..84686c95402f 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -58,7 +58,6 @@
 #include <sys/signalvar.h>
 
 #include <machine/frame.h>
-#include <machine/md_var.h>
 #include <machine/random.h>
 #include <machine/psl.h>
 #include <machine/specialreg.h>
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 3711b371c90c..dec05e207191 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -71,8 +71,6 @@
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
-#include <machine/cputypes.h>
-#include <machine/cputypes.h>
 #include <machine/globaldata.h>
 
 #if defined(APIC_IO)
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 3711b371c90c..dec05e207191 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -71,8 +71,6 @@
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
-#include <machine/cputypes.h>
-#include <machine/cputypes.h>
 #include <machine/globaldata.h>
 
 #if defined(APIC_IO)
diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c
index d4637f41128a..c707b0510ad4 100644
--- a/sys/amd64/amd64/nexus.c
+++ b/sys/amd64/amd64/nexus.c
@@ -46,7 +46,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <machine/bus.h>
@@ -57,7 +56,6 @@
 #include <vm/pmap.h>
 #include <machine/pmap.h>
 
-#include <machine/ipl.h>
 #include <machine/resource.h>
 #ifdef APIC_IO
 #include <machine/smp.h>
@@ -69,7 +67,6 @@
 #else
 #include <i386/isa/isa.h>
 #endif
-#include <i386/isa/icu.h>
 #include <i386/isa/intr_machdep.h>
 
 static struct rman irq_rman, drq_rman, port_rman, mem_rman;
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 54f63ca0f7d1..f9227dcc6e77 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -54,7 +54,6 @@
 #include <machine/cpu.h>
 #include <machine/pcb_ext.h>	/* pcb.h included by sys/user.h */
 #include <machine/sysarch.h>
-#include <machine/smp.h>
 
 #include <vm/vm_kern.h>		/* for kernel_map */
 
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index dc76336dc14a..252f3a613f33 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -63,8 +63,6 @@
 #ifdef SMP
 #include <machine/smp.h>
 #endif
-#include <machine/pcb_ext.h>
-#include <machine/vm86.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 3711b371c90c..dec05e207191 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -71,8 +71,6 @@
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
-#include <machine/cputypes.h>
-#include <machine/cputypes.h>
 #include <machine/globaldata.h>
 
 #if defined(APIC_IO)
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 5dbbeddb81f9..e76758f5ead7 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -62,7 +62,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
-#include <sys/sysctl.h>
 #include <sys/cons.h>
 
 #include <machine/bootinfo.h>
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 0f22bb31c3f7..b66d87212226 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -32,7 +32,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
@@ -41,7 +40,6 @@
 #include <machine/md_var.h>
 #include <machine/segments.h>
 #include <machine/stdarg.h>
-#include <machine/tss.h>
 #include <machine/vmparam.h>
 #include <machine/pc/bios.h>
 #include <isa/pnpreg.h>
diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c
index 51a2e77541f6..4369925be8da 100644
--- a/sys/i386/i386/elf_machdep.c
+++ b/sys/i386/i386/elf_machdep.c
@@ -26,13 +26,7 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/namei.h>
-#include <sys/fcntl.h>
-#include <sys/vnode.h>
 #include <sys/linker.h>
 #include <machine/elf.h>
 
diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c
index 33342b92227c..4be3d13dd7a8 100644
--- a/sys/i386/i386/i686_mem.c
+++ b/sys/i386/i386/i686_mem.c
@@ -31,7 +31,6 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/ioccom.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 
@@ -39,7 +38,7 @@
 #include <machine/specialreg.h>
 
 #ifdef SMP
-#include "machine/smp.h"
+#include <machine/smp.h>
 #endif
 
 /*
diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c
index d4637f41128a..c707b0510ad4 100644
--- a/sys/i386/i386/legacy.c
+++ b/sys/i386/i386/legacy.c
@@ -46,7 +46,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <machine/bus.h>
@@ -57,7 +56,6 @@
 #include <vm/pmap.h>
 #include <machine/pmap.h>
 
-#include <machine/ipl.h>
 #include <machine/resource.h>
 #ifdef APIC_IO
 #include <machine/smp.h>
@@ -69,7 +67,6 @@
 #else
 #include <i386/isa/isa.h>
 #endif
-#include <i386/isa/icu.h>
 #include <i386/isa/intr_machdep.h>
 
 static struct rman irq_rman, drq_rman, port_rman, mem_rman;
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 999837942dd6..84686c95402f 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -58,7 +58,6 @@
 #include <sys/signalvar.h>
 
 #include <machine/frame.h>
-#include <machine/md_var.h>
 #include <machine/random.h>
 #include <machine/psl.h>
 #include <machine/specialreg.h>
diff --git a/sys/i386/i386/mp_clock.c b/sys/i386/i386/mp_clock.c
index 096af9917f74..abe93e282a3b 100644
--- a/sys/i386/i386/mp_clock.c
+++ b/sys/i386/i386/mp_clock.c
@@ -10,9 +10,9 @@
  *
  */
 
-#include "opt_bus.h"
-#include "opt_pci.h"
-#include "opt_smp.h"
+/* #include "opt_bus.h" */
+/* #include "opt_pci.h" */
+/* #include "opt_smp.h" */
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -22,7 +22,6 @@
 #include <sys/bus.h>
 
 #include <pci/pcivar.h>
-#include <pci/pcireg.h>
 
 static unsigned piix_get_timecount(struct timecounter *tc);
 
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 3711b371c90c..dec05e207191 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -71,8 +71,6 @@
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
-#include <machine/cputypes.h>
-#include <machine/cputypes.h>
 #include <machine/globaldata.h>
 
 #if defined(APIC_IO)
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 3711b371c90c..dec05e207191 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -71,8 +71,6 @@
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
-#include <machine/cputypes.h>
-#include <machine/cputypes.h>
 #include <machine/globaldata.h>
 
 #if defined(APIC_IO)
diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c
index d4637f41128a..c707b0510ad4 100644
--- a/sys/i386/i386/nexus.c
+++ b/sys/i386/i386/nexus.c
@@ -46,7 +46,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <machine/bus.h>
@@ -57,7 +56,6 @@
 #include <vm/pmap.h>
 #include <machine/pmap.h>
 
-#include <machine/ipl.h>
 #include <machine/resource.h>
 #ifdef APIC_IO
 #include <machine/smp.h>
@@ -69,7 +67,6 @@
 #else
 #include <i386/isa/isa.h>
 #endif
-#include <i386/isa/icu.h>
 #include <i386/isa/intr_machdep.h>
 
 static struct rman irq_rman, drq_rman, port_rman, mem_rman;
diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c
index 6d48081e4d01..a81adfd3dfc6 100644
--- a/sys/i386/i386/procfs_machdep.c
+++ b/sys/i386/i386/procfs_machdep.c
@@ -68,7 +68,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/vnode.h>
@@ -81,8 +80,6 @@
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 
-#include <sys/user.h>
-
 int
 procfs_read_regs(p, regs)
 	struct proc *p;
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 54f63ca0f7d1..f9227dcc6e77 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -54,7 +54,6 @@
 #include <machine/cpu.h>
 #include <machine/pcb_ext.h>	/* pcb.h included by sys/user.h */
 #include <machine/sysarch.h>
-#include <machine/smp.h>
 
 #include <vm/vm_kern.h>		/* for kernel_map */
 
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index c041d3b8e078..ad1bbfceafa0 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -37,9 +37,7 @@
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
-#include <vm/vm_param.h>
 
-#include <sys/reboot.h>
 #include <sys/user.h>
 
 #include <machine/md_var.h>
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index dc76336dc14a..252f3a613f33 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -63,8 +63,6 @@
 #ifdef SMP
 #include <machine/smp.h>
 #endif
-#include <machine/pcb_ext.h>
-#include <machine/vm86.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 3711b371c90c..dec05e207191 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -71,8 +71,6 @@
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
-#include <machine/cputypes.h>
-#include <machine/cputypes.h>
 #include <machine/globaldata.h>
 
 #if defined(APIC_IO)
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 3711b371c90c..dec05e207191 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -71,8 +71,6 @@
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, TEST_TEST1 */
 #include <machine/tss.h>
 #include <machine/specialreg.h>
-#include <machine/cputypes.h>
-#include <machine/cputypes.h>
 #include <machine/globaldata.h>
 
 #if defined(APIC_IO)