5 files changed, 4 insertions, 11 deletions
diff --git a/contrib/ipfilter/ipsend/sbpf.c b/contrib/ipfilter/ipsend/sbpf.c
index fcb66bc9ca2f..97559650f3b4 100644
--- a/contrib/ipfilter/ipsend/sbpf.c
+++ b/contrib/ipfilter/ipsend/sbpf.c
@@ -12,9 +12,6 @@
 #include <sys/socket.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
-#if BSD < 199103
-#include <sys/fcntlcom.h>
-#endif
 #if (__FreeBSD_version >= 300000)
 # include <sys/dirent.h>
 #else
diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c
index a39f9de16345..ddb59eb029f8 100644
--- a/contrib/ipfilter/ipsend/sock.c
+++ b/contrib/ipfilter/ipsend/sock.c
@@ -95,11 +95,7 @@ struct	proc	*proc;
 #endif
 
 
-#if BSD < 199103
-static	struct	proc	*getproc(void);
-#else
 static	struct	kinfo_proc	*getproc(void);
-#endif
 
 
 int	kmemcpy(buf, pos, n)
diff --git a/contrib/ipfilter/man/ipf.4 b/contrib/ipfilter/man/ipf.4
index 9b82e01bfc76..73a17a0cc8d3 100644
--- a/contrib/ipfilter/man/ipf.4
+++ b/contrib/ipfilter/man/ipf.4
@@ -60,7 +60,7 @@ typedef struct  frentry {
         struct  frentry *fr_grp;
         int     fr_ref;         /* reference count - for grouping */
         void    *fr_ifa;
-#if BSD >= 199306
+#ifdef BSD
         void    *fr_oifa;
 #endif
         /*
@@ -93,7 +93,7 @@ typedef struct  frentry {
         int     (*fr_func)(int, ip_t *, fr_info_t *));
         char    fr_icode;       /* return ICMP code */
         char    fr_ifname[IFNAMSIZ];
-#if BSD > 199306
+#ifdef BSD
         char    fr_oifname[IFNAMSIZ];
 #endif
         struct  frdest  fr_tif; /* "to" interface */
diff --git a/contrib/ipfilter/tools/ipfsyncd.c b/contrib/ipfilter/tools/ipfsyncd.c
index 0ccc15542f6b..a75075059763 100644
--- a/contrib/ipfilter/tools/ipfsyncd.c
+++ b/contrib/ipfilter/tools/ipfsyncd.c
@@ -131,7 +131,7 @@ main(argc, argv)
 
 	if (!debuglevel) {
 
-#if BSD >= 199306
+#ifdef BSD
 		daemon(0, 0);
 #else
 		int fd = open("/dev/null", O_RDWR);
diff --git a/contrib/ipfilter/tools/ipmon.c b/contrib/ipfilter/tools/ipmon.c
index f14cef832722..9022f12b6149 100644
--- a/contrib/ipfilter/tools/ipmon.c
+++ b/contrib/ipfilter/tools/ipmon.c
@@ -1702,7 +1702,7 @@ int main(argc, argv)
 
 	if (make_daemon &&
 	    ((config.log != stdout) || (ipmonopts & IPMON_SYSLOG))) {
-#if BSD >= 199306
+#ifdef BSD
 		daemon(0, !(ipmonopts & IPMON_SYSLOG));
 #else
 		int pid;