diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 14d3e28ed6ea..53b1e20235b3 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.135 1998/02/27 06:39:30 msmith Exp $
+ *	$Id: if_ed.c,v 1.136 1998/02/27 14:29:51 hosokawa Exp $
  */
 
 /*
@@ -39,7 +39,6 @@
 
 #include "ed.h"
 #include "bpfilter.h"
-#include "opt_inet.h"
 #include "pnp.h"
 
 #ifndef EXTRA_ED
@@ -67,15 +66,6 @@
 #include <net/if_dl.h>
 #include <net/if_mib.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#endif
-
-#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/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 269844902285..6e96c8f6a0d5 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.72 1998/02/06 12:13:16 eivind Exp $
+ *  $Id: if_ep.c,v 1.73 1998/02/27 05:38:30 msmith Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -79,11 +79,6 @@
 
 #include <net/if.h>
 
-#if defined(__FreeBSD__)
-#include <net/ethernet.h>
-#include <net/if_arp.h>
-#endif
-
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 566d884a99e6..1f58a06edac3 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ex.c,v 1.9 1997/12/15 20:30:45 eivind Exp $
+ *	$Id: if_ex.c,v 1.10 1998/01/08 23:40:52 eivind Exp $
  */
 
 /*
@@ -48,9 +48,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 462d1a5432a4..81a4b72696a4 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.38 1998/02/27 05:38:31 msmith Exp $
+ * $Id: if_fe.c,v 1.39 1998/02/27 06:39:31 msmith Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -86,9 +86,7 @@
 #include <sys/socket.h>
 #include <sys/syslog.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/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 1eeb5330beec..755656c45d48 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.49 1998/01/08 23:40:56 eivind Exp $
+ *	$Id: if_ie.c,v 1.50 1998/02/09 06:08:29 eivind Exp $
  */
 
 /*
@@ -121,9 +121,7 @@ iomem and and with 0xffff.
 #include <sys/sockio.h>
 #include <sys/syslog.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
 
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index d6f90607acf9..677aa34686c0 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -80,9 +80,7 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_types.h>
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 66cd72d5874d..52838cfbfe26 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.68 1998/03/21 05:17:29 peter Exp $
+ *	$Id: si.c,v 1.69 1998/03/23 16:27:37 peter Exp $
  */
 
 #ifndef lint
@@ -76,7 +76,6 @@ static const char si_copyright1[] =  "@(#) Copyright (C) Specialix International
 #include "pci.h"
 #if NPCI > 0
 #include <pci/pcivar.h>
-#include <pci/pcireg.h>
 #endif
 
 #include "eisa.h"
diff --git a/sys/i386/isa/alog.c b/sys/i386/isa/alog.c
index 5312fa13909d..eeb6c967a555 100644
--- a/sys/i386/isa/alog.c
+++ b/sys/i386/isa/alog.c
@@ -46,17 +46,13 @@
 
 #include <sys/param.h> 
 #include <sys/systm.h>
-#include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
-#include <sys/buf.h> 
 #include <sys/poll.h>
 #include <sys/vnode.h>
 #include <sys/filio.h>
-#include <machine/clock.h>
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <sys/alogio.h>
 #include <sys/dataacq.h>
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 14d3e28ed6ea..53b1e20235b3 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.135 1998/02/27 06:39:30 msmith Exp $
+ *	$Id: if_ed.c,v 1.136 1998/02/27 14:29:51 hosokawa Exp $
  */
 
 /*
@@ -39,7 +39,6 @@
 
 #include "ed.h"
 #include "bpfilter.h"
-#include "opt_inet.h"
 #include "pnp.h"
 
 #ifndef EXTRA_ED
@@ -67,15 +66,6 @@
 #include <net/if_dl.h>
 #include <net/if_mib.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/i386/isa/if_eg.c b/sys/i386/isa/if_eg.c
index afe35c2e0b63..75000164add3 100644
--- a/sys/i386/isa/if_eg.c
+++ b/sys/i386/isa/if_eg.c
@@ -27,7 +27,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_eg.c,v 1.25 1997/09/02 01:18:09 bde Exp $
+ * $Id: if_eg.c,v 1.26 1998/01/08 23:40:47 eivind Exp $
  *
  * Support for 3Com 3c505 Etherlink+ card.
  */
@@ -38,7 +38,6 @@
  */
 #include "eg.h"
 #include "bpfilter.h"
