diff --git a/share/mk/local.gendirdeps.mk b/share/mk/local.gendirdeps.mk
index 28b589daf994..ff36d97a836e 100644
--- a/share/mk/local.gendirdeps.mk
+++ b/share/mk/local.gendirdeps.mk
@@ -3,7 +3,17 @@
 GENDIRDEPS_FILTER+= \
 	Ngnu/lib/libssp/libssp_nonshared \
 	Ncddl/usr.bin/ctf* \
-	Npkgs/pseudo/stage*
+	Nlib/clang/include \
+	Nlib/libc_nonshared \
+	Npkgs/pseudo/stage* \
+	Ntools/*
+
+.if ${RELDIR:Mpkgs*} == ""
+GENDIRDEPS_FILTER+= \
+	Nusr.bin/clang/clang.host \
+	Ngnu/usr.bin/cc* \
+
+.endif
 
 # gendirdeps.mk will turn _{VAR} into ${VAR} which keeps this simple
 # order of this list matters!