2006-10-15 Thomas Schwinge <tschwinge@gnu.org>

[task #5956 --- ``Automake'ify GNU Mach's code base'']

	* kern/bootstrap.c: Don't include `bootstrap_symbols.h'.
	* ddb/db_command.c: Don't include `cpus.h'.
	* ddb/db_mp.c: Likewise.
	* i386/i386/ast_check.c: Likewise.
	* i386/i386/cswitch.S: Likewise.
	* i386/i386/db_interface.c: Likewise.
	* i386/i386/fpu.c: Likewise.
	* i386/i386/fpu.h: Likewise.
	* i386/i386/i386asm.sym: Likewise.
	* i386/i386/locore.S: Likewise.
	* i386/i386/mp_desc.c: Likewise.
	* i386/i386/mp_desc.h: Likewise.
	* i386/i386/pcb.c: Likewise.
	* i386/i386/trap.c: Likewise.
	* i386/intel/pmap.c: Likewise.
	* include/mach/machine.h: Likewise.
	* ipc/ipc_kmsg.c: Likewise.
	* ipc/ipc_kmsg.h: Likewise.
	* kern/ast.c: Likewise.
	* kern/ast.h: Likewise.
	* kern/cpu_number.h: Likewise.
	* kern/debug.c: Likewise.
	* kern/eventcount.c: Likewise.
	* kern/host.c: Likewise.
	* kern/ipc_sched.c: Likewise.
	* kern/lock.c: Likewise.
	* kern/lock.h: Likewise.
	* kern/lock_mon.c: Likewise.
	* kern/mach_clock.c: Likewise.
	* kern/mach_factor.c: Likewise.
	* kern/machine.c: Likewise.
	* kern/priority.c: Likewise.
	* kern/processor.c: Likewise.
	* kern/processor.h: Likewise.
	* kern/sched.h: Likewise.
	* kern/sched_prim.c: Likewise.
	* kern/startup.c: Likewise.
	* kern/syscall_subr.c: Likewise.
	* kern/thread.c: Likewise.
	* kern/timer.c: Likewise.
	* kern/timer.h: Likewise.
	* vm/vm_resident.c: Likewise.
	* kern/sched_prim.c: Don't include `fast_tas.h'.
	* kern/task.c: Likewise.
	* kern/task.h: Likewise.
	* kern/sched_prim.c: Don't include `hw_footprint.h'.
	* kern/thread.c: Likewise.
	* kern/thread.h: Likewise.
	* kern/counters.c: Don't include `mach_counters.h'.
	* kern/counters.h: Likewise.
	* ddb/db_ext_symtab.c: Don't include `mach_debug.h'.
	* i386/i386/pcb.c: Likewise.
	* kern/ipc_kobject.c: Likewise.
	* kern/thread.c: Likewise.
	* kern/zalloc.c: Likewise.
	* kern/ast.c: Don't include `mach_fixpri.h'.
	* kern/processor.c: Likewise.
	* kern/processor.h: Likewise.
	* kern/sched.h: Likewise.
	* kern/sched_prim.c: Likewise.
	* kern/syscall_subr.c: Likewise.
	* kern/thread.c: Likewise.
	* kern/thread.h: Likewise.
	* kern/host.c: Don't include `mach_host.h'.
	* kern/ipc_sched.c: Likewise.
	* kern/machine.c: Likewise.
	* kern/processor.c: Likewise.
	* kern/processor.h: Likewise.
	* kern/sched_prim.c: Likewise.
	* kern/startup.c: Likewise.
	* kern/task.c: Likewise.
	* kern/thread.c: Likewise.
	* kern/thread.h: Likewise.
	* include/mach/mach.defs: Don't include `mach_ipc_compat.h'.
	* include/mach/mach_param.h: Likewise.
	* include/mach/mach_traps.h: Likewise.
	* include/mach/message.h: Likewise.
	* include/mach/mig_errors.h: Likewise.
	* include/mach/notify.h: Likewise.
	* include/mach/port.h: Likewise.
	* include/mach/std_types.defs: Likewise.
	* include/mach/task_special_ports.h: Likewise.
	* include/mach/thread_special_ports.h: Likewise.
	* ipc/ipc_kmsg.c: Likewise.
	* ipc/ipc_kmsg.h: Likewise.
	* ipc/ipc_marequest.c: Likewise.
	* ipc/ipc_notify.c: Likewise.
	* ipc/ipc_notify.h: Likewise.
	* ipc/ipc_object.c: Likewise.
	* ipc/ipc_object.h: Likewise.
	* ipc/ipc_port.c: Likewise.
	* ipc/ipc_port.h: Likewise.
	* ipc/ipc_right.c: Likewise.
	* ipc/ipc_right.h: Likewise.
	* ipc/ipc_space.c: Likewise.
	* ipc/ipc_space.h: Likewise.
	* ipc/mach_debug.c: Likewise.
	* ipc/mach_msg.c: Likewise.
	* ipc/mach_msg.h: Likewise.
	* ipc/mach_port.c: Likewise.
	* kern/ipc_tt.c: Likewise.
	* kern/syscall_sw.c: Likewise.
	* kern/thread.h: Likewise.
	* include/mach_debug/mach_debug.defs: Don't include `mach_ipc_debug.h'.
	* ipc/ipc_hash.c: Likewise.
	* ipc/ipc_hash.h: Likewise.
	* ipc/ipc_marequest.c: Likewise.
	* ipc/ipc_marequest.h: Likewise.
	* kern/ipc_kobject.c: Don't include `mach_ipc_test.h'.
	* ddb/db_access.c: Don't include `mach_kdb.h'.
	* ddb/db_aout.c: Likewise.
	* ddb/db_break.c: Likewise.
	* ddb/db_command.c: Likewise.
	* ddb/db_command.h: Likewise.
	* ddb/db_cond.c: Likewise.
	* ddb/db_examine.c: Likewise.
	* ddb/db_expr.c: Likewise.
	* ddb/db_ext_symtab.c: Likewise.
	* ddb/db_input.c: Likewise.
	* ddb/db_lex.c: Likewise.
	* ddb/db_macro.c: Likewise.
	* ddb/db_mp.c: Likewise.
	* ddb/db_output.c: Likewise.
	* ddb/db_print.c: Likewise.
	* ddb/db_run.c: Likewise.
	* ddb/db_sym.c: Likewise.
	* ddb/db_task_thread.c: Likewise.
	* ddb/db_trap.c: Likewise.
	* ddb/db_variables.c: Likewise.
	* ddb/db_watch.c: Likewise.
	* ddb/db_watch.h: Likewise.
	* ddb/db_write_cmd.c: Likewise.
	* i386/i386/db_disasm.c: Likewise.
	* i386/i386/db_interface.c: Likewise.
	* i386/i386/db_trace.c: Likewise.
	* i386/i386/i386asm.sym: Likewise.
	* i386/i386/locore.S: Likewise.
	* i386/i386/trap.c: Likewise.
	* i386/i386at/kd.c: Likewise.
	* i386/i386at/model_dep.c: Likewise.
	* include/mach_debug/mach_debug.defs: Likewise.
	* ipc/ipc_kmsg.c: Likewise.
	* ipc/ipc_object.c: Likewise.
	* ipc/ipc_port.c: Likewise.
	* ipc/ipc_pset.c: Likewise.
	* kern/bootstrap.c: Likewise.
	* kern/debug.c: Likewise.
	* kern/exception.c: Likewise.
	* kern/lock.c: Likewise.
	* kern/xpr.c: Likewise.
	* vm/vm_fault.c: Likewise.
	* vm/vm_map.c: Likewise.
	* vm/vm_object.c: Likewise.
	* vm/vm_resident.c: Likewise.
	* kern/lock.h: Don't include `mach_ldebug.h'.
	* kern/lock_mon.c: Don't include `mach_lock_mon.h'.
	* kern/ipc_kobject.c: Don't include `mach_machine_routines.h'.
	* kern/lock_mon.c: Don't include `mach_mp_debug.h'.
	* vm/memory_object.c: Don't include `mach_pagemap.h'.
	* vm/vm_fault.c: Likewise.
	* vm/vm_object.c: Likewise.
	* vm/vm_object.h: Likewise.
	* vm/vm_pageout.c: Likewise.
	* i386/i386/trap.c: Don't include `mach_pcsample.h'.
	* kern/mach4.srv: Likewise.
	* kern/mach_clock.c: Likewise.
	* kern/pc_sample.c: Likewise.
	* kern/task.c: Likewise.
	* kern/thread.c: Likewise.
	* vm/vm_fault.c: Likewise.
	* device/net_io.c: Don't include `mach_ttd.h'.
	* i386/i386/kttd_interface.c: Likewise.
	* i386/i386/locore.S: Likewise.
	* i386/i386/trap.c: Likewise.
	* i386/i386at/autoconf.c: Likewise.
	* include/mach_debug/mach_debug.defs: Don't include `mach_vm_debug.h'.
	* vm/vm_debug.c: Likewise.
	* vm/vm_page.h: Likewise.
	* vm/vm_resident.c: Likewise.
	* kern/sched_prim.c: Don't include `power_save.h'.
	* kern/sched.h: Don't include `simple_clock.h'.
	* kern/sched_prim.c: Likewise.
	* kern/thread.c: Likewise.
	* kern/mach_clock.c: Don't include `stat_time.h'.
	* i386/i386/i386asm.sym: Likewise.
	* i386/i386/locore.S: Likewise.
	* kern/sched.h: Likewise.
	* kern/timer.c: Likewise.
	* kern/timer.h: Likewise.
	* kern/startup.c: Don't include `xpr_debug.h'.
	* kern/xpr.h: Likewise.
	* i386/i386at/autoconf.c: Don't include `com.h'.
	* i386/i386at/com.c: Likewise.
	* i386/i386at/conf.c: Likewise.
	* i386/i386at/cons_conf.c: Likewise.
	* i386/i386/fpe_linkage.c: Don't include `fpe.h'.
	* i386/i386/fpu.c: Likewise.
	* i386/i386/fpu.h: Likewise.
	* i386/i386/trap.c: Likewise.
	* i386/i386at/autoconf.c: Don't include `lpr.h'.
	* i386/i386at/conf.c: Likewise.
	* i386/i386at/lpr.c: Likewise.
	* i386/i386/cswitch.S: Don't include `platforms.h'.
	* i386/i386/fpu.c: Likewise.
	* i386/i386/gdt.c: Likewise.
	* i386/i386/hardclock.c: Likewise.
	* i386/i386/i386asm.sym: Likewise.
	* i386/i386/io_emulate.c: Likewise.
	* i386/i386/locore.S: Likewise.
	* i386/i386/pic.c: Likewise.
	* i386/i386/pic.h: Likewise.
	* i386/i386/pit.c: Likewise.
	* i386/i386/pit.h: Likewise.
	* i386/i386/seg.h: Likewise.
	* i386/i386at/model_dep.c: Likewise.
	* i386/i386at/com.c: Don't include `rc.h'
	* i386/i386at/cons_conf.c: Likewise.
	* i386/i386at/pic_isa.c: Likewise.
	* device/ds_routines.c: Don't include <i386/linux/device-drivers.h>.
	* i386/i386at/i386at_ds_routines.c: Likewise.
	* i386/linux/dev/include/linux/autoconf.h: Likewise.
	* linux/dev/arch/i386/kernel/setup.c: Likewise.
	* linux/dev/init/main.c: Likewise.
	* linux/pcmcia-cs/glue/pcmcia_glue.h: Likewise.
	* linux/pcmcia-cs/glue/wireless_glue.h: Likewise.
	* kern/lock_mon.c: Don't include <time_stamp.h>.
	* device/cons.c: Include <device/cons.h> instead of <cons.h>.
	* i386/i386at/com.c: Likewise.
	* i386/i386at/kd.c: Likewise.
	* i386/i386at/cons_conf.c: Likewise.
	* i386/i386at/i386at_ds_routines.c: Include <device/device.server.h>
	instead of "device_interface.h".
	* device/chario.c: Include <device/device_reply.user.h> instead of
	"device_reply.h".
	* device/ds_routines.c: Likewise.
	* linux/dev/glue/block.c: Likewise.
	* linux/dev/glue/net.c: Likewise.
	* linux/pcmcia-cs/glue/ds.c: Likewise.
	* device/cons.c: Include <device/kmsg.h> instead of <kmsg.h>.
	* device/kmsg.c: Likewise.
	* i386/i386/cswitch.S: Include <i386/cpu_number.h> instead of
	"cpu_number.h".
	* i386/i386/locore.S: Likewise.
	* i386/intel/pmap.c: Likewise.
	* ipc/ipc_kmsg.h: Likewise.
	* i386/i386/i386asm.sym: Include <i386/gdt.h> instead of "gdt.h".
	* i386/i386/idt.c: Likewise.
	* i386/i386at/int_init.c: Likewise.
	* i386/i386/cswitch.S: Include <i386/i386asm.h> instead of "i386asm.h".
	* i386/i386/locore.S: Likewise.
	* i386/i386at/boothdr.S: Likewise.
	* i386/i386at/interrupt.S: Likewise.
	* i386/i386at/idt.h: Include <i386/idt-gen.h> instead of "idt-gen.h".
	* i386/i386at/interrupt.S: Include <i386/ipl.h> instead of "ipl.h".
	* i386/i386/i386asm.sym: Include <i386/ldt.h> instead of "ldt.h".
	* i386/i386/locore.S: Likewise.
	* i386/i386/i386asm.sym: Include <i386/mp_desc.h> instead of
	"mp_desc.h".
	* i386/i386at/interrupt.S: Include <i386/pic.h> instead of "pic.h".
	* i386/i386/cswitch.S: Include <i386/proc_reg.h> instead of
	"proc_reg.h".
	* i386/i386/locore.S: Likewise.
	* i386/i386at/model_dep.c: Likewise.
	* i386/i386/i386asm.sym: Include <i386/seg.h> instead of "seg.h".
	* i386/i386/idt.c: Likewise.
	* i386/i386/locore.S: Likewise.
	* i386/i386/locore.S: Include <i386/trap.h> instead of "trap.h".
	* i386/i386/i386asm.sym: Include <i386/tss.h> instead of "tss.h".
	* i386/i386/i386asm.sym: Include <i386/vm_param.h> instead of
	"vm_param.h".
	* i386/i386/idt.c: Likewise.
	* i386/i386at/kd.c: Likewise.
	* i386/i386at/model_dep.c: Likewise.
	* i386/intel/pmap.c: Likewise.
	* i386/i386/i386asm.sym: Include <i386at/idt.h> instead of "idt.h".
	* i386/i386/idt.c: Likewise.
	* i386/i386at/int_init.c: Likewise.
	* ipc/ipc_target.c: Include <kern/sched_prim.h> instead of
	"sched_prim.h".
	* vm/memory_object.c: Include <vm/memory_object_default.user.h> instead
	of "memory_object_default.h".
	* vm/vm_object.c: Likewise.
	* vm/vm_pageout.c: Likewise.
	* vm/memory_object.c: Include <vm/memory_object_user.user.h> instead of
	"memory_object_user.h".
	* vm/vm_fault.c: Likewise.
	* vm/vm_object.c: Likewise.
	* vm/vm_pageout.c: Likewise.

39 files changed, 37 insertions, 115 deletions

diff --git a/i386/i386/ast_check.c b/i386/i386/ast_check.c
index 37071c2e..982c7053 100644
--- a/i386/i386/ast_check.c
+++ b/i386/i386/ast_check.c
@@ -24,8 +24,6 @@
  * the rights to redistribute these changes.
  */
 
-#include <cpus.h>
-
 #if	NCPUS > 1
 
 /*
diff --git a/i386/i386/cswitch.S b/i386/i386/cswitch.S
index 4e94f37c..6ca616d0 100644
--- a/i386/i386/cswitch.S
+++ b/i386/i386/cswitch.S
@@ -24,14 +24,11 @@
  * the rights to redistribute these changes.
  */
 
-#include <cpus.h>
-#include <platforms.h>
-
 #include <mach/machine/asm.h>
 
-#include "proc_reg.h"
-#include "i386asm.h"
-#include "cpu_number.h"
+#include <i386/proc_reg.h>
+#include <i386/i386asm.h>
+#include <i386/cpu_number.h>
 
 /*
  * Context switch routines for i386.
diff --git a/i386/i386/db_disasm.c b/i386/i386/db_disasm.c
index 293a1c0a..00327218 100644
--- a/i386/i386/db_disasm.c
+++ b/i386/i386/db_disasm.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
-#include "mach_kdb.h"
+
 #if MACH_KDB
 
 /*
diff --git a/i386/i386/db_interface.c b/i386/i386/db_interface.c
index 2897beb9..8da6df4f 100644
--- a/i386/i386/db_interface.c
+++ b/i386/i386/db_interface.c
@@ -27,11 +27,8 @@
  * Interface to new debugger.
  */
 
-#include "mach_kdb.h"
 #if MACH_KDB
 
-#include <cpus.h>
-
 #include <sys/reboot.h>
 #include <vm/pmap.h>
 
diff --git a/i386/i386/db_trace.c b/i386/i386/db_trace.c
index 41e7bd69..dec0ac14 100644
--- a/i386/i386/db_trace.c
+++ b/i386/i386/db_trace.c
@@ -24,7 +24,6 @@
  * the rights to redistribute these changes.
  */
 
-#include "mach_kdb.h"
 #if MACH_KDB
 
 #include <mach/boolean.h>
diff --git a/i386/i386/fpe_linkage.c b/i386/i386/fpe_linkage.c
index 02bd24da..be394203 100644
--- a/i386/i386/fpe_linkage.c
+++ b/i386/i386/fpe_linkage.c
@@ -28,8 +28,6 @@
  * Support routines for FP emulator.
  */
 
-#include <fpe.h>
-
 #if FPE
 
 #include <cpus.h>
diff --git a/i386/i386/fpu.c b/i386/i386/fpu.c
index c5d15a67..0ebdaa5b 100644
--- a/i386/i386/fpu.c
+++ b/i386/i386/fpu.c
@@ -26,9 +26,6 @@
 /*
  * Support for 80387 floating point or FP emulator.
  */
-#include <cpus.h>
-#include <fpe.h>
-#include <platforms.h>
 
 #include <mach/exception.h>
 #include <mach/machine/thread_status.h>
diff --git a/i386/i386/fpu.h b/i386/i386/fpu.h
index 7db1a8ef..37bd94e1 100644
--- a/i386/i386/fpu.h
+++ b/i386/i386/fpu.h
@@ -32,8 +32,6 @@
  * floating-point processor.
  */
 
-#include <cpus.h>
-#include <fpe.h>
 #include <i386/proc_reg.h>
 #include <i386/thread.h>
 
diff --git a/i386/i386/gdt.c b/i386/i386/gdt.c
index 6766051e..56c1168f 100644
--- a/i386/i386/gdt.c
+++ b/i386/i386/gdt.c
@@ -32,8 +32,6 @@
  */
 #include <mach/machine/vm_types.h>
 
-#include <platforms.h>
-
 #include "vm_param.h"
 #include "seg.h"
 #include "gdt.h"
diff --git a/i386/i386/hardclock.c b/i386/i386/hardclock.c
index 6d475379..140a6f5a 100644
--- a/i386/i386/hardclock.c
+++ b/i386/i386/hardclock.c
@@ -32,8 +32,6 @@
  */
 #include <mach/machine/eflags.h>
 
-#include <platforms.h>
-
 #include <kern/time_out.h>
 #include <i386/thread.h>
 
diff --git a/i386/i386/i386asm.sym b/i386/i386/i386asm.sym
index a120f5cd..fb3ee430 100644
--- a/i386/i386/i386asm.sym
+++ b/i386/i386/i386asm.sym
@@ -28,11 +28,6 @@
  * the rights to redistribute these changes.
  */
 
-#include <platforms.h>
-#include <cpus.h>
-#include <mach_kdb.h>
-#include <stat_time.h>
-
 /*
  * Pass field offsets to assembly code.
  */
@@ -43,13 +38,13 @@
 #include <kern/syscall_emulation.h>
 #include <i386/thread.h>
 #include <i386/pmap.h>
-#include "vm_param.h"
-#include "seg.h"
-#include "tss.h"
-#include "idt.h"
-#include "gdt.h"
-#include "ldt.h"
-#include "mp_desc.h"
+#include <i386/vm_param.h>
+#include <i386/seg.h>
+#include <i386/tss.h>
+#include <i386at/idt.h>
+#include <i386/gdt.h>
+#include <i386/ldt.h>
+#include <i386/mp_desc.h>
 
 
 offset	thread			th	pcb
diff --git a/i386/i386/idt.c b/i386/i386/idt.c
index 56688517..1a8f9177 100644
--- a/i386/i386/idt.c
+++ b/i386/i386/idt.c
@@ -21,10 +21,10 @@
  *      Author: Bryan Ford, University of Utah CSL
  */
 
-#include "vm_param.h"
-#include "seg.h"
-#include "idt.h"
-#include "gdt.h"
+#include <i386/vm_param.h>
+#include <i386/seg.h>
+#include <i386at/idt.h>
+#include <i386/gdt.h>
 
 struct real_gate idt[IDTSZ];
 
diff --git a/i386/i386/io_emulate.c b/i386/i386/io_emulate.c
index 1bc5a75b..0d672572 100644
--- a/i386/i386/io_emulate.c
+++ b/i386/i386/io_emulate.c
@@ -23,7 +23,6 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
-#include <platforms.h>
 
 #include <mach/boolean.h>
 #include <mach/port.h>
diff --git a/i386/i386/kttd_interface.c b/i386/i386/kttd_interface.c
index 298ffac8..d0d7efd7 100644
--- a/i386/i386/kttd_interface.c
+++ b/i386/i386/kttd_interface.c
@@ -24,8 +24,6 @@
  * the rights to redistribute these changes.
  */
 
-#include "mach_ttd.h"
-
 #if MACH_TTD
 
 #include <mach/machine/eflags.h>
diff --git a/i386/i386/locore.S b/i386/i386/locore.S
index 7d320d75..7ae5bf18 100644
--- a/i386/i386/locore.S
+++ b/i386/i386/locore.S
@@ -28,20 +28,14 @@
  * the rights to redistribute these changes.
  */
 
-#include <cpus.h>
-#include <platforms.h>
-#include <mach_kdb.h>
-#include <mach_ttd.h>
-#include <stat_time.h>
-
 #include <mach/machine/asm.h>
 #include <mach/machine/eflags.h>
-#include "proc_reg.h"
-#include "trap.h"
-#include "seg.h"
-#include "ldt.h"
-#include "i386asm.h"
-#include "cpu_number.h"
+#include <i386/proc_reg.h>
+#include <i386/trap.h>
+#include <i386/seg.h>
+#include <i386/ldt.h>
+#include <i386/i386asm.h>
+#include <i386/cpu_number.h>
 
 /*
  * Fault recovery.
diff --git a/i386/i386/mp_desc.c b/i386/i386/mp_desc.c
index d7b4f61e..3a549a89 100644
--- a/i386/i386/mp_desc.c
+++ b/i386/i386/mp_desc.c
@@ -24,8 +24,6 @@
  * the rights to redistribute these changes.
  */
 
-#include <cpus.h>
-
 #if	NCPUS > 1
 
 #include <kern/cpu_number.h>
diff --git a/i386/i386/mp_desc.h b/i386/i386/mp_desc.h
index 96a0ca73..d683cf6b 100644
--- a/i386/i386/mp_desc.h
+++ b/i386/i386/mp_desc.h
@@ -27,8 +27,6 @@
 #ifndef	_I386_MP_DESC_H_
 #define	_I386_MP_DESC_H_
 
-#include <cpus.h>
-
 #if MULTIPROCESSOR
 
 /*
diff --git a/i386/i386/pcb.c b/i386/i386/pcb.c
index 09e25977..5187a8b5 100644
--- a/i386/i386/pcb.c
+++ b/i386/i386/pcb.c
@@ -24,9 +24,6 @@
  * the rights to redistribute these changes.
  */
 
-#include <cpus.h>
-#include <mach_debug.h>
-
 #include <mach/std_types.h>
 #include <mach/kern_return.h>
 #include <mach/thread_status.h>
diff --git a/i386/i386/pic.c b/i386/i386/pic.c
index 18162fc5..4efe0ab3 100644
--- a/i386/i386/pic.c
+++ b/i386/i386/pic.c
@@ -49,8 +49,6 @@ OTHER TORTIOUS ACTION, ARISING OUR OF OR IN CONNECTION
 WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <platforms.h>
-
 #include <sys/types.h>
 #include <i386/ipl.h>
 #include <i386/pic.h>
diff --git a/i386/i386/pic.h b/i386/i386/pic.h
index 17031928..faf123a7 100644
--- a/i386/i386/pic.h
+++ b/i386/i386/pic.h
@@ -52,8 +52,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef	_I386_PIC_H_
 #define	_I386_PIC_H_
 
-#include <platforms.h>
-
 #define NINTR	0x10
 #define	NPICS	0x02
 
diff --git a/i386/i386/pit.c b/i386/i386/pit.c
index 4d360a74..68661f58 100644
--- a/i386/i386/pit.c
+++ b/i386/i386/pit.c
@@ -49,7 +49,6 @@ NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <platforms.h>
 #include <kern/time_out.h>
 #include <i386/ipl.h>
 #include <i386/pit.h>
diff --git a/i386/i386/pit.h b/i386/i386/pit.h
index 082bb158..380bffd1 100644
--- a/i386/i386/pit.h
+++ b/i386/i386/pit.h
@@ -45,7 +45,6 @@ NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <platforms.h>
 #if	defined(MB1) || defined(MB2) || EXL > 0 || iPSC386
 /* Definitions for 8254 Programmable Interrupt Timer ports on 386/20 */
 #define PITCTR0_PORT	0xD0		/* counter 0 port */
diff --git a/i386/i386/seg.h b/i386/i386/seg.h
index 339c30a5..9427d854 100644
--- a/i386/i386/seg.h
+++ b/i386/i386/seg.h
@@ -32,7 +32,6 @@
 #define	_I386_SEG_H_
 
 #include <mach/inline.h>
-#include <platforms.h>
 
 /*
  * i386 segmentation.
diff --git a/i386/i386/trap.c b/i386/i386/trap.c
index ea7a0972..4c09ee0d 100644
--- a/i386/i386/trap.c
+++ b/i386/i386/trap.c
@@ -27,12 +27,6 @@
  * Hardware trap/fault handler.
  */
 
-#include <cpus.h>
-#include <fpe.h>
-#include <mach_kdb.h>
-#include <mach_ttd.h>
-#include <mach_pcsample.h>
-
 #include <sys/types.h>
 #include <mach/machine/eflags.h>
 #include <i386/trap.h>
diff --git a/i386/i386at/autoconf.c b/i386/i386at/autoconf.c
index 1c2e9df3..9426f440 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 125eece8..27d04053 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 f986f185..950ef958 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 0b9aa4b2..ddeea7fa 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 49dc0238..8784ed94 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 b4387d6a..48050ac9 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 72c4ad07..840bad11 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 819201f3..0f00b868 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 25cd66e7..4916903f 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 cf03bc20..3858f709 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 3873151d..f085265d 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 362ba7fa..565f1894 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 49eff4d3..9d791c77 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 */
diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index 540070b9..3b0f9522 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -55,8 +55,6 @@
  *	and to when physical maps must be made correct.
  */
 
-#include <cpus.h>
-
 #include <mach/machine/vm_types.h>
 
 #include <mach/boolean.h>
@@ -68,7 +66,7 @@
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
-#include "vm_param.h"
+#include <i386/vm_param.h>
 #include <mach/vm_prot.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
@@ -76,7 +74,7 @@
 
 #include <mach/machine/vm_param.h>
 #include <machine/thread.h>
-#include "cpu_number.h"
+#include <i386/cpu_number.h>
 #if	i860
 #include <i860ipsc/nodehw.h>
 #endif
diff --git a/i386/linux/dev/include/linux/autoconf.h b/i386/linux/dev/include/linux/autoconf.h
index 5770582d..c67a6677 100644
--- a/i386/linux/dev/include/linux/autoconf.h
+++ b/i386/linux/dev/include/linux/autoconf.h
@@ -34,8 +34,6 @@
 #undef  CONFIG_M686
 #endif
 
-#include <device-drivers.h>
-
 /*
  * Floppy, IDE, and other block devices
  */