diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index d9b0360085e6..a249be99c47f 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -212,8 +212,4 @@ afterinstall:
 		${.OBJDIR}/libstdc++.a
 .endif
 
-# avoid cyclic dependency
-CFLAGS+= -I${LIBCXXRTDIR}
-GENDIRDEPS_FILTER= N*/libcxxrt
-
 .include <bsd.lib.mk>
diff --git a/lib/libc++/Makefile.depend b/lib/libc++/Makefile.depend
index cb8163981f80..39735a833707 100644
--- a/lib/libc++/Makefile.depend
+++ b/lib/libc++/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libcxxrt \
 	lib/msun \