From 37174c05e61383f861bae6b5c39f85c40dc38f56 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sun, 20 Jul 1997 08:37:24 +0000
Subject: [PATCH] Removed unused #includes.

---
 sys/amd64/amd64/autoconf.c     |  6 +-----
 sys/amd64/amd64/cpu_switch.S   |  3 +--
 sys/amd64/amd64/db_interface.c |  4 +---
 sys/amd64/amd64/db_trace.c     |  5 +----
 sys/amd64/amd64/exception.S    |  5 +----
 sys/amd64/amd64/exception.s    |  5 +----
 sys/amd64/amd64/identcpu.c     |  6 +-----
 sys/amd64/amd64/locore.S       |  8 +-------
 sys/amd64/amd64/locore.s       |  8 +-------
 sys/amd64/amd64/machdep.c      |  8 +-------
 sys/amd64/amd64/mem.c          |  4 +---
 sys/amd64/amd64/mp_machdep.c   |  7 +------
 sys/amd64/amd64/mptable.c      |  7 +------
 sys/amd64/amd64/pmap.c         |  5 +----
 sys/amd64/amd64/swtch.s        |  3 +--
 sys/amd64/amd64/sys_machdep.c  |  4 +---
 sys/amd64/amd64/trap.c         |  6 +-----
 sys/amd64/amd64/vm_machdep.c   |  7 +------
 sys/amd64/include/mptable.h    |  7 +------
 sys/i386/i386/autoconf.c       |  6 +-----
 sys/i386/i386/db_interface.c   |  4 +---
 sys/i386/i386/db_trace.c       |  5 +----
 sys/i386/i386/exception.s      |  5 +----
 sys/i386/i386/identcpu.c       |  6 +-----
 sys/i386/i386/locore.s         |  8 +-------
 sys/i386/i386/machdep.c        |  8 +-------
 sys/i386/i386/math_emulate.c   | 14 +-------------
 sys/i386/i386/mem.c            |  4 +---
 sys/i386/i386/mp_machdep.c     |  7 +------
 sys/i386/i386/mpapic.c         |  4 +---
 sys/i386/i386/mplock.s         |  7 +------
 sys/i386/i386/mptable.c        |  7 +------
 sys/i386/i386/pmap.c           |  5 +----
 sys/i386/i386/procfs_machdep.c |  8 +-------
 sys/i386/i386/swtch.s          |  3 +--
 sys/i386/i386/sys_machdep.c    |  4 +---
 sys/i386/i386/trap.c           |  6 +-----
 sys/i386/i386/vm_machdep.c     |  7 +------
 sys/i386/include/mptable.h     |  7 +------
 sys/kern/subr_smp.c            |  7 +------
 sys/kern/subr_trap.c           |  6 +-----
 41 files changed, 41 insertions(+), 205 deletions(-)

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 8e0764b84e5..ebbbc23f63d 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.2 1997/07/08 23:40:04 smp Exp smp $
+ *	$Id: autoconf.c,v 1.70 1997/07/08 23:42:02 fsmp Exp $
  */
 
 /*
@@ -49,13 +49,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/conf.h>
-#include <sys/dmap.h>
 #include <sys/reboot.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
-#include <sys/vnode.h>
 #include <sys/sysctl.h>
 
 #include <machine/bootinfo.h>
@@ -106,7 +103,6 @@ static void	setroot __P((void));
 #include <sys/proc.h>
 #include <sys/stat.h>
 #include <machine/clock.h>
-#include <isofs/cd9660/iso.h>
 
 /*
  * XXX All this CD-ROM root stuff is fairly messy.  Ick.
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index 9b0df296f7c..eec0f387d53 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.2 1997/07/15 00:12:55 smp Exp smp $
+ *	$Id: swtch.s,v 1.55 1997/07/15 02:51:20 fsmp Exp $
  */
 
 #include "npx.h"
@@ -42,7 +42,6 @@
 #include <sys/rtprio.h>
 
 #include <machine/asmacros.h>
