diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1128,6 +1128,7 @@
 .if !empty(SUBDIR_OVERRIDE) && make(buildworld)
 	${_+_}cd ${.CURDIR}; ${WMAKE} MK_INCLUDES=yes SHARED=symlinks includes
 .endif
+	${_+_}cd ${.CURDIR};  ${WMAKE} test-includes
 _libraries:
 	@echo
 	@echo "--------------------------------------------------------------"
diff --git a/tools/build/test-includes/Makefile b/tools/build/test-includes/Makefile
--- a/tools/build/test-includes/Makefile
+++ b/tools/build/test-includes/Makefile
@@ -13,11 +13,11 @@
 # programs to detect FreeBSD has different headers, omitting internal
 # headers cuts down on the noise w/o causing problems for the goal.
 #
-PROG=	test-includes
-SRCS=	test-includes.c
-INTERNALPROG=	This is a compile-only test
+LIB=	test-includes
+INTERNALLIB=	This is a compile-only test
 MAN=
 HDRS!=	(cd ${SRCTOP}/sys; ls sys/[^_]*.h net*/[^_]*.h)
+NO_PIC=	yes
 
 # Some files have to be clean for extra defines too...
 CFLAGS.event.c=	-D_WANT_KEVENT32 -D_WANT_FREEBSD11_KEVENT
@@ -33,6 +33,8 @@
 .endif
 .endfor
 
+test-includes: lib${LIB}.a .PHONY
+
 #
 # Target to make the current known bad list. In general, this list should only
 # ever shrink and never grow.
@@ -49,4 +51,4 @@
 	done;									\
 	echo) > ${.CURDIR}/badfiles.inc
 
-.include <bsd.prog.mk>
+.include <bsd.lib.mk>
diff --git a/tools/build/test-includes/test-includes.c b/tools/build/test-includes/test-includes.c
deleted file mode 100644
--- a/tools/build/test-includes/test-includes.c
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Public domain */
-
-int
-main(void)
-{
-	return 0;
-}