By popular demand, protect from multiple inclusion, and fix to use the

same naming style.

31 files changed, 119 insertions, 118 deletions

diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index 1fbc42e0392..6cfd2337b27 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpf.h,v 1.14 2001/05/28 19:51:06 dugsong Exp $	*/
+/*	$OpenBSD: bpf.h,v 1.15 2001/06/09 06:16:37 angelos Exp $	*/
 /*	$NetBSD: bpf.h,v 1.15 1996/12/13 07:57:33 mikel Exp $	*/
 
 /*
@@ -245,7 +245,7 @@ void	 bpfattach __P((caddr_t *, struct ifnet *, u_int, u_int));
 void	 bpfdetach __P((struct ifnet *));
 void	 bpfilterattach __P((int));
 u_int	 bpf_filter __P((struct bpf_insn *, u_char *, u_int, u_int));
-#endif
+#endif /* _KERNEL */
 
 /*
  * Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST).
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index 0d21bc82f84..4310b6b3769 100644
--- a/sys/net/bpfdesc.h
+++ b/sys/net/bpfdesc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpfdesc.h,v 1.7 2001/05/28 19:51:06 dugsong Exp $	*/
+/*	$OpenBSD: bpfdesc.h,v 1.8 2001/06/09 06:16:37 angelos Exp $	*/
 /*	$NetBSD: bpfdesc.h,v 1.11 1995/09/27 18:30:42 thorpej Exp $	*/
 
 /*
@@ -41,6 +41,9 @@
  *	@(#)bpfdesc.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NET_BPFDESC_H_
+#define _NET_BPFDESC_H_
+
 #include <sys/select.h>
 
 /*
@@ -99,5 +102,5 @@ struct bpf_if {
 
 #ifdef _KERNEL
 int	 bpf_setf __P((struct bpf_d *, struct bpf_program *));
-#endif
-
+#endif /* _KERNEL */
+#endif /* _NET_BPFDESC_H_ */
diff --git a/sys/net/if.h b/sys/net/if.h
index 7bdd11c4d14..e913c4e34e9 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.h,v 1.25 2001/05/28 10:29:21 angelos Exp $	*/
+/*	$OpenBSD: if.h,v 1.26 2001/06/09 06:16:37 angelos Exp $	*/
 /*	$NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NET_IF_H_
+#define _NET_IF_H_
+
 #include <sys/queue.h>
 
 /*
@@ -455,3 +458,4 @@ int	looutput __P((struct ifnet *,
 	   struct mbuf *, struct sockaddr *, struct rtentry *));
 void	lortrequest __P((int, struct rtentry *, struct rt_addrinfo *));
 #endif /* _KERNEL */
+#endif /* _NET_IF_H_ */
diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index d123a1a797d..80247f02cd7 100644
--- a/sys/net/if_arp.h
+++ b/sys/net/if_arp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_arp.h,v 1.3 1999/07/30 22:22:19 fgsch Exp $	*/
+/*	$OpenBSD: if_arp.h,v 1.4 2001/06/09 06:16:37 angelos Exp $	*/
 /*	$NetBSD: if_arp.h,v 1.8 1995/03/08 02:56:52 cgd Exp $	*/
 
 /*
@@ -36,6 +36,8 @@
  *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NET_IF_ARP_H_
+#define _NET_IF_ARP_H_
 /*
  * Address Resolution Protocol.
  *
@@ -87,3 +89,4 @@ struct arpreq {
 #define	ATF_PERM	0x04	/* permanent entry */
 #define	ATF_PUBL	0x08	/* publish entry (respond for other host) */
 #define	ATF_USETRAILERS	0x10	/* has requested trailers */
+#endif /* _NET_IF_ARP_H_ */
diff --git a/sys/net/if_atm.h b/sys/net/if_atm.h
index f70e41e878a..160a55bc37c 100644
--- a/sys/net/if_atm.h
+++ b/sys/net/if_atm.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_atm.h,v 1.9 1998/05/10 18:53:05 deraadt Exp $       */
+/*      $OpenBSD: if_atm.h,v 1.10 2001/06/09 06:16:37 angelos Exp $       */
 
 /*
  *
@@ -35,18 +35,10 @@
 /*
  * net/if_atm.h
  */
