Trim include files.

6 files changed, 14 insertions, 61 deletions

diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c
index e3ea676ff6a..88d8d91b530 100644
--- a/sys/netinet/ip_ah.c
+++ b/sys/netinet/ip_ah.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ah.c,v 1.58 2001/06/01 00:09:23 angelos Exp $ */
+/*	$OpenBSD: ip_ah.c,v 1.59 2001/06/08 03:13:14 angelos Exp $ */
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -38,29 +38,22 @@
 
 #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/socketvar.h>
-#include <machine/cpu.h>
-#include <machine/endian.h>
 
 #include <net/if.h>
-#include <net/route.h>
-#include <net/netisr.h>
-#include <net/raw_cb.h>
 #include <net/bpf.h>
 
+#ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
+#endif /* INET */
 
 #ifdef INET6
+#ifndef INET
+#include <netinet/in.h>
+#endif /* INET */
 #include <netinet/ip6.h>
 #endif /* INET6 */
 
@@ -69,9 +62,6 @@
 #include <net/pfkeyv2.h>
 #include <net/if_enc.h>
 
-#include <sys/md5k.h>
-#include <crypto/sha1.h>
-#include <crypto/rmd160.h>
 #include <crypto/crypto.h>
 #include <crypto/xform.h>
 
diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c
index 509df9a8c3b..415a56965f6 100644
--- a/sys/netinet/ip_esp.c
+++ b/sys/netinet/ip_esp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_esp.c,v 1.64 2001/06/05 11:10:10 angelos Exp $ */
+/*	$OpenBSD: ip_esp.c,v 1.65 2001/06/08 03:13:14 angelos Exp $ */
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -37,23 +37,13 @@
 
 #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 <machine/cpu.h>
 
 #include <net/if.h>
-#include <net/route.h>
-#include <net/netisr.h>
 #include <net/bpf.h>
 
-#include <sys/socketvar.h>
-#include <net/raw_cb.h>
+#include <dev/rndvar.h>
 
 #ifdef INET
 #include <netinet/in.h>
@@ -73,9 +63,6 @@
 #include <net/pfkeyv2.h>
 #include <net/if_enc.h>
 
-#include <sys/md5k.h>
-#include <crypto/sha1.h>
-#include <crypto/rmd160.h>
 #include <crypto/crypto.h>
 #include <crypto/xform.h>
 
diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index 14aa50126b2..da8f7ea8657 100644
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ipsp.c,v 1.129 2001/06/07 16:19:47 angelos Exp $	*/
+/*	$OpenBSD: ip_ipsp.c,v 1.130 2001/06/08 03:13:14 angelos Exp $	*/
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -38,13 +38,9 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/errno.h>
 #include <sys/kernel.h>
-#include <sys/queue.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
@@ -53,7 +49,6 @@
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
-#include <netinet/ip_var.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #endif /* INET */
@@ -65,12 +60,9 @@
 #include <netinet6/in6_var.h>
 #endif /* INET6 */
 
-#include <net/pfkeyv2.h>
-
 #include <netinet/ip_ipsp.h>
-
+#include <net/pfkeyv2.h>
 #include <crypto/xform.h>
-
 #include <dev/rndvar.h>
 
 #ifdef DDB
diff --git a/sys/netinet/ip_spd.c b/sys/netinet/ip_spd.c
index 71e8bd72b41..33b697736dd 100644
--- a/sys/netinet/ip_spd.c
+++ b/sys/netinet/ip_spd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_spd.c,v 1.22 2001/06/07 16:19:47 angelos Exp $ */
+/* $OpenBSD: ip_spd.c,v 1.23 2001/06/08 03:13:14 angelos Exp $ */
 
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
@@ -23,14 +23,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/errno.h>
 #include <sys/kernel.h>
-#include <sys/queue.h>
-
-#include <machine/cpu.h>
 
 #include <net/if.h>
 #include <net/route.h>
@@ -51,9 +46,8 @@
 #include <netinet6/in6_var.h>
 #endif /* INET6 */
 
-#include <net/pfkeyv2.h>
-
 #include <netinet/ip_ipsp.h>
+#include <net/pfkeyv2.h>
 
 #ifdef ENCDEBUG
 #define DPRINTF(x)	if (encdebug) printf x
diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c
index 9aac39a36e9..a0f2d1490d8 100644
--- a/sys/netinet/ipsec_input.c
+++ b/sys/netinet/ipsec_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipsec_input.c,v 1.42 2001/06/05 11:10:12 angelos Exp $	*/
+/*	$OpenBSD: ipsec_input.c,v 1.43 2001/06/08 03:13:15 angelos Exp $	*/
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -36,20 +36,12 @@
  */
 
 #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/sysctl.h>
-#include <sys/errno.h>
 #include <sys/kernel.h>
 
-#include <machine/cpu.h>
-
 #include <net/if.h>
-#include <net/route.h>
 #include <net/netisr.h>
 #include <net/bpf.h>
 
diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c
index 604a8f8f06a..e2b996989ed 100644
--- a/sys/netinet/ipsec_output.c
+++ b/sys/netinet/ipsec_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipsec_output.c,v 1.13 2001/05/30 12:29:04 angelos Exp $ */
+/*	$OpenBSD: ipsec_output.c,v 1.14 2001/06/08 03:13:15 angelos Exp $ */
 
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
@@ -23,10 +23,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/errno.h>
 #include <sys/kernel.h>
 
 #include <net/if.h>