-#include <machine/ipl.h>
 #include <machine/smptests.h>		/** TEST_LOPRIO */
 
 #ifdef SMP
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index b8aeb6315e1..5c5bcccd003 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_interface.c,v 1.10 1997/07/18 19:45:41 smp Exp smp $
+ *	$Id: db_interface.c,v 1.34 1997/07/18 21:27:52 fsmp Exp $
  */
 
 /*
@@ -31,8 +31,6 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/reboot.h>
 
 #include <machine/cons.h>
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index d8d6962cacb..69a88e1b340 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -23,20 +23,17 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_trace.c,v 1.21 1997/04/26 11:45:04 peter Exp $
+ *	$Id: db_trace.c,v 1.22 1997/04/26 19:12:03 peter Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 
 #include <machine/md_var.h>
 #include <machine/segments.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <sys/lock.h>
-#include <vm/vm_prot.h>
 #include <vm/pmap.h>
 #include <ddb/ddb.h>
 
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index bf834e536b6..991ff7be79d 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -30,18 +30,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.30 1997/06/22 16:03:02 peter Exp $
+ *	$Id: exception.s,v 1.31 1997/07/01 01:02:03 bde Exp $
  */
 
 #include "npx.h"				/* NNPX */
 #include "assym.s"				/* system defines */
-#include <sys/errno.h>				/* error return codes */
 #include <machine/ipl.h>			/* SWI_AST_MASK ... */
 #include <machine/psl.h>			/* PSL_I */
 #include <machine/trap.h>			/* trap codes */
-#include <sys/syscall.h>			/* syscall numbers */
 #include <machine/asmacros.h>			/* miscellaneous macros */
-#include <sys/cdefs.h>				/* CPP macros */
 
 #ifdef SMP
 #include <machine/apic.h>			/* for apic_vector.s */
diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s
index bf834e536b6..991ff7be79d 100644
--- a/sys/amd64/amd64/exception.s
+++ b/sys/amd64/amd64/exception.s
@@ -30,18 +30,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.30 1997/06/22 16:03:02 peter Exp $
+ *	$Id: exception.s,v 1.31 1997/07/01 01:02:03 bde Exp $
  */
 
 #include "npx.h"				/* NNPX */
 #include "assym.s"				/* system defines */
-#include <sys/errno.h>				/* error return codes */
 #include <machine/ipl.h>			/* SWI_AST_MASK ... */
 #include <machine/psl.h>			/* PSL_I */
 #include <machine/trap.h>			/* trap codes */
-#include <sys/syscall.h>			/* syscall numbers */
 #include <machine/asmacros.h>			/* miscellaneous macros */
-#include <sys/cdefs.h>				/* CPP macros */
 
 #ifdef SMP
 #include <machine/apic.h>			/* for apic_vector.s */
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index 03752c6681f..5edb5e84018 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -36,24 +36,20 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.24 1997/06/02 18:55:44 peter Exp $
+ *	$Id: identcpu.c,v 1.25 1997/06/24 09:45:35 kato Exp $
  */
 
 #include "opt_cpu.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
 #include <machine/asmacros.h>
 #include <machine/cpu.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
 #include <machine/clock.h>
 #include <machine/specialreg.h>
-#include <machine/sysarch.h>
 #include <machine/md_var.h>
 
 #include <i386/isa/intr_machdep.h>
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index e2ae0df7f36..57af04233a1 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.91 1997/07/15 11:07:32 kato Exp $
+ *	$Id: locore.s,v 1.92 1997/07/17 19:44:53 dyson Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -47,9 +47,7 @@
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_userconfig.h"
-#include "opt_smp.h"
 
-#include <sys/errno.h>
 #include <sys/syscall.h>
 #include <sys/reboot.h>
 
@@ -59,10 +57,6 @@
 #include <machine/pmap.h>
 #include <machine/specialreg.h>
 
