diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 62d9db23e60f..b3343fe1fd52 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -41,8 +41,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/interrupt.h>
-#include <sys/conf.h>
 #include <sys/disk.h>
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 843b8525c0ed..333a5d1335e4 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -40,8 +40,6 @@
 #include <sys/conf.h>
 #include <sys/disk.h>
 #include <sys/devicestat.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
 #include <vm/vm.h>
 #include <vm/vm_prot.h>
 #include <vm/pmap.h>
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index f016b91cca69..28e5970df47e 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -32,7 +32,6 @@
 #include "apm.h"
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/malloc.h> 
 #include <sys/bus.h>
@@ -40,7 +39,6 @@
 #include <vm/pmap.h>
 #if NPCI > 0
 #include <pci/pcivar.h>
-#include <pci/pcireg.h>
 #endif
 #if NAPM > 0
 #include <machine/apm_bios.h>
diff --git a/sys/dev/ata/atapi-all.c b/sys/dev/ata/atapi-all.c
index 509bc04bf048..3368f783af13 100644
--- a/sys/dev/ata/atapi-all.c
+++ b/sys/dev/ata/atapi-all.c
@@ -39,8 +39,6 @@
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
-#include <sys/devicestat.h>
-#include <pci/pcivar.h>
 #include <machine/clock.h>
 #if NAPM > 0
 #include <machine/apm_bios.h>
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index debb3c0e2f84..edaa58a816e0 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -42,7 +42,6 @@
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/stat.h>
-#include <pci/pcivar.h>
 #if NAPM > 0
 #include <machine/apm_bios.h>
 #endif
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index 01dc368ed6c1..f514443f10cf 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -39,9 +39,6 @@
 #include <sys/disk.h>
 #include <sys/devicestat.h>
 #include <sys/cdio.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <pci/pcivar.h>
 #if NAPM > 0
 #include <machine/apm_bios.h>
 #endif
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index 94e60bf05e9c..99c02e471c13 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -38,8 +38,6 @@
 #include <sys/mtio.h>
 #include <sys/disklabel.h>
 #include <sys/devicestat.h>
-#include <pci/pcivar.h>
-#include <machine/clock.h>
 #if NAPM > 0
 #include <machine/apm_bios.h>
 #endif