diff --git a/src/drivers/bus/eisa.c b/src/drivers/bus/eisa.c
index bb447026..d1902dd4 100644
--- a/src/drivers/bus/eisa.c
+++ b/src/drivers/bus/eisa.c
@@ -1,4 +1,4 @@
-#include "etherboot.h"
+#include "string.h"
 #include "io.h"
 #include "timer.h"
 #include "eisa.h"
diff --git a/src/drivers/bus/isa.c b/src/drivers/bus/isa.c
index 6778d486..4fb06be9 100644
--- a/src/drivers/bus/isa.c
+++ b/src/drivers/bus/isa.c
@@ -1,4 +1,4 @@
-#include "etherboot.h"
+#include "string.h"
 #include "isa.h"
 
 /*
diff --git a/src/drivers/bus/isa_ids.c b/src/drivers/bus/isa_ids.c
index e6ca7d59..85175e04 100644
--- a/src/drivers/bus/isa_ids.c
+++ b/src/drivers/bus/isa_ids.c
@@ -1,4 +1,6 @@
-#include "etherboot.h"
+#include "stdint.h"
+#include "byteswap.h"
+#include "console.h"
 #include "isa_ids.h"
 
 /* 
diff --git a/src/drivers/bus/isapnp.c b/src/drivers/bus/isapnp.c
index cf5114fa..3cf65b9e 100644
--- a/src/drivers/bus/isapnp.c
+++ b/src/drivers/bus/isapnp.c
@@ -33,7 +33,7 @@
 *
 ***************************************************************************/
 
-#include "etherboot.h"
+#include "string.h"
 #include "timer.h"
 #include "io.h"
 #include "isapnp.h"
diff --git a/src/drivers/bus/mca.c b/src/drivers/bus/mca.c
index eb40fdca..f3795023 100644
--- a/src/drivers/bus/mca.c
+++ b/src/drivers/bus/mca.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "etherboot.h"
+#include "string.h"
 #include "io.h"
 #include "mca.h"
 
diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c
index 6894cad9..e109d030 100644
--- a/src/drivers/bus/pci.c
+++ b/src/drivers/bus/pci.c
@@ -1,4 +1,6 @@
-#include "etherboot.h"
+#include "stdint.h"
+#include "string.h"
+#include "console.h"
 #include "pci.h"
 
 /*