Index: projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile
===================================================================
--- projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile	(revision 344419)
+++ projects/import-googletest-1.8.1/lib/googletest/gmock/Makefile	(revision 344420)
@@ -1,48 +1,48 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src
 
 LIB_CXX=	gmock
 SHLIB_MAJOR=	0
 PRIVATELIB=	true
 
 CXXFLAGS+=	-I${GOOGLEMOCK_SRCROOT}/include
 CXXFLAGS+=	-I${GOOGLEMOCK_SRCROOT}
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
 
 LIBADD+=	gtest
 LDFLAGS+=	-L${.OBJDIR:H}/gtest
 
 INCSGROUPS=	MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS
 
-MAIN_INCSDIR=	${INCLUDEDIR}/gmock
+MAIN_INCSDIR=	${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}}
 MAIN_INCS+=	gmock/gmock-matchers.h
 MAIN_INCS+=	gmock/gmock-more-actions.h
 MAIN_INCS+=	gmock/gmock-generated-actions.h
 MAIN_INCS+=	gmock/gmock-generated-matchers.h
 MAIN_INCS+=	gmock/gmock-generated-nice-strict.h
 MAIN_INCS+=	gmock/gmock-more-matchers.h
 MAIN_INCS+=	gmock/gmock-generated-function-mockers.h
 MAIN_INCS+=	gmock/gmock-cardinalities.h
 MAIN_INCS+=	gmock/gmock-spec-builders.h
 MAIN_INCS+=	gmock/gmock.h
 MAIN_INCS+=	gmock/gmock-actions.h
 
-INTERNAL_INCSDIR=	${INCLUDEDIR}/gmock/internal
+INTERNAL_INCSDIR=	${MAIN_INCSDIR}/internal
 INTERNAL_INCS+=		gmock/internal/gmock-port.h
 INTERNAL_INCS+=		gmock/internal/gmock-internal-utils.h
 INTERNAL_INCS+=		gmock/internal/gmock-generated-internal-utils.h
 
-INTERNAL_CUSTOM_INCSDIR= ${INCLUDEDIR}/gmock/internal/custom
+INTERNAL_CUSTOM_INCSDIR= ${INTERNAL_INCSDIR}/custom
 INTERNAL_CUSTOM_INCS+=	gmock/internal/custom/gmock-port.h
 INTERNAL_CUSTOM_INCS+=	gmock/internal/custom/gmock-matchers.h
 INTERNAL_CUSTOM_INCS+=	gmock/internal/custom/gmock-generated-actions.h
 
 SRCS+=		gmock-all.cc
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
Index: projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile
===================================================================
--- projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile	(revision 344419)
+++ projects/import-googletest-1.8.1/lib/googletest/gtest/Makefile	(revision 344420)
@@ -1,53 +1,53 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 .PATH:	${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src
 
 LIB_CXX=	gtest
 SHLIB_MAJOR=	0
 PRIVATELIB=	true
 
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}/include
 CXXFLAGS+=	-I${GOOGLETEST_SRCROOT}
 
 INCSGROUPS=	MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS
 
-MAIN_INCSDIR=	${INCLUDEDIR}/gtest
+MAIN_INCSDIR=	${INCLUDEDIR}${PRIVATELIB:D/private/${LIB}}
 MAIN_INCS+=	gtest/gtest-death-test.h
 MAIN_INCS+=	gtest/gtest-message.h
 MAIN_INCS+=	gtest/gtest-param-test.h
 MAIN_INCS+=	gtest/gtest-printers.h
 MAIN_INCS+=	gtest/gtest-spi.h
 MAIN_INCS+=	gtest/gtest-test-part.h
 MAIN_INCS+=	gtest/gtest-typed-test.h
 MAIN_INCS+=	gtest/gtest.h
 MAIN_INCS+=	gtest/gtest_pred_impl.h
 MAIN_INCS+=	gtest/gtest_prod.h
 
-INTERNAL_INCSDIR=	${INCLUDEDIR}/gtest/internal
+INTERNAL_INCSDIR=	${MAIN_INCSDIR}/internal
 INTERNAL_INCS+=	gtest/internal/gtest-death-test-internal.h
 INTERNAL_INCS+=	gtest/internal/gtest-filepath.h
 INTERNAL_INCS+=	gtest/internal/gtest-internal.h
 INTERNAL_INCS+=	gtest/internal/gtest-linked_ptr.h
 INTERNAL_INCS+=	gtest/internal/gtest-param-util-generated.h
 INTERNAL_INCS+=	gtest/internal/gtest-param-util.h
 INTERNAL_INCS+=	gtest/internal/gtest-port-arch.h
 INTERNAL_INCS+=	gtest/internal/gtest-port.h
 INTERNAL_INCS+=	gtest/internal/gtest-string.h
 INTERNAL_INCS+=	gtest/internal/gtest-tuple.h
 INTERNAL_INCS+=	gtest/internal/gtest-type-util.h
 
-INTERNAL_CUSTOM_INCSDIR= ${INCLUDEDIR}/gtest/internal/custom
+INTERNAL_CUSTOM_INCSDIR= ${INTERNAL_INCSDIR}/custom
 INTERNAL_CUSTOM_INCS+=	gtest/internal/custom/gtest-port.h
 INTERNAL_CUSTOM_INCS+=	gtest/internal/custom/gtest-printers.h
 INTERNAL_CUSTOM_INCS+=	gtest/internal/custom/gtest.h
 
 SRCS+=		gtest-all.cc
 
 LIBADD+=	pthread
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>
Index: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk
===================================================================
--- projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk	(revision 344419)
+++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk	(revision 344420)
@@ -1,9 +1,12 @@
 # $FreeBSD$
 
 GTESTS_CXXFLAGS+= -DGTESTS_HAS_RTTI=1
 GTESTS_CXXFLAGS+= -DGTESTS_HAS_POSIX_RE=1
 GTESTS_CXXFLAGS+= -DGTESTS_HAS_PTHREAD=1
 GTESTS_CXXFLAGS+= -DGTESTS_HAS_STREAM_REDIRECTION=1
 GTESTS_CXXFLAGS+= -DGTESTS_LANG_CXX11=1
 GTESTS_CXXFLAGS+= -frtti
 GTESTS_CXXFLAGS+= -std=c++11
+
+# XXX: src.libnames.mk should handle adding this directory.
+GTESTS_CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private