diff --git a/cddl/usr.sbin/dtrace/Makefile.depend b/cddl/usr.sbin/dtrace/Makefile.depend
index 819706986006..db4aafd0a282 100644
--- a/cddl/usr.sbin/dtrace/Makefile.depend
+++ b/cddl/usr.sbin/dtrace/Makefile.depend
@@ -13,7 +13,9 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/libelf \
+	lib/libkvm \
 	lib/libproc \
+	lib/libprocstat \
 	lib/librtld_db \
 	lib/libthr \
 	lib/libutil \
diff --git a/cddl/usr.sbin/lockstat/Makefile.depend b/cddl/usr.sbin/lockstat/Makefile.depend
index 70f0672dba3c..18ce380c1380 100644
--- a/cddl/usr.sbin/lockstat/Makefile.depend
+++ b/cddl/usr.sbin/lockstat/Makefile.depend
@@ -13,7 +13,9 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/libelf \
+	lib/libkvm \
 	lib/libproc \
+	lib/libprocstat \
 	lib/librt \
 	lib/librtld_db \
 	lib/libthr \
diff --git a/cddl/usr.sbin/plockstat/Makefile.depend b/cddl/usr.sbin/plockstat/Makefile.depend
index 819706986006..db4aafd0a282 100644
--- a/cddl/usr.sbin/plockstat/Makefile.depend
+++ b/cddl/usr.sbin/plockstat/Makefile.depend
@@ -13,7 +13,9 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/libelf \
+	lib/libkvm \
 	lib/libproc \
+	lib/libprocstat \
 	lib/librtld_db \
 	lib/libthr \
 	lib/libutil \
diff --git a/lib/clang/libclangformat/Makefile.depend b/lib/clang/libclangformat/Makefile.depend
index 3e7f3f5e7165..264ede1c30ce 100644
--- a/lib/clang/libclangformat/Makefile.depend
+++ b/lib/clang/libclangformat/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/libc++ \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libclangtoolingcore/Makefile.depend b/lib/clang/libclangtoolingcore/Makefile.depend
index 3e7f3f5e7165..264ede1c30ce 100644
--- a/lib/clang/libclangtoolingcore/Makefile.depend
+++ b/lib/clang/libclangtoolingcore/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/libc++ \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libc/tests/stdlib/Makefile.depend b/lib/libc/tests/stdlib/Makefile.depend
index 1ee1d19d8e77..1ace922e7b2a 100644
--- a/lib/libc/tests/stdlib/Makefile.depend
+++ b/lib/libc/tests/stdlib/Makefile.depend
@@ -11,9 +11,10 @@ DIRDEPS = \
 	lib/atf/libatf-c++ \
 	lib/libc \
 	lib/libc++ \
-	lib/libthr \
 	lib/libcompiler_rt \
+	lib/libcxxrt \
 	lib/libnetbsd \
+	lib/libthr \
 	lib/libutil \
 	lib/msun \
 
diff --git a/lib/libproc/Makefile.depend b/lib/libproc/Makefile.depend
index 33b871f6a055..89b67c997f30 100644
--- a/lib/libproc/Makefile.depend
+++ b/lib/libproc/Makefile.depend
@@ -12,6 +12,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/libelf \
+	lib/libprocstat \
 	lib/librtld_db \
 	lib/libutil \
 
diff --git a/lib/libproc/tests/Makefile.depend b/lib/libproc/tests/Makefile.depend
index c61b2341db16..b2fb87a7499a 100644
--- a/lib/libproc/tests/Makefile.depend
+++ b/lib/libproc/tests/Makefile.depend
@@ -13,7 +13,9 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/libelf \
+	lib/libkvm \
 	lib/libproc \
+	lib/libprocstat \
 	lib/librtld_db \
 	lib/libutil \
 	lib/libz \
diff --git a/lib/librtld_db/Makefile.depend b/lib/librtld_db/Makefile.depend
index 90c66d42d7ae..2170d7ed9ea7 100644
--- a/lib/librtld_db/Makefile.depend
+++ b/lib/librtld_db/Makefile.depend
@@ -10,6 +10,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libelf \
+	lib/libprocstat \
 	lib/libutil \
 
 
diff --git a/secure/usr.bin/ssh/Makefile.depend b/secure/usr.bin/ssh/Makefile.depend
index b8099fd405f2..aa586707742a 100644
--- a/secure/usr.bin/ssh/Makefile.depend
+++ b/secure/usr.bin/ssh/Makefile.depend
@@ -9,8 +9,6 @@ DIRDEPS = \
 	include/gssapi \
 	include/rpc \
 	include/xlocale \
-	kerberos5/lib/libasn1 \
-	kerberos5/lib/libkrb5 \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
diff --git a/usr.bin/nfsstat/Makefile.depend b/usr.bin/nfsstat/Makefile.depend
index 3646e2e2b1af..270f59a1f4bb 100644
--- a/usr.bin/nfsstat/Makefile.depend
+++ b/usr.bin/nfsstat/Makefile.depend
@@ -9,6 +9,9 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libdevstat \
+	lib/libelf \
+	lib/libkvm \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/tar/tests/Makefile.depend b/usr.bin/tar/tests/Makefile.depend
index 860d9752d8ef..4e7906b9d349 100644
--- a/usr.bin/tar/tests/Makefile.depend
+++ b/usr.bin/tar/tests/Makefile.depend
@@ -8,8 +8,14 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libarchive \
+	lib/libbz2 \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libexpat \
+	lib/liblzma \
+	lib/libthr \
+	lib/libz \
+	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
diff --git a/usr.sbin/bhyve/Makefile.depend b/usr.sbin/bhyve/Makefile.depend
index e12ecb91891e..3cc9293cf771 100644
--- a/usr.sbin/bhyve/Makefile.depend
+++ b/usr.sbin/bhyve/Makefile.depend
@@ -5,6 +5,7 @@ DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
+	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
@@ -13,6 +14,7 @@ DIRDEPS = \
 	lib/libthr \
 	lib/libutil \
 	lib/libvmmapi \
+	lib/libz \
 
 
 .include <dirdeps.mk>
diff --git a/usr.sbin/pw/tests/Makefile.depend b/usr.sbin/pw/tests/Makefile.depend
index f80275d86ab1..aa053cfb4c50 100644
--- a/usr.sbin/pw/tests/Makefile.depend
+++ b/usr.sbin/pw/tests/Makefile.depend
@@ -2,6 +2,13 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libcrypt \
 
 
 .include <dirdeps.mk>