Cut down on include files.

22 files changed, 27 insertions, 203 deletions

diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index b5cb5b146a5..055840232f4 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ether.c,v 1.29 2001/05/15 15:12:54 gluk Exp $	*/
+/*	$OpenBSD: if_ether.c,v 1.30 2001/06/08 03:53:45 angelos Exp $	*/
 /*	$NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $	*/
 
 /*
@@ -45,25 +45,17 @@
 #ifdef INET
 
 #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>
-#include <sys/ioctl.h>
 #include <sys/syslog.h>
-#include <sys/proc.h>
 
 #include <net/if.h>
 #include <net/if_dl.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/if_ether.h>
 
 #define SIN(s) ((struct sockaddr_in *)s)
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index e2e718cf6a1..c0b1f76d6dc 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: igmp.c,v 1.10 2001/05/24 04:07:51 angelos Exp $	*/
+/*	$OpenBSD: igmp.c,v 1.11 2001/06/08 03:53:45 angelos Exp $	*/
 /*	$NetBSD: igmp.c,v 1.15 1996/02/13 23:41:25 christos Exp $	*/
 
 /*
@@ -15,7 +15,6 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/protosw.h>
-#include <sys/systm.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 17ef1ebcb7d..e47ef8e6638 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in.c,v 1.19 2001/05/16 12:53:35 ho Exp $	*/
+/*	$OpenBSD: in.c,v 1.20 2001/06/08 03:53:45 angelos Exp $	*/
 /*	$NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $	*/
 
 /*
@@ -37,20 +37,17 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/ioctl.h>
-#include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/systm.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>
 
 #ifdef MROUTING
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 291d38d3217..f4212f2874b 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_gif.c,v 1.17 2001/05/30 12:30:02 angelos Exp $	*/
+/*	$OpenBSD: in_gif.c,v 1.18 2001/06/08 03:53:45 angelos Exp $	*/
 /*	$KAME: in_gif.c,v 1.50 2001/01/22 07:27:16 itojun Exp $	*/
 
 /*
@@ -37,11 +37,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
-#include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/protosw.h>
 
 #include <net/if.h>
 #include <net/route.h>
@@ -52,7 +48,6 @@
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/in_gif.h>
-#include <netinet/ip_ecn.h>
 #include <netinet/ip_ipsp.h>
 
 #ifdef INET6
@@ -63,15 +58,9 @@
 #include <netinet/ip_mroute.h>
 #endif /* MROUTING */
 
-#include <net/if_gif.h>	
-
 #include "gif.h"
 #include "bridge.h"
 
-#include <machine/stdarg.h>
-
-#include <net/net_osdep.h>
-
 int
 in_gif_output(ifp, family, m, rt)
 	struct ifnet	*ifp;
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 64a77fc173f..eec4c6ef0bb 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.c,v 1.53 2001/06/05 02:31:35 deraadt Exp $	*/
+/*	$OpenBSD: in_pcb.c,v 1.54 2001/06/08 03:53:45 angelos Exp $	*/
 /*	$NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $	*/
 
 /*
@@ -74,14 +74,10 @@
 
 #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/socketvar.h>
-#include <sys/ioctl.h>
-#include <sys/errno.h>
-#include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/domain.h>
 
@@ -100,16 +96,6 @@
 #include <netinet6/ip6_var.h>
 #endif /* INET6 */
 
-#ifdef IPSEC
-#include <netinet/ip_ipsp.h>
-#endif
-
-#if 0 /*KAME IPSEC*/
-#include <netinet6/ipsec.h>
-#include <netkey/key.h>
-#include <netkey/key_debug.h>
-#endif /* IPSEC */
-
 struct	in_addr zeroin_addr;
 
 extern int ipsec_auth_default_level;
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index a3107734415..58d0e3b088d 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_proto.c,v 1.28 2001/06/05 02:31:35 deraadt Exp $	*/
+/*	$OpenBSD: in_proto.c,v 1.29 2001/06/08 03:53:45 angelos Exp $	*/
 /*	$NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $	*/
 
 /*
@@ -108,7 +108,6 @@
 #include <sys/mbuf.h>
 
 #include <net/if.h>
-#include <net/radix.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
@@ -127,14 +126,11 @@
 
 #include <netinet/igmp_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>
-#include <netinet/tcp_debug.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
+
 /*
  * TCP/IP protocol family: IP, ICMP, UDP, TCP.
  */
