summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorelad <elad@NetBSD.org>2005-12-10 23:31:41 +0000
committerelad <elad@NetBSD.org>2005-12-10 23:31:41 +0000
commit9702e9873086f9156b2ff41cbcbbab4956fdc417 (patch)
tree96e670c079db37ab7d414d2649ee2f8666923a10 /sys
parent976bf6cfddde0beb48f68137b0adee32b0e5022e (diff)
Multiple inclusion protection, as suggested by christos@ on tech-kern@
few days ago.
Diffstat (limited to 'sys')
-rw-r--r--sys/netccitt/dll.h7
-rw-r--r--sys/netccitt/hd_var.h7
-rw-r--r--sys/netccitt/hdlc.h7
-rw-r--r--sys/netccitt/llc_var.h7
-rw-r--r--sys/netccitt/pk.h5
-rw-r--r--sys/netccitt/pk_extern.h10
-rw-r--r--sys/netccitt/pk_var.h7
-rw-r--r--sys/netccitt/x25.h4
-rw-r--r--sys/netccitt/x25acct.h7
-rw-r--r--sys/netccitt/x25err.h6
-rw-r--r--sys/netccitt/x25isr.h4
-rw-r--r--sys/netinet/icmp6.h4
-rw-r--r--sys/netinet/icmp_var.h4
-rw-r--r--sys/netinet/if_atm.h4
-rw-r--r--sys/netinet/if_ether.h4
-rw-r--r--sys/netinet/if_inarp.h4
-rw-r--r--sys/netinet/igmp.h4
-rw-r--r--sys/netinet/igmp_var.h4
-rw-r--r--sys/netinet/in_gif.h4
-rw-r--r--sys/netinet/in_offload.h6
-rw-r--r--sys/netinet/in_pcb.h4
-rw-r--r--sys/netinet/in_pcb_hdr.h4
-rw-r--r--sys/netinet/in_proto.h4
-rw-r--r--sys/netinet/in_systm.h4
-rw-r--r--sys/netinet/in_var.h4
-rw-r--r--sys/netinet/ip.h4
-rw-r--r--sys/netinet/ip6.h4
-rw-r--r--sys/netinet/ip_ecn.h4
-rw-r--r--sys/netinet/ip_encap.h4
-rw-r--r--sys/netinet/ip_gre.h7
-rw-r--r--sys/netinet/ip_icmp.h4
-rw-r--r--sys/netinet/ip_mroute.h4
-rw-r--r--sys/netinet/ip_var.h4
-rw-r--r--sys/netinet/pim.h4
-rw-r--r--sys/netinet/pim_var.h4
-rw-r--r--sys/netinet/tcp.h5
-rw-r--r--sys/netinet/tcp_debug.h4
-rw-r--r--sys/netinet/tcp_fsm.h4
-rw-r--r--sys/netinet/tcp_seq.h4
-rw-r--r--sys/netinet/tcp_timer.h4
-rw-r--r--sys/netinet/tcp_var.h4
-rw-r--r--sys/netinet/tcpip.h4
-rw-r--r--sys/netinet/udp.h4
-rw-r--r--sys/netinet/udp_var.h4
-rw-r--r--sys/netinet6/ah.h4
-rw-r--r--sys/netinet6/ah_aesxcbcmac.h6
-rw-r--r--sys/netinet6/esp.h4
-rw-r--r--sys/netinet6/esp_aesctr.h6
-rw-r--r--sys/netinet6/esp_rijndael.h7
-rw-r--r--sys/netinet6/in6.h8
-rw-r--r--sys/netinet6/in6_gif.h4
-rw-r--r--sys/netinet6/in6_ifattach.h4
-rw-r--r--sys/netinet6/in6_var.h4
-rw-r--r--sys/netinet6/ipcomp.h4
-rw-r--r--sys/netinet6/ipsec.h4
-rw-r--r--sys/netinet6/mld6_var.h4
-rw-r--r--sys/netinet6/nd6.h4
-rw-r--r--sys/netinet6/pim6.h8
-rw-r--r--sys/netinet6/pim6_var.h4
-rw-r--r--sys/netinet6/raw_ip6.h4
-rw-r--r--sys/netinet6/udp6.h4
-rw-r--r--sys/netinet6/udp6_var.h4
62 files changed, 178 insertions, 118 deletions
diff --git a/sys/netccitt/dll.h b/sys/netccitt/dll.h
index 1ca2d1f8245..3772c370a6b 100644
--- a/sys/netccitt/dll.h
+++ b/sys/netccitt/dll.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dll.h,v 1.6 2005/02/26 22:45:10 perry Exp $ */
+/* $NetBSD: dll.h,v 1.7 2005/12/10 23:31:41 elad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -67,6 +67,9 @@
* @(#)dll.h 8.1 (Berkeley) 6/10/93
*/
+#ifndef _NETCCITT_DLL_H_
+#define _NETCCITT_DLL_H_
+
/*
* We define the additional PRC_* codes in here
*/
@@ -113,3 +116,5 @@ struct dll_ctlinfo {
#define dlcti_pcb CTLIun.CTLI_DOWN.dctli_down_pcb
#define dlcti_rt CTLIun.CTLI_DOWN.dctli_down_rt
#define dlcti_conf CTLIun.CTLI_DOWN.dctli_down_llconf
+
+#endif /* !_NETCCITT_DLL_H_ */
diff --git a/sys/netccitt/hd_var.h b/sys/netccitt/hd_var.h
index 9c320eed9ea..f0b8597efd6 100644
--- a/sys/netccitt/hd_var.h
+++ b/sys/netccitt/hd_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hd_var.h,v 1.12 2005/05/29 21:53:52 christos Exp $ */
+/* $NetBSD: hd_var.h,v 1.13 2005/12/10 23:31:41 elad Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -73,6 +73,9 @@
* @(#)hd_var.h 8.1 (Berkeley) 6/10/93
*/
+#ifndef _NETCCITT_HD_VAR_H_
+#define _NETCCITT_HD_VAR_H_
+
/*
*
* hdlc control block
@@ -180,3 +183,5 @@ struct mbuf *hd_remove __P((struct hdtxq *));
void hd_timer __P((void));
#endif
+
+#endif /* !_NETCCITT_HD_VAR_H_ */
diff --git a/sys/netccitt/hdlc.h b/sys/netccitt/hdlc.h
index 6997fac06db..fb6a352ac7b 100644
--- a/sys/netccitt/hdlc.h
+++ b/sys/netccitt/hdlc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hdlc.h,v 1.8 2003/08/07 16:33:01 agc Exp $ */
+/* $NetBSD: hdlc.h,v 1.9 2005/12/10 23:31:41 elad Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -73,6 +73,9 @@
* @(#)hdlc.h 8.1 (Berkeley) 6/10/93
*/
+#ifndef _NETCCITT_HDLC_H_
+#define _NETCCITT_HDLC_H_
+
#ifndef ORDER4
#ifndef CCITT_TYPES_DEFINED
#define CCITT_TYPES_DEFINED
@@ -188,3 +191,5 @@ struct Hdlc_frame {
#define TX 0
#define RX 1
+
+#endif /* !_NETCCITT_HDLC_H_ */
diff --git a/sys/netccitt/llc_var.h b/sys/netccitt/llc_var.h
index 10b51805093..3b48bb4b9dc 100644
--- a/sys/netccitt/llc_var.h
+++ b/sys/netccitt/llc_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: llc_var.h,v 1.15 2005/05/29 21:53:52 christos Exp $ */
+/* $NetBSD: llc_var.h,v 1.16 2005/12/10 23:31:41 elad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -75,6 +75,9 @@
* @(#)llc_var.h 8.2 (Berkeley) 2/9/95
*/
+#ifndef _NETCCITT_LLC_VAR_H_
+#define _NETCCITT_LLC_VAR_H_
+
struct llc;
#define NPAIDB_LINK 0
@@ -719,3 +722,5 @@ void llc_trace __P((struct llc_linkcb *, int, const char *));
void llc_timer __P((void));
#endif
+
+#endif /* !_NETCCITT_LLC_VAR_H_ */
diff --git a/sys/netccitt/pk.h b/sys/netccitt/pk.h
index 8e6139d9e25..0bec9d64c0a 100644
--- a/sys/netccitt/pk.h
+++ b/sys/netccitt/pk.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pk.h,v 1.11 2005/02/26 22:45:10 perry Exp $ */
+/* $NetBSD: pk.h,v 1.12 2005/12/10 23:31:41 elad Exp $ */
/*
* Copyright (c) 1990, 1992, 1993
@@ -245,4 +245,5 @@ struct data_packet {
#define MAXRESTARTCOLLISIONS 10
-#endif /* _NETCCITT_PK_H_ */
+#endif /* !_NETCCITT_PK_H_ */
+
diff --git a/sys/netccitt/pk_extern.h b/sys/netccitt/pk_extern.h
index d616b831a0b..a0866c675aa 100644
--- a/sys/netccitt/pk_extern.h
+++ b/sys/netccitt/pk_extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pk_extern.h,v 1.13 2005/05/29 21:53:52 christos Exp $ */
+/* $NetBSD: pk_extern.h,v 1.14 2005/12/10 23:31:41 elad Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -36,11 +36,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef _KERNEL
-
#ifndef _NETCCITT_PK_EXTERN_H_
#define _NETCCITT_PK_EXTERN_H_
+#ifdef _KERNEL
+
#include <netccitt/x25isr.h>
struct pklcd;
@@ -132,6 +132,6 @@ int pk_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
int pk_checksockaddr __P((struct mbuf *));
int pk_send __P((struct mbuf *, void *));
-#endif
+#endif /* _KERNEL */
-#endif /* _NETCCITT_PK_EXTERN_H_ */
+#endif /* !_NETCCITT_PK_EXTERN_H_ */
diff --git a/sys/netccitt/pk_var.h b/sys/netccitt/pk_var.h
index adaff976839..29c7b14fa76 100644
--- a/sys/netccitt/pk_var.h
+++ b/sys/netccitt/pk_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pk_var.h,v 1.19 2005/05/29 21:53:52 christos Exp $ */
+/* $NetBSD: pk_var.h,v 1.20 2005/12/10 23:31:41 elad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,6 +77,9 @@
* @(#)pk_var.h 8.1 (Berkeley) 6/10/93
*/
+#ifndef _NETCCITT_PK_VAR_H_
+#define _NETCCITT_PK_VAR_H_
+
/*
*
* X.25 Logical Channel Descriptor
@@ -277,3 +280,5 @@ extern struct mbuf_cache pk_output_cache;
extern const char *pk_name[], *pk_state[];
extern int pk_t20, pk_t21, pk_t22, pk_t23;
#endif
+
+#endif /* !_NETCCITT_PK_VAR_H_ */
diff --git a/sys/netccitt/x25.h b/sys/netccitt/x25.h
index d6aa72e8806..2a52326f38c 100644
--- a/sys/netccitt/x25.h
+++ b/sys/netccitt/x25.h
@@ -1,4 +1,4 @@
-/* $NetBSD: x25.h,v 1.13 2005/02/26 22:45:10 perry Exp $ */
+/* $NetBSD: x25.h,v 1.14 2005/12/10 23:31:41 elad Exp $ */
/*
* Copyright (c) 1990, 1992, 1993
@@ -221,4 +221,4 @@ int pk_rtattach __P((struct socket *, struct mbuf *));
int x25_rtattach __P((struct pklcd *, struct rtentry *));
#endif
-#endif /* _NETCCITT_X25_H_ */
+#endif /* !_NETCCITT_X25_H_ */
diff --git a/sys/netccitt/x25acct.h b/sys/netccitt/x25acct.h
index 8f27c24ec91..065ebbf5e48 100644
--- a/sys/netccitt/x25acct.h
+++ b/sys/netccitt/x25acct.h
@@ -1,4 +1,4 @@
-/* $NetBSD: x25acct.h,v 1.7 2003/08/07 16:33:06 agc Exp $ */
+/* $NetBSD: x25acct.h,v 1.8 2005/12/10 23:31:41 elad Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -73,6 +73,9 @@
* @(#)x25acct.h 8.1 (Berkeley) 6/10/93
*/
+#ifndef _NETCCITT_X25ACCT_H_
+#define _NETCCITT_X25ACCT_H_
+
/*
* Format of X.25 accounting record written
* to X25ACCTF whenever a circuit is closed.
@@ -103,3 +106,5 @@ struct x25acct {
long x25acct_txcnt; /* packets transmitted */
long x25acct_rxcnt; /* packets received */
};
+
+#endif /* !_NETCCITT_X25ACCT_H_ */
diff --git a/sys/netccitt/x25err.h b/sys/netccitt/x25err.h
index 3501847d4b3..1ad0b2cff38 100644
--- a/sys/netccitt/x25err.h
+++ b/sys/netccitt/x25err.h
@@ -1,4 +1,4 @@
-/* $NetBSD: x25err.h,v 1.8 2005/02/26 22:45:10 perry Exp $ */
+/* $NetBSD: x25err.h,v 1.9 2005/12/10 23:31:41 elad Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -73,6 +73,9 @@
* @(#)x25err.h 8.1 (Berkeley) 6/10/93
*/
+#ifndef _NETCCITT_X25ERR_H_
+#define _NETCCITT_X25ERR_H_
+
/*
*
* X.25 Reset and Clear errors and diagnostics. These values are
@@ -97,3 +100,4 @@
#define EXCNCG 118 /* Clear: network congestion */
#define EXCNOB 119 /* Clear: not obtainable */
+#endif /* !_NETCCITT_X25ERR_H_ */
diff --git a/sys/netccitt/x25isr.h b/sys/netccitt/x25isr.h
index 0126a4563a3..753d21f7316 100644
--- a/sys/netccitt/x25isr.h
+++ b/sys/netccitt/x25isr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: x25isr.h,v 1.1 2000/07/02 17:34:01 sommerfeld Exp $ */
+/* $NetBSD: x25isr.h,v 1.2 2005/12/10 23:31:41 elad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,4 +41,4 @@
void ccittintr __P((void));
-#endif /* _NETCCITT_X25ISR_H_ */
+#endif /* !_NETCCITT_X25ISR_H_ */
diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index 832489f71b5..9b40950bbc9 100644
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.h,v 1.31 2005/05/29 21:38:37 christos Exp $ */
+/* $NetBSD: icmp6.h,v 1.32 2005/12/10 23:36:23 elad Exp $ */
/* $KAME: icmp6.h,v 1.84 2003/04/23 10:26:51 itojun Exp $ */
@@ -693,4 +693,4 @@ 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 2bd60e4236d..48ec8b1bde6 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp_var.h,v 1.24 2005/08/05 09:21:25 elad Exp $ */
+/* $NetBSD: icmp_var.h,v 1.25 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -89,4 +89,4 @@ extern struct icmpstat icmpstat;
#endif
#endif /* _KERNEL_ */
-#endif /* _NETINET_ICMP_VAR_H_ */
+#endif /* !_NETINET_ICMP_VAR_H_ */
diff --git a/sys/netinet/if_atm.h b/sys/netinet/if_atm.h
index 580eb3dd4dd..dc20eee0ffd 100644
--- a/sys/netinet/if_atm.h
+++ b/sys/netinet/if_atm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atm.h,v 1.8 2004/04/21 17:49:46 itojun Exp $ */
+/* $NetBSD: if_atm.h,v 1.9 2005/12/10 23:36:23 elad Exp $ */
/*
*
@@ -43,4 +43,4 @@ void atm_rtrequest(int, struct rtentry *, struct rt_addrinfo *);
int atmresolve(struct rtentry *, struct mbuf *, struct sockaddr *,
struct atm_pseudohdr *);
-#endif /* _NETINET_IF_ATM_H_ */
+#endif /* !_NETINET_IF_ATM_H_ */
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index f0c385c0087..da04aa0d2d8 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ether.h,v 1.31 2003/08/07 16:33:08 agc Exp $ */
+/* $NetBSD: if_ether.h,v 1.32 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -84,4 +84,4 @@ struct ether_arp {
#endif /* _netinet_if_ether_compat_h_ */
-#endif /* _NETINET_IF_ETHER_H_ */
+#endif /* !_NETINET_IF_ETHER_H_ */
diff --git a/sys/netinet/if_inarp.h b/sys/netinet/if_inarp.h
index 032b00d7c75..30df3faba77 100644
--- a/sys/netinet/if_inarp.h
+++ b/sys/netinet/if_inarp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_inarp.h,v 1.35 2004/04/21 17:49:46 itojun Exp $ */
+/* $NetBSD: if_inarp.h,v 1.36 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -77,4 +77,4 @@ void revarprequest(struct ifnet *);
int revarpwhoarewe(struct ifnet *, struct in_addr *, struct in_addr *);
#endif
-#endif /* _NETINET_IF_INARP_H_ */
+#endif /* !_NETINET_IF_INARP_H_ */
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index 162abf74eba..6e9a41204f1 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: igmp.h,v 1.9 2003/08/07 16:33:09 agc Exp $ */
+/* $NetBSD: igmp.h,v 1.10 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -126,4 +126,4 @@ struct igmp {
*/
#define IGMP_AGE_THRESHOLD 540
-#endif /* _NETINET_IGMP_H_ */
+#endif /* !_NETINET_IGMP_H_ */
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 6c3942dab8a..a090155b61e 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: igmp_var.h,v 1.21 2004/04/25 16:42:42 simonb Exp $ */
+/* $NetBSD: igmp_var.h,v 1.22 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -121,4 +121,4 @@ void igmp_slowtimo(void);
void igmp_purgeif(struct ifnet *);
#endif
-#endif /* _NETINET_IGMP_VAR_H_ */
+#endif /* !_NETINET_IGMP_VAR_H_ */
diff --git a/sys/netinet/in_gif.h b/sys/netinet/in_gif.h
index f23b84a4ba9..634665dba74 100644
--- a/sys/netinet/in_gif.h
+++ b/sys/netinet/in_gif.h
@@ -1,4 +1,4 @@
-/* $NetBSD: in_gif.h,v 1.12 2005/06/06 06:06:50 martin Exp $ */
+/* $NetBSD: in_gif.h,v 1.13 2005/12/10 23:36:23 elad Exp $ */
/* $KAME: in_gif.h,v 1.6 2001/07/25 00:55:48 itojun Exp $ */
/*
@@ -54,4 +54,4 @@ struct etherip_header {
#define ETHERIP_VER_RSVD_MASK 0xf0
#define ETHERIP_VERSION 0x03
-#endif /*_NETINET_IN_GIF_H_*/
+#endif /* !_NETINET_IN_GIF_H_ */
diff --git a/sys/netinet/in_offload.h b/sys/netinet/in_offload.h
index 5ee46c88856..6a94ac64404 100644
--- a/sys/netinet/in_offload.h
+++ b/sys/netinet/in_offload.h
@@ -1,4 +1,4 @@
-/* $NetBSD: in_offload.h,v 1.2 2005/08/10 13:06:49 yamt Exp $ */
+/* $NetBSD: in_offload.h,v 1.3 2005/12/10 23:36:23 elad Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*/
-#if !defined(_NETINET_IN_OFFLOAD_H_)
+#ifndef _NETINET_IN_OFFLOAD_H_
#define _NETINET_IN_OFFLOAD_H_
/*
@@ -45,4 +45,4 @@ int tcp4_segment(struct mbuf *, int (*)(void *, struct mbuf *), void *);
extern int tcp_do_loopback_cksum; /* do TCP checksum on loopback? */
extern int udp_do_loopback_cksum; /* do UDP checksum on loopback? */
-#endif /* !defined(_NETINET_IN_OFFLOAD_H_) */
+#endif /* !_NETINET_IN_OFFLOAD_H_ */
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index bd255030b40..a6aa4b35b91 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.h,v 1.40 2005/11/15 18:39:46 dsl Exp $ */
+/* $NetBSD: in_pcb.h,v 1.41 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -147,4 +147,4 @@ extern struct sockaddr_in *in_selectsrc(struct sockaddr_in *,
struct route *, int, struct ip_moptions *, int *);
#endif
-#endif /* _NETINET_IN_PCB_H_ */
+#endif /* !_NETINET_IN_PCB_H_ */
diff --git a/sys/netinet/in_pcb_hdr.h b/sys/netinet/in_pcb_hdr.h
index c2f9ae4c5aa..9d652c3b6d1 100644
--- a/sys/netinet/in_pcb_hdr.h
+++ b/sys/netinet/in_pcb_hdr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb_hdr.h,v 1.3 2004/03/02 02:11:14 thorpej Exp $ */
+/* $NetBSD: in_pcb_hdr.h,v 1.4 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (C) 2003 WIDE Project.
@@ -106,4 +106,4 @@ struct inpcbtable {
#define INP_BOUND 1
#define INP_CONNECTED 2
-#endif /* _NETINET_IN_PCB_HDR_H_ */
+#endif /* !_NETINET_IN_PCB_HDR_H_ */
diff --git a/sys/netinet/in_proto.h b/sys/netinet/in_proto.h
index 6ce76734c25..88386e54ede 100644
--- a/sys/netinet/in_proto.h
+++ b/sys/netinet/in_proto.h
@@ -1,4 +1,4 @@
-/* $NetBSD: in_proto.h,v 1.1 2005/04/29 10:39:09 yamt Exp $ */
+/* $NetBSD: in_proto.h,v 1.2 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -36,4 +36,4 @@
extern const struct protosw inetsw[];
-#endif /* _NETINET_IN_PROTO_H_ */
+#endif /* !_NETINET_IN_PROTO_H_ */
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index 2393140ab70..ff53fb7b956 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: in_systm.h,v 1.12 2004/04/18 21:00:35 matt Exp $ */
+/* $NetBSD: in_systm.h,v 1.13 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -56,4 +56,4 @@ typedef u_int32_t n_time; /* ms since 00:00 GMT, byte rev */
n_time iptime (void);
#endif
-#endif /* _NETINET_IN_SYSTM_H_ */
+#endif /* !_NETINET_IN_SYSTM_H_ */
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index f279f4b8fad..bc0a93523bf 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: in_var.h,v 1.55 2005/03/09 05:07:19 atatat Exp $ */
+/* $NetBSD: in_var.h,v 1.56 2005/12/10 23:36:23 elad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -318,4 +318,4 @@ int sysctl_inpcblist(SYSCTLFN_PROTO);
/* INET6 stuff */
#include <netinet6/in6_var.h>
-#endif /* _NETINET_IN_VAR_H_ */
+#endif /* !_NETINET_IN_VAR_H_ */
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index 000d09795aa..e62fa4d5176 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ip.h,v 1.26 2004/04/25 22:25:03 jonathan Exp $ */
+/* $NetBSD: ip.h,v 1.27 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -194,4 +194,4 @@ struct ippseudo {
u_int8_t ippseudo_p; /* protocol */
u_int16_t ippseudo_len; /* protocol length */
} __packed;
-#endif /* _NETINET_IP_H_ */
+#endif /* !_NETINET_IP_H_ */
diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h
index 21d99b96673..1ff2246854b 100644
--- a/sys/netinet/ip6.h
+++ b/sys/netinet/ip6.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6.h,v 1.19 2005/05/29 21:41:23 christos Exp $ */
+/* $NetBSD: ip6.h,v 1.20 2005/12/10 23:36:23 elad Exp $ */
/* $KAME: ip6.h,v 1.45 2003/06/05 04:46:38 keiichi Exp $ */
/*
@@ -316,4 +316,4 @@ do { \
} while (/*CONSTCOND*/ 0)
#endif /*_KERNEL*/
-#endif /* not _NETINET_IP6_H_ */
+#endif /* !_NETINET_IP6_H_ */
diff --git a/sys/netinet/ip_ecn.h b/sys/netinet/ip_ecn.h
index 5556b31415e..63bccc2e347 100644
--- a/sys/netinet/ip_ecn.h
+++ b/sys/netinet/ip_ecn.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_ecn.h,v 1.10 2004/04/18 21:00:35 matt Exp $ */
+/* $NetBSD: ip_ecn.h,v 1.11 2005/12/10 23:36:23 elad Exp $ */
/* $KAME: ip_ecn.h,v 1.6 2001/05/03 14:51:48 itojun Exp $ */
/*
@@ -56,4 +56,4 @@ extern void ip6_ecn_ingress (int, u_int32_t *, const u_int32_t *);
extern void ip6_ecn_egress (int, const u_int32_t *, u_int32_t *);
#endif
#endif
-#endif
+#endif /* !_NETINET_IP_ECN_H_ */
diff --git a/sys/netinet/ip_encap.h b/sys/netinet/ip_encap.h
index 0c2f199e1d5..f7a2cfd3974 100644
--- a/sys/netinet/ip_encap.h
+++ b/sys/netinet/ip_encap.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_encap.h,v 1.9 2005/06/06 06:06:50 martin Exp $ */
+/* $NetBSD: ip_encap.h,v 1.10 2005/12/10 23:36:23 elad Exp $ */
/* $KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $ */
/*
@@ -70,4 +70,4 @@ int encap_detach(const struct encaptab *);
void *encap_getarg(struct mbuf *);
#endif
-#endif /*_NETINET_IP_ENCAP_H_*/
+#endif /* !_NETINET_IP_ENCAP_H_ */
diff --git a/sys/netinet/ip_gre.h b/sys/netinet/ip_gre.h
index a0ae629eb5b..0ff3f9c8626 100644
--- a/sys/netinet/ip_gre.h
+++ b/sys/netinet/ip_gre.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_gre.h,v 1.7 2004/04/21 17:49:46 itojun Exp $ */
+/* $NetBSD: ip_gre.h,v 1.8 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _NETINET_IP_GRE_H_
+#define _NETINET_IP_GRE_H_
+
#ifdef _KERNEL
void gre_input(struct mbuf *, ...);
void gre_mobile_input(struct mbuf *, ...);
#endif /* _KERNEL */
+
+#endif /* !_NETINET_IP_GRE_H_ */
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index fb089df8491..b93130ad44c 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.h,v 1.21 2005/10/23 18:38:53 christos Exp $ */
+/* $NetBSD: ip_icmp.h,v 1.22 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -187,4 +187,4 @@ void icmp_mtudisc_callback_register(void (*)(struct in_addr));
#endif
-#endif /* _NETINET_IP_ICMP_H_ */
+#endif /* !_NETINET_IP_ICMP_H_ */
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index ae24bc9c007..d50b67ada2b 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_mroute.h,v 1.25 2005/02/26 22:45:12 perry Exp $ */
+/* $NetBSD: ip_mroute.h,v 1.26 2005/12/10 23:36:23 elad Exp $ */
#ifndef _NETINET_IP_MROUTE_H_
#define _NETINET_IP_MROUTE_H_
@@ -351,4 +351,4 @@ int ip_mforward(struct mbuf *, struct ifnet *);
#endif /* _KERNEL */
-#endif /* _NETINET_IP_MROUTE_H_ */
+#endif /* !_NETINET_IP_MROUTE_H_ */
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 22f8f001c26..9595713681c 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_var.h,v 1.73 2005/11/22 17:52:38 yamt Exp $ */
+/* $NetBSD: ip_var.h,v 1.74 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -293,4 +293,4 @@ ip_newid(void)
#endif /* _KERNEL */
-#endif /* _NETINET_IP_VAR_H_ */
+#endif /* !_NETINET_IP_VAR_H_ */
diff --git a/sys/netinet/pim.h b/sys/netinet/pim.h
index 09f40ee1b11..45921cddb1c 100644
--- a/sys/netinet/pim.h
+++ b/sys/netinet/pim.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pim.h,v 1.1 2004/09/04 23:32:29 manu Exp $ */
+/* $NetBSD: pim.h,v 1.2 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1996-2000
@@ -118,4 +118,4 @@ struct pim {
{{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d }}}
-#endif /* _NETINET_PIM_H_ */
+#endif /* !_NETINET_PIM_H_ */
diff --git a/sys/netinet/pim_var.h b/sys/netinet/pim_var.h
index 6a70808d71e..470c9132e4c 100644
--- a/sys/netinet/pim_var.h
+++ b/sys/netinet/pim_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pim_var.h,v 1.1 2004/09/04 23:32:29 manu Exp $ */
+/* $NetBSD: pim_var.h,v 1.2 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1998-2000
@@ -78,4 +78,4 @@ extern struct pimstat pimstat;
void pim_input(struct mbuf *, ...);
#endif
-#endif /* _NETINET_PIM_VAR_H_ */
+#endif /* !_NETINET_PIM_VAR_H_ */
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index 23ae1547b68..79abfaefffb 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp.h,v 1.20 2005/07/21 17:32:11 riz Exp $ */
+/* $NetBSD: tcp.h,v 1.21 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -118,4 +118,5 @@ struct tcphdr {
#define TCP_MAXSEG 0x02 /* set maximum segment size */
/* Bits 0x04, 0x08 reserved for FreeBSD compatibility: TCP_NOPUSH, TCP_NOOPT */
#define TCP_MD5SIG 0x10 /* use MD5 digests (RFC2385) */
-#endif /* _NETINET_TCP_H_ */
+
+#endif /* !_NETINET_TCP_H_ */
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index 8a2503a1c63..7bbc9b4df69 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_debug.h,v 1.15 2005/06/02 04:40:46 riz Exp $ */
+/* $NetBSD: tcp_debug.h,v 1.16 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -72,4 +72,4 @@ const char *tanames[] =
#define TCP_NDEBUG 100
#endif
-#endif /* _NETINET_TCP_DEBUG_H_ */
+#endif /* !_NETINET_TCP_DEBUG_H_ */
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index b2208c7f7ae..911b7b7ac77 100644
--- a/sys/netinet/tcp_fsm.h
+++ b/sys/netinet/tcp_fsm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_fsm.h,v 1.14 2004/04/20 22:54:31 matt Exp $ */
+/* $NetBSD: tcp_fsm.h,v 1.15 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -97,4 +97,4 @@ const char * const tcpstates[] = {
extern const char * const tcpstates[];
#endif
-#endif /* _NETINET_TCP_FSM_H_ */
+#endif /* !_NETINET_TCP_FSM_H_ */
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index 597c4c81b09..f5f233cdcf7 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_seq.h,v 1.15 2005/04/05 01:07:17 kurahone Exp $ */
+/* $NetBSD: tcp_seq.h,v 1.16 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993, 1995
@@ -67,4 +67,4 @@
extern tcp_seq tcp_iss_seq; /* tcp initial seq # */
#endif
-#endif /* _NETINET_TCP_SEQ_H_ */
+#endif /* !_NETINET_TCP_SEQ_H_ */
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 23b61449fe2..bf30a8735de 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_timer.h,v 1.22 2005/06/02 04:40:46 riz Exp $ */
+/* $NetBSD: tcp_timer.h,v 1.23 2005/12/10 23:36:23 elad Exp $ */
/*-
* Copyright (c) 2001, 2005 The NetBSD Foundation, Inc.
@@ -193,4 +193,4 @@ extern const int tcp_backoff[];
void tcp_timer_init(void);
#endif
-#endif /* _NETINET_TCP_TIMER_H_ */
+#endif /* !_NETINET_TCP_TIMER_H_ */
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index bf94d30fe99..489ce426fc4 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_var.h,v 1.130 2005/09/06 02:41:14 rpaulo Exp $ */
+/* $NetBSD: tcp_var.h,v 1.131 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -899,4 +899,4 @@ int tcp_input_checksum(int, struct mbuf *, const struct tcphdr *, int, int,
int);
#endif
-#endif /* _NETINET_TCP_VAR_H_ */
+#endif /* !_NETINET_TCP_VAR_H_ */
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index c7c3ccccdbe..cde92e4857b 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcpip.h,v 1.9 2003/08/07 16:33:20 agc Exp $ */
+/* $NetBSD: tcpip.h,v 1.10 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -57,4 +57,4 @@ struct tcpiphdr {
#define ti_sum ti_t.th_sum
#define ti_urp ti_t.th_urp
-#endif /* _NETINET_TCPIP_H_ */
+#endif /* !_NETINET_TCPIP_H_ */
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index 88dad242668..209bf3e4ecc 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: udp.h,v 1.11 2005/02/12 12:31:07 manu Exp $ */
+/* $NetBSD: udp.h,v 1.12 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -58,4 +58,4 @@ struct udphdr {
/* Maximum UDP fragment size for ESP over UDP */
#define UDP_ENCAP_ESPINUDP_MAXFRAGLEN 552
-#endif /* _NETINET_UDP_H_ */
+#endif /* !_NETINET_UDP_H_ */
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 08077dcb4dc..4e3f1b5d4c6 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_var.h,v 1.29 2005/08/10 13:06:49 yamt Exp $ */
+/* $NetBSD: udp_var.h,v 1.30 2005/12/10 23:36:23 elad Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -107,4 +107,4 @@ int udp_input_checksum(int af, struct mbuf *, const struct udphdr *, int,
int);
#endif
-#endif /* _NETINET_UDP_VAR_H_ */
+#endif /* !_NETINET_UDP_VAR_H_ */
diff --git a/sys/netinet6/ah.h b/sys/netinet6/ah.h
index 35b6789ce59..7ab8053c0a3 100644
--- a/sys/netinet6/ah.h
+++ b/sys/netinet6/ah.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ah.h,v 1.21 2003/08/05 12:20:35 itojun Exp $ */
+/* $NetBSD: ah.h,v 1.22 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: ah.h,v 1.16 2001/09/04 08:43:19 itojun Exp $ */
/*
@@ -104,4 +104,4 @@ extern void ah6_ctlinput __P((int, struct sockaddr *, void *));
#endif /* _KERNEL */
-#endif /* _NETINET6_AH_H_ */
+#endif /* !_NETINET6_AH_H_ */
diff --git a/sys/netinet6/ah_aesxcbcmac.h b/sys/netinet6/ah_aesxcbcmac.h
index 6c86818679d..d6b60a0e023 100644
--- a/sys/netinet6/ah_aesxcbcmac.h
+++ b/sys/netinet6/ah_aesxcbcmac.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ah_aesxcbcmac.h,v 1.1 2003/07/25 09:48:18 itojun Exp $ */
+/* $NetBSD: ah_aesxcbcmac.h,v 1.2 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: ah_aesxcbcmac.h,v 1.2 2003/07/20 00:29:37 itojun Exp $ */
/*
@@ -30,6 +30,9 @@
* SUCH DAMAGE.
*/
+#ifndef _NETINET6_AH_AESXCBCMAC_H_
+#define _NETINET6_AH_AESXCBCMAC_H_
+
extern int ah_aes_xcbc_mac_init __P((struct ah_algorithm_state *,
struct secasvar *));
extern void ah_aes_xcbc_mac_loop __P((struct ah_algorithm_state *, u_int8_t *,
@@ -37,3 +40,4 @@ extern void ah_aes_xcbc_mac_loop __P((struct ah_algorithm_state *, u_int8_t *,
extern void ah_aes_xcbc_mac_result __P((struct ah_algorithm_state *,
u_int8_t *, size_t));
+#endif /* !_NETINET6_AH_AESXCBCMAC_H_ */
diff --git a/sys/netinet6/esp.h b/sys/netinet6/esp.h
index 326e0fe9ab3..adfe5221367 100644
--- a/sys/netinet6/esp.h
+++ b/sys/netinet6/esp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.h,v 1.21 2003/07/20 03:24:03 itojun Exp $ */
+/* $NetBSD: esp.h,v 1.22 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: esp.h,v 1.19 2001/09/04 08:43:19 itojun Exp $ */
/*
@@ -115,4 +115,4 @@ extern int esp_auth __P((struct mbuf *, size_t, size_t,
struct secasvar *, u_char *));
#endif /* _KERNEL */
-#endif /* _NETINET6_ESP_H_ */
+#endif /* !_NETINET6_ESP_H_ */
diff --git a/sys/netinet6/esp_aesctr.h b/sys/netinet6/esp_aesctr.h
index 620c7fba73e..642ea6ff834 100644
--- a/sys/netinet6/esp_aesctr.h
+++ b/sys/netinet6/esp_aesctr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_aesctr.h,v 1.1 2003/07/25 09:48:19 itojun Exp $ */
+/* $NetBSD: esp_aesctr.h,v 1.2 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: esp_aesctr.h,v 1.2 2003/07/20 00:29:38 itojun Exp $ */
/*
@@ -30,6 +30,9 @@
* SUCH DAMAGE.
*/
+#ifndef _NETINET6_ESP_AESCTR_H_
+#define _NETINET6_ESP_AESCTR_H_
+
extern int esp_aesctr_mature __P((struct secasvar *));
extern size_t esp_aesctr_schedlen __P((const struct esp_algorithm *));
extern int esp_aesctr_schedule __P((const struct esp_algorithm *,
@@ -39,3 +42,4 @@ extern int esp_aesctr_decrypt __P((struct mbuf *, size_t,
extern int esp_aesctr_encrypt __P((struct mbuf *, size_t, size_t,
struct secasvar *, const struct esp_algorithm *, int));
+#endif /* !_NETINET6_ESP_AESCTR_H_ */
diff --git a/sys/netinet6/esp_rijndael.h b/sys/netinet6/esp_rijndael.h
index b71bb1be3f9..898c0edadff 100644
--- a/sys/netinet6/esp_rijndael.h
+++ b/sys/netinet6/esp_rijndael.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_rijndael.h,v 1.2 2003/07/20 03:24:03 itojun Exp $ */
+/* $NetBSD: esp_rijndael.h,v 1.3 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: esp_rijndael.h,v 1.1 2000/09/20 18:15:22 itojun Exp $ */
/*
@@ -30,6 +30,9 @@
* SUCH DAMAGE.
*/
+#ifndef _NETINET6_ESP_RIJNDAEL_H_
+#define _NETINET6_ESP_RIJNDAEL_H_
+
size_t esp_rijndael_schedlen __P((const struct esp_algorithm *));
int esp_rijndael_schedule __P((const struct esp_algorithm *,
struct secasvar *));
@@ -37,3 +40,5 @@ int esp_rijndael_blockdecrypt __P((const struct esp_algorithm *,
struct secasvar *, u_int8_t *, u_int8_t *));
int esp_rijndael_blockencrypt __P((const struct esp_algorithm *,
struct secasvar *, u_int8_t *, u_int8_t *));
+
+#endif /* !_NETINET6_ESP_RIJNDAEL_H_ */
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index 36e65b7ed13..05c1d218d87 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.h,v 1.47 2005/08/28 21:01:53 rpaulo Exp $ */
+/* $NetBSD: in6.h,v 1.48 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */
/*
@@ -61,13 +61,13 @@
* @(#)in.h 8.3 (Berkeley) 1/3/94
*/
+#ifndef _NETINET6_IN6_H_
+#define _NETINET6_IN6_H_
+
#ifndef __KAME_NETINET_IN_H_INCLUDED_
#error "do not include netinet6/in6.h directly, include netinet/in.h. see RFC2553"
#endif
-#ifndef _NETINET6_IN6_H_
-#define _NETINET6_IN6_H_
-
/*
* Identification of the network protocol stack
* for *BSD-current/release: http://www.kame.net/dev/cvsweb.cgi/kame/COVERAGE
diff --git a/sys/netinet6/in6_gif.h b/sys/netinet6/in6_gif.h
index 8ab7763ac17..93878efcd86 100644
--- a/sys/netinet6/in6_gif.h
+++ b/sys/netinet6/in6_gif.h
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_gif.h,v 1.10 2005/06/02 15:21:35 tron Exp $ */
+/* $NetBSD: in6_gif.h,v 1.11 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: in6_gif.h,v 1.7 2001/07/26 06:53:16 jinmei Exp $ */
/*
@@ -47,4 +47,4 @@ int in6_gif_attach(struct gif_softc *);
int in6_gif_detach(struct gif_softc *);
void in6_gif_ctlinput(int, struct sockaddr *, void *);
-#endif /* _NETINET6_IN6_GIF_H_ */
+#endif /* !_NETINET6_IN6_GIF_H_ */
diff --git a/sys/netinet6/in6_ifattach.h b/sys/netinet6/in6_ifattach.h
index a74cd8795b2..048237ce0f7 100644
--- a/sys/netinet6/in6_ifattach.h
+++ b/sys/netinet6/in6_ifattach.h
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_ifattach.h,v 1.8 2002/06/08 21:22:31 itojun Exp $ */
+/* $NetBSD: in6_ifattach.h,v 1.9 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: in6_ifattach.h,v 1.8 2000/04/12 03:51:30 itojun Exp $ */
/*
@@ -39,4 +39,4 @@ void in6_ifdetach __P((struct ifnet *));
int in6_nigroup(struct ifnet *, const char *, int, struct sockaddr_in6 *);
#endif /* _KERNEL */
-#endif /* _NETINET6_IN6_IFATTACH_H_ */
+#endif /* !_NETINET6_IN6_IFATTACH_H_ */
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index e38b755512b..ce1dc43c4d7 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_var.h,v 1.39 2005/05/29 21:43:51 christos Exp $ */
+/* $NetBSD: in6_var.h,v 1.40 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: in6_var.h,v 1.81 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -609,4 +609,4 @@ int in6_recoverscope __P((struct sockaddr_in6 *, const struct in6_addr *,
void in6_clearscope __P((struct in6_addr *));
#endif /* _KERNEL */
-#endif /* _NETINET6_IN6_VAR_H_ */
+#endif /* !_NETINET6_IN6_VAR_H_ */
diff --git a/sys/netinet6/ipcomp.h b/sys/netinet6/ipcomp.h
index b314e2069be..90e5fbdaaa0 100644
--- a/sys/netinet6/ipcomp.h
+++ b/sys/netinet6/ipcomp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ipcomp.h,v 1.10 2001/10/15 03:55:38 itojun Exp $ */
+/* $NetBSD: ipcomp.h,v 1.11 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: ipcomp.h,v 1.11 2001/09/04 08:43:19 itojun Exp $ */
/*
@@ -73,4 +73,4 @@ extern int ipcomp6_output __P((struct mbuf *, u_char *, struct mbuf *,
#endif
#endif /* KERNEL */
-#endif /* _NETINET6_IPCOMP_H_ */
+#endif /* !_NETINET6_IPCOMP_H_ */
diff --git a/sys/netinet6/ipsec.h b/sys/netinet6/ipsec.h
index 3cd4e62886d..576f2eb39ff 100644
--- a/sys/netinet6/ipsec.h
+++ b/sys/netinet6/ipsec.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.44 2005/08/07 08:34:32 manu Exp $ */
+/* $NetBSD: ipsec.h,v 1.45 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: ipsec.h,v 1.51 2001/08/05 04:52:58 itojun Exp $ */
/*
@@ -446,4 +446,4 @@ extern char *ipsec_dump_policy __P((ipsec_policy_t, const char *));
extern const char *ipsec_strerror __P((void));
#endif /* !_KERNEL */
-#endif /* _NETINET6_IPSEC_H_ */
+#endif /* !_NETINET6_IPSEC_H_ */
diff --git a/sys/netinet6/mld6_var.h b/sys/netinet6/mld6_var.h
index 7144d0034c6..2db8266d4c5 100644
--- a/sys/netinet6/mld6_var.h
+++ b/sys/netinet6/mld6_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mld6_var.h,v 1.6 2003/06/06 08:13:44 itojun Exp $ */
+/* $NetBSD: mld6_var.h,v 1.7 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: mld6_var.h,v 1.4 2000/03/25 07:23:54 sumikawa Exp $ */
/*
@@ -50,4 +50,4 @@ void mld6_stop_listening __P((struct in6_multi *));
void mld6_fasttimeo __P((void));
#endif /* _KERNEL */
-#endif /* _NETINET6_MLD6_VAR_H_ */
+#endif /* !_NETINET6_MLD6_VAR_H_ */
diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h
index d54db907784..ca04770b59b 100644
--- a/sys/netinet6/nd6.h
+++ b/sys/netinet6/nd6.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.h,v 1.39 2005/02/28 09:27:07 itojun Exp $ */
+/* $NetBSD: nd6.h,v 1.40 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $ */
/*
@@ -418,4 +418,4 @@ int nd6_setdefaultiface __P((int));
#endif /* _KERNEL */
-#endif /* _NETINET6_ND6_H_ */
+#endif /* !_NETINET6_ND6_H_ */
diff --git a/sys/netinet6/pim6.h b/sys/netinet6/pim6.h
index 842273071ec..2848231c75c 100644
--- a/sys/netinet6/pim6.h
+++ b/sys/netinet6/pim6.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pim6.h,v 1.4 2001/02/10 04:14:29 itojun Exp $ */
+/* $NetBSD: pim6.h,v 1.5 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: pim6.h,v 1.3 2000/03/25 07:23:58 sumikawa Exp $ */
/*
@@ -29,6 +29,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
+
+#ifndef _NETINET6_PIM6_H_
+#define _NETINET6_PIM6_H_
+
/*
* Protocol Independent Multicast (PIM) definitions
*
@@ -67,3 +71,5 @@ struct pim {
/* second bit in reg_head is the null bit */
#define PIM_NULL_REGISTER 0x40000000
+
+#endif /* !_NETINET6_PIM6_H_ */
diff --git a/sys/netinet6/pim6_var.h b/sys/netinet6/pim6_var.h
index 42da8bee102..d308208752f 100644
--- a/sys/netinet6/pim6_var.h
+++ b/sys/netinet6/pim6_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pim6_var.h,v 1.12 2005/08/28 21:03:18 rpaulo Exp $ */
+/* $NetBSD: pim6_var.h,v 1.13 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: pim6_var.h,v 1.8 2000/06/06 08:07:43 jinmei Exp $ */
/*
@@ -66,4 +66,4 @@ int pim6_input __P((struct mbuf **, int*, int));
{ 0, 0 }, \
{ "stats", CTLTYPE_STRUCT }, \
}
-#endif /* _NETINET6_PIM6_VAR_H_ */
+#endif /* !_NETINET6_PIM6_VAR_H_ */
diff --git a/sys/netinet6/raw_ip6.h b/sys/netinet6/raw_ip6.h
index 3231c6b9fb1..bf57acc8187 100644
--- a/sys/netinet6/raw_ip6.h
+++ b/sys/netinet6/raw_ip6.h
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip6.h,v 1.2 2005/08/28 21:04:09 rpaulo Exp $ */
+/* $NetBSD: raw_ip6.h,v 1.3 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: raw_ip6.h,v 1.2 2001/05/27 13:28:35 itojun Exp $ */
/*
@@ -62,4 +62,4 @@ struct rip6stat {
extern struct rip6stat rip6stat;
#endif
-#endif
+#endif /* !_NETINET6_RAW_IP6_H_ */
diff --git a/sys/netinet6/udp6.h b/sys/netinet6/udp6.h
index 9f43da79938..af6b221ea9d 100644
--- a/sys/netinet6/udp6.h
+++ b/sys/netinet6/udp6.h
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6.h,v 1.6 2001/12/18 03:04:05 itojun Exp $ */
+/* $NetBSD: udp6.h,v 1.7 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: udp6.h,v 1.4 2001/02/10 00:57:54 itojun Exp $ */
/*
@@ -35,4 +35,4 @@
#include <netinet/udp.h>
-#endif /* _NETINET6_UDP6_H_ */
+#endif /* !_NETINET6_UDP6_H_ */
diff --git a/sys/netinet6/udp6_var.h b/sys/netinet6/udp6_var.h
index 7ce1cfb4329..ffaa1cacdab 100644
--- a/sys/netinet6/udp6_var.h
+++ b/sys/netinet6/udp6_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6_var.h,v 1.17 2005/08/28 21:01:02 rpaulo Exp $ */
+/* $NetBSD: udp6_var.h,v 1.18 2005/12/10 23:39:56 elad Exp $ */
/* $KAME: udp6_var.h,v 1.11 2000/06/05 00:14:31 itojun Exp $ */
/*
@@ -113,4 +113,4 @@ int udp6_usrreq __P((struct socket *,
struct proc *));
#endif /* _KERNEL */
-#endif /* _NETINET6_UDP6_VAR_H_ */
+#endif /* !_NETINET6_UDP6_VAR_H_ */