Index: head/lib/libnv/Makefile
===================================================================
--- head/lib/libnv/Makefile	(revision 336025)
+++ head/lib/libnv/Makefile	(revision 336026)
@@ -1,23 +1,26 @@
 # $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>
Index: head/usr.sbin/config/Makefile
===================================================================
--- head/usr.sbin/config/Makefile	(revision 336025)
+++ head/usr.sbin/config/Makefile	(revision 336026)
@@ -1,27 +1,27 @@
 # 	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
 SRCDIR:=${.PARSEDIR:tA}
 
 PROG=	config
 MAN=	config.5 config.8
 SRCS=	config.y main.c lang.l mkmakefile.c mkheaders.c \
 	mkoptions.c y.tab.h kernconf.c
 
 FILE2C?=file2c
 
 kernconf.c: kernconf.tmpl
 	${FILE2C} 'char kernconfstr[] = {' ',0};' < \
 	    ${SRCDIR}/kernconf.tmpl > kernconf.c
 
-CFLAGS+= -I. -I${SRCDIR} -I${SRCTOP}/sys
+CFLAGS+= -I. -I${SRCDIR}
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
 LIBADD=	l nv sbuf
 
 CLEANFILES+=	kernconf.c
 
 mkmakefile.o: configvers.h
 
 .include <bsd.prog.mk>