-#ifdef SMP
-#include <machine/apic.h>
-#endif /* SMP */
-
 #include "assym.s"
 
 /*
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index e2ae0df7f36..57af04233a1 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.91 1997/07/15 11:07:32 kato Exp $
+ *	$Id: locore.s,v 1.92 1997/07/17 19:44:53 dyson Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -47,9 +47,7 @@
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_userconfig.h"
-#include "opt_smp.h"
 
-#include <sys/errno.h>
 #include <sys/syscall.h>
 #include <sys/reboot.h>
 
@@ -59,10 +57,6 @@
 #include <machine/pmap.h>
 #include <machine/specialreg.h>
 
-#ifdef SMP
-#include <machine/apic.h>
-#endif /* SMP */
-
 #include "assym.s"
 
 /*
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 663fadbe598..7b53f5cdf99 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.251 1997/06/22 16:03:10 peter Exp $
+ *	$Id: machdep.c,v 1.252 1997/06/27 18:29:55 fsmp Exp $
  */
 
 #include "apm.h"
@@ -57,14 +57,11 @@
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
-#include <sys/file.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/mount.h>
 #include <sys/msgbuf.h>
 #include <sys/sysent.h>
-#include <sys/tty.h>
 #include <sys/sysctl.h>
 #include <sys/vmmeter.h>
 
@@ -93,7 +90,6 @@
 
 #include <sys/user.h>
 #include <sys/exec.h>
-#include <sys/vnode.h>
 
 #include <ddb/ddb.h>
 
@@ -103,12 +99,10 @@
 #include <machine/apm_bios.h>
 #endif
 #include <machine/cpu.h>
-#include <machine/npx.h>
 #include <machine/reg.h>
 #include <machine/psl.h>
 #include <machine/clock.h>
 #include <machine/specialreg.h>
-#include <machine/sysarch.h>
 #include <machine/cons.h>
 #include <machine/bootinfo.h>
 #include <machine/md_var.h>
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index c6eb954af0b..5ca32936261 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.44 1997/05/07 20:32:41 peter Exp $
+ *	$Id: mem.c,v 1.45 1997/06/02 08:19:03 dfr Exp $
  */
 
 /*
@@ -68,8 +68,6 @@
 #include <i386/isa/intr_machdep.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <sys/lock.h>
 #include <vm/vm_prot.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 3805c2aecbf..d3cbf2caf71 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,28 +22,23 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.30 1997/07/18 21:27:52 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
  */
 
 #include "opt_smp.h"
 
 #include <sys/param.h>		/* for KERNBASE */
-#include <sys/types.h>
-#include <sys/sysproto.h>
-#include <sys/time.h>
 #include <sys/systm.h>
 
 #include <vm/vm.h>		/* for KERNBASE */
 #include <vm/vm_param.h>	/* for KERNBASE */
 #include <vm/pmap.h>		/* for KERNBASE */
-#include <machine/pmap.h>	/* for KERNBASE */
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 
 #include <machine/smp.h>
 #include <machine/apic.h>
 #include <machine/mpapic.h>
-#include <machine/cpufunc.h>
 #include <machine/segments.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, APIC_PIN0_TIMER, TEST_TEST1 */
 #include <machine/tss.h>
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 3805c2aecbf..d3cbf2caf71 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,28 +22,23 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.30 1997/07/18 21:27:52 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
  */
 
 #include "opt_smp.h"
 
 #include <sys/param.h>		/* for KERNBASE */
-#include <sys/types.h>
-#include <sys/sysproto.h>
-#include <sys/time.h>
 #include <sys/systm.h>
 
 #include <vm/vm.h>		/* for KERNBASE */
 #include <vm/vm_param.h>	/* for KERNBASE */
 #include <vm/pmap.h>		/* for KERNBASE */
-#include <machine/pmap.h>	/* for KERNBASE */
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 
 #include <machine/smp.h>
 #include <machine/apic.h>
 #include <machine/mpapic.h>