+#ifndef _NET_IF_ATM_H_
+#define _NET_IF_ATM_H_
 
-#if (defined(__FreeBSD__) || defined(__bsdi__)) && defined(KERNEL)
-#ifndef _KERNEL
-#define _KERNEL
-#endif
-#endif /* freebsd doesn't define _KERNEL */
-
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
 #define RTALLOC1(A,B)		rtalloc1((A),(B))
-#elif defined(__FreeBSD__)
-#define RTALLOC1(A,B)		rtalloc1((A),(B),0UL)
-#endif
 
 /*
  * pseudo header for packet transmission
@@ -108,4 +100,5 @@ void	atm_input __P((struct ifnet *, struct atm_pseudohdr *,
 		struct mbuf *, void *));
 int	atm_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, 
 		struct rtentry *));
-#endif
+#endif /* _KERNEL */
+#endif /* _NET_IF_ATM_H_ */
diff --git a/sys/net/if_bridge.h b/sys/net/if_bridge.h
index 1ce77c3094d..f4291984f07 100644
--- a/sys/net/if_bridge.h
+++ b/sys/net/if_bridge.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp $	*/
+/*	$OpenBSD: if_bridge.h,v 1.15 2001/06/09 06:16:37 angelos Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -31,6 +31,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef _NET_IF_BRIDGE_H_
+#define _NET_IF_BRIDGE_H_
+
 /*
  * Bridge control request: add/delete member interfaces.
  */
