From e5b19842ef2f7cc2fedb3c37b2a98796d5739f1d Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sun, 21 Jun 1998 14:53:44 +0000
Subject: [PATCH] Removed unused includes.

---
 sys/dev/ar/if_ar.c             |  4 +---
 sys/dev/ar/if_ar_isa.c         |  4 +---
 sys/dev/sr/if_sr.c             |  4 +---
 sys/dev/sr/if_sr_isa.c         |  4 +---
 sys/gnu/ext2fs/ext2_alloc.c    |  1 -
 sys/gnu/fs/ext2fs/ext2_alloc.c |  1 -
 sys/i386/i386/mplock.s         |  5 +----
 sys/i386/isa/aha1542.c         |  4 +---
 sys/i386/isa/aic6360.c         |  4 +---
 sys/i386/isa/if_ar.c           |  4 +---
 sys/i386/isa/if_sr.c           |  4 +---
 sys/i386/isa/ncr5380.c         |  2 --
 sys/i386/isa/wd7000.c          |  2 --
 sys/kern/uipc_proto.c          |  3 +--
 sys/miscfs/devfs/devfs_tree.c  |  4 +---
 sys/net/if_fddisubr.c          |  3 +--
 sys/net/if_spppsubr.c          |  3 +--
 sys/netinet/ip_flow.c          | 10 +---------
 sys/netinet/ip_fw.c            |  3 +--
 sys/netinet/ip_output.c        |  3 +--
 sys/pci/if_tl.c                | 27 ++-------------------------
 sys/ufs/ufs/ufs_quota.c        |  3 +--
 sys/vm/vm_kern.c               |  3 +--
 sys/vm/vm_map.c                |  4 +---
 sys/vm/vm_object.c             |  3 +--
 25 files changed, 22 insertions(+), 90 deletions(-)

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 7eaca7065537..964684ef3b76 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.19 1998/06/07 17:10:24 dfr Exp $
+ * $Id: if_ar.c,v 1.20 1998/06/17 13:54:56 bde Exp $
  */
 
 /*
@@ -72,8 +72,6 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/isa_device.h>
 
-#include "ioconf.h"
-
 #include "sppp.h"
 #if NSPPP <= 0
 #error device 'ar' require sppp.
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 7eaca7065537..964684ef3b76 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.19 1998/06/07 17:10:24 dfr Exp $
+ * $Id: if_ar.c,v 1.20 1998/06/17 13:54:56 bde Exp $
  */
 
 /*
@@ -72,8 +72,6 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/isa_device.h>
 
-#include "ioconf.h"
-
 #include "sppp.h"
 #if NSPPP <= 0
 #error device 'ar' require sppp.
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 58f4ae6a9a17..236bb42f0d1d 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.13 1998/06/07 17:10:37 dfr Exp $
+ * $Id: if_sr.c,v 1.14 1998/06/17 13:54:56 bde Exp $
  */
 
 /*
@@ -81,8 +81,6 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/isa_device.h>
 
-#include "ioconf.h"
-
 /* #define USE_MODEMCK */
 
 #ifndef BUGGY
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 58f4ae6a9a17..236bb42f0d1d 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.13 1998/06/07 17:10:37 dfr Exp $
+ * $Id: if_sr.c,v 1.14 1998/06/17 13:54:56 bde Exp $
  */
 
 /*
@@ -81,8 +81,6 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/isa_device.h>
 
-#include "ioconf.h"
-
 /* #define USE_MODEMCK */
 
 #ifndef BUGGY
diff --git a/sys/gnu/ext2fs/ext2_alloc.c b/sys/gnu/ext2fs/ext2_alloc.c
index 5ac3ba9bd3d5..a60f97a2c0df 100644
--- a/sys/gnu/ext2fs/ext2_alloc.c
+++ b/sys/gnu/ext2fs/ext2_alloc.c
@@ -46,7 +46,6 @@
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 
 #include <ufs/ufs/quota.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c
index 5ac3ba9bd3d5..a60f97a2c0df 100644
--- a/sys/gnu/fs/ext2fs/ext2_alloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_alloc.c
@@ -46,7 +46,6 @@
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
 
 #include <ufs/ufs/quota.h>
diff --git a/sys/i386/i386/mplock.s b/sys/i386/i386/mplock.s
index dd9a8e47f253..fe8281dc50f6 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.23 1997/08/30 08:08:10 fsmp Exp $
+ * $Id: mplock.s,v 1.24 1998/05/17 23:08:04 tegge Exp $
  *
  * Functions for locking between CPUs in a SMP system.
  *
@@ -25,9 +25,6 @@
 #include <machine/smptests.h>		/** GRAB_LOPRIO */
 #include <machine/apic.h>
 
-#include <i386/isa/intr_machdep.h>
-
-
 #define GLPROFILE_NOT
 
 #ifdef CHEAP_TPR
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 47b912befb3b..918c069450aa 100644
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: aha1542.c,v 1.76 1998/04/17 22:36:29 des Exp $
+ *      $Id: aha1542.c,v 1.77 1998/05/01 18:30:00 bde Exp $
  */
 
 /*
@@ -39,8 +39,6 @@
 
 #include <i386/isa/isa_device.h>
 
-#include "ioconf.h"
-
 /************************** board definitions *******************************/
 
 /*
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c
index 98eebca91d7d..2b28abcebcd5 100644
--- a/sys/i386/isa/aic6360.c
+++ b/sys/i386/isa/aic6360.c
@@ -32,7 +32,7 @@
  */
 
 /*
- * $Id: aic6360.c,v 1.39 1998/04/12 12:11:31 phk Exp $
+ * $Id: aic6360.c,v 1.40 1998/04/15 17:45:12 bde Exp $
  *
  * Acknowledgements: Many of the algorithms used in this driver are
  * inspired by the work of Julian Elischer (julian@tfs.com) and
@@ -131,8 +131,6 @@
 #endif /* NAPM > 0 */
 #include <i386/isa/isa_device.h>
 
-#include "ioconf.h"
-
 /* Definitions, most of them has turned out to be unneccesary, but here they
  * are anyway.
  */
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index 7eaca7065537..964684ef3b76 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.19 1998/06/07 17:10:24 dfr Exp $
+ * $Id: if_ar.c,v 1.20 1998/06/17 13:54:56 bde Exp $
  */
 
 /*
@@ -72,8 +72,6 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/isa_device.h>
 
-#include "ioconf.h"
-
 #include "sppp.h"
 #if NSPPP <= 0
 #error device 'ar' require sppp.
diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index 58f4ae6a9a17..236bb42f0d1d 100644
--- a/sys/i386/isa/if_sr.c
+++ b/sys/i386/isa/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.13 1998/06/07 17:10:37 dfr Exp $
+ * $Id: if_sr.c,v 1.14 1998/06/17 13:54:56 bde Exp $
  */
 
 /*
@@ -81,8 +81,6 @@
 #include <i386/isa/ic/hd64570.h>
 #include <i386/isa/isa_device.h>
 
-#include "ioconf.h"
-
 /* #define USE_MODEMCK */
 
 #ifndef BUGGY
diff --git a/sys/i386/isa/ncr5380.c b/sys/i386/isa/ncr5380.c
index a5383114f1cf..e8978372bd01 100644
--- a/sys/i386/isa/ncr5380.c
+++ b/sys/i386/isa/ncr5380.c
@@ -48,8 +48,6 @@
 
 #include <scsi/scsiconf.h>
 
-#include "ioconf.h"
-
 #ifdef DEBUG
 #   define PRINT(s)     printf s
 #else
diff --git a/sys/i386/isa/wd7000.c b/sys/i386/isa/wd7000.c
index f1c9bdf7879f..0dc3829d50c2 100644
--- a/sys/i386/isa/wd7000.c
+++ b/sys/i386/isa/wd7000.c
@@ -63,8 +63,6 @@
 
 #include <i386/isa/isa_device.h>
 
-#include "ioconf.h"
-
 static struct scsi_device wds_dev =
 {
  	NULL,
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index ec2b9f04ad02..d87e14826b09 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_proto.c	8.1 (Berkeley) 6/10/93
- * $Id: uipc_proto.c,v 1.14 1998/02/20 13:11:48 bde Exp $
+ * $Id: uipc_proto.c,v 1.15 1998/05/15 20:11:29 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -41,7 +41,6 @@
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/un.h>
-#include <sys/unpcb.h>
 
 #include <net/raw_cb.h>
 
diff --git a/sys/miscfs/devfs/devfs_tree.c b/sys/miscfs/devfs/devfs_tree.c
index 2e301e6991aa..0fe76be98b7a 100644
--- a/sys/miscfs/devfs/devfs_tree.c
+++ b/sys/miscfs/devfs/devfs_tree.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_tree.c,v 1.52 1998/04/19 23:32:09 julian Exp $
+ *	$Id: devfs_tree.c,v 1.53 1998/04/20 03:57:35 julian Exp $
  */
 
 
@@ -41,11 +41,9 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
-#include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/devfsext.h>
 
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 823bf4d2db12..67b7af1eabf9 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
- * $Id: if_fddisubr.c,v 1.31 1998/06/12 03:48:08 julian Exp $
+ * $Id: if_fddisubr.c,v 1.32 1998/06/14 20:58:14 julian Exp $
  */
 
 #include "opt_atalk.h"
@@ -42,7 +42,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 32e2fc97b15e..c20af40f6de9 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -17,7 +17,7 @@
  *
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
  *
- * $Id: if_spppsubr.c,v 1.38 1998/04/06 11:40:17 phk Exp $
+ * $Id: if_spppsubr.c,v 1.39 1998/05/17 11:53:14 phk Exp $
  */
 
 #include "opt_inet.h"
@@ -29,7 +29,6 @@
 #include <sys/sockio.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
-#include <machine/random.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/md5.h>
diff --git a/sys/netinet/ip_flow.c b/sys/netinet/ip_flow.c
index fd13a99c67bc..b9a000ce532b 100644
--- a/sys/netinet/ip_flow.c
+++ b/sys/netinet/ip_flow.c
@@ -33,33 +33,25 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ip_flow.c,v 1.3 1998/05/19 15:53:47 pb Exp $
+ * $Id: ip_flow.c,v 1.4 1998/05/19 17:47:11 jdp Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <sys/time.h>
 #include <sys/kernel.h>
-#include <sys/proc.h>
 
-#include <vm/vm.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <netinet/in_pcb.h>
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_flow.h>
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index 71b20b710ebb..2ea98b763995 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -12,7 +12,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_fw.c,v 1.88 1998/06/06 20:45:26 julian Exp $
+ *	$Id: ip_fw.c,v 1.89 1998/06/12 20:03:26 julian Exp $
  */
 
 /*
@@ -36,7 +36,6 @@
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
-#include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index e9d52fd80cf9..c142887cd9bf 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,12 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- *	$Id: ip_output.c,v 1.73 1998/06/14 20:58:17 julian Exp $
+ *	$Id: ip_output.c,v 1.74 1998/06/15 00:35:47 julian Exp $
  */
 
 #define _IP_VHL
 
-#include "opt_ipfw.h"
 #include "opt_ipdivert.h"
 #include "opt_ipfilter.h"
 
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index ff49040ec7d5..19ed498c63a5 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tl.c,v 1.8 1998/05/31 16:59:39 wpaul Exp $
+ *	$Id: if_tl.c,v 1.9 1998/06/07 17:12:38 dfr Exp $
  */
 
 /*
@@ -195,41 +195,18 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
-#include <sys/syslog.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
-#include <net/if_mib.h>
 #include <net/if_media.h>
-#include <net/if_types.h>
-
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-#endif
-
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
-#include <net/bpfdesc.h>
 #endif
 
 #include <vm/vm.h>              /* for vtophys */
-#include <vm/vm_param.h>        /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
 #include <machine/clock.h>      /* for DELAY */
 
@@ -240,7 +217,7 @@
 
 #ifndef lint
 static char rcsid[] =
-	"$Id: if_tl.c,v 1.8 1998/05/31 16:59:39 wpaul Exp $";
+	"$Id: if_tl.c,v 1.9 1998/06/07 17:12:38 dfr Exp $";
 #endif
 
 /*
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 26de09b56395..b899ebe55788 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -34,11 +34,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_quota.c	8.5 (Berkeley) 5/20/95
- * $Id: ufs_quota.c,v 1.21 1998/03/30 09:56:27 phk Exp $
+ * $Id: ufs_quota.c,v 1.22 1998/06/04 17:03:16 dfr Exp $
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/malloc.h>
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index ffe110d44d41..6a71c87fa21b 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.c,v 1.46 1998/03/01 04:18:20 dyson Exp $
+ * $Id: vm_kern.c,v 1.47 1998/06/05 21:48:45 dg Exp $
  */
 
 /*
@@ -72,7 +72,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
-#include <sys/syslog.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 44fc57f99df2..c28c2892ebdf 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.c,v 1.127 1998/05/21 07:47:55 dyson Exp $
+ * $Id: vm_map.c,v 1.128 1998/06/07 17:13:10 dfr Exp $
  */
 
 /*
@@ -74,9 +74,7 @@
 #include <sys/proc.h>
 #include <sys/vmmeter.h>
 #include <sys/mman.h>
-#include <sys/buf.h>
 #include <sys/vnode.h>
-#include <sys/mount.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 550dc44dfab5..cdc60a62f3e3 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.c,v 1.121 1998/05/21 07:47:58 dyson Exp $
+ * $Id: vm_object.c,v 1.122 1998/06/07 17:13:12 dfr Exp $
  */
 
 /*
@@ -79,7 +79,6 @@
 #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>