5 files changed, 5 insertions, 10 deletions
diff --git a/device/chario.c b/device/chario.c
index 3b5841d..1c1ec54 100644
--- a/device/chario.c
+++ b/device/chario.c
@@ -47,7 +47,7 @@
 #include <device/device_types.h>
 #include <device/io_req.h>
 #include <device/ds_routines.h>
-#include "device_reply.h"
+#include <device/device_reply.user.h>
 
 #include <device/tty.h>
 
diff --git a/device/cons.c b/device/cons.c
index a06fdf3..bbcb408 100644
--- a/device/cons.c
+++ b/device/cons.c
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <device/conf.h>
 #include <mach/boolean.h>
-#include <cons.h>
+#include <device/cons.h>
 #else
 #include <sys/param.h>
 #include <sys/user.h>
@@ -39,7 +39,7 @@
 
 #ifdef MACH_KMSG
 #include <device/io_req.h>
-#include <kmsg.h>
+#include <device/kmsg.h>
 #endif
 
 static	int cn_inited = 0;
diff --git a/device/ds_routines.c b/device/ds_routines.c
index 1286001..dd2b7f5 100644
--- a/device/ds_routines.c
+++ b/device/ds_routines.c
@@ -58,15 +58,12 @@
 #include <device/ds_routines.h>
 #include <device/net_status.h>
 #include <device/device_port.h>
-#include "device_reply.h"
+#include <device/device_reply.user.h>
 
 #include <machine/machspl.h>
 
 #ifdef i386
 #include <i386at/device_emul.h>
-#ifdef LINUX_DEV
-#include <i386/linux/device-drivers.h>
-#endif
 #endif
 
 #ifdef i386
diff --git a/device/kmsg.c b/device/kmsg.c
index a887666..96f7d70 100644
--- a/device/kmsg.c
+++ b/device/kmsg.c
@@ -23,7 +23,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <device/io_req.h>
 #include <mach/boolean.h>
 #include <kern/lock.h>
-#include <kmsg.h>
+#include <device/kmsg.h>
 
 
 #define KMSGBUFSIZE	(4096)  /* XXX */
diff --git a/device/net_io.c b/device/net_io.c
index 4df103f..25c75ae 100644
--- a/device/net_io.c
+++ b/device/net_io.c
@@ -38,8 +38,6 @@
  *	It may change a lot real soon.	-cmaeda 11 June 1993
  */
 
-#include <mach_ttd.h>
-
 #include <sys/types.h>
 #include <device/net_status.h>
 #include <machine/machspl.h>		/* spl definitions */