-#include <machine/cpufunc.h>
 #include <machine/segments.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, APIC_PIN0_TIMER, TEST_TEST1 */
 #include <machine/tss.h>
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 17d926c77d8..83285b47647 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.148 1997/07/17 04:33:38 dyson Exp $
+ *	$Id: pmap.c,v 1.149 1997/07/17 19:45:01 dyson Exp $
  */
 
 /*
@@ -78,7 +78,6 @@
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/msgbuf.h>
-#include <sys/queue.h>
 #include <sys/vmmeter.h>
 #include <sys/mman.h>
 
@@ -97,14 +96,12 @@
 #include <sys/user.h>
 
 #include <machine/cpu.h>
-#include <machine/pcb.h>
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #if defined(SMP) || defined(APIC_IO)
 #include <machine/smp.h>
 #include <machine/apic.h>
-#include <machine/smptests.h>
 #endif /* SMP || APIC_IO */
 
 #define PMAP_KEEP_PDIRS
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index 9b0df296f7c..eec0f387d53 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.2 1997/07/15 00:12:55 smp Exp smp $
+ *	$Id: swtch.s,v 1.55 1997/07/15 02:51:20 fsmp Exp $
  */
 
 #include "npx.h"
@@ -42,7 +42,6 @@
 #include <sys/rtprio.h>
 
 #include <machine/asmacros.h>
-#include <machine/ipl.h>
 #include <machine/smptests.h>		/** TEST_LOPRIO */
 
 #ifdef SMP
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index ef8c023d87f..4fc52a27c52 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id$
+ *	$Id: sys_machdep.c,v 1.21 1997/02/22 09:32:53 peter Exp $
  *
  */
 
@@ -42,8 +42,6 @@
 #include <sys/proc.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 8914a5b9a12..6e8c0c36e5d 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.99 1997/06/07 04:36:10 bde Exp $
+ *	$Id: trap.c,v 1.100 1997/06/22 16:03:37 peter Exp $
  */
 
 /*
@@ -48,11 +48,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/acct.h>
 #include <sys/kernel.h>
 #include <sys/syscall.h>
 #include <sys/sysent.h>
-#include <sys/queue.h>
 #include <sys/vmmeter.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
@@ -74,8 +72,6 @@
 #include <machine/ipl.h>
 #include <machine/md_var.h>
 #include <machine/psl.h>
-#include <machine/reg.h>
-#include <machine/trap.h>
 #include <machine/../isa/intr_machdep.h>
 #include <machine/smp.h>
 
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index a41451e8bfb..23198d99012 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.82 1997/06/25 19:49:45 tegge Exp $
+ *	$Id: vm_machdep.c,v 1.83 1997/06/26 02:04:34 tegge Exp $
  */
 
 #include "npx.h"
@@ -54,12 +54,7 @@
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
-#include <machine/reg.h>
 #include <machine/md_var.h>
-#include <machine/npx.h>
-#ifdef SMP
-#include <machine/smp.h>
-#endif
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 3805c2aecbf..d3cbf2caf71 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,28 +22,23 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.30 1997/07/18 21:27:52 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
  */
 
 #include "opt_smp.h"
 
 #include <sys/param.h>		/* for KERNBASE */
-#include <sys/types.h>
-#include <sys/sysproto.h>
-#include <sys/time.h>
 #include <sys/systm.h>
 
 #include <vm/vm.h>		/* for KERNBASE */
 #include <vm/vm_param.h>	/* for KERNBASE */
 #include <vm/pmap.h>		/* for KERNBASE */
-#include <machine/pmap.h>	/* for KERNBASE */
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 
 #include <machine/smp.h>
 #include <machine/apic.h>
 #include <machine/mpapic.h>
-#include <machine/cpufunc.h>
 #include <machine/segments.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, APIC_PIN0_TIMER, TEST_TEST1 */
 #include <machine/tss.h>
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 8e0764b84e5..ebbbc23f63d 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.2 1997/07/08 23:40:04 smp Exp smp $
+ *	$Id: autoconf.c,v 1.70 1997/07/08 23:42:02 fsmp Exp $
  */
 
 /*
@@ -49,13 +49,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/conf.h>
-#include <sys/dmap.h>
 #include <sys/reboot.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
-#include <sys/vnode.h>
 #include <sys/sysctl.h>
 
 #include <machine/bootinfo.h>
@@ -106,7 +103,6 @@ static void	setroot __P((void));
 #include <sys/proc.h>
 #include <sys/stat.h>
 #include <machine/clock.h>
-#include <isofs/cd9660/iso.h>
 
 /*
  * XXX All this CD-ROM root stuff is fairly messy.  Ick.
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index b8aeb6315e1..5c5bcccd003 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_interface.c,v 1.10 1997/07/18 19:45:41 smp Exp smp $
+ *	$Id: db_interface.c,v 1.34 1997/07/18 21:27:52 fsmp Exp $
  */
 
 /*
@@ -31,8 +31,6 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
 #include <sys/reboot.h>
 
 #include <machine/cons.h>
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index d8d6962cacb..69a88e1b340 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -23,20 +23,17 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_trace.c,v 1.21 1997/04/26 11:45:04 peter Exp $
+ *	$Id: db_trace.c,v 1.22 1997/04/26 19:12:03 peter Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 
 #include <machine/md_var.h>
 #include <machine/segments.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <sys/lock.h>
-#include <vm/vm_prot.h>
 #include <vm/pmap.h>
 #include <ddb/ddb.h>
 
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
index bf834e536b6..991ff7be79d 100644
--- a/sys/i386/i386/exception.s
+++ b/sys/i386/i386/exception.s
@@ -30,18 +30,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.30 1997/06/22 16:03:02 peter Exp $
+ *	$Id: exception.s,v 1.31 1997/07/01 01:02:03 bde Exp $
  */
 
 #include "npx.h"				/* NNPX */
 #include "assym.s"				/* system defines */
-#include <sys/errno.h>				/* error return codes */
 #include <machine/ipl.h>			/* SWI_AST_MASK ... */
 #include <machine/psl.h>			/* PSL_I */
 #include <machine/trap.h>			/* trap codes */
-#include <sys/syscall.h>			/* syscall numbers */
 #include <machine/asmacros.h>			/* miscellaneous macros */
-#include <sys/cdefs.h>				/* CPP macros */
 
 #ifdef SMP
 #include <machine/apic.h>			/* for apic_vector.s */
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index 03752c6681f..5edb5e84018 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -36,24 +36,20 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.24 1997/06/02 18:55:44 peter Exp $
+ *	$Id: identcpu.c,v 1.25 1997/06/24 09:45:35 kato Exp $
  */
 
 #include "opt_cpu.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysproto.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
 #include <machine/asmacros.h>
 #include <machine/cpu.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
 #include <machine/clock.h>
 #include <machine/specialreg.h>
-#include <machine/sysarch.h>
 #include <machine/md_var.h>
 
 #include <i386/isa/intr_machdep.h>
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index e2ae0df7f36..57af04233a1 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.91 1997/07/15 11:07:32 kato Exp $
+ *	$Id: locore.s,v 1.92 1997/07/17 19:44:53 dyson Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -47,9 +47,7 @@
 #include "opt_cpu.h"
 #include "opt_ddb.h"
 #include "opt_userconfig.h"
-#include "opt_smp.h"
 
-#include <sys/errno.h>
 #include <sys/syscall.h>
 #include <sys/reboot.h>
 
@@ -59,10 +57,6 @@
 #include <machine/pmap.h>
 #include <machine/specialreg.h>
 
-#ifdef SMP
-#include <machine/apic.h>
-#endif /* SMP */
-
 #include "assym.s"
 
 /*
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 663fadbe598..7b53f5cdf99 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.251 1997/06/22 16:03:10 peter Exp $
+ *	$Id: machdep.c,v 1.252 1997/06/27 18:29:55 fsmp Exp $
  */
 
 #include "apm.h"
@@ -57,14 +57,11 @@
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
-#include <sys/file.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/mount.h>
 #include <sys/msgbuf.h>
 #include <sys/sysent.h>
-#include <sys/tty.h>
 #include <sys/sysctl.h>
 #include <sys/vmmeter.h>
 
