Index: contrib/pf/net/pfvar.h
===================================================================
RCS file: /usr/store/mlaier/fcvs/src/sys/contrib/pf/net/pfvar.h,v
retrieving revision 1.8
diff -u -r1.8 pfvar.h
--- contrib/pf/net/pfvar.h	12 Aug 2004 13:59:44 -0000	1.8
+++ contrib/pf/net/pfvar.h	23 Sep 2004 00:01:41 -0000
@@ -49,16 +49,6 @@
 
 #ifdef __FreeBSD__
 #include <netinet/in.h>
-/*
- * XXX
- *  If we include <netipsec/keydb.h>, we need _KERNEL definition.
- *  This makes pfctl compilation difficult.
- */
-union sockaddr_union {
-	struct sockaddr		sa;
-	struct sockaddr_in	sin;
-	struct sockaddr_in6	sin6;
-};
 #endif
 
 #include <netinet/tcp_fsm.h>
@@ -831,6 +821,15 @@
 #define	pfrts_name	pfrts_t.pfrt_name
 #define pfrts_flags	pfrts_t.pfrt_flags
 
+#ifndef _SOCKADDR_UNION_DEFINED
+#define	_SOCKADDR_UNION_DEFINED
+union sockaddr_union {
+	struct sockaddr		sa;
+	struct sockaddr_in	sin;
+	struct sockaddr_in6	sin6;
+};
+#endif /* _SOCKADDR_UNION_DEFINED */
+
 SLIST_HEAD(pfr_kentryworkq, pfr_kentry);
 struct pfr_kentry {
 	struct radix_node	 pfrke_node[2];
Index: netipsec/keydb.h
===================================================================
RCS file: /usr/store/mlaier/fcvs/src/sys/netipsec/keydb.h,v
retrieving revision 1.3
diff -u -r1.3 keydb.h
--- netipsec/keydb.h	29 Sep 2003 22:57:43 -0000	1.3
+++ netipsec/keydb.h	22 Sep 2004 23:56:07 -0000
@@ -37,6 +37,8 @@
 
 #include <netipsec/key_var.h>
 
+#ifndef _SOCKADDR_UNION_DEFINED
+#define	_SOCKADDR_UNION_DEFINED
 /*
  * The union of all possible address formats we handle.
  */
@@ -45,6 +47,7 @@
 	struct sockaddr_in	sin;
 	struct sockaddr_in6	sin6;
 };
+#endif /* _SOCKADDR_UNION_DEFINED */
 
 /* Security Assocciation Index */
 /* NOTE: Ensure to be same address family */