From 39e4376ba79d20f9d1b73397d4f20f4e2b0aef25 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Fri, 20 Feb 1998 13:11:54 +0000
Subject: [PATCH] Removed unused #includes.

---
 sys/amd64/amd64/busdma_machdep.c |  3 +--
 sys/dev/de/if_de.c               |  4 +---
 sys/dev/dpt/dpt_control.c        | 13 +------------
 sys/dev/dpt/dpt_pci.c            | 10 +---------
 sys/dev/dpt/dpt_scsi.c           | 12 +-----------
 sys/dev/fxp/if_fxp.c             |  8 +-------
 sys/dev/pdq/if_fea.c             |  9 +--------
 sys/dev/pdq/if_fpa.c             |  9 +--------
 sys/dev/pdq/pdq_ifsubr.c         |  4 +---
 sys/dev/vx/if_vx.c               |  6 ------
 sys/dev/vx/if_vx_eisa.c          | 12 ------------
 sys/dev/vx/if_vx_pci.c           | 13 -------------
 sys/dev/wl/if_wl.c               |  4 +---
 sys/fs/msdosfs/msdosfs_fat.c     |  3 +--
 sys/i386/eisa/if_fea.c           |  9 +--------
 sys/i386/eisa/if_vx_eisa.c       | 12 ------------
 sys/i386/i386/busdma_machdep.c   |  3 +--
 sys/i386/isa/if_wl.c             |  4 +---
 sys/kern/imgact_aout.c           |  4 +---
 sys/kern/uipc_proto.c            |  3 +--
 sys/msdosfs/msdosfs_fat.c        |  3 +--
 sys/net/if_ethersubr.c           |  5 +----
 sys/net/if_fddisubr.c            |  4 +---
 sys/pci/dpt_pci.c                | 10 +---------
 sys/pci/if_de.c                  |  4 +---
 sys/pci/if_fpa.c                 |  9 +--------
 sys/pci/if_fxp.c                 |  8 +-------
 sys/pci/if_vx_pci.c              | 13 -------------
 sys/vm/vm_map.c                  |  3 +--
 29 files changed, 24 insertions(+), 180 deletions(-)

diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index 1ed19890f58..6e7faacac80 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -23,13 +23,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: busdma_machdep.c,v 1.2 1998/02/04 22:32:07 eivind Exp $
+ *      $Id: busdma_machdep.c,v 1.3 1998/02/06 12:13:04 eivind Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/queue.h>
 
 #include <vm/vm.h>
 #include <vm/vm_prot.h>
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index c01f608129e..1cfaeba29de 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.56 1997/10/20 14:32:46 matt Exp $	*/
-/*	$Id: if_de.c,v 1.78 1998/02/04 22:33:24 eivind Exp $ */
+/*	$Id: if_de.c,v 1.79 1998/02/06 12:14:08 eivind Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -101,8 +101,6 @@
 #if defined(__FreeBSD__)
 #include <vm/pmap.h>
 #include <pci.h>
-#include <net/ethernet.h>
-#include <net/if_arp.h>
 #if NPCI > 0
 #include <pci/pcivar.h>
 #include <pci/dc21040reg.h>
diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c
index e5d04ab9d48..3015a37ef25 100644
--- a/sys/dev/dpt/dpt_control.c
+++ b/sys/dev/dpt/dpt_control.c
@@ -36,36 +36,25 @@
  * future.
  */
 
-#ident "$Id: dpt_control.c,v 1.1 1998/01/26 06:11:17 julian Exp $"
+#ident "$Id: dpt_control.c,v 1.2 1998/02/10 17:36:43 eivind Exp $"
 
 #include "opt_dpt.h"
 
-#include <sys/types.h>
-/* #include <i386/isa/isa.h> */
 #include <i386/include/cputypes.h>
-#include <i386/isa/timerreg.h>
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/resourcevar.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <sys/conf.h>
-#include <machine/clock.h>
-#include <machine/speaker.h>
-#include <machine/cpu.h>
-#include <machine/cpufunc.h>
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
-#include <scsi/scsi_all.h>
-#include <scsi/scsi_message.h>
 #include <scsi/scsiconf.h>
 
 #include <sys/dpt.h>
-#include <sys/queue.h>
 
 #define INLINE __inline
 
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index a818831654c..1899d6038b3 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -34,34 +34,26 @@
  *  caveats:   We may need an eisa and an isa files too
  */
 
-#ident "$Id: dpt_pci.c,v 1.2 1998/02/09 02:31:47 eivind Exp $"
+#ident "$Id: dpt_pci.c,v 1.3 1998/02/10 17:36:41 eivind Exp $"
 
 #include "opt_devfs.h"
 #include "opt_dpt.h"
