diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile
index bbf8071a91c3..422bdcaaa77a 100644
--- a/usr.sbin/bsdinstall/Makefile
+++ b/usr.sbin/bsdinstall/Makefile
@@ -1,15 +1,16 @@
 
-OSNAME?=	FreeBSD
 SUBDIR=	distextract distfetch partedit runconsoles scripts
 SUBDIR_PARALLEL=
-SUBDIR_DEPEND_distfetch = distextract
-SUBDIR_DEPEND_partedit = distextract
+SUBDIR_DEPEND_distextract = include
+SUBDIR_DEPEND_distfetch = include
+SUBDIR_DEPEND_partedit = include
 SCRIPTS= bsdinstall
 MAN= bsdinstall.8
 PACKAGE=	bsdinstall
 
 SCRIPTS+=	startbsdinstall
 SCRIPTSDIR_startbsdinstall=	${LIBEXECDIR}/bsdinstall
 
+UPDATE_DEPENDFILE= no
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/Makefile.depend b/usr.sbin/bsdinstall/Makefile.depend
index 11aba52f82cf..6ce3965b1642 100644
--- a/usr.sbin/bsdinstall/Makefile.depend
+++ b/usr.sbin/bsdinstall/Makefile.depend
@@ -1,10 +1,12 @@
-# Autogenerated - do NOT edit!
+# Not autogenerated - take care
 
 DIRDEPS = \
+	usr.sbin/bsdinstall/distextract \
+	usr.sbin/bsdinstall/distfetch \
+	usr.sbin/bsdinstall/include \
+	usr.sbin/bsdinstall/partedit \
+	usr.sbin/bsdinstall/runconsoles \
+	usr.sbin/bsdinstall/scripts \
 
 
 .include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.sbin/bsdinstall/Makefile.inc b/usr.sbin/bsdinstall/Makefile.inc
index dc4e35b73799..c0907ffac469 100644
--- a/usr.sbin/bsdinstall/Makefile.inc
+++ b/usr.sbin/bsdinstall/Makefile.inc
@@ -1 +1,4 @@
 PACKAGE=bsdinstall
+
+CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../include
+
diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile
index 368e1b1378ab..6813c9a79391 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile
+++ b/usr.sbin/bsdinstall/distextract/Makefile
@@ -1,18 +1,9 @@
 
 BINDIR= ${LIBEXECDIR}/bsdinstall
 PROG=	distextract
-CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I.
 LIBADD=	archive bsddialog m
 SRCS=	distextract.c
 
 MAN=
-GENHDRS=	opt_osname.h
-SRCS+=		${GENHDRS}
-CLEANFILES+=	${GENHDRS}
-
-opt_osname.h: .PHONY
-	if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \
-		echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \
-	fi
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/distextract/Makefile.depend b/usr.sbin/bsdinstall/distextract/Makefile.depend
index 10731d6ccb01..dd87c979eb80 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile.depend
+++ b/usr.sbin/bsdinstall/distextract/Makefile.depend
@@ -1,18 +1,19 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libarchive \
 	lib/libbsddialog \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/msun \
+	usr.sbin/bsdinstall/include \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile
index 325f5c55cfd5..8a9011734592 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile
+++ b/usr.sbin/bsdinstall/distfetch/Makefile
@@ -1,9 +1,8 @@
 
 BINDIR= ${LIBEXECDIR}/bsdinstall
 PROG=	distfetch
-CFLAGS+=	-I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextract
 LIBADD=	fetch bsddialog
 
 MAN=
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile.depend b/usr.sbin/bsdinstall/distfetch/Makefile.depend
index 16e54d9b2a6e..9e9ac6d1bae8 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile.depend
+++ b/usr.sbin/bsdinstall/distfetch/Makefile.depend
@@ -1,18 +1,18 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libbsddialog \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libfetch \
-	usr.sbin/bsdinstall/distextract \
+	usr.sbin/bsdinstall/include \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
diff --git a/usr.sbin/bsdinstall/include/Makefile b/usr.sbin/bsdinstall/include/Makefile
new file mode 100644
index 000000000000..15f947defa9b
--- /dev/null
+++ b/usr.sbin/bsdinstall/include/Makefile
@@ -0,0 +1,13 @@
+OSNAME?=	FreeBSD
+GENHDRS=	opt_osname.h
+SRCS+=		${GENHDRS}
+CLEANFILES+=	${GENHDRS}
+
+opt_osname.h: ${META_NOPHONY}
+	@if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET} 2> /dev/null; then \
+		echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \
+	fi
+
+MK_STAGING= no
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/Makefile.depend b/usr.sbin/bsdinstall/include/Makefile.depend
similarity index 100%
copy from usr.sbin/bsdinstall/Makefile.depend
copy to usr.sbin/bsdinstall/include/Makefile.depend
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile
index 8d7156fd16d2..397e404a126f 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@@ -1,26 +1,25 @@
 
 BINDIR= ${LIBEXECDIR}/bsdinstall
 PROG=	partedit
 LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
        ${BINDIR}/partedit ${BINDIR}/scriptedpart
 SYMLINKS= ../libexec/bsdinstall/partedit /usr/sbin/sade
-CFLAGS+=	-I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextract
 LIBADD+=	geom util bsddialog
 
 PARTEDIT_ARCH= ${MACHINE}
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
 PARTEDIT_ARCH= x86
 .elif ${MACHINE} == "arm64" || ${MACHINE} == "riscv"
 PARTEDIT_ARCH= efi
 .endif
 .if !exists(partedit_${PARTEDIT_ARCH}.c)
 PARTEDIT_ARCH= generic
 .endif
 
 SRCS=	diskmenu.c partedit.c gpart_ops.c partedit_${PARTEDIT_ARCH}.c \
 	part_wizard.c scripted.c
 
 WARNS?=	3
 MAN= sade.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/partedit/Makefile.depend b/usr.sbin/bsdinstall/partedit/Makefile.depend
index 4d5ca3e13299..68a44a4d87a7 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile.depend
+++ b/usr.sbin/bsdinstall/partedit/Makefile.depend
@@ -1,19 +1,19 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libbsddialog \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libgeom \
 	lib/libutil \
-	usr.sbin/bsdinstall/distextract \
+	usr.sbin/bsdinstall/include \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif