diff --git a/libexec/bootpd/lookup.c b/libexec/bootpd/lookup.c
index b5b51b547cbc..aa73cdaf7ae5 100644
--- a/libexec/bootpd/lookup.c
+++ b/libexec/bootpd/lookup.c
@@ -1,7 +1,7 @@
 /*
  * lookup.c - Lookup IP address, HW address, netmask
  *
- *	$Id: lookup.c,v 1.2 1996/09/22 21:52:21 wosch Exp $
+ *	$Id: lookup.c,v 1.3 1996/12/10 17:05:33 wollman Exp $
  */
 
 #include <sys/types.h>
@@ -12,7 +12,7 @@
 #include <netinet/in.h>
 
 #ifdef	ETC_ETHERS
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 extern int ether_hostton();
 #endif
 
diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c
index 0338a95291ef..1430be9e6a5d 100644
--- a/libexec/bootpd/rtmsg.c
+++ b/libexec/bootpd/rtmsg.c
@@ -39,7 +39,7 @@
 
 /*
  * from arp.c	8.2 (Berkeley) 1/2/94
- * $Id: rtmsg.c,v 1.4 1995/05/30 05:45:49 rgrimes Exp $
+ * $Id: rtmsg.c,v 1.5 1996/12/10 17:05:35 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -54,6 +54,7 @@
 #include <sys/time.h>
 
 #include <net/if.h>
+#include <net/if_var.h>		/* needed for if_ether.h XXX */
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/route.h>
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index 451e6c29ffb4..b8eeb3552143 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -29,7 +29,7 @@
 #ifndef lint
 /*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/
 /*static char sccsid[] = "from: @(#)rstat_proc.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char rcsid[] = "$Id: rstat_proc.c,v 1.3 1995/05/30 05:46:28 rgrimes Exp $";
+static char rcsid[] = "$Id: rstat_proc.c,v 1.4 1996/12/11 19:11:52 wollman Exp $";
 #endif
 
 /*
@@ -299,7 +299,6 @@ updatestat()
 
 setup()
 {
-	struct ifnet ifnet;
 	int off;
 	char errbuf[_POSIX2_LINE_MAX];
 
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 0bd94ea2eb32..0a1bc90da081 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 */
 static const char rcsid[] =
-	"$Id: ifconfig.c,v 1.20 1996/11/21 19:36:09 wollman Exp $";
+	"$Id: ifconfig.c,v 1.21 1996/12/10 17:07:17 wollman Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -52,6 +52,7 @@ static const char rcsid[] =
 #include <sys/time.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/route.h>
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index 9ab7b31cce94..dcbdcd27a8a6 100644
--- a/sbin/slattach/slattach.c
+++ b/sbin/slattach/slattach.c
@@ -42,7 +42,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)slattach.c	4.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: slattach.c,v 1.21 1996/12/10 17:07:44 wollman Exp $";
+static char rcsid[] = "$Id: slattach.c,v 1.22 1996/12/10 21:25:42 wollman Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -64,6 +64,7 @@ static char rcsid[] = "$Id: slattach.c,v 1.21 1996/12/10 17:07:44 wollman Exp $"
 
 #include <netinet/in.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/slip.h>
 #include <net/if_slvar.h>
 
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index 222d163877ae..feb0f908e2c8 100644
--- a/sbin/startslip/startslip.c
+++ b/sbin/startslip/startslip.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: startslip.c,v 1.18 1995/09/27 17:15:37 ache Exp $
+ * $Id: startslip.c,v 1.19 1996/12/10 17:07:48 wollman Exp $
  */
 
 #ifndef lint
@@ -63,6 +63,7 @@ static char sccsid[] = "@(#)startslip.c	8.1 (Berkeley) 6/5/93";
 
 #include <netinet/in.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_slvar.h>
 #include <net/slip.h>
 