diff --git a/sys/netinet/ip_ecn.c b/sys/netinet/ip_ecn.c
index 1d9ee292b28..3664e847255 100644
--- a/sys/netinet/ip_ecn.c
+++ b/sys/netinet/ip_ecn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ecn.c,v 1.2 2001/02/16 08:48:04 itojun Exp $	*/
+/*	$OpenBSD: ip_ecn.c,v 1.3 2001/06/08 03:53:45 angelos Exp $	*/
 /*	$KAME: ip_ecn.c,v 1.9 2000/10/01 12:44:48 itojun Exp $	*/
 
 /*
@@ -35,15 +35,9 @@
  * http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt
  */
 
-#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__NetBSD__)
-#include "opt_inet.h"
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/errno.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/netinet/ip_ether.c b/sys/netinet/ip_ether.c
index 33ebb1422b4..6b1d6b56712 100644
--- a/sys/netinet/ip_ether.c
+++ b/sys/netinet/ip_ether.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ether.c,v 1.27 2001/05/27 11:52:21 angelos Exp $  */
+/*	$OpenBSD: ip_ether.c,v 1.28 2001/06/08 03:53:45 angelos Exp $  */
 
 /*
  * The author of this code is Angelos D. Keromytis (kermit@adk.gr)
@@ -30,32 +30,23 @@
 #include "bridge.h"
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/domain.h>
 #include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/route.h>
-#include <net/netisr.h>
 
 #ifdef INET
 #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>
 #endif /* INET */
 
-#include <netinet/ip_ipsp.h>
 #include <netinet/ip_ether.h>
 #include <netinet/if_ether.h>
-#include <dev/rndvar.h>
 #include <net/if_bridge.h>
 #include <net/if_gif.h>
 
diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c
index cb9db7f993c..7ceca6101ea 100644
--- a/sys/netinet/ip_gre.c
+++ b/sys/netinet/ip_gre.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ip_gre.c,v 1.9 2001/06/05 23:43:46 maja Exp $ */
+/*      $OpenBSD: ip_gre.c,v 1.10 2001/06/08 03:53:46 angelos Exp $ */
 /*	$NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
@@ -48,7 +48,6 @@
 #if NGRE > 0
 
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
@@ -57,8 +56,6 @@
 #include <net/route.h>
 #include <net/bpf.h>
 
-#include <machine/cpu.h>
-
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_var.h>
@@ -86,8 +83,6 @@
 /* Needs IP headers. */
 #include <net/if_gre.h>
 
-#include <machine/stdarg.h>
-
 struct gre_softc *gre_lookup __P((struct mbuf *, u_int8_t));
 static int gre_input2 __P((struct mbuf *, int, u_char));
 
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index bff96886579..680a669b9f3 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_icmp.c,v 1.36 2001/06/05 02:31:35 deraadt Exp $	*/
+/*	$OpenBSD: ip_icmp.c,v 1.37 2001/06/08 03:53:46 angelos Exp $	*/
 /*	$NetBSD: ip_icmp.c,v 1.19 1996/02/13 23:42:22 christos Exp $	*/
 
 /*
@@ -73,16 +73,9 @@
  */
 
 #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/proc.h>
-
-#include <vm/vm.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
@@ -96,8 +89,6 @@
 #include <netinet/ip_var.h>
 #include <netinet/icmp_var.h>
 
-#include <machine/stdarg.h>
-
 /*
  * ICMP routines: error generation, receive packet processing, and
  * routines to turnaround packets back to the originator, and
diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c
index 63fdf033485..28b8702eded 100644
--- a/sys/netinet/ip_id.c
+++ b/sys/netinet/ip_id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_id.c,v 1.3 2001/06/04 19:57:22 mickey Exp $ */
+/* $OpenBSD: ip_id.c,v 1.4 2001/06/08 03:53:46 angelos Exp $ */
 
 /*
  * Copyright 1998 Niels Provos <provos@citi.umich.edu>
@@ -56,7 +56,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/time.h>
 #include <sys/kernel.h>
 
 #include <dev/rndvar.h>
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 4a0f62f1a8f..ef3f45e361f 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_input.c,v 1.74 2001/06/01 19:53:33 provos Exp $	*/
+/*	$OpenBSD: ip_input.c,v 1.75 2001/06/08 03:53:46 angelos Exp $	*/
 /*	$NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $	*/
 
 /*
@@ -37,20 +37,11 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
 #include <sys/syslog.h>
-#include <sys/proc.h>
-#include <sys/pool.h>
-
-#include <vm/vm.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
@@ -65,11 +56,6 @@
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
-#include <netinet/ip_ipsp.h>
-
-#ifdef IPSEC
-#include <netinet/ip_ipsp.h>
-#endif /* IPSEC */
 
 #ifndef	IPFORWARDING
 #ifdef GATEWAY
