Removed unused #includes.

39 files changed, 39 insertions, 178 deletions

diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 4c96903..7bc26e1 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -23,13 +23,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_aout.c,v 1.34 1997/04/13 01:48:21 dyson Exp $
+ *	$Id: imgact_aout.c,v 1.35 1997/08/26 00:02:23 bde Exp $
  */
 
-#include "opt_rlimit.h"
-
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/resourcevar.h>
 #include <sys/exec.h>
 #include <sys/mman.h>
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index 7d7643e..b588962 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: imgact_gzip.c,v 1.29 1997/04/13 01:48:22 dyson Exp $
+ * $Id: imgact_gzip.c,v 1.30 1997/08/26 00:02:24 bde Exp $
  *
  * This module handles execution of a.out files which have been run through
  * "gzip".  This saves diskspace, but wastes cpu-cycles and VM.
@@ -21,8 +21,6 @@
  *	tidy up unnecesary includes
  */
 
-#include "opt_rlimit.h"
-
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/imgact.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 4c4024a..1abc687 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,10 +39,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.69 1997/08/15 02:33:30 fsmp Exp $
+ * $Id: init_main.c,v 1.70 1997/08/26 18:10:37 peter Exp $
  */
 
-#include "opt_rlimit.h"
 #include "opt_devfs.h"
 
 #include <sys/param.h>
@@ -62,9 +61,6 @@
 #include <sys/vmmeter.h>
 
 #include <machine/cpu.h>
-#ifdef SMP
-#include <machine/smp.h>
-#endif /* SMP */
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index f72d2d0..65aa4fc 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_acct.c	8.1 (Berkeley) 6/14/93
- *	$Id: kern_acct.c,v 1.14 1997/03/23 03:36:17 bde Exp $
+ *	$Id: kern_acct.c,v 1.15 1997/03/24 11:24:34 bde Exp $
  */
 
 #include <sys/param.h>
@@ -52,7 +52,6 @@
 #include <sys/sysent.h>
 #include <sys/sysctl.h>
 #include <sys/namei.h>
-#include <sys/errno.h>
 #include <sys/acct.h>
 #include <sys/resourcevar.h>
 #include <sys/tty.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 05ce91c..03de315 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.37 1997/06/24 18:20:47 jhay Exp $
+ * $Id: kern_clock.c,v 1.38 1997/08/21 20:33:38 bde Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -68,8 +68,6 @@
 #include <sys/signalvar.h>
 #include <sys/timex.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/kern/kern_exec.c b/sys/kern/kern_exec.c
index 3bf808c..d1fbf72 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_exec.c,v 1.63 1997/04/23 22:07:05 ache Exp $
+ *	$Id: kern_exec.c,v 1.64 1997/08/04 05:39:24 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,6 @@
 #include <sys/malloc.h>
 #include <sys/namei.h>
 #include <sys/sysent.h>
-#include <sys/syslog.h>
 #include <sys/shm.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
@@ -59,8 +58,6 @@
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>
 
-#include <sys/user.h>
-
 #include <machine/reg.h>
 
 static int *exec_copyout_strings __P((struct image_params *));
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 9b568a3..7d326da 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.52 1997/08/21 20:33:38 bde Exp $
+ * $Id: kern_exit.c,v 1.53 1997/08/26 00:11:55 bde Exp $
  */
 
 #include "opt_ktrace.h"
@@ -44,17 +44,10 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
-#include <sys/sysent.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/kernel.h>
-#include <sys/buf.h>
 #include <sys/wait.h>
-#include <sys/file.h>
 #include <sys/vnode.h>
-#include <sys/syslog.h>
 #include <sys/malloc.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
@@ -73,11 +66,9 @@
 
 #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>