-#include <pci.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/kernel.h>
 
-#include <scsi/scsi_all.h>
-#include <scsi/scsi_message.h>
 #include <scsi/scsiconf.h>
 
 #include <pci/pcireg.h>
-#include <sys/queue.h>
 #include <pci/pcivar.h>
 
 #include <sys/dpt.h>
 #include <pci/dpt_pci.h>
 
-#include <machine/clock.h>
-
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/pmap.h>
 
 #define PCI_BASEADR0  PCI_MAP_REG_START  /* I/O Address */
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index 3d077ce3154..df99dee82ab 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -64,35 +64,25 @@
  *       3.  dpt_handle_timeouts   potentially inserts into the queue
  */
 
-#ident "$Id: dpt_scsi.c,v 1.1 1998/01/26 06:11:17 julian Exp $"
+#ident "$Id: dpt_scsi.c,v 1.2 1998/02/10 17:36:44 eivind Exp $"
 #define _DPT_C_
 
 #include "opt_dpt.h"
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/time.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/kernel.h>
-#include <sys/acct.h>
-#include <sys/queue.h>
 
-#include <machine/endian.h>
 #include <machine/ipl.h>
-#include <scsi/scsi_all.h>
-#include <scsi/scsi_message.h>
 #include <scsi/scsiconf.h>
 #include <scsi/scsi_disk.h>
 
 #include <machine/clock.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#include <sys/reboot.h>
-
 #include <sys/dpt.h>
 
 #ifdef INLINE
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 2e48cc9fa03..bd934651178 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.47 1998/01/08 23:42:29 eivind Exp $
+ *	$Id: if_fxp.c,v 1.48 1998/02/09 06:10:51 eivind Exp $
  */
 
 /*
@@ -35,7 +35,6 @@
  */
 
 #include "bpfilter.h"
-#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,11 +47,6 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#endif
-
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index 2cf06a04e2f..b13b18fb762 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fea.c,v 1.7 1997/09/21 21:35:24 gibbs Exp $
+ * $Id: if_fea.c,v 1.8 1998/01/08 23:40:33 eivind Exp $
  */
 
 /*
@@ -30,8 +30,6 @@
  *	This module support the DEFEA EISA FDDI Controller.
  */
 
-#include "opt_inet.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
@@ -39,14 +37,9 @@
 #include <sys/device.h>
 #endif
 
-#include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#endif
-
 #if defined(__FreeBSD__)
 #include <i386/eisa/eisaconf.h>
 #include <dev/pdq/pdqvar.h>
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index e2e45adf0d2..8706f2a06d5 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fpa.c,v 1.5 1998/01/08 23:42:26 eivind Exp $
+ * $Id: if_fpa.c,v 1.6 1998/02/09 06:10:49 eivind Exp $
  *
  */
 
@@ -31,8 +31,6 @@
  *   This module supports the DEC DEFPA PCI FDDI Controller
  */
 
-#include "opt_inet.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
@@ -42,11 +40,6 @@
 
 #include <net/if.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#endif
-
 #if defined(__FreeBSD__)
 #include "fpa.h"
 #include <net/ethernet.h>
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 9c13a005a6a..0a8106f6012 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdq_ifsubr.c,v 1.5 1997/06/14 13:56:07 bde Exp $
+ * $Id: pdq_ifsubr.c,v 1.6 1998/01/08 23:40:28 eivind Exp $
  *
  */
 
@@ -51,8 +51,6 @@
 #endif
 
 #if defined(__FreeBSD__)
-#include <net/ethernet.h>
-#include <net/if_arp.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 47367ac7051..78208c251ad 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -61,7 +61,6 @@
 #endif
 
 #include "bpfilter.h"
-#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -75,11 +74,6 @@
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c
index 68fca3fb3ac..fcee846452a 100644
--- a/sys/dev/vx/if_vx_eisa.c
+++ b/sys/dev/vx/if_vx_eisa.c
@@ -34,26 +34,14 @@
 #include "vx.h"
 #if NVX > 0
 
-#include "opt_inet.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include <i386/eisa/eisaconf.h>
 
 #include <dev/vx/if_vxreg.h>
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index bce0de98f56..bd47856c7ff 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -33,28 +33,15 @@
 
 #include "vx.h"
 #if NVX > 0
