diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile
index e71cae726536..aaa006694222 100644
--- a/usr.sbin/bsdinstall/Makefile
+++ b/usr.sbin/bsdinstall/Makefile
@@ -1,21 +1,16 @@
 # $FreeBSD$
 
 OSNAME?=	FreeBSD
 SUBDIR=	distextract distfetch partedit runconsoles scripts
 SUBDIR_PARALLEL=
+SUBDIR_DEPEND_distfetch = distextract
+SUBDIR_DEPEND_partedit = distextract
 SCRIPTS= bsdinstall
 MAN= bsdinstall.8
 PACKAGE=	bsdinstall
-GENHDRS=	opt_osname.h
-SRCS+=		${GENHDRS}
-CLEANFILES+=	${GENHDRS}
 
 SCRIPTS+=	startbsdinstall
 SCRIPTSDIR_startbsdinstall=	${LIBEXECDIR}/bsdinstall
 
-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 b/usr.sbin/bsdinstall/distextract/Makefile
index 6ae9bb65e8fb..0292c01e78f4 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile
+++ b/usr.sbin/bsdinstall/distextract/Makefile
@@ -1,10 +1,19 @@
 # $FreeBSD$
 
 BINDIR= ${LIBEXECDIR}/bsdinstall
 PROG=	distextract
-CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/..
+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/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile
index 0104df0e3aec..1555719dd15d 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile
+++ b/usr.sbin/bsdinstall/distfetch/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 BINDIR= ${LIBEXECDIR}/bsdinstall
 PROG=	distfetch
-CFLAGS+=	-I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/..
+CFLAGS+=	-I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextract
 LIBADD=	fetch bsddialog
 
 MAN=
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile
index 96c4ddb53961..df17028eab2a 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 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}/..
+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>