diff --git a/usr.sbin/amd/fsinfo/fsinfo.h b/usr.sbin/amd/fsinfo/fsinfo.h
index 1483337e9c1d..4ef86e1523e5 100644
--- a/usr.sbin/amd/fsinfo/fsinfo.h
+++ b/usr.sbin/amd/fsinfo/fsinfo.h
@@ -37,7 +37,7 @@
  *
  *	@(#)fsinfo.h	8.1 (Berkeley) 6/6/93
  *
- * $Id: fsinfo.h,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $
+ * $Id: fsinfo.h,v 1.2 1996/12/10 17:00:31 wollman Exp $
  *
  */
 
@@ -83,7 +83,7 @@ typedef char *voidp;
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <net/if.h>
-#include <netinet/if_ether.h>
+#include <net/ethernet.h>
 
 #include "fsi_data.h"
 
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 7b6ac2bcc10b..f606a7fbb228 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 
 #ifndef lint
 static char const sccsid[] = "@(#)from: arp.c	8.2 (Berkeley) 1/2/94";
-static char const freebsdid[] = "$Id: arp.c,v 1.5 1996/12/10 17:00:34 wollman Exp $";
+static char const freebsdid[] = "$Id: arp.c,v 1.6 1996/12/19 19:33:10 nate Exp $";
 #endif /* not lint */
 
 /*
@@ -59,6 +59,7 @@ static char const freebsdid[] = "$Id: arp.c,v 1.5 1996/12/10 17:00:34 wollman Ex
 #include <sys/time.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/route.h>
diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index 4e19349ff061..c9e97c87a936 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -7,7 +7,7 @@
  * Leland Stanford Junior University.
  *
  *
- * $Id: defs.h,v 3.8.1.2 1996/09/05 19:00:20 fenner Exp $
+ * $Id: defs.h,v 1.7 1996/11/11 03:49:57 fenner Exp $
  */
 
 
@@ -28,6 +28,9 @@
 #endif
 #include <sys/time.h>
 #include <net/if.h>
+#define rtentry kern_rtentry	/* XXX !!! UGH */
+#include <net/route.h>
+#undef rtentry
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c
index 5faa46f9227c..74a0f215d957 100644
--- a/usr.sbin/ppp/arp.c
+++ b/usr.sbin/ppp/arp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: arp.c,v 1.4 1996/01/11 17:48:34 phk Exp $
+ * $Id: arp.c,v 1.5 1996/05/11 20:48:09 phk Exp $
  *
  */
 
@@ -35,6 +35,7 @@
 #include <string.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/if_dl.h>
 #include <netinet/in.h>
diff --git a/usr.sbin/ppp/os.c b/usr.sbin/ppp/os.c
index f7e70576a5d3..5998d0e5ba5f 100644
--- a/usr.sbin/ppp/os.c
+++ b/usr.sbin/ppp/os.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: os.c,v 1.7 1996/06/03 21:35:21 gpalmer Exp $
+ * $Id: os.c,v 1.8 1996/12/10 17:00:38 wollman Exp $
  *
  */
 #include "fsm.h"
@@ -33,6 +33,7 @@
 #include <errno.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_tun.h>
 #include <net/route.h>
 #include <arpa/inet.h>
diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c
index a07bb24a7c06..d6f90b7e2582 100644
--- a/usr.sbin/pppd/sys-bsd.c
+++ b/usr.sbin/pppd/sys-bsd.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: sys-bsd.c,v 1.6 1996/03/01 19:29:44 phk Exp $";
+static char rcsid[] = "$Id: sys-bsd.c,v 1.7 1996/08/13 09:16:49 peter Exp $";
 #endif
 
 /*
@@ -41,6 +41,7 @@ static char rcsid[] = "$Id: sys-bsd.c,v 1.6 1996/03/01 19:29:44 phk Exp $";
 #include <sys/stat.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/ppp_defs.h>
 #include <net/if_ppp.h>
 #include <net/route.h>
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index 0d9aa03d0f1d..62f63483f8bf 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -26,7 +26,7 @@ The Regents of the University of California.  All rights reserved.\n";
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /home/ncvs/src/usr.sbin/rarpd/rarpd.c,v 1.10 1996/11/19 23:57:06 wpaul Exp $ (LBL)";
+    "$Id: /home/ncvs/src/usr.sbin/rarpd/rarpd.c,v 1.12 1996/11/27 20:45:10 fenner Exp $";
 #endif
 
 /*
@@ -46,14 +46,10 @@ static const char rcsid[] =
 
 #include <net/bpf.h>
 #include <net/if.h>
-
-#if BSD >= 199100
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
-#if BSD >= 199200
 #include <net/route.h>
-#endif
-#endif
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
@@ -65,16 +61,8 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <string.h>
 #include <syslog.h>
-#if BSD >= 199200
 #include <stdlib.h>
 #include <unistd.h>
-#else
-
-extern char *optarg;
-extern int optind, opterr;
-
-extern int errno;
-#endif
 
 #if defined(SUNOS4) || defined(__FreeBSD__) /* XXX */
 #define HAVE_DIRENT_H
diff --git a/usr.sbin/slstat/slstat.c b/usr.sbin/slstat/slstat.c
index 54d344da498f..a23b6ba3b396 100644
--- a/usr.sbin/slstat/slstat.c
+++ b/usr.sbin/slstat/slstat.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: slstat.c,v 1.7 1996/11/04 17:14:43 bde Exp $";
+	"$Id: slstat.c,v 1.8 1996/12/10 17:00:45 wollman Exp $";
 #endif
 
 #include <sys/param.h>
@@ -44,6 +44,7 @@ static const char rcsid[] =
 #define INET
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_mib.h>
 #include <net/if_types.h>
 #include <netinet/in.h>