-#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#endif
-
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include <pci/pcivar.h>
 
 #include <dev/vx/if_vxreg.h>
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 7ed1d4ced72..8908c20c170 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.9 1997/09/21 21:41:13 gibbs Exp $ */
+/* $Id: if_wl.c,v 1.10 1998/01/08 23:41:04 eivind Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -204,9 +204,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 
 #ifdef INET
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index f5568605d74..9aebfb69f76 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_fat.c,v 1.16 1998/02/09 06:09:52 eivind Exp $ */
+/*	$Id: msdosfs_fat.c,v 1.17 1998/02/18 09:28:36 jkh Exp $ */
 /*	$NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $	*/
 
 /*-
@@ -56,7 +56,6 @@
 #include <sys/buf.h>
 #include <sys/mount.h>		/* to define statfs structure */
 #include <sys/vnode.h>		/* to define vattr structure */
-#include <sys/errno.h>
 
 /*
  * msdosfs include files.
diff --git a/sys/i386/eisa/if_fea.c b/sys/i386/eisa/if_fea.c
index 2cf06a04e2f..b13b18fb762 100644
--- a/sys/i386/eisa/if_fea.c
+++ b/sys/i386/eisa/if_fea.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fea.c,v 1.7 1997/09/21 21:35:24 gibbs Exp $
+ * $Id: if_fea.c,v 1.8 1998/01/08 23:40:33 eivind Exp $
  */
 
 /*
@@ -30,8 +30,6 @@
  *	This module support the DEFEA EISA FDDI Controller.
  */
 
-#include "opt_inet.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
@@ -39,14 +37,9 @@
 #include <sys/device.h>
 #endif
 
-#include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#endif
-
 #if defined(__FreeBSD__)
 #include <i386/eisa/eisaconf.h>
 #include <dev/pdq/pdqvar.h>
diff --git a/sys/i386/eisa/if_vx_eisa.c b/sys/i386/eisa/if_vx_eisa.c
index 68fca3fb3ac..fcee846452a 100644
--- a/sys/i386/eisa/if_vx_eisa.c
+++ b/sys/i386/eisa/if_vx_eisa.c
@@ -34,26 +34,14 @@
 #include "vx.h"
 #if NVX > 0
 
-#include "opt_inet.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include <i386/eisa/eisaconf.h>
 
 #include <dev/vx/if_vxreg.h>
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index 1ed19890f58..6e7faacac80 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -23,13 +23,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: busdma_machdep.c,v 1.2 1998/02/04 22:32:07 eivind Exp $
+ *      $Id: busdma_machdep.c,v 1.3 1998/02/06 12:13:04 eivind Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/queue.h>
 
 #include <vm/vm.h>
 #include <vm/vm_prot.h>
diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c
index 7ed1d4ced72..8908c20c170 100644
--- a/sys/i386/isa/if_wl.c
+++ b/sys/i386/isa/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.9 1997/09/21 21:41:13 gibbs Exp $ */
+/* $Id: if_wl.c,v 1.10 1998/01/08 23:41:04 eivind Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -204,9 +204,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 
 #ifdef INET
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index f3f890ed796..dec3eeb6bf4 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -23,13 +23,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_aout.c,v 1.38 1998/01/11 21:35:30 dyson Exp $
+ *	$Id: imgact_aout.c,v 1.39 1998/02/03 21:41:12 bde Exp $
  */
 
 #include <sys/param.h>
 #include <sys/resourcevar.h>
 #include <sys/exec.h>
-#include <sys/mman.h>
 #include <sys/imgact.h>
 #include <sys/imgact_aout.h>
 #include <sys/kernel.h>
@@ -45,7 +44,6 @@
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_object.h>
-#include <vm/vm_extern.h>
 
 static int	exec_aout_imgact __P((struct image_params *imgp));
 
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index c5bae86a7f3..6e2ef5de4a5 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.12 1997/04/27 20:00:43 wollman Exp $
+ * $Id: uipc_proto.c,v 1.13 1997/08/02 14:31:42 bde Exp $
  */
 
 #include <sys/param.h>
@@ -40,7 +40,6 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
-#include <sys/queue.h>
 #include <sys/un.h>
 
 #include <net/raw_cb.h>
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c
index f5568605d74..9aebfb69f76 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_fat.c,v 1.16 1998/02/09 06:09:52 eivind Exp $ */
+/*	$Id: msdosfs_fat.c,v 1.17 1998/02/18 09:28:36 jkh Exp $ */
 /*	$NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $	*/
 
 /*-
@@ -56,7 +56,6 @@
 #include <sys/buf.h>
 #include <sys/mount.h>		/* to define statfs structure */
 #include <sys/vnode.h>		/* to define vattr structure */
-#include <sys/errno.h>
 
 /*
  * msdosfs include files.
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index e78773dc192..73c7cc27f79 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ethersubr.c,v 1.43 1998/01/09 00:51:53 eivind Exp $
+ * $Id: if_ethersubr.c,v 1.44 1998/01/31 07:23:14 eivind Exp $
  */
 
 #include "opt_atalk.h"