-#include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -53,15 +52,6 @@
 #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
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 7eeabd7aee4c..f02b38c1e8d2 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
- * $Id: if_el.c,v 1.32 1997/12/15 20:30:40 eivind Exp $
+ * $Id: if_el.c,v 1.33 1998/01/08 23:40:48 eivind Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -32,9 +32,7 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 269844902285..6e96c8f6a0d5 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.72 1998/02/06 12:13:16 eivind Exp $
+ *  $Id: if_ep.c,v 1.73 1998/02/27 05:38:30 msmith Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -79,11 +79,6 @@
 
 #include <net/if.h>
 
-#if defined(__FreeBSD__)
-#include <net/ethernet.h>
-#include <net/if_arp.h>
-#endif
-
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git a/sys/i386/isa/if_ex.c b/sys/i386/isa/if_ex.c
index 566d884a99e6..1f58a06edac3 100644
--- a/sys/i386/isa/if_ex.c
+++ b/sys/i386/isa/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ex.c,v 1.9 1997/12/15 20:30:45 eivind Exp $
+ *	$Id: if_ex.c,v 1.10 1998/01/08 23:40:52 eivind Exp $
  */
 
 /*
@@ -48,9 +48,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 462d1a5432a4..81a4b72696a4 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.38 1998/02/27 05:38:31 msmith Exp $
+ * $Id: if_fe.c,v 1.39 1998/02/27 06:39:31 msmith Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -86,9 +86,7 @@
 #include <sys/socket.h>
 #include <sys/syslog.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/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index 1eeb5330beec..755656c45d48 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.49 1998/01/08 23:40:56 eivind Exp $
+ *	$Id: if_ie.c,v 1.50 1998/02/09 06:08:29 eivind Exp $
  */
 
 /*
@@ -121,9 +121,7 @@ iomem and and with 0xffff.
 #include <sys/sockio.h>
 #include <sys/syslog.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
 
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index e8ca9304029f..348190387366 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.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_le.c,v 1.42 1997/12/15 20:30:51 eivind Exp $
+ * $Id: if_le.c,v 1.43 1998/01/08 23:40:58 eivind Exp $
  */
 
 /*
@@ -48,9 +48,7 @@
 #include <sys/sockio.h>
 #include <sys/malloc.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
 
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index d6f90607acf9..677aa34686c0 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -80,9 +80,7 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_types.h>
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index b31adaca4f9b..f40fb97bebe2 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.49 1998/02/04 04:41:37 eivind Exp $
+ * $Id: if_ze.c,v 1.50 1998/02/13 06:49:15 bde Exp $
  */
 
 /* XXX don't mix different PCCARD support code. */
@@ -76,9 +76,7 @@ static char const zedummy[] = "code to use the includes of card.h and pcic.h";
 #include <sys/socket.h>
 #include <sys/syslog.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index 6798e96c89d1..106b1e3be597 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.44 1998/02/04 04:41:37 eivind Exp $
+ *	$Id: if_zp.c,v 1.45 1998/02/13 06:49:16 bde Exp $
  */
 /*-
  * TODO:
@@ -128,9 +128,7 @@ static char const zpdummy[] = "code to use the includes of card.h and pcic.h";
 #include <sys/sockio.h>
 #include <sys/syslog.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index 7d524e1668ff..814906768c1a 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id$
+ * $Id: loran.c,v 1.1 1998/02/24 22:05:12 phk Exp $
  *
  * This device-driver helps the userland controlprogram for a LORAN-C
  * receiver avoid monopolizing the CPU.
@@ -20,21 +20,12 @@
  *
  */
 
-#include "loran.h"
-#include "opt_devfs.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/uio.h>
-#include <sys/syslog.h>
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif /*DEVFS*/
 
-#include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 
 static int	loranprobe (struct isa_device *dvp);
diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c
index 7fd83646cac0..84c8dd537166 100644
--- a/sys/i386/isa/random_machdep.c
+++ b/sys/i386/isa/random_machdep.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id: random_machdep.c,v 1.20 1997/12/26 20:42:11 phk Exp $
+ * $Id: random_machdep.c,v 1.21 1998/02/20 16:35:42 phk Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
@@ -45,16 +45,9 @@
 #include <sys/select.h>
 #include <sys/poll.h>
 
-#include <machine/clock.h>
 #include <machine/random.h>
 
 #include <i386/isa/icu.h>