-#include <vm/vm_kern.h>
 
 static int wait1 __P((struct proc *, struct wait_args *, int [], int));
 
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 62ab7fc..ed2c7c6 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,12 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_malloc.c	8.3 (Berkeley) 1/4/94
- * $Id: kern_malloc.c,v 1.27 1997/06/24 09:41:00 davidg Exp $
+ * $Id: kern_malloc.c,v 1.28 1997/08/05 00:01:23 dyson Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index ac60e66..652c37a 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: kern_physio.c,v 1.20 1997/08/09 10:13:17 dyson Exp $
+ * $Id: kern_physio.c,v 1.21 1997/08/26 00:15:04 bde Exp $
  */
 
 #include <sys/param.h>
@@ -25,7 +25,6 @@
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/vm_extern.h>
 
 static void	physwakeup __P((struct buf *bp));
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 9d0be80..caaeb02 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_shutdown.c	8.3 (Berkeley) 1/21/94
- * $Id: kern_shutdown.c,v 1.21 1997/08/26 18:36:15 peter Exp $
+ * $Id: kern_shutdown.c,v 1.22 1997/08/31 23:08:38 bde Exp $
  */
 
 #include "opt_ddb.h"
@@ -46,12 +46,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
-#include <sys/msgbuf.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/tty.h>
-#include <sys/tprintf.h>
-#include <sys/syslog.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
@@ -67,7 +63,6 @@
 #include <machine/smp.h>		/* smp_active, cpuid */
 #endif
 
-#include <sys/utsname.h>
 #include <sys/signalvar.h>
 
 #ifndef PANIC_REBOOT_WAIT_TIME
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 957d391..b73503e 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
- * $Id: kern_sig.c,v 1.31 1997/03/23 03:36:21 bde Exp $
+ * $Id: kern_sig.c,v 1.32 1997/08/26 00:31:04 bde Exp $
  */
 
 #include "opt_ktrace.h"
@@ -50,12 +50,8 @@
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
-#include <sys/timeb.h>
-#include <sys/times.h>
-#include <sys/buf.h>
 #include <sys/acct.h>
 #include <sys/fcntl.h>
-#include <sys/kernel.h>
 #include <sys/wait.h>
 #include <sys/ktrace.h>
 #include <sys/syslog.h>
@@ -67,7 +63,6 @@
 /* All these for coredump() only. */
 #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/kern/kern_subr.c b/sys/kern/kern_subr.c
index 236824f..8596570 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -36,14 +36,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_subr.c	8.3 (Berkeley) 1/21/94
- * $Id: kern_subr.c,v 1.10 1997/02/22 09:39:11 peter Exp $
+ * $Id: kern_subr.c,v 1.11 1997/05/28 00:47:27 alex Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
-#include <sys/queue.h>
 
 int
 uiomove(cp, n, uio)
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 493c9c1..87d6244 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,24 +36,20 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_synch.c	8.9 (Berkeley) 5/19/95
- * $Id: kern_synch.c,v 1.36 1997/08/18 01:34:38 julian Exp $
+ * $Id: kern_synch.c,v 1.37 1997/08/21 20:33:39 bde Exp $
  */
 
 #include "opt_ktrace.h"
-#include "opt_smp.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
-#include <sys/buf.h>
 #include <sys/signalvar.h>
 #include <sys/resourcevar.h>
-#include <sys/signalvar.h>
 #include <sys/vmmeter.h>
 #include <sys/sysctl.h>
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/vm_extern.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 05ce91c..03de315 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.37 1997/06/24 18:20:47 jhay Exp $
+ * $Id: kern_clock.c,v 1.38 1997/08/21 20:33:38 bde Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -68,8 +68,6 @@
 #include <sys/signalvar.h>
 #include <sys/timex.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/kern/kern_threads.c b/sys/kern/kern_threads.c
index 1e0b659..93a2290 100644
--- a/sys/kern/kern_threads.c
+++ b/sys/kern/kern_threads.c
@@ -46,26 +46,14 @@
  * in Germany will I accept domestic beer.  This code may or may not work
  * and I certainly make no claims as to its fitness for *any* purpose.
  * 
