Removed unused #includes.

12 files changed, 11 insertions, 75 deletions

diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index a1daf11..81a955b 100644
--- a/sys/netinet/if_atm.c
+++ b/sys/netinet/if_atm.c
@@ -40,19 +40,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
-#if defined(__FreeBSD__)
 #include <sys/sockio.h>
-#else
-#include <sys/ioctl.h>
-#endif
 #include <sys/syslog.h>
-#include <sys/proc.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -60,9 +51,6 @@
 #include <net/if_atm.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
 #include <netinet/if_atm.h>
 
 #ifdef NATM
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 4586c22..8ec66ff 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -31,28 +31,23 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.c	8.4 (Berkeley) 1/9/95
- *	$Id: in.c,v 1.33 1997/03/24 11:33:25 bde Exp $
+ *	$Id: in.c,v 1.34 1997/04/27 20:01:03 wollman Exp $
  */
 
 #include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
-#include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/route.h>
 
-#include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netinet/if_ether.h>
 
 #include <netinet/igmp_var.h>
 
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index 5c1c24d..2d9c9da 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: in_rmx.c,v 1.28 1997/02/13 19:46:41 wollman Exp $
+ *	$Id: in_rmx.c,v 1.29 1997/02/14 18:15:45 wollman Exp $
  */
 
 /*
@@ -46,26 +46,15 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/queue.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 
 #include <net/if.h>
 #include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-
-#include <netinet/tcp.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-
 extern int	in_inithead __P((void **head, int off));
 
 #define RTPRF_OURS		RTF_PROTO3	/* set on routes we manage */
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 0c941a3..5106a59 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -30,17 +30,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ip_divert.c,v 1.11 1997/06/01 15:58:44 peter Exp $
+ *	$Id: ip_divert.c,v 1.12 1997/06/02 05:02:35 julian Exp $
  */
 
 #include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/protosw.h>
 #include <sys/socketvar.h>
-#include <sys/errno.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index de4fbad..9d047a6 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.58 1997/06/02 05:02:36 julian Exp $
+ *	$Id: ip_fw.c,v 1.59 1997/06/04 22:09:15 julian Exp $
  */
 
 /*
@@ -27,13 +27,10 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #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>
-#include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index d813c29..3166dd8 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -31,18 +31,16 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_icmp.c,v 1.25 1997/02/22 09:41:33 peter Exp $
+ * $Id: ip_icmp.c,v 1.26 1997/05/23 22:33:16 julian Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 4401f6b..01d9ad3 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,17 +31,15 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- *	$Id: ip_output.c,v 1.56 1997/05/06 21:22:04 fenner Exp $
+ *	$Id: ip_output.c,v 1.57 1997/06/02 05:02:37 julian Exp $
  */
 
 #define _IP_VHL
 
 #include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/errno.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 51594c7..b5b3c7d 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -31,18 +31,16 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_ip.c	8.7 (Berkeley) 5/15/95
- *	$Id: raw_ip.c,v 1.45 1997/04/27 20:01:10 wollman Exp $
+ *	$Id: raw_ip.c,v 1.46 1997/05/22 20:52:56 fenner Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/protosw.h>
-#include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index 9dff2efd..b90ff6e 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tcp_debug.c,v 1.9 1997/02/22 09:41:37 peter Exp $
  */
 
 #ifdef TCPDEBUG
@@ -43,25 +43,14 @@
 #endif
 
 #include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <net/route.h>
-#include <net/if.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 8d43589..bcaca20 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -31,18 +31,15 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
- *	$Id: tcp_output.c,v 1.23 1997/02/22 09:41:40 peter Exp $
+ *	$Id: tcp_output.c,v 1.24 1997/04/03 05:14:43 davidg Exp $
  */
 
 #include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/errno.h>
 
 #include <net/route.h>
 
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 6843217..63357dd 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -31,30 +31,24 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.c	8.2 (Berkeley) 5/24/95
- *	$Id$
+ *	$Id: tcp_timer.c,v 1.22 1997/02/22 09:41:42 peter Exp $
  */
 
 #ifndef TUBA_INCLUDE
 #include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
-#include <sys/errno.h>
 
 #include <machine/cpu.h>	/* before tcp_seq.h, for tcp_random18() */
 
-#include <net/if.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/ip_var.h>
 #include <netinet/tcp.h>
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 6946c08..36256fd 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,28 +31,23 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- *	$Id: tcp_usrreq.c,v 1.30 1997/02/21 16:30:31 wollman Exp $
+ *	$Id: tcp_usrreq.c,v 1.31 1997/04/27 20:01:14 wollman Exp $
  */
 
 #include <sys/param.h>
-#include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
-#include <sys/errno.h>
-#include <sys/stat.h>
 
 #include <net/if.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>