diff --git a/gnu/usr.bin/groff/src/libs/libbib/Makefile.depend b/gnu/usr.bin/groff/src/libs/libbib/Makefile.depend
index 18be76b0cb6f..8c3d0809f1a3 100644
--- a/gnu/usr.bin/groff/src/libs/libbib/Makefile.depend
+++ b/gnu/usr.bin/groff/src/libs/libbib/Makefile.depend
@@ -4,6 +4,7 @@
 DIRDEPS = \
 	include \
 	include/xlocale \
+	lib/libc++ \
 
 
 .include <dirdeps.mk>
diff --git a/kerberos5/tools/asn1_compile/Makefile.depend b/kerberos5/tools/asn1_compile/Makefile.depend
index a3edb7fca954..947a8edfebc3 100644
--- a/kerberos5/tools/asn1_compile/Makefile.depend
+++ b/kerberos5/tools/asn1_compile/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	include/xlocale \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/tools/make-roken.host \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
diff --git a/lib/libclang_rt/asan_cxx/Makefile.depend b/lib/libclang_rt/asan_cxx/Makefile.depend
index 79506ce16b79..3ac123f440c2 100644
--- a/lib/libclang_rt/asan_cxx/Makefile.depend
+++ b/lib/libclang_rt/asan_cxx/Makefile.depend
@@ -3,6 +3,7 @@
 
 DIRDEPS = \
 	include \
+	lib/libc++ \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libclang_rt/profile/Makefile.depend b/lib/libclang_rt/profile/Makefile.depend
index 18be76b0cb6f..8c3d0809f1a3 100644
--- a/lib/libclang_rt/profile/Makefile.depend
+++ b/lib/libclang_rt/profile/Makefile.depend
@@ -4,6 +4,7 @@
 DIRDEPS = \
 	include \
 	include/xlocale \
+	lib/libc++ \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libclang_rt/safestack/Makefile.depend b/lib/libclang_rt/safestack/Makefile.depend
index 082e283588a1..1df7d3387057 100644
--- a/lib/libclang_rt/safestack/Makefile.depend
+++ b/lib/libclang_rt/safestack/Makefile.depend
@@ -5,6 +5,7 @@ DIRDEPS = \
 	include \
 	include/arpa \
 	include/xlocale \
+	lib/libc++ \
 	lib/ncurses/ncursesw \
 
 
diff --git a/lib/libpam/static_libpam/Makefile.depend b/lib/libpam/static_libpam/Makefile.depend
index 373bac45e6da..c628f1cdc23a 100644
--- a/lib/libpam/static_libpam/Makefile.depend
+++ b/lib/libpam/static_libpam/Makefile.depend
@@ -4,7 +4,6 @@
 DIRDEPS = \
 	include \
 	include/xlocale \
-	lib/libpam/libpam \
 	lib/libpam/modules/pam_chroot \
 	lib/libpam/modules/pam_deny \
 	lib/libpam/modules/pam_echo \
diff --git a/libexec/fingerd/Makefile.depend b/libexec/fingerd/Makefile.depend
index 7de116d21d37..5ac9545f6f12 100644
--- a/libexec/fingerd/Makefile.depend
+++ b/libexec/fingerd/Makefile.depend
@@ -8,8 +8,10 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
+	lib/libblacklist \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libthr \
 	lib/libutil \
 
 
diff --git a/libexec/ftpd/Makefile.depend b/libexec/ftpd/Makefile.depend
index 5480d1d8fe7f..7d0157f8daee 100644
--- a/libexec/ftpd/Makefile.depend
+++ b/libexec/ftpd/Makefile.depend
@@ -8,12 +8,14 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
+	lib/libblacklist \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libmd \
 	lib/libopie \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 	lib/libxo \
 	lib/msun \
diff --git a/libexec/rlogind/Makefile.depend b/libexec/rlogind/Makefile.depend
index 7de116d21d37..5ac9545f6f12 100644
--- a/libexec/rlogind/Makefile.depend
+++ b/libexec/rlogind/Makefile.depend
@@ -8,8 +8,10 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
+	lib/libblacklist \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libthr \
 	lib/libutil \
 
 
diff --git a/libexec/rshd/Makefile.depend b/libexec/rshd/Makefile.depend
index 7ce0fb7c651d..289484837f9a 100644
--- a/libexec/rshd/Makefile.depend
+++ b/libexec/rshd/Makefile.depend
@@ -8,9 +8,11 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
+	lib/libblacklist \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 
 
diff --git a/secure/usr.sbin/sshd/Makefile.depend b/secure/usr.sbin/sshd/Makefile.depend
index d24b0bef5d55..220aae36c11c 100644
--- a/secure/usr.sbin/sshd/Makefile.depend
+++ b/secure/usr.sbin/sshd/Makefile.depend
@@ -17,6 +17,7 @@ DIRDEPS = \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
+	lib/libblacklist \
 	lib/libbsm \
 	lib/libc \
 	lib/libcom_err \