- * $Id: kern_threads.c,v 1.1 1997/06/16 00:27:26 dyson Exp $
+ * $Id: kern_threads.c,v 1.2 1997/07/06 02:40:42 dyson Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/filedesc.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/proc.h>
-#include <sys/resourcevar.h>
-#include <sys/vnode.h>
-#include <sys/file.h>
-#include <sys/acct.h>
-#include <sys/ktrace.h>
 #include <sys/sysproto.h>
-#include <sys/unistd.h>
-
-#include <vm/vm.h>
-
-#include <machine/cpu.h>
 
 /*
  * Low level support for sleep/wakeup paradigm
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index f84e9bb..8b68ea0 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_time.c	8.1 (Berkeley) 6/10/93
- * $Id: kern_time.c,v 1.32 1997/08/14 08:15:12 ache Exp $
+ * $Id: kern_time.c,v 1.33 1997/08/26 00:40:04 bde Exp $
  */
 
 #include <sys/param.h>
@@ -42,11 +42,9 @@
 #include <sys/systm.h>
 #include <sys/sysent.h>
 #include <sys/proc.h>
-#include <sys/signal.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/vm_extern.h>
 
 struct timezone tz;
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 05ce91c..03de315 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.37 1997/06/24 18:20:47 jhay Exp $
+ * $Id: kern_clock.c,v 1.38 1997/08/21 20:33:38 bde Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -68,8 +68,6 @@
 #include <sys/signalvar.h>
 #include <sys/timex.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/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 44e01b0..28c7768 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,7 +43,7 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: subr_diskslice.c,v 1.35 1997/02/22 09:39:15 peter Exp $
+ *	$Id: subr_diskslice.c,v 1.36 1997/03/24 11:24:37 bde Exp $
  */
 
 #include <sys/param.h>
@@ -62,7 +62,6 @@
 #include <sys/systm.h>
 #include <sys/vnode.h>
 
-#include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 
 #define TRACE(str)	do { if (ds_debug) printf str; } while (0)
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 4b3ed36..a76cf7d 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -36,11 +36,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $Id: subr_prf.c,v 1.41 1997/02/22 09:39:17 peter Exp $
  */
 
-#include "opt_ddb.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/msgbuf.h>
diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c
index ef29ce3..dead1a6 100644
--- a/sys/kern/subr_rlist.c
+++ b/sys/kern/subr_rlist.c
@@ -54,16 +54,13 @@
  * functioning of this software, nor does the author assume any responsibility
  * for damages incurred with its use.
  *
- *	$Id$
+ *	$Id: subr_rlist.c,v 1.21 1997/02/22 09:39:18 peter Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/rlist.h>
-#include <sys/proc.h>
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 4f0cc23..aea2165 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
- * $Id: sys_generic.c,v 1.26 1997/03/24 11:52:25 bde Exp $
+ * $Id: sys_generic.c,v 1.27 1997/06/16 00:29:31 dyson Exp $
  */
 
 #include "opt_ktrace.h"
@@ -50,18 +50,14 @@
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/proc.h>
-#include <sys/stat.h>
 #include <sys/signalvar.h>
-#include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
-#include <sys/stat.h>
 #include <sys/malloc.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
-#include <vm/vm.h>
 
 static int	selscan __P((struct proc *, fd_mask **, fd_mask **, int, int *));
 
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index cbf180f..35394dc 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: sys_pipe.c,v 1.30 1997/08/05 00:05:00 dyson Exp $
+ * $Id: sys_pipe.c,v 1.31 1997/08/05 22:24:17 dyson Exp $
  */
 
 /*
@@ -54,19 +54,11 @@
 #include <sys/proc.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
-#include <sys/protosw.h>
-#include <sys/stat.h>
 #include <sys/filedesc.h>
-#include <sys/malloc.h>
 #include <sys/filio.h>
 #include <sys/ttycom.h>
 #include <sys/stat.h>
-#include <sys/select.h>
 #include <sys/signalvar.h>
-#include <sys/errno.h>
-#include <sys/queue.h>
-#include <sys/vmmeter.h>
-#include <sys/kernel.h>
 #include <sys/sysproto.h>
 #include <sys/pipe.h>
 
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 05ad9ca..364fc9b 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sys_process.c,v 1.28 1997/04/27 19:02:34 alex Exp $
+ *	$Id: sys_process.c,v 1.29 1997/04/27 21:26:29 alex Exp $
  */
 
 #include <sys/param.h>
