diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile
index 8eb19256e479..199837bcddf7 100644
--- a/usr.sbin/makefs/Makefile
+++ b/usr.sbin/makefs/Makefile
@@ -29,9 +29,6 @@ SRCS+=	getid.c misc.c spec.c
 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
 
diff --git a/usr.sbin/makefs/cd9660/Makefile.inc b/usr.sbin/makefs/cd9660/Makefile.inc
index a04664ed4928..b5012a323699 100644
--- a/usr.sbin/makefs/cd9660/Makefile.inc
+++ b/usr.sbin/makefs/cd9660/Makefile.inc
@@ -1,7 +1,7 @@
 #	$FreeBSD$
 #
 
-.PATH:	${SRCDIR}/cd9660 ${SRCTOP}/sys/fs/cd9660/
+.PATH:	${SRCDIR}/cd9660
 
 CFLAGS+=-I${SRCTOP}/sys/fs/cd9660/
 
diff --git a/usr.sbin/makefs/ffs/Makefile.inc b/usr.sbin/makefs/ffs/Makefile.inc
index 2e9f1921b43f..a1e839fd7ab6 100644
--- a/usr.sbin/makefs/ffs/Makefile.inc
+++ b/usr.sbin/makefs/ffs/Makefile.inc
@@ -2,8 +2,8 @@
 #
 
 .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