diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c
index 0ab059abab2..0fdff7c4528 100644
--- a/sys/dev/awi/awi.c
+++ b/sys/dev/awi/awi.c
@@ -86,14 +86,6 @@
  */
 
 #include "opt_inet.h"
-#if defined(__FreeBSD__) && __FreeBSD__ >= 4
-#define	NBPFILTER	1
-#elif defined(__FreeBSD__) && __FreeBSD__ >= 3
-#include "bpf.h"
-#define	NBPFILTER	NBPF
-#else
-#include "bpfilter.h"
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -134,6 +126,15 @@
 #endif
 #endif
 
+#if defined(__FreeBSD__) && __FreeBSD_version >= 400000
+#define	NBPFILTER	1
+#elif defined(__FreeBSD__) && __FreeBSD_version >= 300000
+#include "bpf.h"
+#define	NBPFILTER	NBPF
+#else
+#include "bpfilter.h"
+#endif
+
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
@@ -464,7 +465,7 @@ awi_ioctl(ifp, cmd, data)
 	u_int8_t tmpstr[IEEE80211_NWID_LEN*2];
 #ifdef __FreeBSD_version
 #if __FreeBSD_version < 500028
-	struct proc *mythread = curproc;		/* Little lie */
+	struct proc *mythread = curproc;		/* name a white lie */
 #else
 	struct thread *mythread = curthread;
 #endif
diff --git a/sys/dev/awi/awivar.h b/sys/dev/awi/awivar.h
index a55b6a75912..0d4a979a904 100644
--- a/sys/dev/awi/awivar.h
+++ b/sys/dev/awi/awivar.h
@@ -95,7 +95,7 @@ struct awi_softc
 	void			*sc_ih; /* interrupt handler */
 #endif
 #ifdef __FreeBSD__
-#if __FreeBSD__ >= 4
+#if __FreeBSD_version >= 40000
 	struct {
 		char	dv_xname[64];	/*XXX*/
 	}			sc_dev;