diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index dbd428ab316..2ebdc5dd391 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.37 1996/07/31 09:25:51 davidg Exp $
+ *	$Id: genassym.c,v 1.38 1996/07/31 12:36:10 bde Exp $
  */
 
 #include <stdio.h>
@@ -50,6 +50,7 @@
 #include <sys/mount.h>
 #endif
 #include <sys/mbuf.h>
+#include <sys/socket.h>
 #include <sys/msgbuf.h>
 #include <machine/cpu.h>
 #include <machine/trap.h>
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index 48ad8e3b0d8..3b0530245f6 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: 3c5x9.c,v 1.5 1996/09/06 23:06:53 phk Exp $
+ *	$Id: 3c5x9.c,v 1.6 1996/10/12 17:34:25 bde Exp $
  */
 
 #include "eisa.h"
@@ -28,6 +28,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/socket.h>
 
 #include <machine/clock.h>
 
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 75bc852476c..63b8fb5d562 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.19 1996/09/22 11:48:54 davidg Exp $
+ *	$Id: if_fxp.c,v 1.20 1996/09/29 10:20:45 davidg Exp $
  */
 
 /*
@@ -39,6 +39,7 @@
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
+#include <sys/socket.h>
 #include <sys/syslog.h>
 
 #include <net/if.h>
diff --git a/sys/i386/eisa/3c5x9.c b/sys/i386/eisa/3c5x9.c
index 48ad8e3b0d8..3b0530245f6 100644
--- a/sys/i386/eisa/3c5x9.c
+++ b/sys/i386/eisa/3c5x9.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: 3c5x9.c,v 1.5 1996/09/06 23:06:53 phk Exp $
+ *	$Id: 3c5x9.c,v 1.6 1996/10/12 17:34:25 bde Exp $
  */
 
 #include "eisa.h"
@@ -28,6 +28,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/socket.h>
 
 #include <machine/clock.h>
 
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index dbd428ab316..2ebdc5dd391 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.37 1996/07/31 09:25:51 davidg Exp $
+ *	$Id: genassym.c,v 1.38 1996/07/31 12:36:10 bde Exp $
  */
 
 #include <stdio.h>
@@ -50,6 +50,7 @@
 #include <sys/mount.h>
 #endif
 #include <sys/mbuf.h>
+#include <sys/socket.h>
 #include <sys/msgbuf.h>
 #include <machine/cpu.h>
 #include <machine/trap.h>
diff --git a/sys/net/if.h b/sys/net/if.h
index 056b711a90e..1f08bcbdacc 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $Id: if.h,v 1.33 1996/08/04 10:54:12 phk Exp $
+ * $Id: if.h,v 1.34 1996/08/26 23:17:17 julian Exp $
  */
 
 #ifndef _NET_IF_H_
@@ -62,8 +62,6 @@
  * interfaces.  These routines live in the files if.c and route.c
  */
 
-#include <sys/socket.h>			/* for struct sockaddr */
-
 #ifndef _TIME_ /*  XXX fast fix for SNMP, going away soon */
 #include <sys/time.h>
 #endif
diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index 15151109430..d7718cd4892 100644
--- a/sys/net/if_arp.h
+++ b/sys/net/if_arp.h
@@ -31,14 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $Id: if_arp.h,v 1.4 1994/11/15 14:41:38 bde Exp $
+ * $Id: if_arp.h,v 1.5 1994/11/16 02:15:05 phk Exp $
  */
 
 #ifndef _NET_IF_ARP_H_
 #define	_NET_IF_ARP_H_
 
-#include <sys/socket.h>		/* for struct sockaddr */
-
 /*
  * Address Resolution Protocol.
  *
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index bb147450ca5..7bf4d18db85 100644
--- a/sys/net/if_mib.c
+++ b/sys/net/if_mib.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: if_mib.c,v 1.1 1996/07/30 19:17:00 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -34,6 +34,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
+#include <sys/socket.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index d420c2715b7..1d85ace0515 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ether.c,v 1.32 1996/06/20 22:53:08 fenner Exp $
+ * $Id: if_ether.c,v 1.33 1996/06/21 21:45:58 peter Exp $
  */
 
 /*
@@ -47,6 +47,7 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
+#include <sys/socket.h>
 #include <sys/syslog.h>
 
 #include <net/if.h>
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index 811127f5c6d..77739b44374 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.49 1996/08/31 21:05:20 alex Exp $
+ *	$Id: ip_fw.c,v 1.50 1996/10/12 19:38:50 alex Exp $
  */
 
 /*
@@ -29,6 +29,7 @@
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
+#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index 75bc852476c..63b8fb5d562 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.19 1996/09/22 11:48:54 davidg Exp $
+ *	$Id: if_fxp.c,v 1.20 1996/09/29 10:20:45 davidg Exp $
  */
 
 /*
@@ -39,6 +39,7 @@
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
+#include <sys/socket.h>
 #include <sys/syslog.h>
 
 #include <net/if.h>