Index: head/lib/libpmc/Makefile
===================================================================
--- head/lib/libpmc/Makefile
+++ head/lib/libpmc/Makefile
@@ -16,9 +16,10 @@
 EVENT_ARCH="powerpc"
 .endif
 
+CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
+
 .if ${MK_DIRDEPS_BUILD} == "yes"
 # avoid circular dependency
-CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
 GENDIRDEPS_FILTER+= N${RELDIR:H}/libpmcstat
 JEVENTS?= ${HOST_OBJTOP}/${RELDIR}/pmu-events/jevents
 .else
Index: head/lib/libpmcstat/Makefile
===================================================================
--- head/lib/libpmcstat/Makefile
+++ head/lib/libpmcstat/Makefile
@@ -10,6 +10,8 @@
 	libpmcstat_process.c	\
 	libpmcstat_string.c	\
 	libpmcstat_symbol.c
-INCS=	libpmcstat.h
+
+# If libpmcstat becomes public uncomment this line
+#INCS=	libpmcstat.h
 
 .include <bsd.lib.mk>
Index: head/usr.sbin/pmc/Makefile
===================================================================
--- head/usr.sbin/pmc/Makefile
+++ head/usr.sbin/pmc/Makefile
@@ -9,6 +9,7 @@
 CXXFLAGS+= -O0
 CXXSTD= c++14
 CWARNFLAGS.gcc+= -Wno-redundant-decls
+CFLAGS+= -I${SRCTOP}/lib/libpmcstat
 
 LIBADD=	kvm pmc m ncursesw pmcstat elf
 
Index: head/usr.sbin/pmcstat/Makefile
===================================================================
--- head/usr.sbin/pmcstat/Makefile
+++ head/usr.sbin/pmcstat/Makefile
@@ -5,6 +5,7 @@
 PROG_CXX=	pmcstat
 MAN=	pmcstat.8
 
+CFLAGS+= -I${SRCTOP}/lib/libpmcstat
 LIBADD=	kvm pmc m ncursesw pmcstat elf
 
 SRCS=	pmcstat.c pmcstat.h pmcstat_log.c \