@@ -93,7 +90,6 @@
 
 #include <sys/user.h>
 #include <sys/exec.h>
-#include <sys/vnode.h>
 
 #include <ddb/ddb.h>
 
@@ -103,12 +99,10 @@
 #include <machine/apm_bios.h>
 #endif
 #include <machine/cpu.h>
-#include <machine/npx.h>
 #include <machine/reg.h>
 #include <machine/psl.h>
 #include <machine/clock.h>
 #include <machine/specialreg.h>
-#include <machine/sysarch.h>
 #include <machine/cons.h>
 #include <machine/bootinfo.h>
 #include <machine/md_var.h>
diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c
index dcb20600fd9..a91946d2bc9 100644
--- a/sys/i386/i386/math_emulate.c
+++ b/sys/i386/i386/math_emulate.c
@@ -6,7 +6,7 @@
  * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj]
  *
  *	from: 386BSD 0.1
- *	$Id: math_emulate.c,v 1.22 1997/05/09 04:02:58 peter Exp $
+ *	$Id: math_emulate.c,v 1.23 1997/05/09 09:46:50 peter Exp $
  */
 
 /*
@@ -38,24 +38,12 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#ifdef LKM
-#include <sys/types.h>
-#include <sys/kernel.h>
-#include <sys/lkm.h>
-#endif
-
-#include <machine/cpu.h>
-#include <machine/psl.h>
 #include <machine/reg.h>
 
 #include <sys/proc.h>
-#include <sys/acct.h>
 #include <sys/kernel.h>
-#include <sys/signal.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index c6eb954af0b..5ca32936261 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.44 1997/05/07 20:32:41 peter Exp $
+ *	$Id: mem.c,v 1.45 1997/06/02 08:19:03 dfr Exp $
  */
 
 /*
@@ -68,8 +68,6 @@
 #include <i386/isa/intr_machdep.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <sys/lock.h>
 #include <vm/vm_prot.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 3805c2aecbf..d3cbf2caf71 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,28 +22,23 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.30 1997/07/18 21:27:52 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
  */
 
 #include "opt_smp.h"
 
 #include <sys/param.h>		/* for KERNBASE */
-#include <sys/types.h>
-#include <sys/sysproto.h>
-#include <sys/time.h>
 #include <sys/systm.h>
 
 #include <vm/vm.h>		/* for KERNBASE */
 #include <vm/vm_param.h>	/* for KERNBASE */
 #include <vm/pmap.h>		/* for KERNBASE */
-#include <machine/pmap.h>	/* for KERNBASE */
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 
 #include <machine/smp.h>
 #include <machine/apic.h>
 #include <machine/mpapic.h>
-#include <machine/cpufunc.h>
 #include <machine/segments.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, APIC_PIN0_TIMER, TEST_TEST1 */
 #include <machine/tss.h>
diff --git a/sys/i386/i386/mpapic.c b/sys/i386/i386/mpapic.c
index ce344786840..b342344c381 100644
--- a/sys/i386/i386/mpapic.c
+++ b/sys/i386/i386/mpapic.c
@@ -22,19 +22,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mpapic.c,v 1.13 1997/07/18 19:45:41 smp Exp smp $
+ *	$Id: mpapic.c,v 1.14 1997/07/18 21:27:53 fsmp Exp $
  */
 
 #include "opt_smp.h"
 
 #include <sys/types.h>
-#include <sys/sysproto.h>
 #include <sys/systm.h>
 
 #include <machine/smptests.h>	/** TEST_LOPRIO, TEST_IPI, TEST_ALTTIMER */
 #include <machine/smp.h>
 #include <machine/mpapic.h>
-#include <machine/cpufunc.h>
 #include <machine/segments.h>
 
 #include <i386/isa/intr_machdep.h>	/* Xspuriousint() */
