Index: projects/clang390-import/share/mk/local.gendirdeps.mk
===================================================================
--- projects/clang390-import/share/mk/local.gendirdeps.mk	(revision 305299)
+++ projects/clang390-import/share/mk/local.gendirdeps.mk	(revision 305300)
@@ -1,65 +1,65 @@
 # $FreeBSD$
 
 # we need a keyword, this noise is to prevent it being expanded
 GENDIRDEPS_HEADER= echo '\# ${FreeBSD:L:@v@$$$v$$ @:M*F*}';
 
 # suppress optional/auto dependencies
 # local.dirdeps.mk will put them in if necessary
 GENDIRDEPS_FILTER+= \
 	Nbin/cat.host \
 	Ngnu/lib/libssp/libssp_nonshared \
 	Ncddl/usr.bin/ctf* \
 	Nlib/libc_nonshared \
 	Ntargets/pseudo/stage* \
 	Ntools/*
 
 # Clang has nested directories in its OBJDIR.
 GENDIRDEPS_FILTER+= C,(lib/clang/lib[^/]*)/.*,\1,
 
 # 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_HOST_TOOLS+= \
-	Nlib/clang/include \
+	Nlib/clang/headers \
 	Nusr.bin/addr2line \
 	Nusr.bin/ar \
 	Nusr.bin/clang/clang \
 	Nusr.bin/elfcopy \
 	Nusr.bin/elfdump \
 	Nusr.bin/nm \
 	Nusr.bin/readelf \
 	Nusr.bin/size \
 	Nusr.bin/strings \
 	Nusr.bin/strip \
 	Ngnu/usr.bin/cc* \
 	Ngnu/usr.bin/binutils* \
 
 .if ${MACHINE} != "host"
 GENDIRDEPS_FILTER+=	${GENDIRDEPS_FILTER_HOST_TOOLS:C,$,.host,}
 .else
 GENDIRDEPS_FILTER+=	${GENDIRDEPS_FILTER_HOST_TOOLS}
 .endif
 .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}
Index: projects/clang390-import/targets/pseudo/clang/Makefile.depend
===================================================================
--- projects/clang390-import/targets/pseudo/clang/Makefile.depend	(revision 305299)
+++ projects/clang390-import/targets/pseudo/clang/Makefile.depend	(revision 305300)
@@ -1,51 +1,51 @@
 # $FreeBSD$
 
 # This file is not autogenerated - take care!
 
 .include <src.opts.mk>
 
 DIRDEPS = \
-	lib/clang/include \
+	lib/clang/headers \
 	share/doc/llvm/clang \
 	usr.bin/clang/clang \
 	usr.bin/clang/clang-tblgen \
 	usr.bin/clang/llvm-tblgen \
 
 .if ${MK_LLDB} == "yes"
 DIRDEPS+= \
 	usr.bin/clang/lldb
 .endif
 
 .if ${MK_CLANG_EXTRAS} == "yes"
 DIRDEPS+= \
 	usr.bin/clang/bugpoint \
 	usr.bin/clang/clang-format \
 	usr.bin/clang/llc \
 	usr.bin/clang/lli \
 	usr.bin/clang/llvm-ar \
 	usr.bin/clang/llvm-as \
 	usr.bin/clang/llvm-bcanalyzer \
 	usr.bin/clang/llvm-cov \
 	usr.bin/clang/llvm-cxxdump \
 	usr.bin/clang/llvm-diff \
 	usr.bin/clang/llvm-dis \
 	usr.bin/clang/llvm-dwarfdump \
 	usr.bin/clang/llvm-extract \
 	usr.bin/clang/llvm-link \
 	usr.bin/clang/llvm-lto \
 	usr.bin/clang/llvm-mc \
 	usr.bin/clang/llvm-nm \
 	usr.bin/clang/llvm-objdump \
 	usr.bin/clang/llvm-pdbdump \
 	usr.bin/clang/llvm-profdata \
 	usr.bin/clang/llvm-rtdyld \
 	usr.bin/clang/llvm-symbolizer \
 	usr.bin/clang/opt \
 
 .endif
 
 .if ${MK_LLD} == "yes"
 DIRDEPS+=	usr.bin/clang/lld
 .endif
 
 .include <dirdeps.mk>