@@ -265,3 +268,4 @@ struct mbuf *bstp_input __P((struct bridge_softc *, struct ifnet *,
 void	bstp_initialization __P((struct bridge_softc *));
 int	bstp_ioctl __P((struct ifnet *, u_long, caddr_t));
 #endif /* _KERNEL */
+#endif /* _NET_IF_BRIDGE_H_ */
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index 2ef93321449..87d7c2ab3cc 100644
--- a/sys/net/if_dl.h
+++ b/sys/net/if_dl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_dl.h,v 1.3 2001/01/09 17:24:00 angelos Exp $	*/
+/*	$OpenBSD: if_dl.h,v 1.4 2001/06/09 06:16:37 angelos Exp $	*/
 /*	$NetBSD: if_dl.h,v 1.8 1995/03/26 20:30:13 jtc Exp $	*/
 
 /*
@@ -54,6 +54,9 @@
  * expected that all drivers for an interface of a given if_type will agree.
  */
 
+#ifndef _NET_IF_DL_H_
+#define _NET_IF_DL_H_
+
 /*
  * Structure of a Link-Level sockaddr:
  */
@@ -80,4 +83,5 @@ void	link_addr __P((const char *, struct sockaddr_dl *));
 char	*link_ntoa __P((const struct sockaddr_dl *));
 __END_DECLS
 
-#endif /* !_KERNEL */
+#endif /* _KERNEL */
+#endif /* _NET_IF_DL_H_ */
diff --git a/sys/net/if_enc.h b/sys/net/if_enc.h
index 2cbcf574cd5..a0736642616 100644
--- a/sys/net/if_enc.h
+++ b/sys/net/if_enc.h
@@ -31,8 +31,8 @@
  * PURPOSE.
  */
 
-#ifndef _IF_ENC_H_
-#define _IF_ENC_H_
+#ifndef _NET_IF_ENC_H_
+#define _NET_IF_ENC_H_
 
 #define ENCMTU		(1024+512)
 #define ENC_HDRLEN	12
@@ -48,4 +48,4 @@ struct enchdr {
 };
 
 extern struct enc_softc encif[];
-#endif
+#endif /* _NET_IF_ENC_H_ */
diff --git a/sys/net/if_fddi.h b/sys/net/if_fddi.h
index b4367e55138..3f9a7afe9c0 100644
--- a/sys/net/if_fddi.h
+++ b/sys/net/if_fddi.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fddi.h,v 1.2 1997/02/24 13:33:59 niklas Exp $	*/
+/*	$OpenBSD: if_fddi.h,v 1.3 2001/06/09 06:16:37 angelos Exp $	*/
 /*	$NetBSD: if_fddi.h,v 1.2 1995/08/19 04:35:28 cgd Exp $	*/
 
 /*
@@ -80,7 +80,5 @@ void    fddi_ifattach __P((struct ifnet *));
 void    fddi_input __P((struct ifnet *, struct fddi_header *, struct mbuf *));
 int     fddi_output __P((struct ifnet *,
            struct mbuf *, struct sockaddr *, struct rtentry *)); 
-
-#endif
-
-#endif
+#endif /* _KERNEL */
+#endif /* _NET_IF_FDDI_H_ */
diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h
index 05a44579b87..1ccda1a9bb2 100644
--- a/sys/net/if_gre.h
+++ b/sys/net/if_gre.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_gre.h,v 1.3 2001/06/05 23:43:46 maja Exp $ */
+/*      $OpenBSD: if_gre.h,v 1.4 2001/06/09 06:16:38 angelos Exp $ */
 /*	$NetBSD: if_gre.h,v 1.5 1999/11/19 20:41:19 thorpej Exp $ */
 
 /*
@@ -149,5 +149,4 @@ int     gre_output __P((struct ifnet *, struct mbuf *, struct sockaddr *,
 	    struct rtentry *rt));
 u_short	gre_in_cksum(u_short *p, u_int len);
 #endif /* _KERNEL */
-
-#endif
+#endif /* _NET_IF_GRE_H_ */
diff --git a/sys/net/if_ieee80211.h b/sys/net/if_ieee80211.h
index cb7096ed3d8..4d4fe18030b 100644
--- a/sys/net/if_ieee80211.h
+++ b/sys/net/if_ieee80211.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ieee80211.h,v 1.2 2000/09/04 04:02:08 mickey Exp $	*/
+/*	$OpenBSD: if_ieee80211.h,v 1.3 2001/06/09 06:16:38 angelos Exp $	*/
 /*	$NetBSD: if_ieee80211.h,v 1.4 2000/07/05 02:35:53 onoe Exp $	*/
 
 
@@ -134,4 +134,4 @@ struct ieee80211_nwkey {
 #define	SIOCS80211NWKEY		 _IOW('i', 232, struct ieee80211_nwkey)
 #define	SIOCG80211NWKEY		_IOWR('i', 233, struct ieee80211_nwkey)
 
-#endif /* !_NET_IF_IEEE80211_H_ */
+#endif /* _NET_IF_IEEE80211_H_ */
diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h
index 08ad83eb110..e6a7a06ce12 100644
--- a/sys/net/if_llc.h
+++ b/sys/net/if_llc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_llc.h,v 1.5 2000/11/05 22:58:23 jason Exp $	*/
+/*	$OpenBSD: if_llc.h,v 1.6 2001/06/09 06:16:38 angelos Exp $	*/
 /*	$NetBSD: if_llc.h,v 1.6 1995/03/08 02:56:57 cgd Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)if_llc.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NET_IF_LLC_H_
+#define _NET_IF_LLC_H_
+
 /*
  * IEEE 802.2 Link Level Control headers, for use in conjunction with
  * 802.{3,4,5} media access control methods.
@@ -143,3 +146,4 @@ struct llc {
 #define	LLC_X25_LSAP	0x7e
 #define	LLC_SNAP_LSAP	0xaa
 #define	LLC_ISO_LSAP	0xfe
+#endif /* _NET_IF_LLC_H_ */
diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h
index e4a4c6afdf0..1720dc86d9e 100644
--- a/sys/net/if_ppp.h
+++ b/sys/net/if_ppp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.h,v 1.5 2000/03/21 23:31:27 mickey Exp $	*/
+/*	$OpenBSD: if_ppp.h,v 1.6 2001/06/09 06:16:38 angelos Exp $	*/
 /*	$NetBSD: if_ppp.h,v 1.11 1996/03/15 02:28:05 paulus Exp $	*/
 
 /*
@@ -20,8 +20,8 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef _IF_PPP_H_
-#define _IF_PPP_H_
+#ifndef _NET_IF_PPP_H_
+#define _NET_IF_PPP_H_
 
 /*
  * Packet sizes
@@ -132,4 +132,4 @@ int pppoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *,
 		   struct rtentry *));
 void pppintr __P((void));
 #endif
-#endif /* _IF_PPP_H_ */
+#endif /* _NET_IF_PPP_H_ */
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index 6372adb38de..6effbced66c 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pppvar.h,v 1.8 2000/06/30 01:05:19 art Exp $	*/
+/*	$OpenBSD: if_pppvar.h,v 1.9 2001/06/09 06:16:38 angelos Exp $	*/
 /*	$NetBSD: if_pppvar.h,v 1.5 1997/01/03 07:23:29 mikel Exp $	*/
 /*
  * if_pppvar.h - private structures and declarations for PPP.
@@ -114,5 +114,4 @@ void	ppp_restart __P((struct ppp_softc *sc));
 int	pppoutput __P((struct ifnet *, struct mbuf *,
 		       struct sockaddr *, struct rtentry *));
 #endif /* _KERNEL */
-
 #endif /* _NET_IF_PPPVAR_H_ */
diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h
index 75c21d64e5e..efb4af4fb9a 100644
--- a/sys/net/if_slvar.h
+++ b/sys/net/if_slvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_slvar.h,v 1.6 2001/05/17 18:41:46 provos Exp $	*/
+/*	$OpenBSD: if_slvar.h,v 1.7 2001/06/09 06:16:38 angelos Exp $	*/
 /*	$NetBSD: if_slvar.h,v 1.16 1996/05/07 02:40:46 thorpej Exp $	*/
 
 /*-
@@ -36,6 +36,9 @@
  *	@(#)if_slvar.h	8.3 (Berkeley) 2/1/94
  */
 
+#ifndef _NET_IF_SLVAR_H_
+#define _NET_IF_SLVAR_H_
+
 /*
  * Definitions for SLIP interface data structures
  * 
@@ -87,3 +90,4 @@ int	sloutput __P((struct ifnet *,
 void	slstart __P((struct tty *));
 int	sltioctl __P((struct tty *, u_long, caddr_t, int));
 #endif /* _KERNEL */
+#endif /* _NET_IF_SLVAR_H_ */
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h
index 184c324a46c..a0e61b1c9ce 100644
--- a/sys/net/if_sppp.h
+++ b/sys/net/if_sppp.h
@@ -23,12 +23,10 @@
  * From: Id: if_sppp.h,v 1.7 1998/12/01 20:20:19 hm Exp
  */
 
-#ifndef _NET_IF_HDLC_H_
-#define _NET_IF_HDLC_H_ 1
+#ifndef _NET_IF_SPPP_H_
+#define _NET_IF_SPPP_H_
 
-#ifdef __OpenBSD__
 #include <sys/timeout.h>
-#endif
 
 #define IDX_LCP 0		/* idx into state table */
 
@@ -101,13 +99,8 @@ struct sppp {
 	u_char  confid[IDX_COUNT];	/* id of last configuration request */
 	int	rst_counter[IDX_COUNT];	/* restart counter */
 	int	fail_counter[IDX_COUNT]; /* negotiation failure counter */
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-	struct callout_handle ch[IDX_COUNT]; /* per-proto and if callouts */
-	struct callout_handle pap_my_to_ch; /* PAP needs one more... */
-#elif defined(__OpenBSD__)
 	struct timeout ch[IDX_COUNT];
 	struct timeout pap_my_to_ch;
-#endif
 	struct slcp lcp;		/* LCP params */
 	struct sipcp ipcp;		/* IPCP params */
 	struct sauth myauth;		/* auth params, i'm peer */
@@ -171,23 +164,18 @@ struct spppreq {
 	struct sppp defs;
 };
 
-#if defined(KERNEL) || defined(_KERNEL)
+#if defined(_KERNEL)
 void sppp_attach (struct ifnet *ifp);
 void sppp_detach (struct ifnet *ifp);
 void sppp_input (struct ifnet *ifp, struct mbuf *m);
-#if defined(__OpenBSD__)
+
 /* Workaround */
 void spppattach (struct ifnet *ifp);
-#endif
-#if (defined(__FreeBSD_version) && __FreeBSD_version >= 300003)
-int sppp_ioctl(struct ifnet *ifp, int cmd, void *data);
-#else
 int sppp_ioctl(struct ifnet *ifp, u_long cmd, void *data);
-#endif
+
 struct mbuf *sppp_dequeue (struct ifnet *ifp);
 struct mbuf *sppp_pick(struct ifnet *ifp);
 int sppp_isempty (struct ifnet *ifp);
 void sppp_flush (struct ifnet *ifp);
 #endif
-
-#endif /* _NET_IF_HDLC_H_ */
+#endif /* _NET_IF_SPPP_H_ */
diff --git a/sys/net/if_stripvar.h b/sys/net/if_stripvar.h
index 377e2af4a2f..ab3cfb44d44 100644
--- a/sys/net/if_stripvar.h
+++ b/sys/net/if_stripvar.h
@@ -1,6 +1,8 @@
-/*	$OpenBSD: if_stripvar.h,v 1.5 2000/06/26 22:51:01 art Exp $	*/
+/*	$OpenBSD: if_stripvar.h,v 1.6 2001/06/09 06:16:38 angelos Exp $	*/
 /*	$NetBSD: if_stripvar.h,v 1.2.4.1 1996/08/05 20:37:51 jtc Exp $	*/
 
+#ifndef _NET_IF_STRIPVAR_H_
+#define _NET_IF_STRIPVAR_H_
 /*
  * Definitions for SLIP interface data structures
  * 
@@ -61,3 +63,4 @@ int	stripoutput __P((struct ifnet *,
 void	stripstart __P((struct tty *));
 int	striptioctl __P((struct tty *, u_long, caddr_t, int));
 #endif /* _KERNEL */
+#endif /* _NET_IF_STRIPVAR_H_ */
diff --git a/sys/net/if_token.h b/sys/net/if_token.h
index cf3a7883a60..1549869432f 100644
--- a/sys/net/if_token.h
+++ b/sys/net/if_token.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_token.h,v 1.1 1999/12/27 21:47:23 fgsch Exp $	*/
+/*	$OpenBSD: if_token.h,v 1.2 2001/06/09 06:16:38 angelos Exp $	*/
 /*	$NetBSD: if_token.h,v 1.6 1999/11/19 20:41:19 thorpej Exp $	*/
 
 /*
@@ -129,4 +129,4 @@ void    token_ifattach __P((struct ifnet *));
 void	token_input __P((struct ifnet *, struct mbuf *));
 #endif
 
-#endif /* !_NET_IF_TOKEN_H_ */
+#endif /* _NET_IF_TOKEN_H_ */
diff --git a/sys/net/if_tun.h b/sys/net/if_tun.h
index 305d067812c..f3d7eda1037 100644
--- a/sys/net/if_tun.h
+++ b/sys/net/if_tun.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tun.h,v 1.9 2001/03/05 04:00:37 angelos Exp $	*/
+/*	$OpenBSD: if_tun.h,v 1.10 2001/06/09 06:16:38 angelos Exp $	*/
 
 /*
  * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
@@ -56,4 +56,4 @@ struct tuninfo {
 
 /* ioctl for changing the broadcast/point-to-point status */
 #define TUNSIFMODE      _IOW('t', 93, int)
-#endif /* !_NET_IF_TUN_H_ */
+#endif /* _NET_IF_TUN_H_ */
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index 889ed824ab1..beeafa12294 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_types.h,v 1.8 2001/03/26 19:00:58 jason Exp $	*/
+/*	$OpenBSD: if_types.h,v 1.9 2001/06/09 06:16:38 angelos Exp $	*/
 /*	$NetBSD: if_types.h,v 1.7 1995/02/27 09:10:24 glass Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)if_types.h	8.2 (Berkeley) 4/20/94
  */
 
+#ifndef _NET_IF_TYPES_H_
+#define _NET_IF_TYPES_H_
+
 /*
  * Interface types for benefit of parsing media address headers.
  * This list is derived from the SNMP list of ifTypes, currently
@@ -104,3 +107,5 @@
 #define	IFT_DUMMY	0xf1
 #define IFT_PVC		0xf2
 #define IFT_FAITH	0xf3
+
+#endif /* _NET_IF_TYPES_H_ */
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index eb492496f96..1d7f55b1b6f 100644
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vlan_var.h,v 1.4 2001/03/28 15:22:44 jason Exp $	*/
+/*	$OpenBSD: if_vlan_var.h,v 1.5 2001/06/09 06:16:38 angelos Exp $	*/
 
 /*
  * Copyright 1998 Massachusetts Institute of Technology
@@ -32,7 +32,7 @@
  */
 
 #ifndef _NET_IF_VLAN_VAR_H_
-#define	_NET_IF_VLAN_VAR_H_	1
+#define	_NET_IF_VLAN_VAR_H_
 
 #ifdef _KERNEL
 struct vlan_mc_entry {
@@ -90,5 +90,4 @@ extern	int vlan_input(register struct ether_header *eh, struct mbuf *m);
 extern	int vlan_input_tag(struct ether_header *eh,
 			struct mbuf *m, u_int16_t t);
 #endif /* _KERNEL */
-
 #endif /* _NET_IF_VLAN_VAR_H_ */
diff --git a/sys/net/net_osdep.h b/sys/net/net_osdep.h
index 3080960b92b..3d12a51f0d7 100644
--- a/sys/net/net_osdep.h
+++ b/sys/net/net_osdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: net_osdep.h,v 1.6 2001/02/16 08:48:03 itojun Exp $	*/
+/*	$OpenBSD: net_osdep.h,v 1.7 2001/06/09 06:16:38 angelos Exp $	*/
 /*	$KAME: net_osdep.h,v 1.40 2001/02/14 17:07:50 itojun Exp $	*/
 
 /*
@@ -207,34 +207,12 @@
  *		ifa_refcnt goes negative.
  */
 
-#ifndef __NET_NET_OSDEP_H_DEFINED_
-#define __NET_NET_OSDEP_H_DEFINED_
+#ifndef _NET_NET_OSDEP_H_DEFINED_
+#define _NET_NET_OSDEP_H_DEFINED_
 #ifdef _KERNEL
 
-#if defined(__NetBSD__) || defined(__OpenBSD__)
 #define if_name(ifp)	((ifp)->if_xname)
-#else
-struct ifnet;
-extern char *if_name __P((struct ifnet *));
-#endif
-
-#ifdef __FreeBSD__
-#define HAVE_OLD_BPF
-#endif
-
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-#define ifa_list	ifa_link
-#define if_addrlist	if_addrhead
-#define if_list		if_link
-#endif
-
-#if defined(__NetBSD__) && __NetBSD_Version__ >= 104000000
-#define ovbcopy		bcopy
-#endif
-
-#if defined(__OpenBSD__) || (defined(__bsdi__) && _BSDI_VERSION >= 199802)
 #define HAVE_NRL_INPCB
-#endif
 
-#endif /*_KERNEL*/
-#endif /*__NET_NET_OSDEP_H_DEFINED_ */
+#endif /* _KERNEL */
+#endif /*_NET_NET_OSDEP_H_DEFINED_ */
diff --git a/sys/net/netisr_dispatch.h b/sys/net/netisr_dispatch.h
index b630adedcc1..822577ad843 100644
--- a/sys/net/netisr_dispatch.h
+++ b/sys/net/netisr_dispatch.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netisr_dispatch.h,v 1.2 2000/11/08 11:33:10 art Exp $	*/
+/*	$OpenBSD: netisr_dispatch.h,v 1.3 2001/06/09 06:16:38 angelos Exp $	*/
 /* $NetBSD: netisr_dispatch.h,v 1.2 2000/07/02 04:40:47 cgd Exp $ */
 
 /*
@@ -16,6 +16,9 @@
  * }
  */
 
+#ifndef _NET_NETISR_DISPATCH_H_
+#define _NET_NETISR_DISPATCH_H_
+
 #ifndef _NET_NETISR_H_
 #error <net/netisr.h> must be included before <net/netisr_dispatch.h>
 #endif
@@ -64,3 +67,4 @@
 #if NBRIDGE > 0
         DONETISR(NETISR_BRIDGE,bridgeintr);
 #endif
+#endif /* _NET_NETISR_DISPATCH_H_ */
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h
index 7c1f20418ac..05464a6f20a 100644
--- a/sys/net/pfkeyv2.h
+++ b/sys/net/pfkeyv2.h
@@ -9,8 +9,8 @@ You should have received a copy of the license with this software. If you
 didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
 
 */
-#ifndef _NET_PFKEY_V2_H
-#define _NET_PFKEY_V2_H 1
+#ifndef _NET_PFKEY_V2_H_
+#define _NET_PFKEY_V2_H_
 
 #define PF_KEY_V2			2
 #define PFKEYV2_REVISION		199806L
@@ -392,4 +392,4 @@ void import_lifetime(struct tdb *, struct sadb_lifetime *, int);
 void import_credentials(struct tdb *, struct sadb_x_cred *, int);
 void import_sa(struct tdb *, struct sadb_sa *, struct ipsecinit *);
 #endif /* _KERNEL */
-#endif /* _NET_PFKEY_V2_H */
+#endif /* _NET_PFKEY_V2_H_ */
diff --git a/sys/net/ppp-comp.h b/sys/net/ppp-comp.h
index e0064097c18..9d4201139c0 100644
--- a/sys/net/ppp-comp.h
+++ b/sys/net/ppp-comp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppp-comp.h,v 1.4 1998/05/08 05:02:01 millert Exp $	*/
+/*	$OpenBSD: ppp-comp.h,v 1.5 2001/06/09 06:16:39 angelos Exp $	*/
 
 /*
  * ppp-comp.h - Definitions for doing PPP packet compression.
@@ -29,8 +29,8 @@
  * Id: ppp-comp.h,v 1.11 1998/03/25 03:33:34 paulus Exp $
  */
 
-#ifndef _NET_PPP_COMP_H
-#define _NET_PPP_COMP_H
+#ifndef _NET_PPP_COMP_H_
+#define _NET_PPP_COMP_H_
 
 /*
  * The following symbols control whether we include code for
@@ -164,4 +164,4 @@ struct compressor {
 #define CI_PREDICTOR_2		2	/* config option for Predictor-2 */
 #define CILEN_PREDICTOR_2	2	/* length of its config option */
 
-#endif /* _NET_PPP_COMP_H */
+#endif /* _NET_PPP_COMP_H_ */
diff --git a/sys/net/ppp_defs.h b/sys/net/ppp_defs.h
index e3a435e3e01..36d19e6d94d 100644
--- a/sys/net/ppp_defs.h
+++ b/sys/net/ppp_defs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppp_defs.h,v 1.10 1999/12/08 06:50:18 itojun Exp $	*/
+/*	$OpenBSD: ppp_defs.h,v 1.11 2001/06/09 06:16:39 angelos Exp $	*/
 /*	$NetBSD: ppp_defs.h,v 1.1 1995/07/04 06:28:26 paulus Exp $	*/
 
 /*
@@ -166,5 +166,4 @@ struct ppp_idle {
 #define __P(x)	()
 #endif
 #endif
-
 #endif /* _PPP_DEFS_H_ */
diff --git a/sys/net/radix.h b/sys/net/radix.h
index dc659c43caa..11f98d653b2 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radix.h,v 1.4 2000/06/17 20:30:34 provos Exp $	*/
+/*	$OpenBSD: radix.h,v 1.5 2001/06/09 06:16:39 angelos Exp $	*/
 /*	$NetBSD: radix.h,v 1.8 1996/02/13 22:00:37 christos Exp $	*/
 
 /*
@@ -167,5 +167,4 @@ struct radix_node
 	 *rn_search __P((void *, struct radix_node *)),
 	 *rn_search_m __P((void *, struct radix_node *, void *));
 #endif /* define(_KERNEL) || defined(_ROUTED) */
-
-#endif /* !_NET_RADIX_H_ */
+#endif /* _NET_RADIX_H_ */
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index 070e8a298ae..75e12d82f38 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raw_cb.h,v 1.2 1996/03/03 21:07:17 niklas Exp $	*/
+/*	$OpenBSD: raw_cb.h,v 1.3 2001/06/09 06:16:39 angelos Exp $	*/
 /*	$NetBSD: raw_cb.h,v 1.9 1996/02/13 22:00:41 christos Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NET_RAW_CB_H_
+#define _NET_RAW_CB_H_
+
 /*
  * Raw protocol interface control block.  Used
  * to tie a socket to the generic raw interface.
@@ -69,3 +72,4 @@ int	 raw_usrreq __P((struct socket *,
 	    int, struct mbuf *, struct mbuf *, struct mbuf *));
 
 #endif /* _KERNEL */
+#endif /* _NET_RAW_CB_H_ */
diff --git a/sys/net/route.h b/sys/net/route.h
index de946b154c2..83b753e2074 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.h,v 1.11 2001/01/19 06:37:36 itojun Exp $	*/
+/*	$OpenBSD: route.h,v 1.12 2001/06/09 06:16:39 angelos Exp $	*/
 /*	$NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
  *	@(#)route.h	8.3 (Berkeley) 4/19/94
  */
 
+#ifndef _NET_ROUTE_H_
+#define _NET_ROUTE_H_
+
 #include <sys/queue.h>
 
 /*
@@ -328,3 +331,4 @@ int	 rtrequest __P((int, struct sockaddr *,
 			struct rtentry **));
 int	 rtrequest1 __P((int, struct rt_addrinfo *, struct rtentry **));
 #endif /* _KERNEL */
+#endif /* _NET_ROUTE_H_ */
diff --git a/sys/net/slip.h b/sys/net/slip.h
index d247287ae69..f9de719334d 100644
--- a/sys/net/slip.h
+++ b/sys/net/slip.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: slip.h,v 1.2 1997/02/24 13:34:05 niklas Exp $	*/
+/*	$OpenBSD: slip.h,v 1.3 2001/06/09 06:16:39 angelos Exp $	*/
 /*	$NetBSD: slip.h,v 1.6 1994/06/29 06:36:53 cgd Exp $	*/
 
 /*-
@@ -36,6 +36,9 @@
  *	@(#)slip.h	8.1 (Berkeley) 2/12/94
  */
 
+#ifndef _NET_SLIP_H_
+#define _NET_SLIP_H_
+
 /* Ioctls operating on SLIP ttys. */
 #define	SLIOCGUNIT	_IOR('t', 88, int)	/* get slip unit number */
 
@@ -52,3 +55,4 @@
 
 #define	SLIPDIR_IN	0		/* incoming */
 #define	SLIPDIR_OUT	1		/* outgoing */
+#endif /* _NET_SLIP_H_ */
diff --git a/sys/net/zlib.h b/sys/net/zlib.h
index 92460eaaa9b..12617477a01 100644
--- a/sys/net/zlib.h
+++ b/sys/net/zlib.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zlib.h,v 1.3 2001/01/29 06:12:12 mickey Exp $	*/
+/*	$OpenBSD: zlib.h,v 1.4 2001/06/09 06:16:39 angelos Exp $	*/
 /*	$NetBSD: zlib.h,v 1.1 1996/03/15 02:28:17 paulus Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
   gzip@prep.ai.mit.edu    madler@alumni.caltech.edu
  */
 
-#ifndef _ZLIB_H
-#define _ZLIB_H
+#ifndef _NET_ZLIB_H_
+#define _NET_ZLIB_H_
 
 /* #include "zconf.h" */	/* included directly here */
 
@@ -628,5 +628,4 @@ extern uLong adler32 OF((uLong adler, Bytef *buf, uInt len));
 #ifndef _Z_UTIL_H
     struct internal_state {int dummy;}; /* hack for buggy compilers */
 #endif
-
-#endif /* _ZLIB_H */
+#endif /* _NET_ZLIB_H_ */