13 files changed, 14 insertions, 34 deletions
diff --git a/i386/i386at/autoconf.c b/i386/i386at/autoconf.c
index 1c2e9df..9426f44 100644
--- a/i386/i386at/autoconf.c
+++ b/i386/i386at/autoconf.c
@@ -25,7 +25,6 @@
  */
 
 #ifdef	MACH_KERNEL
-#include <mach_ttd.h>
 #include <mach/std_types.h>
 #else	/* MACH_KERNEL */
 #include <cpus.h>
@@ -47,13 +46,11 @@
 #define	SPL_TTY		(vm_offset_t)SPLTTY
 
 
-#include <com.h>
 #if NCOM > 0
 extern	struct	bus_driver	comdriver;
 extern int			comintr();
 #endif /* NCOM */
 
-#include <lpr.h>
 #if NLPR > 0
 extern	struct	bus_driver	lprdriver;
 extern int			lprintr();
diff --git a/i386/i386at/boothdr.S b/i386/i386at/boothdr.S
index 125eece..27d0405 100644
--- a/i386/i386at/boothdr.S
+++ b/i386/i386at/boothdr.S
@@ -1,7 +1,7 @@
 
 #include <mach/machine/asm.h>
 
-#include "i386asm.h"
+#include <i386/i386asm.h>
 
 	/*
 	 * This section will be put first into .text.  See also	i386/ldscript.
diff --git a/i386/i386at/com.c b/i386/i386at/com.c
index f986f18..950ef95 100644
--- a/i386/i386at/com.c
+++ b/i386/i386at/com.c
@@ -24,7 +24,6 @@
  * the rights to redistribute these changes.
  */
 
-#include <com.h>
 #if NCOM > 0
 
 #include <mach/std_types.h>
@@ -41,8 +40,7 @@
 #include <chips/busses.h>
 #include <i386at/comreg.h>
 
-#include <rc.h>
-#include <cons.h>
+#include <device/cons.h>
 
 extern void timeout(), ttrstrt();
 
diff --git a/i386/i386at/conf.c b/i386/i386at/conf.c
index 0b9aa4b..ddeea7f 100644
--- a/i386/i386at/conf.c
+++ b/i386/i386at/conf.c
@@ -41,14 +41,12 @@ extern int	kdgetstat(), kdsetstat(), kdportdeath();
 extern vm_offset_t kdmmap();
 #define	kdname			"kd"
 
-#include <com.h>
 #if	NCOM > 0
 extern int	comopen(), comclose(), comread(), comwrite();
 extern int	comgetstat(), comsetstat(), comportdeath();
 #define	comname			"com"
 #endif	/* NCOM > 0 */
 
-#include <lpr.h>
 #if	NLPR > 0
 extern int	lpropen(), lprclose(), lprread(), lprwrite();
 extern int	lprgetstat(), lprsetstat(), lprportdeath();
diff --git a/i386/i386at/cons_conf.c b/i386/i386at/cons_conf.c
index 49dc023..8784ed9 100644
--- a/i386/i386at/cons_conf.c
+++ b/i386/i386at/cons_conf.c
@@ -28,9 +28,7 @@
  * known algorithm unless we see a pressing need otherwise.
  */
 #include <sys/types.h>
-#include <cons.h>
-#include <com.h>
-#include <rc.h>
+#include <device/cons.h>
 
 extern	int kdcnprobe(), kdcninit(), kdcngetc(), kdcnputc();
 #if NCOM > 0 && RCLINE >= 0
diff --git a/i386/i386at/i386at_ds_routines.c b/i386/i386at/i386at_ds_routines.c
index b4387d6..48050ac 100644
--- a/i386/i386at/i386at_ds_routines.c
+++ b/i386/i386at/i386at_ds_routines.c
@@ -31,15 +31,11 @@
 
 #include <device/device_types.h>
 #include <device/device_port.h>
-#include "device_interface.h"
+#include <device/device.server.h>
 
 #include <i386at/dev_hdr.h>
 #include <i386at/device_emul.h>
 