diff --git a/sys/netinet/ip_ipip.c b/sys/netinet/ip_ipip.c
index 385ea888921..8f5d5eb3b7e 100644
--- a/sys/netinet/ip_ipip.c
+++ b/sys/netinet/ip_ipip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ipip.c,v 1.15 2001/05/30 12:22:57 angelos Exp $ */
+/*	$OpenBSD: ip_ipip.c,v 1.16 2001/06/08 03:53:46 angelos Exp $ */
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -41,17 +41,9 @@
 
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
 #include <sys/sysctl.h>
-#include <machine/cpu.h>
 
 #include <net/if.h>
 #include <net/route.h>
@@ -63,19 +55,14 @@
 #include <netinet/in_pcb.h>
 #include <netinet/in_var.h>
 #include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
 #include <netinet/ip_ecn.h>
 
 #ifdef MROUTING
 #include <netinet/ip_mroute.h>
 #endif
 
-#include <sys/socketvar.h>
-#include <net/raw_cb.h>
-
 #include <netinet/ip_ipsp.h>
 #include <netinet/ip_ipip.h>
-#include <dev/rndvar.h>
 
 #ifdef ENCDEBUG
 #define DPRINTF(x)	if (encdebug) printf x
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 992bd8bedbe..01480a04faa 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_output.c,v 1.100 2001/06/05 11:05:08 angelos Exp $	*/
+/*	$OpenBSD: ip_output.c,v 1.101 2001/06/08 03:53:46 angelos Exp $	*/
 /*	$NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $	*/
 
 /*
@@ -37,17 +37,11 @@
  */
 
 #include <sys/param.h>
-#include <sys/malloc.h>
+#include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/errno.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-
-#include <vm/vm.h>
 #include <sys/proc.h>
 
 #include <net/if.h>
@@ -64,16 +58,7 @@
 #include <machine/mtpr.h>
 #endif
 
-#include <machine/stdarg.h>
-
 #ifdef IPSEC
-#include <netinet/ip_ah.h>
-#include <netinet/ip_esp.h>
-#include <netinet/udp.h>
-#include <netinet/tcp.h>
-#include <net/pfkeyv2.h>
-#include <net/if_enc.h>
-
 #ifdef ENCDEBUG
 #define DPRINTF(x)    do { if (encdebug) printf x ; } while (0)
 #else
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 564819e6a08..ac3f2b02829 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raw_ip.c,v 1.22 2001/06/05 02:31:35 deraadt Exp $	*/
+/*	$OpenBSD: raw_ip.c,v 1.23 2001/06/08 03:53:46 angelos Exp $	*/
 /*	$NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $	*/
 
 /*
@@ -73,13 +73,11 @@
  */
 
 #include <sys/param.h>
-#include <sys/malloc.h>
+#include <sys/systm.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 <net/if.h>
 #include <net/route.h>
@@ -93,8 +91,6 @@
 #include <netinet/in_var.h>
 #include <netinet/ip_icmp.h>
 
-#include <machine/stdarg.h>
-
 struct inpcbtable rawcbtable;
 
 /*
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index a8dc853f30d..3a908a11560 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_debug.c,v 1.9 2001/06/05 02:31:36 deraadt Exp $	*/
+/*	$OpenBSD: tcp_debug.c,v 1.10 2001/06/08 03:53:46 angelos Exp $	*/
 /*	$NetBSD: tcp_debug.c,v 1.10 1996/02/13 23:43:36 christos Exp $	*/
 
 /*
@@ -84,9 +84,6 @@
 #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>
@@ -97,8 +94,6 @@
 #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_input.c b/sys/netinet/tcp_input.c
index 32710c21cb8..103e4a03694 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_input.c,v 1.92 2001/06/05 02:31:36 deraadt Exp $	*/
+/*	$OpenBSD: tcp_input.c,v 1.93 2001/06/08 03:53:46 angelos Exp $	*/
 /*	$NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $	*/
 
 /*
@@ -75,13 +75,10 @@
 #ifndef TUBA_INCLUDE
 #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/socketvar.h>
-#include <sys/errno.h>
-#include <sys/domain.h>
 
 #include <net/if.h>
 #include <net/route.h>
@@ -98,20 +95,9 @@
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
 #include <netinet/tcp_debug.h>
-#include <dev/rndvar.h>
-#include <machine/stdarg.h>
-#include <sys/md5k.h>
-
-#ifdef IPSEC
-#include <netinet/ip_ipsp.h>
-#endif /* IPSEC */
 
 #ifdef INET6
 #include <netinet6/in6_var.h>
