diff --git a/src/drivers/bus/eisa.c b/src/drivers/bus/eisa.c
index 1cd53c9b8..006565111 100644
--- a/src/drivers/bus/eisa.c
+++ b/src/drivers/bus/eisa.c
@@ -1,5 +1,4 @@
 #include "etherboot.h"
-#include "dev.h"
 #include "io.h"
 #include "timer.h"
 #include "eisa.h"
diff --git a/src/drivers/bus/mca.c b/src/drivers/bus/mca.c
index f87da8d2e..60690ae11 100644
--- a/src/drivers/bus/mca.c
+++ b/src/drivers/bus/mca.c
@@ -6,7 +6,6 @@
  */
 
 #include "etherboot.h"
-#include "dev.h"
 #include "io.h"
 #include "mca.h"
 
diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c
index e98319138..6e08f0890 100644
--- a/src/drivers/bus/pci.c
+++ b/src/drivers/bus/pci.c
@@ -1,5 +1,4 @@
 #include "etherboot.h"
-#include "dev.h"
 #include "pci.h"
 
 /*
diff --git a/src/include/eisa.h b/src/include/eisa.h
index 081ce47ef..df03fe842 100644
--- a/src/include/eisa.h
+++ b/src/include/eisa.h
@@ -2,6 +2,7 @@
 #define EISA_H
 
 #include "isa_ids.h"
+#include "dev.h"
 
 /*
  * EISA constants
diff --git a/src/include/mca.h b/src/include/mca.h
index 9115b98d6..e5daf7156 100644
--- a/src/include/mca.h
+++ b/src/include/mca.h
@@ -8,6 +8,9 @@
 #ifndef MCA_H
 #define MCA_H
 
+#include "isa_ids.h"
+#include "dev.h"
+
 /*
  * MCA constants
  *
@@ -19,7 +22,6 @@
 #define MCA_POS_REG(n)			(0x100+(n))
 
 /* Is there a standard that would define this? */
-#include "isa_ids.h"
 #define GENERIC_MCA_VENDOR ISA_VENDOR ( 'M', 'C', 'A' )
 
 /*
diff --git a/src/include/pci.h b/src/include/pci.h
index e7ac084b5..ee1631de8 100644
--- a/src/include/pci.h
+++ b/src/include/pci.h
@@ -23,6 +23,7 @@
 
 #include "stdint.h"
 #include "pci_ids.h"
+#include "dev.h"
 
 /*
  * PCI constants