diff --git a/lib/libpe/Makefile.depend b/lib/libpe/Makefile.depend
new file mode 100644
index 000000000000..18be76b0cb6f
--- /dev/null
+++ b/lib/libpe/Makefile.depend
@@ -0,0 +1,13 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sbin/kldstat/Makefile.depend b/sbin/kldstat/Makefile.depend
index 9cb890b58360..0f77a15a871f 100644
--- a/sbin/kldstat/Makefile.depend
+++ b/sbin/kldstat/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libutil \
 
 
 .include <dirdeps.mk>
diff --git a/secure/lib/libssh/Makefile.depend b/secure/lib/libssh/Makefile.depend
index 51e45b4efd13..4b24848fc507 100644
--- a/secure/lib/libssh/Makefile.depend
+++ b/secure/lib/libssh/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
+	include/gssapi \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
diff --git a/sys/boot/efi/boot1/Makefile.depend b/sys/boot/efi/boot1/Makefile.depend
index 79506ce16b79..29844140c2c3 100644
--- a/sys/boot/efi/boot1/Makefile.depend
+++ b/sys/boot/efi/boot1/Makefile.depend
@@ -3,6 +3,8 @@
 
 DIRDEPS = \
 	include \
+	include/xlocale \
+	lib/libstand \
 
 
 .include <dirdeps.mk>
diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend
index e57164a7d917..1b2c35b56b59 100644
--- a/targets/pseudo/userland/lib/Makefile.depend
+++ b/targets/pseudo/userland/lib/Makefile.depend
@@ -46,6 +46,7 @@ DIRDEPS = \
 	lib/libdwarf \
 	lib/libedit/edit/readline \
 	lib/libelf \
+	lib/libelftc \
 	lib/libevent \
 	lib/libexecinfo \
 	lib/libexpat \
@@ -118,6 +119,7 @@ DIRDEPS = \
 	lib/libpam/modules/pam_tacplus \
 	lib/libpam/modules/pam_unix \
 	lib/libpcap \
+	lib/libpe \
 	lib/libpjdlog \
 	lib/libpmc \
 	lib/libproc \
diff --git a/usr.bin/elfcopy/Makefile.depend b/usr.bin/elfcopy/Makefile.depend
index 7c3c6db5863a..6416d535adfa 100644
--- a/usr.bin/elfcopy/Makefile.depend
+++ b/usr.bin/elfcopy/Makefile.depend
@@ -15,6 +15,7 @@ DIRDEPS = \
 	lib/libelftc \
 	lib/libexpat \
 	lib/liblzma \
+	lib/libpe \
 	lib/libthr \
 	lib/libz \
 	secure/lib/libcrypto \
diff --git a/usr.bin/kdump/Makefile.depend b/usr.bin/kdump/Makefile.depend
index 83a2492bdfb9..e3c5ae7bab49 100644
--- a/usr.bin/kdump/Makefile.depend
+++ b/usr.bin/kdump/Makefile.depend
@@ -20,11 +20,7 @@ DIRDEPS = \
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 kdump.o: kdump_subr.h
-kdump.o: linux32_syscalls.c
-kdump.o: linux_syscalls.c
 kdump.po: kdump_subr.h
-kdump.po: linux32_syscalls.c
-kdump.po: linux_syscalls.c
 kdump_subr.o: kdump_subr.c
 kdump_subr.o: kdump_subr.h
 kdump_subr.po: kdump_subr.c
diff --git a/usr.bin/truss/Makefile.depend.amd64 b/usr.bin/truss/Makefile.depend
similarity index 50%
rename from usr.bin/truss/Makefile.depend.amd64
rename to usr.bin/truss/Makefile.depend
index 334bb3a8d446..3c34d02197b2 100644
--- a/usr.bin/truss/Makefile.depend.amd64
+++ b/usr.bin/truss/Makefile.depend
@@ -17,12 +17,4 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-amd64-cloudabi64.o: cloudabi64_syscalls.h
-amd64-cloudabi64.po: cloudabi64_syscalls.h
-amd64-freebsd.o: freebsd_syscalls.h
-amd64-freebsd.po: freebsd_syscalls.h
-amd64-freebsd32.o: freebsd32_syscalls.h
-amd64-freebsd32.po: freebsd32_syscalls.h
-amd64-linux32.o: amd64-linux32_syscalls.h
-amd64-linux32.po: amd64-linux32_syscalls.h
 .endif
diff --git a/usr.sbin/ctld/Makefile.depend b/usr.sbin/ctld/Makefile.depend
index ece2325335a5..a7783f1d6e1b 100644
--- a/usr.sbin/ctld/Makefile.depend
+++ b/usr.sbin/ctld/Makefile.depend
@@ -13,7 +13,9 @@ DIRDEPS = \
 	lib/libexpat \
 	lib/libmd \
 	lib/libsbuf \
+	lib/libucl \
 	lib/libutil \
+	lib/msun \
 	usr.bin/lex/lib \
 	usr.bin/yacc.host \