diff --git a/lib/libc++experimental/Makefile.depend b/lib/libc++experimental/Makefile.depend
new file mode 100644
index 000000000000..c210061155d2
--- /dev/null
+++ b/lib/libc++experimental/Makefile.depend
@@ -0,0 +1,14 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/libclang_rt/stats/Makefile.depend b/lib/libclang_rt/stats/Makefile.depend
new file mode 100644
index 000000000000..1df7d3387057
--- /dev/null
+++ b/lib/libclang_rt/stats/Makefile.depend
@@ -0,0 +1,16 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/arpa \
+	include/xlocale \
+	lib/libc++ \
+	lib/ncurses/ncursesw \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/libclang_rt/stats_client/Makefile.depend b/lib/libclang_rt/stats_client/Makefile.depend
new file mode 100644
index 000000000000..3ac123f440c2
--- /dev/null
+++ b/lib/libclang_rt/stats_client/Makefile.depend
@@ -0,0 +1,13 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	lib/libc++ \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/libdl/Makefile.depend b/lib/libdl/Makefile.depend
new file mode 100644
index 000000000000..3646e2e2b1af
--- /dev/null
+++ b/lib/libdl/Makefile.depend
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/libifconfig/Makefile.depend b/lib/libifconfig/Makefile.depend
new file mode 100644
index 000000000000..18be76b0cb6f
--- /dev/null
+++ b/lib/libifconfig/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/lib/librss/Makefile.depend b/lib/librss/Makefile.depend
new file mode 100644
index 000000000000..3646e2e2b1af
--- /dev/null
+++ b/lib/librss/Makefile.depend
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/lib/libsysdecode/Makefile.depend b/lib/libsysdecode/Makefile.depend
index c7ab903a0056..6470465f751c 100644
--- a/lib/libsysdecode/Makefile.depend
+++ b/lib/libsysdecode/Makefile.depend
@@ -74,6 +74,7 @@ DIRDEPS = \
 	lib/libfigpar \
 	lib/libgeom \
 	lib/libgpio \
+	lib/libifconfig \
 	lib/libjail \
 	lib/libkvm \
 	lib/liblzma \
@@ -92,6 +93,7 @@ DIRDEPS = \
 	lib/libproc \
 	lib/libprocstat \
 	lib/libradius \
+	lib/librss \
 	lib/librtld_db \
 	lib/libsdp \
 	lib/libsqlite3 \
diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend
index 81284c71f9d0..2735e3b8ca15 100644
--- a/targets/pseudo/userland/lib/Makefile.depend
+++ b/targets/pseudo/userland/lib/Makefile.depend
@@ -2,9 +2,7 @@
 
 # This file is not autogenerated - take care!
 
-.if !defined(MK_CLANG)
 .include <src.opts.mk>
-.endif
 
 DIRDEPS = \
 	lib/${CSU_DIR} \
@@ -30,9 +28,12 @@ DIRDEPS = \
 	lib/libbsnmp/libbsnmp \
 	lib/libbz2 \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libc++ \
+	lib/libc++experimental \
 	lib/libcalendar \
 	lib/libcam \
+	lib/libcapsicum \
 	lib/libcom_err/doc \
 	lib/libcompat \
 	lib/libcompiler_rt \
@@ -51,6 +52,7 @@ DIRDEPS = \
 	lib/libexecinfo \
 	lib/libexpat \
 	lib/libfetch \
+	lib/libfigpar \
 	lib/libgeom \
 	lib/libgssapi \
 	lib/libiconv_modules/BIG5 \
@@ -76,6 +78,7 @@ DIRDEPS = \
 	lib/libiconv_modules/mapper_serial \
 	lib/libiconv_modules/mapper_std \
 	lib/libiconv_modules/mapper_zone \
+	lib/libifconfig \
 	lib/libipsec \
 	lib/libipx \
 	lib/libjail \
@@ -128,6 +131,7 @@ DIRDEPS = \
 	lib/libradius \
 	lib/librpcsec_gss \
 	lib/librpcsvc \
+	lib/librss \
 	lib/librt \
 	lib/librtld_db \
 	lib/libsbuf \
@@ -144,6 +148,7 @@ DIRDEPS = \
 	lib/libtelnet \
 	lib/libthr \
 	lib/libthread_db \
+	lib/libucl \
 	lib/libufs \
 	lib/libugidfw \
 	lib/libulog \
@@ -158,6 +163,7 @@ DIRDEPS = \
 	lib/libyaml \
 	lib/libypclnt \
 	lib/libz \
+	lib/libzstd \
 	lib/msun \
 	lib/ncurses/form \
 	lib/ncurses/formw \
@@ -175,15 +181,22 @@ DIRDEPS = \
 DIRDEPS+= \
 	lib/libclang_rt/asan-preinit \
 	lib/libclang_rt/asan \
+	lib/libclang_rt/asan_dynamic \
 	lib/libclang_rt/asan_cxx \
 	lib/libclang_rt/include \
 	lib/libclang_rt/profile \
 	lib/libclang_rt/safestack \
+	lib/libclang_rt/stats \
+	lib/libclang_rt/stats_client \
 	lib/libclang_rt/ubsan_standalone \
 	lib/libclang_rt/ubsan_standalone_cxx \
 
 .endif
 
+.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mfilter}
+DIRDEPS+= lib/libdl
+.endif
+
 .if ${MK_NAND} != "no"
 DIRDEPS+= lib/libnandfs
 .endif
@@ -199,6 +212,18 @@ DIRDEPS+= \
 
 .endif
 
+.if ${MK_DIALOG} != "no"
+DIRDEPS+= lib/libdpv
+.endif
+
+.if ${MK_GPIO} != "no"
+DIRDEPS+= lib/libgpio
+.endif
+
+.if ${MK_EFI} != "no"
+DIRDEPS+= lib/libefivar
+.endif
+
 .if ${MK_OFED} != "no"
 DIRDEPS+= \
 	contrib/ofed/usr.lib/libcxgb4 \