@@ -37,20 +37,14 @@
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/ptrace.h>
-#include <sys/errno.h>
-#include <sys/queue.h>
 
 #include <machine/reg.h>
-#include <machine/psl.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>
-#include <vm/vm_object.h>
 #include <vm/vm_page.h>
-#include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 
 #include <sys/user.h>
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index f6e14f9..0c023ea 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.93 1997/03/23 03:36:26 bde Exp $
+ * $Id: tty.c,v 1.94 1997/03/24 12:02:59 bde Exp $
  */
 
 /*-
@@ -83,10 +83,8 @@
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
-#include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
-#include <sys/syslog.h>
 #include <sys/signalvar.h>
 #include <sys/resourcevar.h>
 #include <sys/malloc.h>
@@ -95,8 +93,6 @@
 #endif
 
 #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/kern/tty_pty.c b/sys/kern/tty_pty.c
index f721b41..cc46c2a 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
- * $Id: tty_pty.c,v 1.43 1997/03/24 12:03:06 bde Exp $
+ * $Id: tty_pty.c,v 1.44 1997/07/30 10:05:18 jmg Exp $
  */
 
 /*
@@ -49,7 +49,6 @@
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
-#include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/signalvar.h>
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index be164d5..bc0de91 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,14 +31,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_tty.c,v 1.15 1997/03/23 03:36:30 bde Exp $
+ * $Id: tty_tty.c,v 1.16 1997/03/24 11:24:38 bde Exp $
  */
 
 /*
  * Indirect driver for controlling tty.
  */
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index b20b9ee..5059cd5 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -31,15 +31,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- *	$Id: uipc_socket2.c,v 1.26 1997/07/19 20:15:35 fenner Exp $
+ *	$Id: uipc_socket2.c,v 1.27 1997/08/16 19:15:05 wollman Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 46ac263..cd8830d 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -31,11 +31,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
- *	$Id: uipc_socket.c,v 1.28 1997/08/16 19:15:04 wollman Exp $
+ *	$Id: uipc_socket.c,v 1.29 1997/08/21 20:33:39 bde Exp $
  */
 
 #include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/fcntl.h>
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index b20b9ee..5059cd5 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -31,15 +31,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- *	$Id: uipc_socket2.c,v 1.26 1997/07/19 20:15:35 fenner Exp $
+ *	$Id: uipc_socket2.c,v 1.27 1997/08/16 19:15:05 wollman Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index f8275d5..8b18787 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_syscalls.c	8.4 (Berkeley) 2/21/94
- * $Id: uipc_syscalls.c,v 1.27 1997/08/16 19:15:06 wollman Exp $
+ * $Id: uipc_syscalls.c,v 1.29 1997/08/17 19:47:28 wollman Exp $
  */
 
 #include "opt_ktrace.h"
@@ -43,15 +43,12 @@
 #include <sys/proc.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
-#include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
-#include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/signalvar.h>
-#include <sys/un.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index a18798d..4bc70096 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,11 +31,10 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
- *	$Id: uipc_usrreq.c,v 1.24 1997/08/16 19:15:06 wollman Exp $
+ *	$Id: uipc_usrreq.c,v 1.25 1997/09/02 01:18:23 bde Exp $
  */
 
 #include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/domain.h>
