Index: head/share/mk/local.dirdeps.mk
===================================================================
--- head/share/mk/local.dirdeps.mk	(revision 291558)
+++ head/share/mk/local.dirdeps.mk	(revision 291559)
@@ -1,104 +1,100 @@
 # $FreeBSD$
 .if !target(_DIRDEP_USE)
 # we are the 1st makefile
 
 .if !defined(MK_CLANG)
 .include "${SRCTOP}/share/mk/src.opts.mk"
 .endif
 
 # DEP_MACHINE is set before we get here, this may not be.
 DEP_RELDIR ?= ${RELDIR}
 
 .if ${.TARGETS:Uall:M*/*} && empty(DIRDEPS)
 # This little trick let's us do
 #
 # mk -f dirdeps.mk some/dir.i386,bsd
 #
 DIRDEPS := ${.TARGETS:M*/*}
 ${.TARGETS:Nall}: all
 .endif
 
 # making universe is special
 .if defined(UNIVERSE_GUARD)
 # these should be done by now
 DIRDEPS_FILTER+= N*.host
 .endif
 
 # pseudo machines get no qualification
 .for m in host common
 M_dep_qual_fixes += C;($m),[^/.,]*$$;\1;
 .endfor
 #.info M_dep_qual_fixes=${M_dep_qual_fixes}
 
 # Cheat for including src.libnames.mk
 __<bsd.init.mk>__:
 # Pull in _INTERNALLIBS
 .include <src.libnames.mk>
 
 # Host libraries should mostly be excluded from the build so the
 # host version in /usr/lib is used.  Internal libraries need to be
 # allowed to be built though since they are never installed.
 _need_host_libs=
 .for lib in ${_INTERNALLIBS}
 _need_host_libs+= ${LIB${lib:tu}DIR:S,^${OBJTOP}/,,}
 .endfor
 
 N_host_libs:= ${cd ${SRCTOP} && echo lib/lib*:L:sh:${_need_host_libs:${M_ListToSkip}}:${M_ListToSkip}}
 DIRDEPS_FILTER.host = \
 	${N_host_libs} \
 	Ninclude* \
 	Nlib/csu* \
 	Nlib/[mn]* \
 	Ngnu/lib/csu* \
 	Ngnu/lib/lib[a-r]* \
 	Nusr.bin/xinstall* \
 
 
 DIRDEPS_FILTER+= \
 	Nbin/cat.host \
 	${DIRDEPS_FILTER.xtras:U}
 .endif
 
 # reset this each time
 DIRDEPS_FILTER.xtras=
 .if ${DEP_MACHINE:Npkgs*} != ""
 DIRDEPS_FILTER.xtras+= Nusr.bin/clang/clang.host
 .endif
 
 .if ${DEP_MACHINE} != "host"
 
 # this is how we can handle optional dependencies
 .if ${DEP_RELDIR} == "lib/libc"
 DIRDEPS += lib/libc_nonshared
 .if ${MK_SSP:Uno} != "no" 
 DIRDEPS += gnu/lib/libssp/libssp_nonshared
 .endif
 .else
 DIRDEPS_FILTER.xtras+= Nlib/libc_nonshared
 .endif
 
 # some optional things
 .if ${MK_CTF} == "yes" && ${DEP_RELDIR:Mcddl/usr.bin/ctf*} == ""
 DIRDEPS += \
 	cddl/usr.bin/ctfconvert.host \
 	cddl/usr.bin/ctfmerge.host
 .endif
 
 .endif
 
-.if ${MK_CLANG} == "yes" && ${DEP_RELDIR:Nlib/clang/lib*:Nlib/libc*} == ""
-DIRDEPS+= lib/clang/include
-.endif
-
 .if ${MK_STAGING} == "yes"
 # we need targets/pseudo/stage to prep the stage tree
 .if ${DEP_RELDIR} != "targets/pseudo/stage"
 DIRDEPS += targets/pseudo/stage
 .endif
 .endif
 
 DEP_MACHINE_ARCH = ${MACHINE_ARCH.${DEP_MACHINE}}
 CSU_DIR.${DEP_MACHINE_ARCH} ?= csu/${DEP_MACHINE_ARCH}
 CSU_DIR := ${CSU_DIR.${DEP_MACHINE_ARCH}}
 BOOT_MACHINE_DIR:= ${BOOT_MACHINE_DIR.${DEP_MACHINE}}
 KERNEL_NAME:= ${KERNEL_NAME.${DEP_MACHINE}}
Index: head/share/mk/local.gendirdeps.mk
===================================================================
--- head/share/mk/local.gendirdeps.mk	(revision 291558)
+++ head/share/mk/local.gendirdeps.mk	(revision 291559)
@@ -1,58 +1,57 @@
 # $FreeBSD$
 
 # we need a keyword, this noise is to prevent it being expanded
 GENDIRDEPS_HEADER= echo '\# ${FreeBSD:L:@v@$$$v$$ @:M*F*}';
 
 # supress optional/auto dependecies
 # local.dirdeps.mk will put them in if necessary
 GENDIRDEPS_FILTER+= \
 	Nbin/cat.host \
 	Ngnu/lib/libssp/libssp_nonshared \
 	Ncddl/usr.bin/ctf* \
-	Nlib/clang/include \
 	Nlib/libc_nonshared \
 	Ntargets/pseudo/stage* \
 	Ntools/*
 
 # Exclude toolchain which is handled special.
 .if ${RELDIR:Mtargets*} == ""
 .if ${RELDIR:Nusr.bin/clang/*:Ngnu/usr.bin/cc/*:Nlib/clang*} != ""
 GENDIRDEPS_FILTER.host+= \
 	Nusr.bin/clang/* \
 	Ngnu/usr.bin/cc/* \
 
 .endif
 GENDIRDEPS_FILTER+= \
 	Nlib/clang/include.host \
 	Nusr.bin/addr2line.host \
 	Nusr.bin/ar.host \
 	Nusr.bin/clang/clang.host \
 	Nusr.bin/elfcopy.host \
 	Nusr.bin/elfdump.host \
 	Nusr.bin/nm.host \
 	Nusr.bin/readelf.host \
 	Nusr.bin/size.host \
 	Nusr.bin/strings.host \
 	Nusr.bin/strip.host \
 	Ngnu/usr.bin/cc* \
 	Ngnu/usr.bin/binutils*.host \
 
 .endif
 
 GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER.${MACHINE}:U}
 
 # gendirdeps.mk will turn _{VAR} into ${VAR} which keeps this simple
 # order of this list matters!
 GENDIRDEPS_FILTER_DIR_VARS+= \
        CSU_DIR \
        BOOT_MACHINE_DIR
 
 # order of this list matters!
 GENDIRDEPS_FILTER_VARS+= \
        KERNEL_NAME \
        MACHINE_CPUARCH \
        MACHINE_ARCH \
        MACHINE
 
 GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER_DIR_VARS:@v@S,${$v},_{${v}},@}
 GENDIRDEPS_FILTER+= ${GENDIRDEPS_FILTER_VARS:@v@S,/${$v}/,/_{${v}}/,@:NS,//,*:u}