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.

38 files changed, 1 insertions, 121 deletions

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>