diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index da655284478..538824c3801 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -57,13 +57,9 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/malloc.h>
-#include <sys/module.h>
 #include <machine/bus.h>
-#include <sys/rman.h>
 
 #include <machine/resource.h>
 
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 8cebfb004c0..3cb86f7a806 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -31,7 +31,6 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/conf.h>
 #include <sys/malloc.h>
 
 #include <machine/clock.h>
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index da655284478..538824c3801 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -57,13 +57,9 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/malloc.h>
-#include <sys/module.h>
 #include <machine/bus.h>
-#include <sys/rman.h>
 
 #include <machine/resource.h>
 
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index e47c8d9355a..65a575588db 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -34,7 +34,6 @@
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
-#include <sys/kernel.h>
 #include <sys/filio.h>
 #include <sys/poll.h>
 #include <sys/vnode.h>
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index 8cebfb004c0..3cb86f7a806 100644
--- a/sys/i386/isa/pcf.c
+++ b/sys/i386/isa/pcf.c
@@ -31,7 +31,6 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/conf.h>
 #include <sys/malloc.h>
 
 #include <machine/clock.h>
diff --git a/sys/i386/isa/pcicx.c b/sys/i386/isa/pcicx.c
index 65c9df899eb..07d950ea328 100644
--- a/sys/i386/isa/pcicx.c
+++ b/sys/i386/isa/pcicx.c
@@ -35,13 +35,14 @@
  *   circumstances is the author responsible for the proper functioning
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
+ *
+ * $FreeBSD$
  */
 #include <sys/param.h>
 #if defined(__FreeBSD__)
 #include <sys/systm.h>
 #include <machine/clock.h>
 #endif
-#include <i386/isa/isa_device.h>
 #include <i386/isa/pcic.h>
 
 /*
diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c
index c9c450fc4f0..ef63742579e 100644
--- a/sys/i386/isa/random_machdep.c
+++ b/sys/i386/isa/random_machdep.c
@@ -45,12 +45,10 @@
 #include <sys/select.h>
 #include <sys/poll.h>
 #include <sys/md5.h>
-#include <sys/bus.h>
 
 #include <machine/random.h>
 
 #include <i386/isa/icu.h>
-#include <i386/isa/intr_machdep.h>
 
 #define MAX_BLKDEV 4
 
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index 816ec1eec78..bea8ec33967 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -57,7 +57,6 @@ error "Can only have 1 spigot configured."
 
 #include	<sys/param.h>
 #include	<sys/systm.h>
-#include	<sys/kernel.h>
 #include	<sys/conf.h>
 #include	<sys/proc.h>
 #include	<sys/signalvar.h>
diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c
index c9c450fc4f0..ef63742579e 100644
--- a/sys/kern/kern_random.c
+++ b/sys/kern/kern_random.c
@@ -45,12 +45,10 @@
 #include <sys/select.h>
 #include <sys/poll.h>
 #include <sys/md5.h>
-#include <sys/bus.h>
 
 #include <machine/random.h>
 
 #include <i386/isa/icu.h>
-#include <i386/isa/intr_machdep.h>
 
 #define MAX_BLKDEV 4