-#ifdef PC98
-#include <pc98/pc98/pc98.h>
-#else
-#include <i386/isa/isa.h>
-#endif
-#include <i386/isa/timerreg.h>
 
 #define MAX_BLKDEV 4
 
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index 66cd72d5874d..52838cfbfe26 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.68 1998/03/21 05:17:29 peter Exp $
+ *	$Id: si.c,v 1.69 1998/03/23 16:27:37 peter Exp $
  */
 
 #ifndef lint
@@ -76,7 +76,6 @@ static const char si_copyright1[] =  "@(#) Copyright (C) Specialix International
 #include "pci.h"
 #if NPCI > 0
 #include <pci/pcivar.h>
-#include <pci/pcireg.h>
 #endif
 
 #include "eisa.h"
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index bfe8064cef81..c3b27add1714 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: stallion.c,v 1.16 1998/02/09 06:08:42 eivind Exp $
+ * $Id: stallion.c,v 1.17 1998/02/13 12:45:58 phk Exp $
  */
 
 /*****************************************************************************/
@@ -50,7 +50,6 @@
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
-#include <machine/clock.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/ic/scd1400.h>
 #include <machine/comstats.h>
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index c7dd09009e9a..a6d67855b4c3 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -26,7 +26,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: imgact_elf.c,v 1.21 1998/02/09 06:09:21 eivind Exp $
+ *	$Id: imgact_elf.c,v 1.22 1998/03/02 05:47:58 peter Exp $
  */
 
 #include "opt_rlimit.h"
@@ -39,9 +39,7 @@
 #include <sys/imgact_elf.h>
 #include <sys/kernel.h>
 #include <sys/sysent.h>
-#include <sys/fcntl.h>
 #include <sys/malloc.h>
-#include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/syscall.h>
diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c
index 7fd83646cac0..84c8dd537166 100644
--- a/sys/kern/kern_random.c
+++ b/sys/kern/kern_random.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id: random_machdep.c,v 1.20 1997/12/26 20:42:11 phk Exp $
+ * $Id: random_machdep.c,v 1.21 1998/02/20 16:35:42 phk Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
@@ -45,16 +45,9 @@
 #include <sys/select.h>
 #include <sys/poll.h>
 
-#include <machine/clock.h>
 #include <machine/random.h>
 
 #include <i386/isa/icu.h>
-#ifdef PC98
-#include <pc98/pc98/pc98.h>
-#else
-#include <i386/isa/isa.h>
-#endif
-#include <i386/isa/timerreg.h>
 
 #define MAX_BLKDEV 4
 
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 52dce037c0a9..b5076836b0af 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.145 1998/03/19 22:48:16 dyson Exp $
+ * $Id: vfs_subr.c,v 1.146 1998/03/28 12:04:32 bde Exp $
  */
 
 /*
@@ -55,7 +55,6 @@
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
-#include <sys/poll.h>
 #include <sys/domain.h>
 #include <sys/dirent.h>
 #include <sys/vmmeter.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 52dce037c0a9..b5076836b0af 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.145 1998/03/19 22:48:16 dyson Exp $
+ * $Id: vfs_subr.c,v 1.146 1998/03/28 12:04:32 bde Exp $
  */
 
 /*
@@ -55,7 +55,6 @@
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
-#include <sys/poll.h>
 #include <sys/domain.h>
 #include <sys/dirent.h>
 #include <sys/vmmeter.h>
diff --git a/sys/netkey/key.c b/sys/netkey/key.c
index 75754acb77c3..508c8dedf64e 100644
--- a/sys/netkey/key.c
+++ b/sys/netkey/key.c
@@ -89,17 +89,14 @@ Research Laboratory (NRL).
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/time.h>
 
 #include <net/raw_cb.h>
 #include <net/if.h>
-#include <net/if_types.h>
 #include <net/if_dl.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netinet/if_ether.h>
 
 #ifdef INET6
 #include <netinet6/in6.h>
diff --git a/sys/netkey/key_debug.c b/sys/netkey/key_debug.c
index 2cf8d79f8779..8c3a9fd11084 100644
--- a/sys/netkey/key_debug.c
+++ b/sys/netkey/key_debug.c
@@ -78,7 +78,6 @@ Research Laboratory (NRL).
 
 /*#include <netkey/osdep_44bsd.h>*/
 
-#include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/mbuf.h>
@@ -91,7 +90,6 @@ Research Laboratory (NRL).
 #include <netinet/in.h>
 
 #include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 
 #ifdef INET6