@@ -52,7 +51,6 @@
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/un.h>
-#include <sys/unpcb.h>
 #include <sys/vnode.h>
 
 /*
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 26a79476..e1ed37b 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: vfs_aio.c,v 1.2 1997/07/06 02:40:43 dyson Exp $
+ * $Id: vfs_aio.c,v 1.3 1997/07/17 04:49:31 dyson Exp $
  */
 
 /*
@@ -31,31 +31,23 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sysent.h>
 #include <sys/sysproto.h>
-#include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
-#include <sys/stat.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
-#include <sys/dirent.h>
 #include <sys/signalvar.h>
-#include <sys/queue.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
-#include <vm/vm_object.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
-#include <sys/sysctl.h>
 #include <sys/aio.h>
 #include <sys/shm.h>
 
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index f4f52bb..18c4b8b 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -34,18 +34,16 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cache.c	8.5 (Berkeley) 3/22/95
- * $Id: vfs_cache.c,v 1.27 1997/08/26 07:32:34 phk Exp $
+ * $Id: vfs_cache.c,v 1.28 1997/08/31 07:32:13 phk Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/time.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
-#include <sys/errno.h>
 #include <sys/malloc.h>
 
 
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 6358781..f4e4885 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.95 1997/08/26 11:59:20 bde Exp $
+ * $Id: vfs_subr.c,v 1.96 1997/08/31 07:32:14 phk Exp $
  */
 
 /*
@@ -48,28 +48,20 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
-#include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/stat.h>
-#include <sys/namei.h>
-#include <sys/ucred.h>
 #include <sys/buf.h>
-#include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/domain.h>
-#include <sys/mbuf.h>
 #include <sys/dirent.h>
 
 #include <machine/limits.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
-#include <vm/vm_pager.h>
 #include <vm/vnode_pager.h>
 #include <sys/sysctl.h>
 
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 03576ec..e28f93b 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.65 1997/04/04 17:47:41 dfr Exp $
+ * $Id: vfs_syscalls.c,v 1.66 1997/07/17 07:17:33 dfr Exp $
  */
 
 /*
@@ -62,7 +62,6 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
-#include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/dirent.h>
 
@@ -71,7 +70,6 @@
 #endif
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
 #include <sys/sysctl.h>
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 4c10a2f..97a29d6 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -36,19 +36,16 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_lookup.c	8.4 (Berkeley) 2/16/94
- * $Id: vfs_lookup.c,v 1.17 1997/04/04 17:46:13 dfr Exp $
+ * $Id: vfs_lookup.c,v 1.18 1997/04/04 17:47:43 dfr Exp $
  */
 
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/syslimits.h>
-#include <sys/time.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
-#include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/filedesc.h>
 #include <sys/proc.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 6358781..f4e4885 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.95 1997/08/26 11:59:20 bde Exp $
+ * $Id: vfs_subr.c,v 1.96 1997/08/31 07:32:14 phk Exp $
  */
 
 /*
@@ -48,28 +48,20 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
-#include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/stat.h>
-#include <sys/namei.h>
-#include <sys/ucred.h>
 #include <sys/buf.h>
-#include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/domain.h>
-#include <sys/mbuf.h>
 #include <sys/dirent.h>
 
 #include <machine/limits.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
-#include <vm/vm_pager.h>
 #include <vm/vnode_pager.h>
 #include <sys/sysctl.h>
 
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 03576ec..e28f93b 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.65 1997/04/04 17:47:41 dfr Exp $
+ * $Id: vfs_syscalls.c,v 1.66 1997/07/17 07:17:33 dfr Exp $
  */
 
 /*
@@ -62,7 +62,6 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
-#include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/dirent.h>
 
@@ -71,7 +70,6 @@
 #endif
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
 #include <sys/sysctl.h>
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index a294cdd..4c655564 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,16 +36,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
- * $Id: vfs_vnops.c,v 1.35 1997/04/04 17:46:21 dfr Exp $
+ * $Id: vfs_vnops.c,v 1.36 1997/04/04 17:47:40 dfr Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/stat.h>
-#include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
@@ -53,11 +51,6 @@
 #include <sys/filio.h>
 #include <sys/ttycom.h>
 
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_object.h>
-#include <vm/vnode_pager.h>
-
 static int vn_closefile __P((struct file *fp, struct proc *p));
 static int vn_ioctl __P((struct file *fp, int com, caddr_t data, 
 		struct proc *p));