diff --git a/gnu/usr.bin/cc/c++/Makefile.depend b/gnu/usr.bin/cc/c++/Makefile.depend
index 3884bc845a8..012ac3a7342 100644
--- a/gnu/usr.bin/cc/c++/Makefile.depend
+++ b/gnu/usr.bin/cc/c++/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/cc/cc/Makefile.depend b/gnu/usr.bin/cc/cc/Makefile.depend
index 2bea3c0fa88..012ac3a7342 100644
--- a/gnu/usr.bin/cc/cc/Makefile.depend
+++ b/gnu/usr.bin/cc/cc/Makefile.depend
@@ -3,6 +3,7 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
+	gnu/lib/libgcc \
 	gnu/usr.bin/cc/cc_tools \
 	gnu/usr.bin/cc/libcpp \
 	gnu/usr.bin/cc/libiberty \
diff --git a/gnu/usr.bin/cc/cc1/Makefile.depend b/gnu/usr.bin/cc/cc1/Makefile.depend
index 6c2e7322cea..05af396011e 100644
--- a/gnu/usr.bin/cc/cc1/Makefile.depend
+++ b/gnu/usr.bin/cc/cc1/Makefile.depend
@@ -2,6 +2,8 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
 	gnu/usr.bin/cc/cc_int \
 	gnu/usr.bin/cc/cc_tools \
 	gnu/usr.bin/cc/libcpp \
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile.depend b/gnu/usr.bin/cc/cc1plus/Makefile.depend
index 6c2e7322cea..ab413839c19 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile.depend
+++ b/gnu/usr.bin/cc/cc1plus/Makefile.depend
@@ -2,11 +2,14 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
 	gnu/usr.bin/cc/cc_int \
 	gnu/usr.bin/cc/cc_tools \
 	gnu/usr.bin/cc/libcpp \
 	gnu/usr.bin/cc/libdecnumber \
 	gnu/usr.bin/cc/libiberty \
+	gnu/usr.bin/gperf.host \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile.depend b/gnu/usr.bin/cc/cc_tools/Makefile.depend
index fbd66b1d5ed..cb804542add 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile.depend
+++ b/gnu/usr.bin/cc/cc_tools/Makefile.depend
@@ -8,9 +8,9 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/msun \
+	usr.bin/yacc.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/cc/cpp/Makefile.depend b/gnu/usr.bin/cc/cpp/Makefile.depend
index 3884bc845a8..012ac3a7342 100644
--- a/gnu/usr.bin/cc/cpp/Makefile.depend
+++ b/gnu/usr.bin/cc/cpp/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/gnu/usr.bin/cc/gcov/Makefile.depend b/gnu/usr.bin/cc/gcov/Makefile.depend
index 98e34785a0a..1260907b2d6 100644
--- a/gnu/usr.bin/cc/gcov/Makefile.depend
+++ b/gnu/usr.bin/cc/gcov/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	lib/libc_nonshared \
 	lib/libcompiler_rt \