Index: contrib/libpcap/gencode.c
===================================================================
RCS file: /usr/store/mlaier/fcvs/src/contrib/libpcap/gencode.c,v
retrieving revision 1.16
diff -u -r1.16 gencode.c
--- contrib/libpcap/gencode.c	4 Sep 2006 19:54:21 -0000	1.16
+++ contrib/libpcap/gencode.c	30 Jun 2007 17:01:13 -0000
@@ -75,7 +75,14 @@
 #include "ppp.h"
 #include "sll.h"
 #include "arcnet.h"
+#ifdef HAVE_NET_PFVAR_H
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/pfvar.h>
+#include <net/if_pflog.h>
+#else
 #include "pf.h"
+#endif
 #ifndef offsetof
 #define offsetof(s, e) ((size_t)&((s *)0)->e)
 #endif
Index: contrib/libpcap/grammar.y
===================================================================
RCS file: /usr/store/mlaier/fcvs/src/contrib/libpcap/grammar.y,v
retrieving revision 1.11
diff -u -r1.11 grammar.y
--- contrib/libpcap/grammar.y	4 Sep 2006 19:54:21 -0000	1.11
+++ contrib/libpcap/grammar.y	30 Jun 2007 17:02:55 -0000
@@ -53,7 +53,13 @@
 #include "pcap-int.h"
 
 #include "gencode.h"
+#ifdef HAVE_NET_PFVAR_H
+#include <net/if.h>
+#include <net/pfvar.h>
+#include <net/if_pflog.h>
+#else
 #include "pf.h"
+#endif
 #include <pcap-namedb.h>
 
 #ifdef HAVE_OS_PROTO_H
Index: contrib/tcpdump/print-pflog.c
===================================================================
RCS file: /usr/store/mlaier/fcvs/src/contrib/tcpdump/print-pflog.c,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 print-pflog.c
--- contrib/tcpdump/print-pflog.c	4 Sep 2006 20:04:14 -0000	1.1.1.3
+++ contrib/tcpdump/print-pflog.c	30 Jun 2007 17:03:26 -0000
@@ -28,6 +28,16 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_NET_PFVAR_H
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/pfvar.h>
+#include <net/if_pflog.h>
+#else
+#include "pf.h"
+#endif
+
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
@@ -35,7 +45,6 @@
 
 #include "interface.h"
 #include "addrtoname.h"
-#include "pf.h"
 
 static struct tok pf_reasons[] = {
 	{ 0,	"0(match)" },
Index: lib/libpcap/config.h
===================================================================
RCS file: /usr/store/mlaier/fcvs/src/lib/libpcap/config.h,v
retrieving revision 1.5
diff -u -r1.5 config.h
--- lib/libpcap/config.h	29 May 2005 18:12:46 -0000	1.5
+++ lib/libpcap/config.h	30 Jun 2007 17:05:20 -0000
@@ -45,6 +45,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
+/* Define to 1 if you have the <net/pfvar.h> header file. */
+#define HAVE_NET_PFVAR_H 1
+
 /* Define to 1 if you have the <netinet/ether.h> header file. */
 /* #undef HAVE_NETINET_ETHER_H */
 
Index: usr.sbin/tcpdump/tcpdump/config.h
===================================================================
RCS file: /usr/store/mlaier/fcvs/src/usr.sbin/tcpdump/tcpdump/config.h,v
retrieving revision 1.7
diff -u -r1.7 config.h
--- usr.sbin/tcpdump/tcpdump/config.h	11 Jul 2005 04:14:42 -0000	1.7
+++ usr.sbin/tcpdump/tcpdump/config.h	30 Jun 2007 17:06:34 -0000
@@ -193,6 +193,9 @@
 /* Define to 1 if you have the <netdnet/dnetdb.h> header file. */
 /* #undef HAVE_NETDNET_DNETDB_H */
 
+/* Define to 1 if you have the <net/pfvar.h> header file. */
+#define HAVE_NET_PFVAR_H 1
+
 /* Define to 1 if you have the <netinet/ether.h> header file. */
 /* #undef HAVE_NETINET_ETHER_H */