summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog289
-rw-r--r--ddb/db_access.c2
-rw-r--r--ddb/db_aout.c2
-rw-r--r--ddb/db_break.c2
-rw-r--r--ddb/db_command.c2
-rw-r--r--ddb/db_command.h2
-rw-r--r--ddb/db_cond.c1
-rw-r--r--ddb/db_examine.c2
-rw-r--r--ddb/db_expr.c2
-rw-r--r--ddb/db_ext_symtab.c3
-rw-r--r--ddb/db_input.c2
-rw-r--r--ddb/db_lex.c2
-rw-r--r--ddb/db_macro.c2
-rw-r--r--ddb/db_mp.c4
-rw-r--r--ddb/db_output.c1
-rw-r--r--ddb/db_print.c1
-rw-r--r--ddb/db_run.c1
-rw-r--r--ddb/db_sym.c1
-rw-r--r--ddb/db_task_thread.c1
-rw-r--r--ddb/db_trap.c1
-rw-r--r--ddb/db_variables.c1
-rw-r--r--ddb/db_watch.c1
-rw-r--r--ddb/db_watch.h1
-rw-r--r--ddb/db_write_cmd.c1
-rw-r--r--device/chario.c2
-rw-r--r--device/cons.c4
-rw-r--r--device/ds_routines.c5
-rw-r--r--device/kmsg.c2
-rw-r--r--device/net_io.c2
-rw-r--r--i386/i386/ast_check.c2
-rw-r--r--i386/i386/cswitch.S9
-rw-r--r--i386/i386/db_disasm.c2
-rw-r--r--i386/i386/db_interface.c3
-rw-r--r--i386/i386/db_trace.c1
-rw-r--r--i386/i386/fpe_linkage.c2
-rw-r--r--i386/i386/fpu.c3
-rw-r--r--i386/i386/fpu.h2
-rw-r--r--i386/i386/gdt.c2
-rw-r--r--i386/i386/hardclock.c2
-rw-r--r--i386/i386/i386asm.sym19
-rw-r--r--i386/i386/idt.c8
-rw-r--r--i386/i386/io_emulate.c1
-rw-r--r--i386/i386/kttd_interface.c2
-rw-r--r--i386/i386/locore.S18
-rw-r--r--i386/i386/mp_desc.c2
-rw-r--r--i386/i386/mp_desc.h2
-rw-r--r--i386/i386/pcb.c3
-rw-r--r--i386/i386/pic.c2
-rw-r--r--i386/i386/pic.h2
-rw-r--r--i386/i386/pit.c1
-rw-r--r--i386/i386/pit.h1
-rw-r--r--i386/i386/seg.h1
-rw-r--r--i386/i386/trap.c6
-rw-r--r--i386/i386at/autoconf.c3
-rw-r--r--i386/i386at/boothdr.S2
-rw-r--r--i386/i386at/com.c4
-rw-r--r--i386/i386at/conf.c2
-rw-r--r--i386/i386at/cons_conf.c4
-rw-r--r--i386/i386at/i386at_ds_routines.c6
-rw-r--r--i386/i386at/idt.h2
-rw-r--r--i386/i386at/int_init.c4
-rw-r--r--i386/i386at/interrupt.S6
-rw-r--r--i386/i386at/kd.c6
-rw-r--r--i386/i386at/lpr.c1
-rw-r--r--i386/i386at/model_dep.c7
-rw-r--r--i386/i386at/pic_isa.c1
-rw-r--r--i386/intel/pmap.c6
-rw-r--r--i386/linux/dev/include/linux/autoconf.h2
-rw-r--r--include/mach/mach.defs2
-rw-r--r--include/mach/mach_param.h4
-rw-r--r--include/mach/mach_traps.h4
-rw-r--r--include/mach/machine.h4
-rw-r--r--include/mach/message.h4
-rw-r--r--include/mach/mig_errors.h4
-rw-r--r--include/mach/notify.h4
-rw-r--r--include/mach/port.h4
-rw-r--r--include/mach/std_types.defs4
-rw-r--r--include/mach/task_special_ports.h4
-rw-r--r--include/mach/thread_special_ports.h4
-rw-r--r--include/mach_debug/mach_debug.defs6
-rw-r--r--ipc/ipc_hash.c1
-rw-r--r--ipc/ipc_hash.h2
-rw-r--r--ipc/ipc_kmsg.c4
-rw-r--r--ipc/ipc_kmsg.h5
-rw-r--r--ipc/ipc_marequest.c3
-rw-r--r--ipc/ipc_marequest.h2
-rw-r--r--ipc/ipc_notify.c2
-rw-r--r--ipc/ipc_notify.h2
-rw-r--r--ipc/ipc_object.c4
-rw-r--r--ipc/ipc_object.h2
-rw-r--r--ipc/ipc_port.c4
-rw-r--r--ipc/ipc_port.h2
-rw-r--r--ipc/ipc_pset.c2
-rw-r--r--ipc/ipc_right.c2
-rw-r--r--ipc/ipc_right.h2
-rw-r--r--ipc/ipc_space.c2
-rw-r--r--ipc/ipc_space.h2
-rw-r--r--ipc/ipc_target.c2
-rw-r--r--ipc/mach_debug.c2
-rw-r--r--ipc/mach_msg.c2
-rw-r--r--ipc/mach_msg.h2
-rw-r--r--ipc/mach_port.c2
-rw-r--r--kern/ast.c3
-rw-r--r--kern/ast.h2
-rw-r--r--kern/bootstrap.c2
-rw-r--r--kern/counters.c2
-rw-r--r--kern/counters.h2
-rw-r--r--kern/cpu_number.h2
-rw-r--r--kern/debug.c3
-rw-r--r--kern/eventcount.c3
-rw-r--r--kern/exception.c2
-rw-r--r--kern/host.c3
-rw-r--r--kern/ipc_kobject.c4
-rw-r--r--kern/ipc_sched.c3
-rw-r--r--kern/ipc_tt.c2
-rw-r--r--kern/lock.c3
-rw-r--r--kern/lock.h3
-rw-r--r--kern/lock_mon.c5
-rw-r--r--kern/mach4.srv2
-rw-r--r--kern/mach_clock.c3
-rw-r--r--kern/mach_factor.c2
-rw-r--r--kern/machine.c3
-rw-r--r--kern/pc_sample.c4
-rw-r--r--kern/priority.c2
-rw-r--r--kern/processor.c4
-rw-r--r--kern/processor.h4
-rw-r--r--kern/sched.h5
-rw-r--r--kern/sched_prim.c8
-rw-r--r--kern/startup.c5
-rw-r--r--kern/syscall_subr.c3
-rw-r--r--kern/syscall_sw.c2
-rw-r--r--kern/task.c4
-rw-r--r--kern/task.h2
-rw-r--r--kern/thread.c8
-rw-r--r--kern/thread.h5
-rw-r--r--kern/timer.c3
-rw-r--r--kern/timer.h3
-rw-r--r--kern/xpr.c1
-rw-r--r--kern/xpr.h4
-rw-r--r--kern/zalloc.c1
-rw-r--r--linux/dev/arch/i386/kernel/setup.c2
-rw-r--r--linux/dev/glue/block.c2
-rw-r--r--linux/dev/glue/net.c2
-rw-r--r--linux/dev/init/main.c2
-rw-r--r--linux/pcmcia-cs/glue/ds.c2
-rw-r--r--linux/pcmcia-cs/glue/pcmcia_glue.h1
-rw-r--r--linux/pcmcia-cs/glue/wireless_glue.h2
-rw-r--r--vm/memory_object.c5
-rw-r--r--vm/vm_debug.c1
-rw-r--r--vm/vm_fault.c6
-rw-r--r--vm/vm_map.c2
-rw-r--r--vm/vm_object.c8
-rw-r--r--vm/vm_object.h2
-rw-r--r--vm/vm_page.h2
-rw-r--r--vm/vm_pageout.c6
-rw-r--r--vm/vm_resident.c4
156 files changed, 355 insertions, 411 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a5189c..18480f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,295 @@
[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.
+
* Makefile.am: New file.
* Makerules.am <configure's findings, System dependent Makerules>
<Compilation flags, Dependency generation, Autoconf support>: Remove
diff --git a/ddb/db_access.c b/ddb/db_access.c
index f2ec068..f06f950 100644
--- a/ddb/db_access.c
+++ b/ddb/db_access.c
@@ -27,7 +27,7 @@
* Author: David B. Golub, Carnegie Mellon University
* Date: 7/90
*/
-#include "mach_kdb.h"
+
#if MACH_KDB
#include <mach/boolean.h>
diff --git a/ddb/db_aout.c b/ddb/db_aout.c
index 7c2b2ab..c47d37a 100644
--- a/ddb/db_aout.c
+++ b/ddb/db_aout.c
@@ -27,7 +27,7 @@
* Author: David B. Golub, Carnegie Mellon University
* Date: 7/90
*/
-#include "mach_kdb.h"
+
#if MACH_KDB
/*
diff --git a/ddb/db_break.c b/ddb/db_break.c
index 54339ee..777ad34 100644
--- a/ddb/db_break.c
+++ b/ddb/db_break.c
@@ -27,7 +27,7 @@
* Author: David B. Golub, Carnegie Mellon University
* Date: 7/90
*/
-#include "mach_kdb.h"
+
#if MACH_KDB
diff --git a/ddb/db_command.c b/ddb/db_command.c
index 6a42bc4..573c697 100644
--- a/ddb/db_command.c
+++ b/ddb/db_command.c
@@ -28,13 +28,11 @@
* Date: 7/90
*/
-#include "mach_kdb.h"
#if MACH_KDB
/*
* Command dispatcher.
*/
-#include <cpus.h>
#include <mach/boolean.h>
#include <kern/strings.h>
diff --git a/ddb/db_command.h b/ddb/db_command.h
index b7324f0..58309b5 100644
--- a/ddb/db_command.h
+++ b/ddb/db_command.h
@@ -27,7 +27,7 @@
* Author: David B. Golub, Carnegie Mellon University
* Date: 7/90
*/
-#include "mach_kdb.h"
+
#if MACH_KDB
/*
diff --git a/ddb/db_cond.c b/ddb/db_cond.c
index deaa699..cbaf5a4 100644
--- a/ddb/db_cond.c
+++ b/ddb/db_cond.c
@@ -24,7 +24,6 @@
* the rights to redistribute these changes.
*/
-#include "mach_kdb.h"
#if MACH_KDB
#include <machine/db_machdep.h>
diff --git a/ddb/db_examine.c b/ddb/db_examine.c
index 9e45bd1..0881df7 100644
--- a/ddb/db_examine.c
+++ b/ddb/db_examine.c
@@ -27,7 +27,7 @@
* Author: David B. Golub, Carnegie Mellon University
* Date: 7/90
*/
-#include "mach_kdb.h"
+
#if MACH_KDB
#include <mach/boolean.h>
diff --git a/ddb/db_expr.c b/ddb/db_expr.c
index 23b4ef8..d10f1bc 100644
--- a/ddb/db_expr.c
+++ b/ddb/db_expr.c
@@ -27,7 +27,7 @@
* Author: David B. Golub, Carnegie Mellon University
* Date: 7/90
*/
-#include "mach_kdb.h"
+
#if MACH_KDB
#include <mach/boolean.h>
diff --git a/ddb/db_ext_symtab.c b/ddb/db_ext_symtab.c
index 7d85252..2434297 100644
--- a/ddb/db_ext_symtab.c
+++ b/ddb/db_ext_symtab.c
@@ -24,11 +24,8 @@
* the rights to redistribute these changes.
*/
-#include "mach_kdb.h"
#if MACH_KDB
-#include <mach_debug.h>
-
#if MACH_DEBUG
#include <mach/mach_types.h> /* vm_address_t */
diff --git a/ddb/db_input.c b/ddb/db_input.c
index f45d4f9..6e8e240 100644
--- a/ddb/db_input.c
+++ b/ddb/db_input.c
@@ -27,7 +27,7 @@
* Author: David B. Golub, Carnegie Mellon University
* Date: 7/90
*/
-#include "mach_kdb.h"
+
#if MACH_KDB
#include <mach/boolean.h>
diff --git a/ddb/db_lex.c b/ddb/db_lex.c
index 783f4ee..f770eaf 100644
--- a/ddb/db_lex.c
+++ b/ddb/db_lex.c
@@ -27,7 +27,7 @@
* Author: David B. Golub, Carnegie Mellon University
* Date: 7/90
*/
-#include "mach_kdb.h"
+
#if MACH_KDB
/*
diff --git a/ddb/db_macro.c b/ddb/db_macro.c
index 5a7e8c2..e71e83b 100644
--- a/ddb/db_macro.c
+++ b/ddb/db_macro.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
#include <kern/thread.h>
diff --git a/ddb/db_mp.c b/ddb/db_mp.c
index 3e4f6ed..cc14aea 100644
--- a/ddb/db_mp.c
+++ b/ddb/db_mp.c
@@ -23,10 +23,8 @@
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
-#include "mach_kdb.h"
-#if MACH_KDB
-#include <cpus.h>
+#if MACH_KDB
#if NCPUS > 1
diff --git a/ddb/db_output.c b/ddb/db_output.c
index de3b370..daf141d 100644
--- a/ddb/db_output.c
+++ b/ddb/db_output.c
@@ -28,7 +28,6 @@
* Date: 7/90
*/
-#include "mach_kdb.h"
#if MACH_KDB
/*
diff --git a/ddb/db_print.c b/ddb/db_print.c
index 2dee9cc..5c15d00 100644
--- a/ddb/db_print.c
+++ b/ddb/db_print.c
@@ -28,7 +28,6 @@
* Date: 7/90
*/
-#include "mach_kdb.h"
#if MACH_KDB
/*
diff --git a/ddb/db_run.c b/ddb/db_run.c
index c6feb24..8769523 100644
--- a/ddb/db_run.c
+++ b/ddb/db_run.c
@@ -28,7 +28,6 @@
* Date: 7/90
*/
-#include "mach_kdb.h"
#if MACH_KDB
/*
diff --git a/ddb/db_sym.c b/ddb/db_sym.c
index 8641ce1..ab2cd1f 100644
--- a/ddb/db_sym.c
+++ b/ddb/db_sym.c
@@ -28,7 +28,6 @@
* Date: 7/90
*/
-#include "mach_kdb.h"
#if MACH_KDB
#include <mach/std_types.h>
diff --git a/ddb/db_task_thread.c b/ddb/db_task_thread.c
index 8a62e23..f4dfaf2 100644
--- a/ddb/db_task_thread.c
+++ b/ddb/db_task_thread.c
@@ -24,7 +24,6 @@
* the rights to redistribute these changes.
*/
-#include "mach_kdb.h"
#if MACH_KDB
#include <machine/db_machdep.h>
diff --git a/ddb/db_trap.c b/ddb/db_trap.c
index 367670b..44b4f4d 100644
--- a/ddb/db_trap.c
+++ b/ddb/db_trap.c
@@ -28,7 +28,6 @@
* Date: 7/90
*/
-#include "mach_kdb.h"
#if MACH_KDB
/*
diff --git a/ddb/db_variables.c b/ddb/db_variables.c
index 96f2c5c..0f43396 100644
--- a/ddb/db_variables.c
+++ b/ddb/db_variables.c
@@ -28,7 +28,6 @@
* Date: 7/90
*/
-#include "mach_kdb.h"
#if MACH_KDB
#include <machine/db_machdep.h>
diff --git a/ddb/db_watch.c b/ddb/db_watch.c
index 9585286..22734fa 100644
--- a/ddb/db_watch.c
+++ b/ddb/db_watch.c
@@ -28,7 +28,6 @@
* Date: 10/90
*/
-#include "mach_kdb.h"
#if MACH_KDB
#include <mach/boolean.h>
diff --git a/ddb/db_watch.h b/ddb/db_watch.h
index 6e28403..2fb79fa 100644
--- a/ddb/db_watch.h
+++ b/ddb/db_watch.h
@@ -28,7 +28,6 @@
* Date: 10/90
*/
-#include "mach_kdb.h"
#if MACH_KDB
#ifndef _DDB_DB_WATCH_
diff --git a/ddb/db_write_cmd.c b/ddb/db_write_cmd.c
index a8cf272..b10c74c 100644
--- a/ddb/db_write_cmd.c
+++ b/ddb/db_write_cmd.c
@@ -28,7 +28,6 @@
* Date: 7/90
*/
-#include "mach_kdb.h"
#if MACH_KDB
#include <mach/boolean.h>
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 */
diff --git a/i386/i386/ast_check.c b/i386/i386/ast_check.c
index 37071c2..982c705 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 4e94f37..6ca616d 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 293a1c0..0032721 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 2897beb..8da6df4 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 41e7bd6..dec0ac1 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 02bd24d..be39420 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 c5d15a6..0ebdaa5 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 7db1a8e..37bd94e 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 6766051..56c1168 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 6d47537..140a6f5 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 a120f5c..fb3ee43 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 5668851..1a8f917 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 1bc5a75..0d67257 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 298ffac..d0d7efd 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 7d320d7..7ae5bf1 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 d7b4f61..3a549a8 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 96a0ca7..d683cf6 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 09e2597..5187a8b 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 18162fc..4efe0ab 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 1703192..faf123a 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 4d360a7..68661f5 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 082bb15..380bffd 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 339c30a..9427d85 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 ea7a097..4c09ee0 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 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 */
diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index 540070b..3b0f952 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 5770582..c67a667 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
*/
diff --git a/include/mach/mach.defs b/include/mach/mach.defs
index 36d4277..4b32809 100644
--- a/include/mach/mach.defs
+++ b/include/mach/mach.defs
@@ -31,8 +31,6 @@
*/
#ifdef MACH_KERNEL
-#include <mach_ipc_compat.h>
-
simport <kern/compat_xxx_defs.h>; /* for obsolete routines */
#endif /* MACH_KERNEL */
diff --git a/include/mach/mach_param.h b/include/mach/mach_param.h
index ce02ed8..a63acda 100644
--- a/include/mach/mach_param.h
+++ b/include/mach/mach_param.h
@@ -34,10 +34,6 @@
#ifndef _MACH_MACH_PARAM_H_
#define _MACH_MACH_PARAM_H_
-#ifdef MACH_KERNEL
-#include <mach_ipc_compat.h>
-#endif /* MACH_KERNEL */
-
#define TASK_PORT_REGISTER_MAX 4 /* Number of "registered" ports */
diff --git a/include/mach/mach_traps.h b/include/mach/mach_traps.h
index 3303e32..6c051e7 100644
--- a/include/mach/mach_traps.h
+++ b/include/mach/mach_traps.h
@@ -33,10 +33,6 @@
#ifndef _MACH_MACH_TRAPS_H_
#define _MACH_MACH_TRAPS_H_
-#ifdef MACH_KERNEL
-#include <mach_ipc_compat.h>
-#endif /* MACH_KERNEL */
-
#include <mach/port.h>
mach_port_t mach_reply_port
diff --git a/include/mach/machine.h b/include/mach/machine.h
index df8d2a6..b696d4b 100644
--- a/include/mach/machine.h
+++ b/include/mach/machine.h
@@ -33,10 +33,6 @@
#ifndef _MACH_MACHINE_H_
#define _MACH_MACHINE_H_
-#ifdef MACH_KERNEL
-#include <cpus.h>
-#endif /* MACH_KERNEL */
-
#include <mach/machine/vm_types.h>
#include <mach/boolean.h>
diff --git a/include/mach/message.h b/include/mach/message.h
index 1cd1ad9..9810b3d 100644
--- a/include/mach/message.h
+++ b/include/mach/message.h
@@ -32,10 +32,6 @@
#ifndef _MACH_MESSAGE_H_
#define _MACH_MESSAGE_H_
-#ifdef MACH_KERNEL
-#include <mach_ipc_compat.h>
-#endif /* MACH_KERNEL */
-
#include <mach/kern_return.h>
#include <mach/port.h>
diff --git a/include/mach/mig_errors.h b/include/mach/mig_errors.h
index eec4c19..e71317a 100644
--- a/include/mach/mig_errors.h
+++ b/include/mach/mig_errors.h
@@ -31,10 +31,6 @@
#ifndef _MACH_MIG_ERRORS_H_
#define _MACH_MIG_ERRORS_H_
-#ifdef MACH_KERNEL
-#include <mach_ipc_compat.h>
-#endif /* MACH_KERNEL */
-
#include <mach/kern_return.h>
#include <mach/message.h>
diff --git a/include/mach/notify.h b/include/mach/notify.h
index 9fa65ad..780e918 100644
--- a/include/mach/notify.h
+++ b/include/mach/notify.h
@@ -32,10 +32,6 @@
#ifndef _MACH_NOTIFY_H_
#define _MACH_NOTIFY_H_
-#ifdef MACH_KERNEL
-#include <mach_ipc_compat.h>
-#endif /* MACH_KERNEL */
-
#include <mach/port.h>
#include <mach/message.h>
diff --git a/include/mach/port.h b/include/mach/port.h
index 6b9de37..251b87c 100644
--- a/include/mach/port.h
+++ b/include/mach/port.h
@@ -35,10 +35,6 @@
#ifndef _MACH_PORT_H_
#define _MACH_PORT_H_
-#ifdef MACH_KERNEL
-#include <mach_ipc_compat.h>
-#endif /* MACH_KERNEL */
-
#include <mach/boolean.h>
#include <mach/machine/vm_types.h>
diff --git a/include/mach/std_types.defs b/include/mach/std_types.defs
index b0011f1..b387415 100644
--- a/include/mach/std_types.defs
+++ b/include/mach/std_types.defs
@@ -30,10 +30,6 @@
#ifndef _MACH_STD_TYPES_DEFS_
#define _MACH_STD_TYPES_DEFS_
-#ifdef MACH_KERNEL
-#include <mach_ipc_compat.h>
-#endif
-
type char = MACH_MSG_TYPE_CHAR;
type short = MACH_MSG_TYPE_INTEGER_16;
type int = MACH_MSG_TYPE_INTEGER_32;
diff --git a/include/mach/task_special_ports.h b/include/mach/task_special_ports.h
index 682c7f6..3d61c83 100644
--- a/include/mach/task_special_ports.h
+++ b/include/mach/task_special_ports.h
@@ -35,10 +35,6 @@
#ifndef _MACH_TASK_SPECIAL_PORTS_H_
#define _MACH_TASK_SPECIAL_PORTS_H_
-#ifdef MACH_KERNEL
-#include <mach_ipc_compat.h>
-#endif /* MACH_KERNEL */
-
#define TASK_KERNEL_PORT 1 /* Represents task to the outside
world.*/
#define TASK_EXCEPTION_PORT 3 /* Exception messages for task are
diff --git a/include/mach/thread_special_ports.h b/include/mach/thread_special_ports.h
index 0ab3646..aa4efe7 100644
--- a/include/mach/thread_special_ports.h
+++ b/include/mach/thread_special_ports.h
@@ -35,10 +35,6 @@
#ifndef _MACH_THREAD_SPECIAL_PORTS_H_
#define _MACH_THREAD_SPECIAL_PORTS_H_
-#ifdef MACH_KERNEL
-#include <mach_ipc_compat.h>
-#endif /* MACH_KERNEL */
-
#define THREAD_KERNEL_PORT 1 /* Represents the thread to the outside
world.*/
#define THREAD_EXCEPTION_PORT 3 /* Exception messages for the thread
diff --git a/include/mach_debug/mach_debug.defs b/include/mach_debug/mach_debug.defs
index dc4050f..2a58dc4 100644
--- a/include/mach_debug/mach_debug.defs
+++ b/include/mach_debug/mach_debug.defs
@@ -27,12 +27,6 @@
* Matchmaker definitions file for Mach kernel debugging interface.
*/
-#ifdef MACH_KERNEL
-#include <mach_ipc_debug.h>
-#include <mach_vm_debug.h>
-#include <mach_kdb.h>
-#endif
-
subsystem
#if KERNEL_SERVER
KernelServer
diff --git a/ipc/ipc_hash.c b/ipc/ipc_hash.c
index 50024b5..1c5bfa9 100644
--- a/ipc/ipc_hash.c
+++ b/ipc/ipc_hash.c
@@ -43,7 +43,6 @@
#include <ipc/ipc_init.h>
#include <ipc/ipc_types.h>
-#include <mach_ipc_debug.h>
#if MACH_IPC_DEBUG
#include <mach/kern_return.h>
#include <mach_debug/hash_info.h>
diff --git a/ipc/ipc_hash.h b/ipc/ipc_hash.h
index bf5e9ac..b5b1ba6 100644
--- a/ipc/ipc_hash.h
+++ b/ipc/ipc_hash.h
@@ -34,8 +34,6 @@
#ifndef _IPC_IPC_HASH_H_
#define _IPC_IPC_HASH_H_
-#include <mach_ipc_debug.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
diff --git a/ipc/ipc_kmsg.c b/ipc/ipc_kmsg.c
index 44b5d82..12bd0c7 100644
--- a/ipc/ipc_kmsg.c
+++ b/ipc/ipc_kmsg.c
@@ -34,9 +34,6 @@
* Operations on kernel messages.
*/
-#include <cpus.h>
-#include <mach_ipc_compat.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/message.h>
@@ -3144,7 +3141,6 @@ ipc_kmsg_copyout_compat(kmsg, space, map)
#endif /* MACH_IPC_COMPAT */
-#include <mach_kdb.h>
#if MACH_KDB
char *
diff --git a/ipc/ipc_kmsg.h b/ipc/ipc_kmsg.h
index 77e7c28..32cf828 100644
--- a/ipc/ipc_kmsg.h
+++ b/ipc/ipc_kmsg.h
@@ -34,13 +34,10 @@
#ifndef _IPC_IPC_KMSG_H_
#define _IPC_IPC_KMSG_H_
-#include <cpus.h>
-#include <mach_ipc_compat.h>
-
#include <mach/machine/vm_types.h>
#include <mach/message.h>
#include <kern/assert.h>
-#include "cpu_number.h"
+#include <kern/cpu_number.h>
#include <kern/macro_help.h>
#include <kern/kalloc.h>
#include <ipc/ipc_marequest.h>
diff --git a/ipc/ipc_marequest.c b/ipc/ipc_marequest.c
index b5abc58..5826baf 100644
--- a/ipc/ipc_marequest.c
+++ b/ipc/ipc_marequest.c
@@ -34,8 +34,6 @@
* Functions to handle msg-accepted requests.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/message.h>
#include <mach/port.h>
#include <kern/lock.h>
@@ -51,7 +49,6 @@
#include <ipc/ipc_marequest.h>
#include <ipc/ipc_notify.h>
-#include <mach_ipc_debug.h>
#if MACH_IPC_DEBUG
#include <mach/kern_return.h>
#include <mach_debug/hash_info.h>
diff --git a/ipc/ipc_marequest.h b/ipc/ipc_marequest.h
index 5ea1858..6f4e6c8 100644
--- a/ipc/ipc_marequest.h
+++ b/ipc/ipc_marequest.h
@@ -34,8 +34,6 @@
#ifndef _IPC_IPC_MAREQUEST_H_
#define _IPC_IPC_MAREQUEST_H_
-#include <mach_ipc_debug.h>
-
#include <mach/kern_return.h>
#include <mach/port.h>
diff --git a/ipc/ipc_notify.c b/ipc/ipc_notify.c
index d10ac99..c90796f 100644
--- a/ipc/ipc_notify.c
+++ b/ipc/ipc_notify.c
@@ -31,8 +31,6 @@
* Notification-sending functions.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/port.h>
#include <mach/message.h>
#include <mach/notify.h>
diff --git a/ipc/ipc_notify.h b/ipc/ipc_notify.h
index 4e5b2e4..433d919 100644
--- a/ipc/ipc_notify.h
+++ b/ipc/ipc_notify.h
@@ -34,8 +34,6 @@
#ifndef _IPC_IPC_NOTIFY_H_
#define _IPC_IPC_NOTIFY_H_
-#include <mach_ipc_compat.h>
-
extern void
ipc_notify_init();
diff --git a/ipc/ipc_object.c b/ipc/ipc_object.c
index fca204f..e0cbbc3 100644
--- a/ipc/ipc_object.c
+++ b/ipc/ipc_object.c
@@ -31,8 +31,6 @@
* Functions to manipulate IPC objects.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/port.h>
@@ -1280,8 +1278,6 @@ ipc_object_copyout_name_compat(space, object, msgt_name, name)
#endif /* MACH_IPC_COMPAT */
-#include <mach_kdb.h>
-
#if MACH_KDB
#define printf kdbprintf
diff --git a/ipc/ipc_object.h b/ipc/ipc_object.h
index 892d3ea..0a0184a 100644
--- a/ipc/ipc_object.h
+++ b/ipc/ipc_object.h
@@ -34,8 +34,6 @@
#ifndef _IPC_IPC_OBJECT_H_
#define _IPC_IPC_OBJECT_H_
-#include <mach_ipc_compat.h>
-
#include <mach/kern_return.h>
#include <mach/message.h>
#include <kern/lock.h>
diff --git a/ipc/ipc_port.c b/ipc/ipc_port.c
index 262ab5e..aaba82d 100644
--- a/ipc/ipc_port.c
+++ b/ipc/ipc_port.c
@@ -34,8 +34,6 @@
* Functions to manipulate IPC ports.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/port.h>
#include <mach/kern_return.h>
#include <kern/lock.h>
@@ -1434,8 +1432,6 @@ ipc_port_copyout_receiver(port, space)
#endif /* MACH_IPC_COMPAT */
-#include <mach_kdb.h>
-
#if MACH_KDB
#define printf kdbprintf
diff --git a/ipc/ipc_port.h b/ipc/ipc_port.h
index 6707268..4b269b6 100644
--- a/ipc/ipc_port.h
+++ b/ipc/ipc_port.h
@@ -39,8 +39,6 @@
#ifndef _IPC_IPC_PORT_H_
#define _IPC_IPC_PORT_H_
-#include <mach_ipc_compat.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/port.h>
diff --git a/ipc/ipc_pset.c b/ipc/ipc_pset.c
index d916f0c..b535e3f 100644
--- a/ipc/ipc_pset.c
+++ b/ipc/ipc_pset.c
@@ -316,8 +316,6 @@ ipc_pset_destroy(
ips_check_unlock(pset);
}
-#include <mach_kdb.h>
-
#if MACH_KDB
#define printf kdbprintf
diff --git a/ipc/ipc_right.c b/ipc/ipc_right.c
index 72d8cc0..b1e538d 100644
--- a/ipc/ipc_right.c
+++ b/ipc/ipc_right.c
@@ -33,8 +33,6 @@
* Functions to manipulate IPC capabilities.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/port.h>
diff --git a/ipc/ipc_right.h b/ipc/ipc_right.h
index f0281e6..4b937c0 100644
--- a/ipc/ipc_right.h
+++ b/ipc/ipc_right.h
@@ -36,8 +36,6 @@
#ifndef _IPC_IPC_RIGHT_H_
#define _IPC_IPC_RIGHT_H_
-#include <mach_ipc_compat.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <ipc/ipc_port.h>
diff --git a/ipc/ipc_space.c b/ipc/ipc_space.c
index bbe8a2f..e3817f5 100644
--- a/ipc/ipc_space.c
+++ b/ipc/ipc_space.c
@@ -36,8 +36,6 @@
* Functions to manipulate IPC capability spaces.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/port.h>
diff --git a/ipc/ipc_space.h b/ipc/ipc_space.h
index 14f2404..6d2ed82 100644
--- a/ipc/ipc_space.h
+++ b/ipc/ipc_space.h
@@ -39,8 +39,6 @@
#ifndef _IPC_IPC_SPACE_H_
#define _IPC_IPC_SPACE_H_
-#include <mach_ipc_compat.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <kern/macro_help.h>
diff --git a/ipc/ipc_target.c b/ipc/ipc_target.c
index b791db2..aa35a59 100644
--- a/ipc/ipc_target.c
+++ b/ipc/ipc_target.c
@@ -22,7 +22,7 @@
* representing a target of messages and migrating RPCs.
*/
-#include "sched_prim.h"
+#include <kern/sched_prim.h>
#include "ipc_target.h"
void
diff --git a/ipc/mach_debug.c b/ipc/mach_debug.c
index 49530cf..04d0c74 100644
--- a/ipc/mach_debug.c
+++ b/ipc/mach_debug.c
@@ -33,8 +33,6 @@
* Exported kernel calls. See mach_debug/mach_debug.defs.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/kern_return.h>
#include <mach/port.h>
#include <mach/machine/vm_types.h>
diff --git a/ipc/mach_msg.c b/ipc/mach_msg.c
index 2ae250c..cdb406e 100644
--- a/ipc/mach_msg.c
+++ b/ipc/mach_msg.c
@@ -36,8 +36,6 @@
* Exported message traps. See mach/message.h.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/kern_return.h>
#include <mach/port.h>
#include <mach/message.h>
diff --git a/ipc/mach_msg.h b/ipc/mach_msg.h
index c5dc3ce..021ddc5 100644
--- a/ipc/mach_msg.h
+++ b/ipc/mach_msg.h
@@ -36,8 +36,6 @@
#ifndef _IPC_MACH_MSG_H_
#define _IPC_MACH_MSG_H_
-#include <mach_ipc_compat.h>
-
#include <mach/boolean.h>
#include <mach/message.h>
diff --git a/ipc/mach_port.c b/ipc/mach_port.c
index 6dc83ad..0ddad53 100644
--- a/ipc/mach_port.c
+++ b/ipc/mach_port.c
@@ -36,8 +36,6 @@
* Exported kernel calls. See mach/mach_port.defs.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/port.h>
#include <mach/kern_return.h>
#include <mach/notify.h>
diff --git a/kern/ast.c b/kern/ast.c
index 9498ce7..8fff997 100644
--- a/kern/ast.c
+++ b/kern/ast.c
@@ -35,9 +35,6 @@
*
*/
-#include <cpus.h>
-#include <mach_fixpri.h>
-
#include <kern/ast.h>
#include <kern/counters.h>
#include "cpu_number.h"
diff --git a/kern/ast.h b/kern/ast.h
index 14a5535..ba22af8 100644
--- a/kern/ast.h
+++ b/kern/ast.h
@@ -40,8 +40,6 @@
* a set of reasons for an AST, and passing this set to ast_taken.
*/
-#include <cpus.h>
-
#include "cpu_number.h"
#include <kern/macro_help.h>
#include <machine/ast.h>
diff --git a/kern/bootstrap.c b/kern/bootstrap.c
index 543ae77..19e25ea 100644
--- a/kern/bootstrap.c
+++ b/kern/bootstrap.c
@@ -29,8 +29,6 @@
/*
* Bootstrap the various built-in servers.
*/
-#include <mach_kdb.h>
-#include <bootstrap_symbols.h>
#include <mach/port.h>
#include <mach/message.h>
diff --git a/kern/counters.c b/kern/counters.c
index d10aa81..a9d450e 100644
--- a/kern/counters.c
+++ b/kern/counters.c
@@ -24,8 +24,6 @@
* the rights to redistribute these changes.
*/
-#include <mach_counters.h>
-
#include <kern/counters.h>
/*
diff --git a/kern/counters.h b/kern/counters.h
index be5d8bb..474c6a2 100644
--- a/kern/counters.h
+++ b/kern/counters.h
@@ -27,8 +27,6 @@
#ifndef _KERN_COUNTERS_
#define _KERN_COUNTERS_
-#include <mach_counters.h>
-
/*
* We can count various interesting events and paths.
*
diff --git a/kern/cpu_number.h b/kern/cpu_number.h
index 32d8323..44bbd64 100644
--- a/kern/cpu_number.h
+++ b/kern/cpu_number.h
@@ -27,8 +27,6 @@
#ifndef _KERN_CPU_NUMBER_H_
#define _KERN_CPU_NUMBER_H_
-#include <cpus.h>
-
/*
* Definitions for cpu identification in multi-processors.
*/
diff --git a/kern/debug.c b/kern/debug.c
index 3827e8f..6a31ab8 100644
--- a/kern/debug.c
+++ b/kern/debug.c
@@ -26,9 +26,6 @@
#include <stdarg.h>
-#include <mach_kdb.h>
-#include <cpus.h>
-
#include "cpu_number.h"
#include <kern/lock.h>
#include <kern/thread.h>
diff --git a/kern/eventcount.c b/kern/eventcount.c
index 9121386..1418c82 100644
--- a/kern/eventcount.c
+++ b/kern/eventcount.c
@@ -35,9 +35,6 @@
*
*/
-
-#include <cpus.h>
-
#include <mach/machine.h>
#include <kern/ast.h>
#include "cpu_number.h"
diff --git a/kern/exception.c b/kern/exception.c
index e8b9c0e..62292b4 100644
--- a/kern/exception.c
+++ b/kern/exception.c
@@ -24,8 +24,6 @@
* the rights to redistribute these changes.
*/
-#include <mach_kdb.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/message.h>
diff --git a/kern/host.c b/kern/host.c
index 062f923..a757266 100644
--- a/kern/host.c
+++ b/kern/host.c
@@ -29,9 +29,6 @@
* Non-ipc host functions.
*/
-#include <cpus.h>
-#include <mach_host.h>
-
#include <kern/assert.h>
#include <kern/kalloc.h>
#include <kern/host.h>
diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c
index 60db89c..7e51d92 100644
--- a/kern/ipc_kobject.c
+++ b/kern/ipc_kobject.c
@@ -33,10 +33,6 @@
* Functions for letting a port represent a kernel object.
*/
-#include <mach_debug.h>
-#include <mach_ipc_test.h>
-#include <mach_machine_routines.h>
-
#include <mach/port.h>
#include <mach/kern_return.h>
#include <mach/message.h>
diff --git a/kern/ipc_sched.c b/kern/ipc_sched.c
index a2f4c35..e1edfd6 100644
--- a/kern/ipc_sched.c
+++ b/kern/ipc_sched.c
@@ -24,9 +24,6 @@
* the rights to redistribute these changes.
*/
-#include <cpus.h>
-#include <mach_host.h>
-
#include <mach/message.h>
#include <kern/counters.h>
#include "cpu_number.h"
diff --git a/kern/ipc_tt.c b/kern/ipc_tt.c
index 816124f..b1a9443 100644
--- a/kern/ipc_tt.c
+++ b/kern/ipc_tt.c
@@ -29,8 +29,6 @@
* Task and thread related IPC functions.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/mach_param.h>
diff --git a/kern/lock.c b/kern/lock.c
index 4d88153..15bc988 100644
--- a/kern/lock.c
+++ b/kern/lock.c
@@ -34,9 +34,6 @@
* Locking primitives implementation
*/
-#include <cpus.h>
-#include <mach_kdb.h>
-
#include <kern/lock.h>
#include <kern/thread.h>
#include <kern/sched_prim.h>
diff --git a/kern/lock.h b/kern/lock.h
index 9be63c5..a8f2fd1 100644
--- a/kern/lock.h
+++ b/kern/lock.h
@@ -34,9 +34,6 @@
#ifndef _KERN_LOCK_H_
#define _KERN_LOCK_H_
-#include <cpus.h>
-#include <mach_ldebug.h>
-
#include <mach/boolean.h>
#include <mach/machine/vm_types.h>
diff --git a/kern/lock_mon.c b/kern/lock_mon.c
index 143d914..1d92ebf 100644
--- a/kern/lock_mon.c
+++ b/kern/lock_mon.c
@@ -38,11 +38,6 @@
* Depending on hardware also records time spent with locks held
*/
-#include <cpus.h>
-#include <mach_mp_debug.h>
-#include <mach_lock_mon.h>
-#include <time_stamp.h>
-
#include <sys/types.h>
#include <mach/machine/vm_types.h>
#include <mach/boolean.h>
diff --git a/kern/mach4.srv b/kern/mach4.srv
index 9df7cea..ead5484 100644
--- a/kern/mach4.srv
+++ b/kern/mach4.srv
@@ -21,8 +21,6 @@
*/
/* This is a server presentation file. */
-#include <mach_pcsample.h>
-
#define KERNEL_SERVER 1
#ifdef MIGRATING_THREADS
diff --git a/kern/mach_clock.c b/kern/mach_clock.c
index bfa6620..71cd583 100644
--- a/kern/mach_clock.c
+++ b/kern/mach_clock.c
@@ -33,9 +33,6 @@
*
* Clock primitives.
*/
-#include <cpus.h>
-#include <mach_pcsample.h>
-#include <stat_time.h>
#include <mach/boolean.h>
#include <mach/machine.h>
diff --git a/kern/mach_factor.c b/kern/mach_factor.c
index 34a7d0c..d9e0465 100644
--- a/kern/mach_factor.c
+++ b/kern/mach_factor.c
@@ -31,8 +31,6 @@
* Compute the Mach Factor.
*/
-#include <cpus.h>
-
#include <mach/machine.h>
#include <mach/processor_info.h>
#include <kern/sched.h>
diff --git a/kern/machine.c b/kern/machine.c
index 5dba1ae..e242da8 100644
--- a/kern/machine.c
+++ b/kern/machine.c
@@ -34,9 +34,6 @@
* Support for machine independent machine abstraction.
*/
-#include <cpus.h>
-#include <mach_host.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/mach_types.h>
diff --git a/kern/pc_sample.c b/kern/pc_sample.c
index 01b9acb..87c7a6c 100644
--- a/kern/pc_sample.c
+++ b/kern/pc_sample.c
@@ -24,10 +24,6 @@
* the rights to redistribute these changes.
*/
-
-
-#include <mach_pcsample.h>
-
#include <mach/mach_types.h> /* vm_address_t */
#include <mach/std_types.h> /* pointer_t */
#include <mach/pc_sample.h>
diff --git a/kern/priority.c b/kern/priority.c
index f9a4091..8e3f2e5 100644
--- a/kern/priority.c
+++ b/kern/priority.c
@@ -34,8 +34,6 @@
* Clock primitives.
*/
-#include <cpus.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/machine.h>
diff --git a/kern/processor.c b/kern/processor.c
index 6066ecf..a6e65c8 100644
--- a/kern/processor.c
+++ b/kern/processor.c
@@ -27,10 +27,6 @@
* processor.c: processor and processor_set manipulation routines.
*/
-#include <cpus.h>
-#include <mach_fixpri.h>
-#include <mach_host.h>
-
#include <mach/boolean.h>
#include <mach/policy.h>
#include <mach/processor_info.h>
diff --git a/kern/processor.h b/kern/processor.h
index 8de7a68..7ff7124 100644
--- a/kern/processor.h
+++ b/kern/processor.h
@@ -37,10 +37,6 @@
* Data structures for managing processors and sets of processors.
*/
-#include <cpus.h>
-#include <mach_fixpri.h>
-#include <mach_host.h>
-
#include <mach/boolean.h>
#include <mach/kern_return.h>
#include <mach/port.h>
diff --git a/kern/sched.h b/kern/sched.h
index 6616e0f..c4ff647 100644
--- a/kern/sched.h
+++ b/kern/sched.h
@@ -35,11 +35,6 @@
#ifndef _KERN_SCHED_H_
#define _KERN_SCHED_H_
-#include <cpus.h>
-#include <mach_fixpri.h>
-#include <simple_clock.h>
-#include <stat_time.h>
-
#include <kern/queue.h>
#include <kern/lock.h>
#include <kern/macro_help.h>
diff --git a/kern/sched_prim.c b/kern/sched_prim.c
index b3c60ad..24b64f9 100644
--- a/kern/sched_prim.c
+++ b/kern/sched_prim.c
@@ -32,14 +32,6 @@
*
*/
-#include <cpus.h>
-#include <simple_clock.h>
-#include <mach_fixpri.h>
-#include <mach_host.h>
-#include <hw_footprint.h>
-#include <fast_tas.h>
-#include <power_save.h>
-
#include <mach/machine.h>
#include <kern/ast.h>
#include <kern/counters.h>
diff --git a/kern/startup.c b/kern/startup.c
index 86d109a..f8d444f 100644
--- a/kern/startup.c
+++ b/kern/startup.c
@@ -27,11 +27,6 @@
* Mach kernel startup.
*/
-
-#include <xpr_debug.h>
-#include <cpus.h>
-#include <mach_host.h>
-
#include <mach/boolean.h>
#include <mach/machine.h>
#include <mach/task_special_ports.h>
diff --git a/kern/syscall_subr.c b/kern/syscall_subr.c
index 8c5b38a..a94e8db 100644
--- a/kern/syscall_subr.c
+++ b/kern/syscall_subr.c
@@ -27,9 +27,6 @@
* the rights to redistribute these changes.
*/
-#include <mach_fixpri.h>
-#include <cpus.h>
-
#include <mach/boolean.h>
#include <mach/thread_switch.h>
#include <ipc/ipc_port.h>
diff --git a/kern/syscall_sw.c b/kern/syscall_sw.c
index 64a5d0d..d4c3e07 100644
--- a/kern/syscall_sw.c
+++ b/kern/syscall_sw.c
@@ -27,8 +27,6 @@
* the rights to redistribute these changes.
*/
-#include <mach_ipc_compat.h>
-
#include <mach/port.h>
#include <mach/kern_return.h>
#include <kern/syscall_sw.h>
diff --git a/kern/task.c b/kern/task.c
index d7e6082..c7633c1 100644
--- a/kern/task.c
+++ b/kern/task.c
@@ -31,10 +31,6 @@
* Task management primitives implementation.
*/
-#include <mach_host.h>
-#include <mach_pcsample.h>
-#include <fast_tas.h>
-
#include <mach/machine/vm_types.h>
#include <mach/vm_param.h>
#include <mach/task_info.h>
diff --git a/kern/task.h b/kern/task.h
index a3f4302..e467a2f 100644
--- a/kern/task.h
+++ b/kern/task.h
@@ -34,8 +34,6 @@
#ifndef _KERN_TASK_H_
#define _KERN_TASK_H_
-#include <fast_tas.h>
-
#include <mach/boolean.h>
#include <mach/port.h>
#include <mach/time_value.h>
diff --git a/kern/thread.c b/kern/thread.c
index f1dcc52..333ee9a 100644
--- a/kern/thread.c
+++ b/kern/thread.c
@@ -31,14 +31,6 @@
* Thread management primitives implementation.
*/
-#include <cpus.h>
-#include <hw_footprint.h>
-#include <mach_host.h>
-#include <mach_fixpri.h>
-#include <mach_pcsample.h>
-#include <simple_clock.h>
-#include <mach_debug.h>
-
#include <mach/std_types.h>
#include <mach/policy.h>
#include <mach/thread_info.h>
diff --git a/kern/thread.h b/kern/thread.h
index b6c801f..e8008d5 100644
--- a/kern/thread.h
+++ b/kern/thread.h
@@ -34,11 +34,6 @@
#ifndef _KERN_THREAD_H_
#define _KERN_THREAD_H_
-#include <mach_ipc_compat.h>
-#include <hw_footprint.h>
-#include <mach_fixpri.h>
-#include <mach_host.h>
-
#include <mach/boolean.h>
#include <mach/thread_info.h>
#include <mach/thread_status.h>
diff --git a/kern/timer.c b/kern/timer.c
index 326d340..ec0524a 100644
--- a/kern/timer.c
+++ b/kern/timer.c
@@ -24,9 +24,6 @@
* the rights to redistribute these changes.
*/
-#include <cpus.h>
-#include <stat_time.h>
-
#include <mach/kern_return.h>
#include <mach/port.h>
#include <kern/queue.h>
diff --git a/kern/timer.h b/kern/timer.h
index 4573936..4146237 100644
--- a/kern/timer.h
+++ b/kern/timer.h
@@ -27,9 +27,6 @@
#ifndef _KERN_TIMER_H_
#define _KERN_TIMER_H_
-#include <cpus.h>
-#include <stat_time.h>
-
#include <kern/macro_help.h>
#if STAT_TIME
diff --git a/kern/xpr.c b/kern/xpr.c
index 872ab8d..e3e5377 100644
--- a/kern/xpr.c
+++ b/kern/xpr.c
@@ -24,7 +24,6 @@
* the rights to redistribute these changes.
*/
-#include <mach_kdb.h>
/*
* xpr silent tracing circular buffer.
*/
diff --git a/kern/xpr.h b/kern/xpr.h
index 29a6005..1e1204d 100644
--- a/kern/xpr.h
+++ b/kern/xpr.h
@@ -48,9 +48,7 @@
#ifndef _KERN_XPR_H_
#define _KERN_XPR_H_
-#ifdef KERNEL
-#include <xpr_debug.h>
-#else /* KERNEL */
+#ifndef KERNEL
#include <sys/features.h>
#endif /* KERNEL */
diff --git a/kern/zalloc.c b/kern/zalloc.c
index 0e62b01..18239be 100644
--- a/kern/zalloc.c
+++ b/kern/zalloc.c
@@ -42,7 +42,6 @@
#include <vm/vm_kern.h>
#include <machine/machspl.h>
-#include <mach_debug.h>
#if MACH_DEBUG
#include <mach/kern_return.h>
#include <mach/machine/vm_types.h>
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
diff --git a/vm/memory_object.c b/vm/memory_object.c
index 16e858a..77ec25c 100644
--- a/vm/memory_object.c
+++ b/vm/memory_object.c
@@ -47,8 +47,8 @@
#include <mach/vm_prot.h>
#include <mach/message.h>
-#include "memory_object_user.h"
-#include "memory_object_default.h"
+#include <vm/memory_object_user.user.h>
+#include <vm/memory_object_default.user.h>
/*
* Implementation dependencies:
@@ -63,7 +63,6 @@
#include <vm/vm_map.h> /* For vm_map_pageable */
#include <ipc/ipc_port.h>
-#include <mach_pagemap.h>
#if MACH_PAGEMAP
#include <vm/vm_external.h>
#endif /* MACH_PAGEMAP */
diff --git a/vm/vm_debug.c b/vm/vm_debug.c
index 16165ca..a6e9347 100644
--- a/vm/vm_debug.c
+++ b/vm/vm_debug.c
@@ -31,7 +31,6 @@
* Exported kernel calls. See mach_debug/mach_debug.defs.
*/
-#include <mach_vm_debug.h>
#if MACH_VM_DEBUG
#include <kern/thread.h>
diff --git a/vm/vm_fault.c b/vm/vm_fault.c
index 42108ed..b757208 100644
--- a/vm/vm_fault.c
+++ b/vm/vm_fault.c
@@ -32,10 +32,6 @@
*
* Page fault handling module.
*/
-#include <mach_pagemap.h>
-#include <mach_kdb.h>
-#include <mach_pcsample.h>
-
#include <vm/vm_fault.h>
#include <mach/kern_return.h>
@@ -51,7 +47,7 @@
#include <vm/vm_pageout.h>
#include <mach/vm_param.h>
#include <mach/memory_object.h>
-#include "memory_object_user.h"
+#include <vm/memory_object_user.user.h>
/* For memory_object_data_{request,unlock} */
#include <kern/mach_param.h>
#include <kern/macro_help.h>
diff --git a/vm/vm_map.c b/vm/vm_map.c
index fcd6265..193146c 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -4676,8 +4676,6 @@ kern_return_t vm_map_machine_attribute(map, address, size, attribute, value)
return ret;
}
-#include <mach_kdb.h>
-
#if MACH_KDB
diff --git a/vm/vm_object.c b/vm/vm_object.c
index 0b57827..e2a5f43 100644
--- a/vm/vm_object.c
+++ b/vm/vm_object.c
@@ -33,11 +33,9 @@
* Virtual memory object module.
*/
-#include <mach_pagemap.h>
-
#include <mach/memory_object.h>
-#include "memory_object_default.h"
-#include "memory_object_user.h"
+#include <vm/memory_object_default.user.h>
+#include <vm/memory_object_user.user.h>
#include <machine/vm_param.h>
#include <ipc/ipc_port.h>
#include <ipc/ipc_space.h>
@@ -2956,8 +2954,6 @@ vm_object_page_map(
}
}
-#include <mach_kdb.h>
-
#if MACH_KDB
#define printf kdbprintf
diff --git a/vm/vm_object.h b/vm/vm_object.h
index 940168d..84e658f 100644
--- a/vm/vm_object.h
+++ b/vm/vm_object.h
@@ -34,8 +34,6 @@
#ifndef _VM_VM_OBJECT_H_
#define _VM_VM_OBJECT_H_
-#include <mach_pagemap.h>
-
#include <mach/kern_return.h>
#include <mach/boolean.h>
#include <mach/memory_object.h>
diff --git a/vm/vm_page.h b/vm/vm_page.h
index 63d8db8..ca76e93 100644
--- a/vm/vm_page.h
+++ b/vm/vm_page.h
@@ -34,8 +34,6 @@
#ifndef _VM_VM_PAGE_H_
#define _VM_VM_PAGE_H_
-#include <mach_vm_debug.h>
-
#include <mach/boolean.h>
#include <mach/vm_prot.h>
#include <mach/vm_param.h>
diff --git a/vm/vm_pageout.c b/vm/vm_pageout.c
index a8f1b3c..c3d890c 100644
--- a/vm/vm_pageout.c
+++ b/vm/vm_pageout.c
@@ -34,12 +34,10 @@
* The proverbial page-out daemon.
*/
-#include <mach_pagemap.h>
-
#include <mach/mach_types.h>
#include <mach/memory_object.h>
-#include "memory_object_default.h"
-#include "memory_object_user.h"
+#include <vm/memory_object_default.user.h>
+#include <vm/memory_object_user.user.h>
#include <mach/vm_param.h>
#include <mach/vm_statistics.h>
#include <kern/counters.h>
diff --git a/vm/vm_resident.c b/vm/vm_resident.c
index 3c5af1c..b939b1d 100644
--- a/vm/vm_resident.c
+++ b/vm/vm_resident.c
@@ -32,7 +32,6 @@
*
* Resident memory management module.
*/
-#include <cpus.h>
#include <mach/vm_prot.h>
#include <kern/counters.h>
@@ -49,7 +48,6 @@
#include <vm/vm_pageout.h>
#include <vm/vm_kern.h>
-#include <mach_vm_debug.h>
#if MACH_VM_DEBUG
#include <mach/kern_return.h>
#include <mach_debug/hash_info.h>
@@ -1483,7 +1481,7 @@ vm_page_info(
}
#endif /* MACH_VM_DEBUG */
-#include <mach_kdb.h>
+
#if MACH_KDB
#define printf kdbprintf