-#include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
-#include <netinet6/tcpipv6.h>
-#include <netinet/icmp6.h>
 #include <netinet6/nd6.h>
 
 struct	tcpiphdr tcp_saveti;
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 0745acf8cff..a694cc0886d 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_output.c,v 1.36 2001/06/05 02:31:36 deraadt Exp $	*/
+/*	$OpenBSD: tcp_output.c,v 1.37 2001/06/08 03:53:46 angelos Exp $	*/
 /*	$NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $	*/
 
 /*
@@ -74,13 +74,10 @@
 
 #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/socketvar.h>
-#include <sys/errno.h>
-#include <sys/domain.h>
 
 #include <net/route.h>
 
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index ede8b35461b..b8b8cbf7918 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_subr.c,v 1.45 2001/06/05 02:31:36 deraadt Exp $	*/
+/*	$OpenBSD: tcp_subr.c,v 1.46 2001/06/08 03:53:46 angelos Exp $	*/
 /*	$NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $	*/
 
 /*
@@ -73,15 +73,12 @@
  */
 
 #include <sys/param.h>
-#include <sys/proc.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
-#include <sys/errno.h>
-#include <sys/time.h>
 #include <sys/kernel.h>
 
 #include <net/route.h>
@@ -102,9 +99,6 @@
 #include <dev/rndvar.h>
 
 #ifdef INET6
-#include <netinet6/ip6_var.h>
-#include <netinet6/tcpipv6.h>
-#include <sys/domain.h>
 #include <netinet6/in6_var.h>
 #include <netinet6/ip6protosw.h>
 #endif /* INET6 */
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index cfa6857a7b4..09f33a5dd32 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_timer.c,v 1.21 2001/05/31 16:27:08 provos Exp $	*/
+/*	$OpenBSD: tcp_timer.c,v 1.22 2001/06/08 03:53:47 angelos Exp $	*/
 /*	$NetBSD: tcp_timer.c,v 1.14 1996/02/13 23:44:09 christos Exp $	*/
 
 /*
@@ -39,14 +39,11 @@
 #ifndef TUBA_INCLUDE
 #include <sys/param.h>
 #include <sys/systm.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 <net/if.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
@@ -56,12 +53,9 @@
 #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>
 #include <netinet/ip_icmp.h>
-#include <dev/rndvar.h>
 
 int	tcp_keepidle = TCPTV_KEEP_IDLE;
 int	tcp_keepintvl = TCPTV_KEEPINTVL;
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index e5d4d962caf..28dfa7c826d 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_usrreq.c,v 1.52 2001/06/05 02:31:37 deraadt Exp $	*/
+/*	$OpenBSD: tcp_usrreq.c,v 1.53 2001/06/08 03:53:47 angelos Exp $	*/
 /*	$NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $	*/
 
 /*
@@ -73,18 +73,11 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.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 <sys/proc.h>
-#include <sys/ucred.h>
-#include <vm/vm.h>
 #include <sys/sysctl.h>
 #include <sys/domain.h>
 
@@ -104,7 +97,6 @@
 #include <netinet/tcp_var.h>
 #include <netinet/tcpip.h>
 #include <netinet/tcp_debug.h>
-#include <dev/rndvar.h>
 
 /*
  * TCP protocol interface to socket abstraction.
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 843ce53498a..969a41a67f3 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udp_usrreq.c,v 1.61 2001/06/05 02:31:37 deraadt Exp $	*/
+/*	$OpenBSD: udp_usrreq.c,v 1.62 2001/06/08 03:53:47 angelos Exp $	*/
 /*	$NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $	*/
 
 /*
@@ -73,17 +73,10 @@
  */
 
 #include <sys/param.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 <sys/stat.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-
-#include <vm/vm.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
@@ -99,20 +92,10 @@
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 
-#ifdef IPSEC
-#include <netinet/ip_ipsp.h>
-#endif
-
-#include <machine/stdarg.h>
-
 #ifdef INET6
 #ifndef INET
 #include <netinet/in.h>
 #endif
-#include <netinet/ip6.h>
-#include <netinet6/in6_var.h>
-#include <netinet6/ip6_var.h>
-#include <netinet/icmp6.h>
 #include <netinet6/ip6protosw.h>
 
 extern int ip6_defhlim;