7 files changed, 3 insertions, 10 deletions
diff --git a/linux/dev/arch/i386/kernel/setup.c b/linux/dev/arch/i386/kernel/setup.c
index 7fba6d8..92b782a 100644
--- a/linux/dev/arch/i386/kernel/setup.c
+++ b/linux/dev/arch/i386/kernel/setup.c
@@ -1,5 +1,3 @@
-#include <device-drivers.h>
-
 char x86 =
 #if defined(CONFIG_M386)
 3;
diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c
index 032aa90..275ad22 100644
--- a/linux/dev/glue/block.c
+++ b/linux/dev/glue/block.c
@@ -59,7 +59,7 @@
 #include <device/device_types.h>
 #include <device/device_port.h>
 #include <device/disk_status.h>
-#include "device_reply.h"
+#include <device/device_reply.user.h>
 
 #include <linux_emul.h>
 
diff --git a/linux/dev/glue/net.c b/linux/dev/glue/net.c
index 9f154b7..06dcdc4 100644
--- a/linux/dev/glue/net.c
+++ b/linux/dev/glue/net.c
@@ -82,7 +82,7 @@
 #include <device/if_ether.h>
 #include <device/if_hdr.h>
 #include <device/net_io.h>
-#include "device_reply.h"
+#include <device/device_reply.user.h>
 
 #include <linux_emul.h>
 
diff --git a/linux/dev/init/main.c b/linux/dev/init/main.c
index fa932bd..c768169 100644
--- a/linux/dev/init/main.c
+++ b/linux/dev/init/main.c
@@ -51,8 +51,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 
-#include <device-drivers.h>
-
 /*
  * Timing loop count.
  */
diff --git a/linux/pcmcia-cs/glue/ds.c b/linux/pcmcia-cs/glue/ds.c
index 7baa29e..0f4e9a2 100644
--- a/linux/pcmcia-cs/glue/ds.c
+++ b/linux/pcmcia-cs/glue/ds.c
@@ -51,7 +51,7 @@
 
 #include <i386at/device_emul.h>
 
-#include <device_reply.h>
+#include <device/device_reply.user.h>
 
 /* Eliminate the queue_empty macro from Mach header files.  */
 #undef queue_empty
diff --git a/linux/pcmcia-cs/glue/pcmcia_glue.h b/linux/pcmcia-cs/glue/pcmcia_glue.h
index 4784645..fc308ee 100644
--- a/linux/pcmcia-cs/glue/pcmcia_glue.h
+++ b/linux/pcmcia-cs/glue/pcmcia_glue.h
@@ -27,7 +27,6 @@
 /*
  * pcmcia glue configuration
  */
-#include <device-drivers.h>
 #define PCMCIA_DEBUG 4
 /* Maximum number of sockets supported by the glue code. */
 #define MAX_SOCKS 8
diff --git a/linux/pcmcia-cs/glue/wireless_glue.h b/linux/pcmcia-cs/glue/wireless_glue.h
index f61f1ec..7883d35 100644
--- a/linux/pcmcia-cs/glue/wireless_glue.h
+++ b/linux/pcmcia-cs/glue/wireless_glue.h
@@ -27,8 +27,6 @@
 /*
  * Wireless glue configuration.
  */
-#include <device-drivers.h>
-
 
 /*
  * Include the pcmcia glue as well, in case the kernel is configured for