Index: head/tools/tools/ath/athaggrstats/Makefile
===================================================================
--- head/tools/tools/ath/athaggrstats/Makefile	(revision 283001)
+++ head/tools/tools/ath/athaggrstats/Makefile	(revision 283002)
@@ -1,28 +1,29 @@
 # $FreeBSD$
 
 .PATH:	${.CURDIR}/../../../../sys/dev/ath/ath_hal
 
 PROG=	athaggrstats
 
 SRCS=	main.c athaggrstats.c opt_ah.h ah_osdep.h
 
 CLEANFILES+=	opt_ah.h
 
 .include <../Makefile.inc>
 
 CFLAGS+=-DATH_SUPPORT_ANI
 CFLAGS+=-DATH_SUPPORT_TDMA
+CFLAGS+=-I${.CURDIR}/../../../../lib/libbsdstat/
 LIBADD+=	bsdstat
 
 opt_ah.h:
 	echo "#define AH_DEBUG 1" > opt_ah.h
 	echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
 	echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
 
 ah_osdep.h:
 	echo 'typedef void *HAL_SOFTC;' >ah_osdep.h
 	echo 'typedef int HAL_BUS_TAG;' >>ah_osdep.h
 	echo 'typedef void *HAL_BUS_HANDLE;' >>ah_osdep.h
 	echo 'typedef uint32_t HAL_DMA_ADDR;' >>ah_osdep.h
 
 .include <bsd.prog.mk>
Index: head/tools/tools/ath/athstats/Makefile
===================================================================
--- head/tools/tools/ath/athstats/Makefile	(revision 283001)
+++ head/tools/tools/ath/athstats/Makefile	(revision 283002)
@@ -1,39 +1,37 @@
 # $FreeBSD$
 
 MAN=
 
 .include <bsd.own.mk>
 
 .PATH:	${.CURDIR}/../../../../sys/dev/ath/ath_hal
 
 PROG=	athstats
 
-# Because of a clang preprocessor parser limitation causing this
-# to not compile, use gcc for now.
-#CC=	gcc
-
 SRCS=	main.c athstats.c opt_ah.h ah_osdep.h
 
 CLEANFILES+=	opt_ah.h
 
 .include <../Makefile.inc>
 
 CFLAGS+=-DATH_SUPPORT_ANI
 CFLAGS+=-DATH_SUPPORT_TDMA
+
+CFLAGS+=-I${.CURDIR}/../../../../lib/libbsdstat/
 
 CFLAGS.clang+= -fbracket-depth=512
 
 LIBADD=	bsdstat
 
 opt_ah.h:
 	echo "#define AH_DEBUG 1" > opt_ah.h
 	echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
 	echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
 
 ah_osdep.h:
 	echo 'typedef void *HAL_SOFTC;' >ah_osdep.h
 	echo 'typedef int HAL_BUS_TAG;' >>ah_osdep.h
 	echo 'typedef void *HAL_BUS_HANDLE;' >>ah_osdep.h
 	echo 'typedef uint32_t HAL_DMA_ADDR;' >>ah_osdep.h
 
 .include <bsd.prog.mk>
Index: head/tools/tools/mwl/mwlstats/Makefile
===================================================================
--- head/tools/tools/mwl/mwlstats/Makefile	(revision 283001)
+++ head/tools/tools/mwl/mwlstats/Makefile	(revision 283002)
@@ -1,12 +1,13 @@
 # $FreeBSD$
 
 PROG=	mwlstats
 BINDIR=	/usr/local/bin
 MAN=
 
 SRCS=	main.c mwlstats.c
 LIBADD=	bsdstat
+CFLAGS+=-I${.CURDIR}/../../../../lib/libbsdstat/
 
 .include <bsd.prog.mk>
 
 CFLAGS+= -I.
Index: head/tools/tools/net80211/wlanstats/Makefile
===================================================================
--- head/tools/tools/net80211/wlanstats/Makefile	(revision 283001)
+++ head/tools/tools/net80211/wlanstats/Makefile	(revision 283002)
@@ -1,14 +1,15 @@
 # $FreeBSD$
 
 .include <bsd.compiler.mk>
 
 PROG=	wlanstats
 BINDIR=	/usr/local/bin
 MAN=
 LIBADD=	bsdstat
+CFLAGS+=-I${.CURDIR}/../../../../lib/libbsdstat/
 
 SRCS=	wlanstats.c main.c
 
 CFLAGS.clang+= -fbracket-depth=512
 
 .include <bsd.prog.mk>
Index: head/tools/tools/npe/npestats/Makefile
===================================================================
--- head/tools/tools/npe/npestats/Makefile	(revision 283001)
+++ head/tools/tools/npe/npestats/Makefile	(revision 283002)
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
 PROG=	npestats
 SRCS=	main.c npestats.c
 BINDIR=	/usr/local/bin
 MAN=
 LIBADD=	bsdstat
+CFLAGS+=-I${.CURDIR}/../../../../lib/libbsdstat/
 
 .include <bsd.prog.mk>