Index: head/cddl/usr.bin/ctfconvert/Makefile.depend
===================================================================
--- head/cddl/usr.bin/ctfconvert/Makefile.depend	(revision 291561)
+++ head/cddl/usr.bin/ctfconvert/Makefile.depend	(revision 291562)
@@ -1,24 +1,22 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	cddl/lib/libctf \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libdwarf \
 	lib/libelf \
 	lib/libthr \
 	lib/libz \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/cddl/usr.bin/ctfdump/Makefile.depend
===================================================================
--- head/cddl/usr.bin/ctfdump/Makefile.depend	(revision 291561)
+++ head/cddl/usr.bin/ctfdump/Makefile.depend	(revision 291562)
@@ -1,22 +1,20 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libelf \
-	lib/libthr \
 	lib/libz \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/cddl/usr.bin/ctfmerge/Makefile.depend
===================================================================
--- head/cddl/usr.bin/ctfmerge/Makefile.depend	(revision 291561)
+++ head/cddl/usr.bin/ctfmerge/Makefile.depend	(revision 291562)
@@ -1,24 +1,21 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	cddl/lib/libctf \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
-	lib/libdwarf \
 	lib/libelf \
 	lib/libthr \
 	lib/libz \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/cddl/usr.sbin/dtrace/Makefile.depend
===================================================================
--- head/cddl/usr.sbin/dtrace/Makefile.depend	(revision 291561)
+++ head/cddl/usr.sbin/dtrace/Makefile.depend	(revision 291562)
@@ -1,30 +1,27 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	cddl/lib/libctf \
 	cddl/lib/libdtrace \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/libelf \
 	lib/libproc \
 	lib/librtld_db \
 	lib/libthr \
 	lib/libutil \
-	lib/liby \
 	lib/libz \
-	usr.bin/lex/lib \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/targets/pseudo/userland/cddl/Makefile.depend
===================================================================
--- head/targets/pseudo/userland/cddl/Makefile.depend	(revision 291561)
+++ head/targets/pseudo/userland/cddl/Makefile.depend	(revision 291562)
@@ -1,47 +1,44 @@
 # $FreeBSD$
 
 # This file is not autogenerated - take care!
 
 .if !defined(MK_CTF)
 .include "${SRCTOP}/share/mk/src.opts.mk"
 .endif
 
 DIRDEPS = \
 	cddl/lib/drti \
 	cddl/lib/libavl \
+	cddl/lib/libctf \
+	cddl/lib/libdtrace \
 	cddl/lib/libnvpair \
 	cddl/lib/libumem \
 	cddl/lib/libuutil \
-
-
-DIRDEPS.CTF = \
-	cddl/lib/libctf \
 	cddl/usr.bin/ctfconvert \
 	cddl/usr.bin/ctfdump \
 	cddl/usr.bin/ctfmerge \
-	cddl/lib/libdtrace \
 	cddl/usr.sbin/dtrace \
 	cddl/usr.sbin/dtruss \
+	cddl/usr.sbin/lockstat \
 
 
 DIRDEPS.ZFS = \
 	cddl/lib/libzfs \
 	cddl/lib/libzfs_core \
 	cddl/lib/libzpool \
 	cddl/sbin/zfs \
 	cddl/sbin/zpool \
 	cddl/usr.bin/zinject \
 	cddl/usr.bin/zstreamdump \
 	cddl/usr.bin/ztest \
-	cddl/usr.sbin/lockstat \
 	cddl/usr.sbin/zdb \
 	cddl/usr.sbin/zhack \
 
 
-.for O in CTF ZFS
+.for O in ZFS
 .if ${MK_$O} == "yes"
 DIRDEPS+= ${DIRDEPS.$O}
 .endif
 .endfor
 
 .include <dirdeps.mk>