Index: head/usr.sbin/makefs/Makefile
===================================================================
--- head/usr.sbin/makefs/Makefile	(revision 332843)
+++ head/usr.sbin/makefs/Makefile	(revision 332844)
@@ -1,41 +1,38 @@
 #	$FreeBSD$
 
 SRCDIR:=${.PARSEDIR:tA}
 
 .include <src.opts.mk>
 
 PROG=	makefs
 
 CFLAGS+=-I${SRCDIR}
 
 SRCS=	cd9660.c ffs.c \
 	makefs.c \
 	mtree.c \
 	walk.c
 MAN=	makefs.8
 
 WARNS?=	2
 
 .include "${SRCDIR}/cd9660/Makefile.inc"
 .include "${SRCDIR}/ffs/Makefile.inc"
 
 CFLAGS+=-DHAVE_STRUCT_STAT_ST_FLAGS=1
 
 .PATH: ${SRCTOP}/contrib/mtree
 CFLAGS+=-I${SRCTOP}/contrib/mtree
 SRCS+=	getid.c misc.c spec.c
 
 .PATH: ${SRCTOP}/contrib/mknod
 CFLAGS+=-I${SRCTOP}/contrib/mknod
 SRCS+=	pack_dev.c
 
-.PATH:	${SRCTOP}/sys/ufs/ffs
-SRCS+=	ffs_tables.c
-
 CFLAGS+=	-I${SRCTOP}/lib/libnetbsd
 LIBADD=		netbsd util sbuf
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/makefs/cd9660/Makefile.inc
===================================================================
--- head/usr.sbin/makefs/cd9660/Makefile.inc	(revision 332843)
+++ head/usr.sbin/makefs/cd9660/Makefile.inc	(revision 332844)
@@ -1,9 +1,9 @@
 #	$FreeBSD$
 #
 
-.PATH:	${SRCDIR}/cd9660 ${SRCTOP}/sys/fs/cd9660/
+.PATH:	${SRCDIR}/cd9660
 
 CFLAGS+=-I${SRCTOP}/sys/fs/cd9660/
 
 SRCS+=	cd9660_strings.c cd9660_debug.c cd9660_eltorito.c \
 	cd9660_write.c cd9660_conversion.c iso9660_rrip.c cd9660_archimedes.c
Index: head/usr.sbin/makefs/ffs/Makefile.inc
===================================================================
--- head/usr.sbin/makefs/ffs/Makefile.inc	(revision 332843)
+++ head/usr.sbin/makefs/ffs/Makefile.inc	(revision 332844)
@@ -1,9 +1,9 @@
 #	$FreeBSD$
 #
 
 .PATH:	${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs
-
-CFLAGS+=	-I${SRCTOP}/sys/ufs/ffs
-
 SRCS+=	ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c
 SRCS+=	buf.c mkfs.c
+
+# Reach-over source from sys/ufs/ffs
+SRCS+=	ffs_tables.c