diff --git a/share/mk/Makefile b/share/mk/Makefile
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -60,8 +60,11 @@
 	bsd.test.mk \
 	dirdeps.mk \
 	dirdeps-options.mk \
+	dirdeps-targets.mk \
 	gendirdeps.mk \
+	host-target.mk \
 	install-new.mk \
+	jobs.mk \
 	meta.autodep.mk \
 	meta.stage.mk \
 	meta.subdir.mk \
@@ -70,6 +73,7 @@
 	stage-install.sh \
 	sys.mk \
 	sys.dependfile.mk \
+	sys.dirdeps.mk \
 	version_gen.awk
 
 FILESDIR=	${BINDIR}/mk
diff --git a/share/mk/local.sys.env.mk b/share/mk/local.sys.env.mk
--- a/share/mk/local.sys.env.mk
+++ b/share/mk/local.sys.env.mk
@@ -56,4 +56,4 @@
 .export HOST_TARGET
 .endif
 
-.include <sys.machine.mk>
+.include <local.sys.machine.mk>
diff --git a/share/mk/sys.machine.mk b/share/mk/local.sys.machine.mk
rename from share/mk/sys.machine.mk
rename to share/mk/local.sys.machine.mk
--- a/share/mk/sys.machine.mk
+++ b/share/mk/local.sys.machine.mk
@@ -1,5 +1,5 @@
 
-.-include <local.sys.machine.mk>
+.-include <site.sys.machine.mk>
 
 PSEUDO_MACHINE_LIST?= common host
 TARGET_MACHINE_LIST?= amd64 arm arm64 i386 powerpc riscv