28 files changed, 158 insertions, 77 deletions

diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index effaf0f04e0..6e3cc6a6214 100644
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.h,v 1.15 2001/02/07 11:43:52 itojun Exp $	*/
+/*	$OpenBSD: icmp6.h,v 1.16 2001/06/09 07:03:39 angelos Exp $	*/
 /*	$KAME: icmp6.h,v 1.39 2001/02/06 03:48:06 itojun Exp $	*/
 
 /*
@@ -679,5 +679,4 @@ do { \
 extern int	icmp6_rediraccept;	/* accept/process redirects */
 extern int	icmp6_redirtimeout;	/* cache time for redirect routes */
 #endif /* _KERNEL */
-
-#endif /* not _NETINET_ICMP6_H_ */
+#endif /* _NETINET_ICMP6_H_ */
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index eb212370741..df7f38801bf 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp_var.h,v 1.5 2000/10/10 14:24:33 itojun Exp $	*/
+/*	$OpenBSD: icmp_var.h,v 1.6 2001/06/09 07:03:39 angelos Exp $	*/
 /*	$NetBSD: icmp_var.h,v 1.8 1995/03/26 20:32:19 jtc Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_ICMP_VAR_H_
+#define _NETINET_ICMP_VAR_H_
+
 /*
  * Variables related to this implementation
  * of the internet control message protocol.
@@ -73,4 +76,5 @@ struct	icmpstat {
 
 #ifdef _KERNEL
 struct	icmpstat icmpstat;
-#endif
+#endif /* _KERNEL */
+#endif /* _NETINET_ICMP_VAR_H_ */
diff --git a/sys/netinet/if_arc.h b/sys/netinet/if_arc.h
index c77ec96d4c0..0da6dad34d0 100644
--- a/sys/netinet/if_arc.h
+++ b/sys/netinet/if_arc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_arc.h,v 1.3 2000/04/26 21:02:02 jakob Exp $	*/
+/*	$OpenBSD: if_arc.h,v 1.4 2001/06/09 07:03:40 angelos Exp $	*/
 /*	$NetBSD: if_arc.h,v 1.5 1995/06/07 00:14:04 cgd Exp $	*/
 
 /*
@@ -37,6 +37,9 @@
  *       @(#)if_ether.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_IF_ARC_H_
+#define _NETINET_IF_ARC_H_
+
 /*
  * Arcnet address - 1 octets
  * don't know who uses this.
@@ -123,4 +126,5 @@ void	arc_input __P((struct ifnet *, struct mbuf *));
 int	arc_output __P((struct ifnet *, struct mbuf *, struct sockaddr *,
 	    struct rtentry *));
 int	arc_isphds __P((int));
-#endif
+#endif /* _KERNEL */
+#endif /* _NETINET_IF_ARC_H_ */
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index ccdb5ff6bf1..32feb81b867 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: igmp.h,v 1.3 1999/08/08 00:43:00 niklas Exp $	*/
+/*	$OpenBSD: igmp.h,v 1.4 2001/06/09 07:03:40 angelos Exp $	*/
 /*	$NetBSD: igmp.h,v 1.6 1995/05/31 06:08:21 mycroft Exp $	*/
 
 /*
@@ -40,6 +40,9 @@
  *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_IGMP_H_
+#define _NETINET_IGMP_H_
+
 /*
  * Internet Group Management Protocol (IGMP) definitions.
  *
@@ -94,4 +97,5 @@ struct igmp {
 
 #ifdef _KERNEL
 void	rti_delete __P((struct ifnet *));
-#endif
+#endif /* _KERNEL */
+#endif /* _NETINET_IGMP_H_ */
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index f31ef56f019..5c454d36ab0 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: igmp_var.h,v 1.3 1997/02/05 15:48:22 deraadt Exp $	*/
+/*	$OpenBSD: igmp_var.h,v 1.4 2001/06/09 07:03:40 angelos Exp $	*/
 /*	$NetBSD: igmp_var.h,v 1.9 1996/02/13 23:41:31 christos Exp $	*/
 
 /*
@@ -40,6 +40,9 @@
  *	@(#)igmp_var.h	8.1 (Berkeley) 7/19/93
  */
 
+#ifndef _NETINET_IGMP_VAR_H_
+#define _NETINET_IGMP_VAR_H_
+
 /*
  * Internet Group Management Protocol (IGMP),
  * implementation-specific definitions.
@@ -79,4 +82,5 @@ void	igmp_joingroup __P((struct in_multi *));
 void	igmp_leavegroup __P((struct in_multi *));
 void	igmp_fasttimo __P((void));
 void	igmp_slowtimo __P((void));
-#endif
+#endif /* _KERNEL */
+#endif /* _NETINET_IGMP_VAR_H_ */
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index de966785d34..0fc93051b9b 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in.h,v 1.45 2001/05/27 05:27:01 angelos Exp $	*/
+/*	$OpenBSD: in.h,v 1.46 2001/06/09 07:03:40 angelos Exp $	*/
 /*	$NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $	*/
 
 /*
@@ -513,5 +513,5 @@ char	  *inet_ntoa __P((struct in_addr));
 #define	satosin(sa)	((struct sockaddr_in *)(sa))
 #define	sintosa(sin)	((struct sockaddr *)(sin))
 #define	ifatoia(ifa)	((struct in_ifaddr *)(ifa))
-#endif
-#endif /* !_NETINET_IN_H_ */
+#endif /* _KERNEL */
+#endif /* _NETINET_IN_H_ */
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 7c5f87d24e6..7dfc1441c3e 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.h,v 1.35 2001/05/27 03:53:09 angelos Exp $	*/
+/*	$OpenBSD: in_pcb.h,v 1.36 2001/06/09 07:03:40 angelos Exp $	*/
 /*	$NetBSD: in_pcb.h,v 1.14 1996/02/13 23:42:00 christos Exp $	*/
 
 /*
@@ -65,6 +65,9 @@
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_IN_PCB_H_
+#define _NETINET_IN_PCB_H_
+
 #include <sys/queue.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
@@ -277,4 +280,5 @@ struct 	in6_addr *in6_selectsrc __P((struct sockaddr_in6 *,
 				     struct in6_addr *, int *));
 int	in6_selecthlim __P((struct inpcb *, struct ifnet *));
 int	in6_pcbsetport __P((struct in6_addr *, struct inpcb *));
-#endif
+#endif /* _KERNEL */
+#endif /* _NETINET_IN_PCB_H_ */
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index 8cf64aaccb2..b2c69dd504b 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_systm.h,v 1.2 1997/02/24 14:06:35 niklas Exp $	*/
+/*	$OpenBSD: in_systm.h,v 1.3 2001/06/09 07:03:41 angelos Exp $	*/
 /*	$NetBSD: in_systm.h,v 1.8 1995/04/13 06:29:22 cgd Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_IN_SYSTM_H_
+#define _NETINET_IN_SYSTM_H_
+
 /*
  * Miscellaneous internetwork
  * definitions for kernel.
@@ -56,4 +59,6 @@ typedef u_int32_t n_time;		/* ms since 00:00 GMT, byte rev */
 
 #ifdef _KERNEL
 n_time	 iptime __P((void));
-#endif
+#endif /* _KERNEL */
+#endif /* _NETINET_IN_SYSTM_H_ */
+
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index c96bf076f15..fc722d7f19a 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_var.h,v 1.3 1999/12/08 06:50:19 itojun Exp $	*/
+/*	$OpenBSD: in_var.h,v 1.4 2001/06/09 07:03:41 angelos Exp $	*/
 /*	$NetBSD: in_var.h,v 1.16 1996/02/13 23:42:15 christos Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)in_var.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_IN_VAR_H_
+#define _NETINET_IN_VAR_H_
+
 #include <sys/queue.h>
 
 /*
@@ -218,3 +221,5 @@ int	in_control __P((struct socket *, u_long, caddr_t, struct ifnet *));
 
 /* INET6 stuff */
 #include <netinet6/in6_var.h>