diff --git a/sys/i386/i386/mplock.s b/sys/i386/i386/mplock.s
index ef6dd53b720..b278c9d6e83 100644
--- a/sys/i386/i386/mplock.s
+++ b/sys/i386/i386/mplock.s
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: mplock.s,v 1.9 1997/07/18 19:45:41 smp Exp smp $
+ * $Id: mplock.s,v 1.11 1997/07/18 21:27:53 fsmp Exp $
  *
  * Functions for locking between CPUs in a SMP system.
  *
@@ -21,17 +21,12 @@
  * 
  */
 
-
-#include "opt_ddb.h"
-#include "assym.s"			/* system definitions */
-#include <machine/specialreg.h>		/* x86 special registers */
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
 #include <machine/smptests.h>		/** TEST_LOPRIO */
 #include <machine/apic.h>
 
 #include <i386/isa/intr_machdep.h>
 
-
 /*
  * claim LOW PRIO, ie. accept ALL INTerrupts
  */
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 3805c2aecbf..d3cbf2caf71 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,28 +22,23 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.30 1997/07/18 21:27:52 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
  */
 
 #include "opt_smp.h"
 
 #include <sys/param.h>		/* for KERNBASE */
-#include <sys/types.h>
-#include <sys/sysproto.h>
-#include <sys/time.h>
 #include <sys/systm.h>
 
 #include <vm/vm.h>		/* for KERNBASE */
 #include <vm/vm_param.h>	/* for KERNBASE */
 #include <vm/pmap.h>		/* for KERNBASE */
-#include <machine/pmap.h>	/* for KERNBASE */
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 
 #include <machine/smp.h>
 #include <machine/apic.h>
 #include <machine/mpapic.h>
-#include <machine/cpufunc.h>
 #include <machine/segments.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, APIC_PIN0_TIMER, TEST_TEST1 */
 #include <machine/tss.h>
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 17d926c77d8..83285b47647 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.148 1997/07/17 04:33:38 dyson Exp $
+ *	$Id: pmap.c,v 1.149 1997/07/17 19:45:01 dyson Exp $
  */
 
 /*
@@ -78,7 +78,6 @@
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/msgbuf.h>
-#include <sys/queue.h>
 #include <sys/vmmeter.h>
 #include <sys/mman.h>
 
@@ -97,14 +96,12 @@
 #include <sys/user.h>
 
 #include <machine/cpu.h>
-#include <machine/pcb.h>
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #if defined(SMP) || defined(APIC_IO)
 #include <machine/smp.h>
 #include <machine/apic.h>
-#include <machine/smptests.h>
 #endif /* SMP || APIC_IO */
 
 #define PMAP_KEEP_PDIRS
diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c
index 7c408e88879..d8e60b9dd5d 100644
--- a/sys/i386/i386/procfs_machdep.c
+++ b/sys/i386/i386/procfs_machdep.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_machdep.c	8.3 (Berkeley) 1/27/94
  *
  * From:
- *	$Id$
+ *	$Id: procfs_machdep.c,v 1.9 1997/02/22 09:32:44 peter Exp $
  */
 
 /*
@@ -66,20 +66,14 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/vnode.h>
-#include <machine/psl.h>
 #include <machine/reg.h>
-#include <machine/frame.h>
 #include <machine/md_var.h>
 #include <miscfs/procfs/procfs.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index 9b0df296f7c..eec0f387d53 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.2 1997/07/15 00:12:55 smp Exp smp $
+ *	$Id: swtch.s,v 1.55 1997/07/15 02:51:20 fsmp Exp $
  */
 
 #include "npx.h"
@@ -42,7 +42,6 @@
 #include <sys/rtprio.h>
 
 #include <machine/asmacros.h>
-#include <machine/ipl.h>
 #include <machine/smptests.h>		/** TEST_LOPRIO */
 
 #ifdef SMP
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index ef8c023d87f..4fc52a27c52 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id$
+ *	$Id: sys_machdep.c,v 1.21 1997/02/22 09:32:53 peter Exp $
  *
  */
 
@@ -42,8 +42,6 @@
 #include <sys/proc.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_prot.h>
 #include <sys/lock.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 8914a5b9a12..6e8c0c36e5d 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.99 1997/06/07 04:36:10 bde Exp $