-#ifdef LINUX_DEV
-#include <i386/linux/device-drivers.h>
-#endif
-
 extern struct device_emulation_ops mach_device_emulation_ops;
 #ifdef LINUX_DEV
 extern struct device_emulation_ops linux_block_emulation_ops;
diff --git a/i386/i386at/idt.h b/i386/i386at/idt.h
index 72c4ad0..840bad1 100644
--- a/i386/i386at/idt.h
+++ b/i386/i386at/idt.h
@@ -32,6 +32,6 @@
 
 #define PIC_INT_BASE 0x40
 
-#include "idt-gen.h"
+#include <i386/idt-gen.h>
 
 #endif /* _I386AT_IDT_ */
diff --git a/i386/i386at/int_init.c b/i386/i386at/int_init.c
index 819201f..0f00b86 100644
--- a/i386/i386at/int_init.c
+++ b/i386/i386at/int_init.c
@@ -21,8 +21,8 @@
  *      Author: Bryan Ford, University of Utah CSL
  */
 
-#include "idt.h"
-#include "gdt.h"
+#include <i386at/idt.h>
+#include <i386/gdt.h>
 
 /* defined in locore.S */
 extern vm_offset_t int_entry_table[];
diff --git a/i386/i386at/interrupt.S b/i386/i386at/interrupt.S
index 25cd66e..4916903 100644
--- a/i386/i386at/interrupt.S
+++ b/i386/i386at/interrupt.S
@@ -15,9 +15,9 @@
 
 #include <mach/machine/asm.h>
 
-#include "ipl.h"
-#include "pic.h"
-#include "i386asm.h"
+#include <i386/ipl.h>
+#include <i386/pic.h>
+#include <i386/i386asm.h>
 
 #define READ_ISR	(OCW_TEMPLATE|READ_NEXT_RD|READ_IS_ONRD)
 
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index cf03bc2..3858f70 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -76,8 +76,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* $ Header:  $ */
 
-#include <mach_kdb.h>
-
 #include <sys/types.h>
 #include <kern/time_out.h>
 #include <device/conf.h>
@@ -86,12 +84,12 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <device/buf.h>		/* for struct uio (!) */
 #include <i386/io_port.h>
 #include <vm/vm_kern.h>
-#include "vm_param.h"
+#include <i386/vm_param.h>
 #include <i386/machspl.h>
 #include <i386at/cram.h>
 #include <i386at/kd.h>
 #include <i386at/kdsoft.h>
-#include <cons.h>
+#include <device/cons.h>
 
 #define DEBUG	1			/* export feep() */
 
diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c
index 3873151..f085265 100644
--- a/i386/i386at/lpr.c
+++ b/i386/i386at/lpr.c
@@ -28,7 +28,6 @@
  *	All rights reserved.
  */ 
   
-#include <lpr.h>
 #if NLPR > 0
   
 #ifdef	MACH_KERNEL
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index 362ba7f..565f189 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -32,15 +32,12 @@
  *	Basic initialization for I386 - ISA bus machines.
  */
 
-#include <platforms.h>
-#include <mach_kdb.h>
-
 #include <mach/vm_param.h>
 #include <mach/vm_prot.h>
 #include <mach/machine.h>
 #include <mach/machine/multiboot.h>
 
-#include "vm_param.h"
+#include <i386/vm_param.h>
 #include <kern/time_out.h>
 #include <kern/assert.h>
 #include <kern/cpu_number.h>
@@ -48,7 +45,7 @@
 #include <vm/vm_page.h>
 #include <i386/machspl.h>
 #include <i386/pmap.h>
-#include "proc_reg.h"
+#include <i386/proc_reg.h>
 
 /* Location of the kernel's symbol table.
    Both of these are 0 if none is available.  */
diff --git a/i386/i386at/pic_isa.c b/i386/i386at/pic_isa.c
index 49eff4d..9d791c7 100644
--- a/i386/i386at/pic_isa.c
+++ b/i386/i386at/pic_isa.c
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <i386/ipl.h>
 #include <i386/pic.h>
-#include <rc.h>
 
 
 /* These interrupts are always present */