Index: head/Makefile.libcompat
===================================================================
--- head/Makefile.libcompat
+++ head/Makefile.libcompat
@@ -186,7 +186,6 @@
 .endif
 	mkdir -p ${WORLDTMP}
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
-	ln -sf ${.CURDIR}/sys ${LIBCOMPATTMP}
 .for _t in ${_obj} includes
 .for _dir in ${_LC_INCDIRS}
 	${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATWMAKE} MK_INCLUDES=yes \
Index: head/lib/libsysdecode/Makefile
===================================================================
--- head/lib/libsysdecode/Makefile
+++ head/lib/libsysdecode/Makefile
@@ -123,9 +123,10 @@
 CFLAGS.gcc+=	${CFLAGS.gcc.${.IMPSRC}}
 
 DEPENDOBJS+=	tables.h
-tables.h: mktables ${SYSROOT}/sys/netinet/in.h ${SYSROOT}/sys/netinet/tcp.h \
-    ${SYSROOT}/sys/netinet6/in6.h
-	sh ${.CURDIR}/mktables ${SYSROOT:U${DESTDIR}}${INCLUDEDIR} ${.TARGET}.tmp && \
+incdir=${SYSROOT:U${DESTDIR}}${INCLUDEDIR}
+tables.h: mktables ${incdir}/netinet/in.h ${incdir}/netinet/tcp.h \
+    ${incdir}/netinet6/in6.h
+	sh ${.CURDIR}/mktables ${incdir} ${.TARGET}.tmp && \
 	    mv -f ${.TARGET}.tmp ${.TARGET}
 
 # mkioctls runs find(1) for headers so needs to rebuild every time.  This used