+
+#endif /* _NETINET_IN_VAR_H_ */
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index a3fd5ea3549..bad86dc5ef4 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip.h,v 1.6 1999/12/08 06:50:19 itojun Exp $	*/
+/*	$OpenBSD: ip.h,v 1.7 2001/06/09 07:03:41 angelos Exp $	*/
 /*	$NetBSD: ip.h,v 1.9 1995/05/15 01:22:44 cgd Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)ip.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_IP_H_
+#define _NETINET_IP_H_
+
 /*
  * Definitions for internet protocol version 4.
  * Per RFC 791, September 1981.
@@ -185,3 +188,4 @@ struct ippseudo {
 	u_int8_t  ippseudo_p;		/* protocol */
 	u_int16_t ippseudo_len;		/* protocol length */
 };
+#endif /* _NETINET_IP_H_ */
diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h
index 08e9db5605b..c189cc9d5f3 100644
--- a/sys/netinet/ip6.h
+++ b/sys/netinet/ip6.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6.h,v 1.6 2000/10/10 15:53:08 itojun Exp $	*/
+/*	$OpenBSD: ip6.h,v 1.7 2001/06/09 07:03:41 angelos Exp $	*/
 /*	$KAME: ip6.h,v 1.14 2000/10/09 01:04:09 itojun Exp $	*/
 
 /*
@@ -294,6 +294,5 @@ do {									\
 		}							\
 	}								\
 } while (0)
-#endif /*_KERNEL*/
-
-#endif /* not _NETINET_IP6_H_ */
+#endif /* _KERNEL */
+#endif /* _NETINET_IP6_H_ */
diff --git a/sys/netinet/ip_ah.h b/sys/netinet/ip_ah.h
index c3349e54c26..c3e33ea3a20 100644
--- a/sys/netinet/ip_ah.h
+++ b/sys/netinet/ip_ah.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ah.h,v 1.26 2000/09/19 03:20:58 angelos Exp $	*/
+/*	$OpenBSD: ip_ah.h,v 1.27 2001/06/09 07:03:41 angelos Exp $	*/
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -35,8 +35,8 @@
  * PURPOSE.
  */
 
-#ifndef _NETINET_AH_H_
-#define _NETINET_AH_H_
+#ifndef _NETINET_IP_AH_H_
+#define _NETINET_IP_AH_H_
 
 struct ahstat
 {
@@ -90,4 +90,4 @@ struct ah
 extern int ah_enable;
 struct ahstat ahstat;
 #endif /* _KERNEL */
-#endif /* _NETINET_AH_H_ */
+#endif /* _NETINET_IP_AH_H_ */
diff --git a/sys/netinet/ip_ecn.h b/sys/netinet/ip_ecn.h
index 7f6f4f529ea..ffe610b1eee 100644
--- a/sys/netinet/ip_ecn.h
+++ b/sys/netinet/ip_ecn.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ecn.h,v 1.2 2001/02/16 08:48:04 itojun Exp $	*/
+/*	$OpenBSD: ip_ecn.h,v 1.3 2001/06/09 07:03:41 angelos Exp $	*/
 /*	$KAME: ip_ecn.h,v 1.5 2000/03/27 04:58:38 sumikawa Exp $	*/
 
 /*
@@ -30,26 +30,25 @@
  * SUCH DAMAGE.
  *
  */
+
+#ifndef _NETINET_IP_ECN_H_
+#define _NETINET_IP_ECN_H_
+
 /*
  * ECN consideration on tunnel ingress/egress operation.
  * http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt
  */
 
-#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__NetBSD__)
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_inet.h"
-#endif
-#endif
-
 #define ECN_ALLOWED	1	/* ECN allowed */
 #define ECN_FORBIDDEN	0	/* ECN forbidden */
 #define ECN_NOCARE	(-1)	/* no consideration to ECN */
 
-#if defined(KERNEL) || defined(_KERNEL)
+#if defined(_KERNEL)
 extern void ip_ecn_ingress __P((int, u_int8_t *, u_int8_t *));
 extern void ip_ecn_egress __P((int, u_int8_t *, u_int8_t *));
 #ifdef INET6
 extern void ip6_ecn_ingress __P((int, u_int32_t *, u_int32_t *));
 extern void ip6_ecn_egress __P((int, u_int32_t *, u_int32_t *));
-#endif
-#endif
+#endif /* INET6 */
+#endif /* _KERNEL */
+#endif /* _NETINET_IP_ECN_H_ */
diff --git a/sys/netinet/ip_esp.h b/sys/netinet/ip_esp.h
index 04f7c55d46d..6bafd2b45fb 100644
--- a/sys/netinet/ip_esp.h
+++ b/sys/netinet/ip_esp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_esp.h,v 1.33 2000/09/19 03:20:58 angelos Exp $	*/
+/*	$OpenBSD: ip_esp.h,v 1.34 2001/06/09 07:03:41 angelos Exp $	*/
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -35,8 +35,8 @@
  * PURPOSE.
  */
 
-#ifndef _NETINET_ESP_H_
-#define _NETINET_ESP_H_
+#ifndef _NETINET_IP_ESP_H_
+#define _NETINET_IP_ESP_H_
 
 #define ESP_ALEN	12	/* 96-bit authenticator */
 
@@ -78,4 +78,4 @@ struct espstat
 extern int esp_enable;
 struct espstat espstat;
 #endif /* _KERNEL */
-#endif _NETINET_ESP_H_
+#endif _NETINET_IP_ESP_H_
diff --git a/sys/netinet/ip_ether.h b/sys/netinet/ip_ether.h
index 322ba90c956..e32ccd5de84 100644
--- a/sys/netinet/ip_ether.h
+++ b/sys/netinet/ip_ether.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ether.h,v 1.9 2001/02/03 21:38:39 jason Exp $ */
+/*	$OpenBSD: ip_ether.h,v 1.10 2001/06/09 07:03:42 angelos Exp $ */
 
 /*
  * The author of this code is Angelos D. Keromytis (angelos@adk.gr) 
@@ -23,6 +23,9 @@
  * PURPOSE.
  */
 
+#ifndef _NETINET_IP_ETHER_H_
+#define _NETINET_IP_ETHER_H_
+
 /*
  * Ethernet-inside-IP processing.
  */
@@ -64,4 +67,5 @@ int	etherip_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
 
 extern int etherip_allow;
 extern struct etheripstat etheripstat;
-#endif
+#endif /* _KERNEL */
+#endif /* _NETINET_IP_ETHER_H_ */
diff --git a/sys/netinet/ip_gre.h b/sys/netinet/ip_gre.h
index 9359558157a..5898083424c 100644
--- a/sys/netinet/ip_gre.h
+++ b/sys/netinet/ip_gre.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ip_gre.h,v 1.1 2000/01/07 21:38:01 angelos Exp $ */
+/*      $OpenBSD: ip_gre.h,v 1.2 2001/06/09 07:03:42 angelos Exp $ */
 /*	$NetBSD: ip_gre.h,v 1.3 1998/10/07 23:33:02 thorpej Exp $ */
 
 /*
@@ -37,6 +37,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef _NETINET_IP_GRE_H_
+#define _NETINET_IP_GRE_H_
+
 /*
  * Names for GRE sysctl objects
  */
@@ -68,5 +71,6 @@ int     gre_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
 
 #ifndef MROUTING
 void gre_ipip_input __P((struct mbuf *, ...));
-#endif
+#endif /* MROUTING */
 #endif /* _KERNEL */
+#endif /* _NETINET_IP_GRE_H_ */
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index 9787a883dbd..6b811f2f1d3 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_icmp.h,v 1.12 2000/12/12 20:55:52 mickey Exp $	*/
+/*	$OpenBSD: ip_icmp.h,v 1.13 2001/06/09 07:03:42 angelos Exp $	*/
 /*	$NetBSD: ip_icmp.h,v 1.10 1996/02/13 23:42:28 christos Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_IP_ICMP_H_
+#define _NETINET_IP_ICMP_H_
+
 /*
  * Interface Control Message Protocol Definitions.
  * Per RFC 792, September 1981.
@@ -193,4 +196,5 @@ int	icmp_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
 struct rtentry *
 	icmp_mtudisc_clone(struct sockaddr *);
 void	icmp_mtudisc __P((struct icmp *));
-#endif
+#endif /* _KERNEL */
+#endif /* _NETINET_IP_ICMP_H_ */
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index 594e1804adc..a315cd025d6 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -1,6 +1,9 @@
-/*	$OpenBSD: ip_mroute.h,v 1.6 2000/01/21 03:15:05 angelos Exp $	*/
+/*	$OpenBSD: ip_mroute.h,v 1.7 2001/06/09 07:03:42 angelos Exp $	*/
 /*	$NetBSD: ip_mroute.h,v 1.10 1996/02/13 23:42:55 christos Exp $	*/
 
+#ifndef _NETINET_IP_MROUTE_H_
+#define _NETINET_IP_MROUTE_H_
+
 /*
  * Definitions for IP multicast forwarding.
  *
@@ -222,14 +225,12 @@ int	legal_vif_num __P((int));
 int	ip_rsvp_vif_init __P((struct socket *, struct mbuf *));
 int	ip_rsvp_vif_done __P((struct socket *, struct mbuf *));
 void	ip_rsvp_force_done __P((struct socket *));
-#if 0
-void	rsvp_input __P((struct mbuf *, struct ifnet *));
-#else
 void rsvp_input __P((struct mbuf *, int, int));
-#endif
 #else
 int	ip_mforward __P((struct mbuf *, struct ifnet *));
-#endif
+#endif /* RSVP_ISI */
+
 void	ipip_mroute_input __P((struct mbuf *, ...));
 
 #endif /* _KERNEL */
+#endif /* _NETINET_IP_MROUTE_H_ */
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index f4a7629eb35..5136ff31747 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_var.h,v 1.18 2001/05/28 05:29:36 angelos Exp $	*/
+/*	$OpenBSD: ip_var.h,v 1.19 2001/06/09 07:03:42 angelos Exp $	*/
 /*	$NetBSD: ip_var.h,v 1.16 1996/02/13 23:43:20 christos Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)ip_var.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_IP_VAR_H_
+#define _NETINET_IP_VAR_H_
+
 #include <sys/queue.h>
 
 /*
@@ -196,4 +199,5 @@ void	 rip_input __P((struct mbuf *, ...));
 int	 rip_output __P((struct mbuf *, ...));
 int	 rip_usrreq __P((struct socket *,
 	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-#endif
+#endif /* _KERNEL */
+#endif /* _NETINET_IP_VAR_H_ */
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index 0bd98882b2b..56f26181ce2 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp.h,v 1.8 1999/07/06 20:17:52 cmetz Exp $	*/
+/*	$OpenBSD: tcp.h,v 1.9 2001/06/09 07:03:43 angelos Exp $	*/
 /*	$NetBSD: tcp.h,v 1.8 1995/04/17 05:32:58 cgd Exp $	*/
 
 /*
@@ -123,4 +123,4 @@ struct tcphdr {
 #define	TCP_SIGNATURE_ENABLE	0x04   /* enable TCP MD5 signature option */
 #define	TCP_SACK_DISABLE	0x300  /* disable SACKs (if enabled by def.) */
 
-#endif /* !_NETINET_TCP_H_ */
+#endif /* _NETINET_TCP_H_ */
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index 0504f95df92..042db3d4f44 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_debug.h,v 1.4 1999/01/11 02:01:35 deraadt Exp $	*/
+/*	$OpenBSD: tcp_debug.h,v 1.5 2001/06/09 07:03:43 angelos Exp $	*/
 /*	$NetBSD: tcp_debug.h,v 1.5 1994/06/29 06:38:38 cgd Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_TCP_DEBUG_H_
+#define _NETINET_TCP_DEBUG_H_
+
 #include <netinet6/tcpipv6.h>
 
 struct	tcp_debug {
@@ -58,8 +61,9 @@ struct	tcp_debug {
 #ifdef TANAMES
 char	*tanames[] =
     { "input", "output", "user", "respond", "drop" };
-#endif
+#endif /* TANAMES */
 
 #define	TCP_NDEBUG 100
 struct	tcp_debug tcp_debug[TCP_NDEBUG];
 int	tcp_debx;
+#endif /* _NETINET_TCP_DEBUG_H_ */
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index a6cd4813081..d35259400dd 100644
--- a/sys/netinet/tcp_fsm.h
+++ b/sys/netinet/tcp_fsm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_fsm.h,v 1.4 1997/11/08 19:54:12 deraadt Exp $	*/
+/*	$OpenBSD: tcp_fsm.h,v 1.5 2001/06/09 07:03:43 angelos Exp $	*/
 /*	$NetBSD: tcp_fsm.h,v 1.6 1994/10/14 16:01:48 mycroft Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_TCP_FSM_H_
+#define _NETINET_TCP_FSM_H_
+
 /*
  * TCP FSM state definitions.
  * Per RFC793, September, 1981.
@@ -74,11 +77,11 @@ u_char	tcp_outflags[TCP_NSTATES] = {
     TH_ACK, TH_ACK,
     TH_FIN|TH_ACK, TH_ACK, TH_FIN|TH_ACK, TH_ACK, TH_ACK,
 };
-#endif
+#endif /* TCPOUTFLAGS */
 
 #ifdef KPROF
 int	tcp_acounts[TCP_NSTATES][PRU_NREQ];
-#endif
+#endif /* KPROF */
 
 #ifdef	TCPSTATES
 char *tcpstates[] = {
@@ -86,4 +89,5 @@ char *tcpstates[] = {
 	"ESTABLISHED",	"CLOSE_WAIT",	"FIN_WAIT_1",	"CLOSING",
 	"LAST_ACK",	"FIN_WAIT_2",	"TIME_WAIT",
 };
-#endif
+#endif /* TCPSTATES */
+#endif /* _NETINET_TCP_FSM_H_ */
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index a9aa1abc025..4fb8ea2629a 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_seq.h,v 1.2 1997/02/24 14:06:46 niklas Exp $	*/
+/*	$OpenBSD: tcp_seq.h,v 1.3 2001/06/09 07:03:43 angelos Exp $	*/
 /*	$NetBSD: tcp_seq.h,v 1.6 1995/03/26 20:32:35 jtc Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)tcp_seq.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_TCP_SEQ_H_
+#define _NETINET_TCP_SEQ_H_
+
 /*
  * TCP sequence numbers are 32 bit integers operated
  * on with modular arithmetic.  These macros can be
@@ -62,4 +65,5 @@
 
 #ifdef _KERNEL
 tcp_seq	tcp_iss;		/* tcp initial send seq # */
-#endif
+#endif /* _KERNEL */
+#endif /* _NETINET_TCP_SEQ_H_ */
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 807cec54ba0..d494fb964a6 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_timer.h,v 1.3 1997/02/24 14:06:46 niklas Exp $	*/
+/*	$OpenBSD: tcp_timer.h,v 1.4 2001/06/09 07:03:43 angelos Exp $	*/
 /*	$NetBSD: tcp_timer.h,v 1.6 1995/03/26 20:32:37 jtc Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_TCP_TIMER_H_
+#define _NETINET_TCP_TIMER_H_
+
 /*
  * Definitions of the TCP timers.  These timers are counted
  * down PR_SLOWHZ times a second.
@@ -109,7 +112,7 @@
 #ifdef	TCPTIMERS
 char *tcptimers[] =
     { "REXMT", "PERSIST", "KEEP", "2MSL" };
-#endif
+#endif /* TCPTIMERS */
 
 /*
  * Force a time value to be in a certain range.
@@ -129,4 +132,5 @@ extern int tcp_keepintvl;		/* time between keepalive probes */
 extern int tcp_maxidle;			/* time to drop after starting probes */
 extern int tcp_ttl;			/* time to live for TCP segs */
 extern int tcp_backoff[];
-#endif
+#endif /* _KERNEL */
+#endif /* _NETINET_TCP_TIMER_H_ */
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index e5119a102fc..452112f9688 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_var.h,v 1.35 2000/12/13 09:47:08 provos Exp $	*/
+/*	$OpenBSD: tcp_var.h,v 1.36 2001/06/09 07:03:43 angelos Exp $	*/
 /*	$NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)tcp_var.h	8.3 (Berkeley) 4/10/94
  */
 
+#ifndef _NETINET_TCP_VAR_H_
+#define _NETINET_TCP_VAR_H_
+
 struct sackblk {
 	tcp_seq start;		/* start seq no. of sack block */
 	tcp_seq end; 		/* end seq no. */
@@ -405,5 +408,5 @@ void	tcp_rndiss_init __P((void));
 tcp_seq	tcp_rndiss_next __P((void));
 u_int16_t
 	tcp_rndiss_encrypt __P((u_int16_t));
-
 #endif /* _KERNEL */
+#endif /* _NETINET_TCP_VAR_H_ */
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index 3e5f7829942..75316280821 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcpip.h,v 1.4 1997/08/26 20:02:35 deraadt Exp $	*/
+/*	$OpenBSD: tcpip.h,v 1.5 2001/06/09 07:03:45 angelos Exp $	*/
 /*	$NetBSD: tcpip.h,v 1.6 1995/11/21 01:07:44 cgd Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_TCPIP_H_
+#define _NETINET_TCPIP_H_
+
 /*
  * Tcp+ip header, after ip options removed.
  */
@@ -58,3 +61,5 @@ struct tcpiphdr {
 #define	ti_win		ti_t.th_win
 #define	ti_sum		ti_t.th_sum
 #define	ti_urp		ti_t.th_urp
+
+#endif /* _NETINET_TCPIP_H_ */
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index 3d5c73edf81..7c60c630493 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udp.h,v 1.3 1997/02/24 14:06:47 niklas Exp $	*/
+/*	$OpenBSD: udp.h,v 1.4 2001/06/09 07:03:45 angelos Exp $	*/
 /*	$NetBSD: udp.h,v 1.6 1995/04/13 06:37:10 cgd Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)udp.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_UDP_H_
+#define _NETINET_UDP_H_
+
 /*
  * Udp protocol header.
  * Per RFC 768, September, 1981.
@@ -46,3 +49,5 @@ struct udphdr {
 	u_int16_t uh_ulen;		/* udp length */
 	u_int16_t uh_sum;		/* udp checksum */
 };
+
+#endif /* _NETINET_UDP_H_ */
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index b6064b0cc89..2c0c3cf1938 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udp_var.h,v 1.10 2000/06/18 17:32:48 itojun Exp $	*/
+/*	$OpenBSD: udp_var.h,v 1.11 2001/06/09 07:03:45 angelos Exp $	*/
 /*	$NetBSD: udp_var.h,v 1.12 1996/02/13 23:44:41 christos Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_UDP_VAR_H_
+#define _NETINET_UDP_VAR_H_
+
 /*
  * UDP kernel structures and variables.
  */
@@ -95,16 +98,17 @@ void	udp6_ctlinput __P((int, struct sockaddr *, void *));
 int	udp6_input __P((struct mbuf **, int *, int));
 int	udp6_usrreq __P((struct socket *,
 	    int, struct mbuf *, struct mbuf *, struct mbuf *, struct proc *));
-#endif
+#endif /* INET6 && !TCP6 */
 void	 *udp_ctlinput __P((int, struct sockaddr *, void *));
 void	 udp_init __P((void));
 void	 udp_input __P((struct mbuf *, ...));
 #ifdef INET6
 int	 udp6_output __P((struct inpcb *, struct mbuf *, struct mbuf *,
 	struct mbuf *));
-#endif
+#endif /* INET6 */
 int	 udp_output __P((struct mbuf *, ...));
 int	 udp_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
 int	 udp_usrreq __P((struct socket *,
 	    int, struct mbuf *, struct mbuf *, struct mbuf *));
-#endif
+#endif /* _KERNEL */
+#endif /* _NETINET_UDP_VAR_H_ */