Index: head/lib/libproc/Makefile
===================================================================
--- head/lib/libproc/Makefile	(revision 291312)
+++ head/lib/libproc/Makefile	(revision 291313)
@@ -1,49 +1,46 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 LIB=	proc
 
 SRCS=	proc_bkpt.c		\
 	proc_create.c		\
 	proc_regs.c		\
 	proc_sym.c		\
 	proc_rtld.c		\
 	proc_util.c
 
 INCS=	libproc.h
 
 CFLAGS+=	-I${.CURDIR}
-# avoid cyclic dependency
-CFLAGS+=	-I${.CURDIR:H}/librtld_db
-GENDIRDEPS_FILTER+= Nlib/librtld_db
 
 .if ${MK_CXX} == "no"
 CFLAGS+=	-DNO_CXA_DEMANGLE
 .elif ${MK_LIBCPLUSPLUS} != "no"
 LIBADD+=		cxxrt
 .else
 LIBADD+=	supcplusplus
 .endif
 
 LIBADD+=	elf rtld_db util
 
 .if ${MK_CDDL} != "no"
 LIBADD+=	ctf
 IGNORE_PRAGMA=	YES
 CFLAGS+=	-I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \
 		-I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \
 		-I${.CURDIR}/../../sys/cddl/compat/opensolaris
 .else
 CFLAGS+=	-DNO_CTF
 .endif
 
 SHLIB_MAJOR=	3
 
 MAN=
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif
 
 .include <bsd.lib.mk>
Index: head/lib/libproc/Makefile.depend
===================================================================
--- head/lib/libproc/Makefile.depend	(revision 291312)
+++ head/lib/libproc/Makefile.depend	(revision 291313)
@@ -1,22 +1,23 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	cddl/lib/libctf \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/libelf \
+	lib/librtld_db \
 	lib/libutil \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
Index: head/lib/librtld_db/Makefile
===================================================================
--- head/lib/librtld_db/Makefile	(revision 291312)
+++ head/lib/librtld_db/Makefile	(revision 291313)
@@ -1,14 +1,16 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 LIB=		rtld_db
 SHLIB_MAJOR= 	2
 MAN=		librtld_db.3
 
 SRCS=		rtld_db.c
 INCS=		rtld_db.h
 
 CFLAGS+= -I${.CURDIR}
+# Avoid circular dependency, we only need the libproc.h header here.
+CFLAGS+= -I${.CURDIR:H}/libproc
 
 .include <bsd.lib.mk>
Index: head/lib/librtld_db/Makefile.depend
===================================================================
--- head/lib/librtld_db/Makefile.depend	(revision 291312)
+++ head/lib/librtld_db/Makefile.depend	(revision 291313)
@@ -1,21 +1,20 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libelf \
-	lib/libproc \
 	lib/libutil \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif