diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile
index 26df47809ce2..6bba1f78a713 100644
--- a/lib/libnv/Makefile
+++ b/lib/libnv/Makefile
@@ -1,26 +1,23 @@
 # $FreeBSD$
 
 PACKAGE=lib${LIB}
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
 LIB=	nv
 SHLIB_MAJOR= 0
 
 .PATH: ${SRCTOP}/sys/contrib/libnv ${SRCTOP}/sys/sys
 CFLAGS+=-I${SRCTOP}/sys -I${.CURDIR}
 
 SRCS=	cnvlist.c
 SRCS+=	dnvlist.c
 SRCS+=	msgio.c
 SRCS+=	nvlist.c
 SRCS+=	nvpair.c
 
-INCSDIR=	${INCLUDEDIR}/sys
-INCS=	${SRCTOP}/sys/sys/cnv.h ${SRCTOP}/sys/sys/nv.h
-
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
diff --git a/tools/build/Makefile b/tools/build/Makefile
index 63b147ceb985..0ec295ac5dd1 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -1,52 +1,55 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../include
 
 LIB=		egacy
 SRC=
 INCSGROUPS=	INCS SYSINCS
 INCS=
 
 SYSINCSDIR=	${INCLUDEDIR}/sys
 
 BOOTSTRAPPING?=	0
 
 _WITH_PWCACHEDB!= grep -c pwcache_groupdb /usr/include/grp.h || true
 .if ${_WITH_PWCACHEDB} == 0
 .PATH: ${.CURDIR}/../../contrib/libc-pwcache
 CFLAGS+=	-I${.CURDIR}/../../contrib/libc-pwcache \
 		-I${.CURDIR}/../../lib/libc/include
 SRCS+=		pwcache.c
 .endif
 
 _WITH_STRSVIS!=	grep -c strsvis /usr/include/vis.h || true
 .if ${_WITH_STRSVIS} == 0
 .PATH: ${.CURDIR}/../../contrib/libc-vis
 SRCS+=		vis.c
 CFLAGS+=	-I${.CURDIR}/../../contrib/libc-vis \
 		-I${.CURDIR}/../../lib/libc/include
 .endif
 
 _WITH_REALLOCARRAY!= grep -c reallocarray /usr/include/stdlib.h || true
 .if ${_WITH_REALLOCARRAY} == 0
 .PATH: ${.CURDIR}/../../lib/libc/stdlib
 INCS+=		stdlib.h
 SRCS+=		reallocarray.c
 CFLAGS+=	-I${.CURDIR}/../../lib/libc/include
 .endif
 
 _WITH_UTIMENS!= grep -c utimensat /usr/include/sys/stat.h || true
 .if ${_WITH_UTIMENS} == 0
 SYSINCS+=	stat.h
 SRCS+=		futimens.c utimensat.c
 .endif
 
 .if empty(SRCS)
 SRCS=		dummy.c
 .endif
 
 .if defined(CROSS_BUILD_TESTING)
 SUBDIR=		cross-build
 .endif
 
+# Needed to build config (since it uses libnv)
+SYSINCS+=	${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h
+
 .include <bsd.lib.mk>