+ *	$Id: trap.c,v 1.100 1997/06/22 16:03:37 peter Exp $
  */
 
 /*
@@ -48,11 +48,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/acct.h>
 #include <sys/kernel.h>
 #include <sys/syscall.h>
 #include <sys/sysent.h>
-#include <sys/queue.h>
 #include <sys/vmmeter.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
@@ -74,8 +72,6 @@
 #include <machine/ipl.h>
 #include <machine/md_var.h>
 #include <machine/psl.h>
-#include <machine/reg.h>
-#include <machine/trap.h>
 #include <machine/../isa/intr_machdep.h>
 #include <machine/smp.h>
 
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index a41451e8bfb..23198d99012 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.82 1997/06/25 19:49:45 tegge Exp $
+ *	$Id: vm_machdep.c,v 1.83 1997/06/26 02:04:34 tegge Exp $
  */
 
 #include "npx.h"
@@ -54,12 +54,7 @@
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
-#include <machine/reg.h>
 #include <machine/md_var.h>
-#include <machine/npx.h>
-#ifdef SMP
-#include <machine/smp.h>
-#endif
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 3805c2aecbf..d3cbf2caf71 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,28 +22,23 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.30 1997/07/18 21:27:52 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
  */
 
 #include "opt_smp.h"
 
 #include <sys/param.h>		/* for KERNBASE */
-#include <sys/types.h>
-#include <sys/sysproto.h>
-#include <sys/time.h>
 #include <sys/systm.h>
 
 #include <vm/vm.h>		/* for KERNBASE */
 #include <vm/vm_param.h>	/* for KERNBASE */
 #include <vm/pmap.h>		/* for KERNBASE */
-#include <machine/pmap.h>	/* for KERNBASE */
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 
 #include <machine/smp.h>
 #include <machine/apic.h>
 #include <machine/mpapic.h>
-#include <machine/cpufunc.h>
 #include <machine/segments.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, APIC_PIN0_TIMER, TEST_TEST1 */
 #include <machine/tss.h>
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 3805c2aecbf..d3cbf2caf71 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,28 +22,23 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.30 1997/07/18 21:27:52 fsmp Exp $
+ *	$Id: mp_machdep.c,v 1.31 1997/07/19 04:00:35 fsmp Exp $
  */
 
 #include "opt_smp.h"
 
 #include <sys/param.h>		/* for KERNBASE */
-#include <sys/types.h>
-#include <sys/sysproto.h>
-#include <sys/time.h>
 #include <sys/systm.h>
 
 #include <vm/vm.h>		/* for KERNBASE */
 #include <vm/vm_param.h>	/* for KERNBASE */
 #include <vm/pmap.h>		/* for KERNBASE */
-#include <machine/pmap.h>	/* for KERNBASE */
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 
 #include <machine/smp.h>
 #include <machine/apic.h>
 #include <machine/mpapic.h>
-#include <machine/cpufunc.h>
 #include <machine/segments.h>
 #include <machine/smptests.h>	/** TEST_DEFAULT_CONFIG, APIC_PIN0_TIMER, TEST_TEST1 */
 #include <machine/tss.h>
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 8914a5b9a12..6e8c0c36e5d 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.99 1997/06/07 04:36:10 bde Exp $
+ *	$Id: trap.c,v 1.100 1997/06/22 16:03:37 peter Exp $
  */
 
 /*
@@ -48,11 +48,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/acct.h>
 #include <sys/kernel.h>
 #include <sys/syscall.h>
 #include <sys/sysent.h>
-#include <sys/queue.h>
 #include <sys/vmmeter.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
@@ -74,8 +72,6 @@
 #include <machine/ipl.h>
 #include <machine/md_var.h>
 #include <machine/psl.h>
-#include <machine/reg.h>
-#include <machine/trap.h>
 #include <machine/../isa/intr_machdep.h>
 #include <machine/smp.h>
 
-- 
2.45.2