@@ -54,9 +54,6 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#include <net/ethernet.h>
-#include <net/if_arp.h>
-
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index d5eed32d26c..8690356c926 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.24 1998/01/08 23:41:24 eivind Exp $
+ * $Id: if_fddisubr.c,v 1.25 1998/01/09 00:51:55 eivind Exp $
  */
 
 #include "opt_atalk.h"
@@ -58,8 +58,6 @@
 #include <netinet/in_var.h>
 #include <netinet/if_ether.h>
 #endif
-#include <net/ethernet.h>		/* XXX We probably should be able to drop this */
-#include <net/if_arp.h>
 #if defined(__FreeBSD__)
 #include <netinet/if_fddi.h>
 #else
diff --git a/sys/pci/dpt_pci.c b/sys/pci/dpt_pci.c
index a818831654c..1899d6038b3 100644
--- a/sys/pci/dpt_pci.c
+++ b/sys/pci/dpt_pci.c
@@ -34,34 +34,26 @@
  *  caveats:   We may need an eisa and an isa files too
  */
 
-#ident "$Id: dpt_pci.c,v 1.2 1998/02/09 02:31:47 eivind Exp $"
+#ident "$Id: dpt_pci.c,v 1.3 1998/02/10 17:36:41 eivind Exp $"
 
 #include "opt_devfs.h"
 #include "opt_dpt.h"
-#include <pci.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
-#include <sys/proc.h>
 #include <sys/kernel.h>
 
-#include <scsi/scsi_all.h>
-#include <scsi/scsi_message.h>
 #include <scsi/scsiconf.h>
 
 #include <pci/pcireg.h>
-#include <sys/queue.h>
 #include <pci/pcivar.h>
 
 #include <sys/dpt.h>
 #include <pci/dpt_pci.h>
 
-#include <machine/clock.h>
-
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/pmap.h>
 
 #define PCI_BASEADR0  PCI_MAP_REG_START  /* I/O Address */
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index c01f608129e..1cfaeba29de 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.56 1997/10/20 14:32:46 matt Exp $	*/
-/*	$Id: if_de.c,v 1.78 1998/02/04 22:33:24 eivind Exp $ */
+/*	$Id: if_de.c,v 1.79 1998/02/06 12:14:08 eivind Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -101,8 +101,6 @@
 #if defined(__FreeBSD__)
 #include <vm/pmap.h>
 #include <pci.h>
-#include <net/ethernet.h>
-#include <net/if_arp.h>
 #if NPCI > 0
 #include <pci/pcivar.h>
 #include <pci/dc21040reg.h>
diff --git a/sys/pci/if_fpa.c b/sys/pci/if_fpa.c
index e2e45adf0d2..8706f2a06d5 100644
--- a/sys/pci/if_fpa.c
+++ b/sys/pci/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fpa.c,v 1.5 1998/01/08 23:42:26 eivind Exp $
+ * $Id: if_fpa.c,v 1.6 1998/02/09 06:10:49 eivind Exp $
  *
  */
 
@@ -31,8 +31,6 @@
  *   This module supports the DEC DEFPA PCI FDDI Controller
  */
 
-#include "opt_inet.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
@@ -42,11 +40,6 @@
 
 #include <net/if.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#endif
-
 #if defined(__FreeBSD__)
 #include "fpa.h"
 #include <net/ethernet.h>
diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index 2e48cc9fa03..bd934651178 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.47 1998/01/08 23:42:29 eivind Exp $
+ *	$Id: if_fxp.c,v 1.48 1998/02/09 06:10:51 eivind Exp $
  */
 
 /*
@@ -35,7 +35,6 @@
  */
 
 #include "bpfilter.h"
-#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,11 +47,6 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#endif
-
 #ifdef NS
 #include <netns/ns.h>
 #include <netns/ns_if.h>
diff --git a/sys/pci/if_vx_pci.c b/sys/pci/if_vx_pci.c
index bce0de98f56..bd47856c7ff 100644
--- a/sys/pci/if_vx_pci.c
+++ b/sys/pci/if_vx_pci.c
@@ -33,28 +33,15 @@
 
 #include "vx.h"
 #if NVX > 0
-#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#endif
-
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #include <pci/pcivar.h>
 
 #include <dev/vx/if_vxreg.h>
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 99231f80015..62be20115a7 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.113 1998/02/08 14:55:13 dyson Exp $
+ * $Id: vm_map.c,v 1.114 1998/02/09 06:11:26 eivind Exp $
  */
 
 /*
@@ -86,7 +86,6 @@
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
-#include <vm/vm_pageout.h>
 #include <vm/vm_pager.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>