diff --git a/bazaar/plugin/gtest/gtest-death-test.cc b/bazaar/plugin/gtest/gtest-death-test.cc
index d0eb0dee9..1c5e75371 100644
--- a/bazaar/plugin/gtest/gtest-death-test.cc
+++ b/bazaar/plugin/gtest/gtest-death-test.cc
@@ -30,12 +30,12 @@
 //
 // This file implements death tests.
 
-#include "gtest/gtest-death-test.h"
+#include "gtest-death-test.h"
 
 #include <utility>
 
-#include "gtest/internal/gtest-port.h"
-#include "gtest/internal/custom/gtest.h"
+#include "internal/gtest-port.h"
+#include "internal/custom/gtest.h"
 
 #if GTEST_HAS_DEATH_TEST
 
diff --git a/bazaar/plugin/gtest/gtest-filepath.cc b/bazaar/plugin/gtest/gtest-filepath.cc
index bd7b99ff0..87cf3c394 100644
--- a/bazaar/plugin/gtest/gtest-filepath.cc
+++ b/bazaar/plugin/gtest/gtest-filepath.cc
@@ -27,11 +27,11 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "gtest/internal/gtest-filepath.h"
+#include "internal/gtest-filepath.h"
 
 #include <stdlib.h>
-#include "gtest/internal/gtest-port.h"
-#include "gtest/gtest-message.h"
+#include "internal/gtest-port.h"
+#include "gtest-message.h"
 
 #if GTEST_OS_WINDOWS_MOBILE
 # include <windows.h>
@@ -43,7 +43,7 @@
 # include <climits>  // Some Linux distributions define PATH_MAX here.
 #endif  // GTEST_OS_WINDOWS_MOBILE
 
-#include "gtest/internal/gtest-string.h"
+#include "internal/gtest-string.h"
 
 #if GTEST_OS_WINDOWS
 # define GTEST_PATH_MAX_ _MAX_PATH
diff --git a/bazaar/plugin/gtest/gtest-matchers.cc b/bazaar/plugin/gtest/gtest-matchers.cc
index 7d2fb6851..9917915a3 100644
--- a/bazaar/plugin/gtest/gtest-matchers.cc
+++ b/bazaar/plugin/gtest/gtest-matchers.cc
@@ -32,9 +32,9 @@
 // This file implements just enough of the matcher interface to allow
 // EXPECT_DEATH and friends to accept a matcher argument.
 
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-port.h"
-#include "gtest/gtest-matchers.h"
+#include "internal/gtest-internal.h"
+#include "internal/gtest-port.h"
+#include "gtest-matchers.h"
 
 #include <string>
 
diff --git a/bazaar/plugin/gtest/gtest-matchers.h b/bazaar/plugin/gtest/gtest-matchers.h
index 04cc63de2..4c0384516 100644
--- a/bazaar/plugin/gtest/gtest-matchers.h
+++ b/bazaar/plugin/gtest/gtest-matchers.h
@@ -44,9 +44,9 @@
 #include <string>
 #include <type_traits>
 
-#include "gtest/gtest-printers.h"
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-port.h"
+#include "gtest-printers.h"
+#include "internal/gtest-internal.h"
+#include "internal/gtest-port.h"
 
 // MSVC warning C5046 is new as of VS2017 version 15.8.
 #if defined(_MSC_VER) && _MSC_VER >= 1915
diff --git a/bazaar/plugin/gtest/gtest-param-test.h b/bazaar/plugin/gtest/gtest-param-test.h
index c2e6eae3d..3bd14a67f 100644
--- a/bazaar/plugin/gtest/gtest-param-test.h
+++ b/bazaar/plugin/gtest/gtest-param-test.h
@@ -177,9 +177,9 @@ TEST_P(DerivedTest, DoesBlah) {
 #include <iterator>
 #include <utility>
 
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-param-util.h"
-#include "gtest/internal/gtest-port.h"
+#include "internal/gtest-internal.h"
+#include "internal/gtest-param-util.h"
+#include "internal/gtest-port.h"
 
 namespace testing {
 
diff --git a/bazaar/plugin/gtest/gtest-port.cc b/bazaar/plugin/gtest/gtest-port.cc
index 5868d788a..424848b82 100644
--- a/bazaar/plugin/gtest/gtest-port.cc
+++ b/bazaar/plugin/gtest/gtest-port.cc
@@ -28,7 +28,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-#include "gtest/internal/gtest-port.h"
+#include "internal/gtest-port.h"
 
 #include <limits.h>
 #include <stdio.h>
diff --git a/bazaar/plugin/gtest/gtest-printers.cc b/bazaar/plugin/gtest/gtest-printers.cc
index 5ad713bb0..d6d3c4e2f 100644
--- a/bazaar/plugin/gtest/gtest-printers.cc
+++ b/bazaar/plugin/gtest/gtest-printers.cc
@@ -41,7 +41,7 @@
 // or void PrintTo(const Foo&, ::std::ostream*) in the namespace that
 // defines Foo.
 
-#include "gtest/gtest-printers.h"
+#include "gtest-printers.h"
 #include <stdio.h>
 #include <cctype>
 #include <cwchar>
diff --git a/bazaar/plugin/gtest/gtest-printers.h b/bazaar/plugin/gtest/gtest-printers.h
index 98807fe4e..72335198e 100644
--- a/bazaar/plugin/gtest/gtest-printers.h
+++ b/bazaar/plugin/gtest/gtest-printers.h
@@ -923,6 +923,6 @@ template <typename T>
 // Include any custom printer added by the local installation.
 // We must include this header at the end to make sure it can use the
 // declarations from this file.
-#include "gtest/internal/custom/gtest-printers.h"
+#include "internal/custom/gtest-printers.h"
 
 #endif  // GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
diff --git a/bazaar/plugin/gtest/gtest-test-part.cc b/bazaar/plugin/gtest/gtest-test-part.cc
index 6a9662535..7ae1ba97d 100644
--- a/bazaar/plugin/gtest/gtest-test-part.cc
+++ b/bazaar/plugin/gtest/gtest-test-part.cc
@@ -30,7 +30,7 @@
 //
 // The Google C++ Testing and Mocking Framework (Google Test)
 
-#include "gtest/gtest-test-part.h"
+#include "gtest-test-part.h"
 #include "gtest-internal-inl.h"
 
 namespace testing {
diff --git a/bazaar/plugin/gtest/gtest-typed-test.cc b/bazaar/plugin/gtest/gtest-typed-test.cc
index 8677caf73..7aacd5f65 100644
--- a/bazaar/plugin/gtest/gtest-typed-test.cc
+++ b/bazaar/plugin/gtest/gtest-typed-test.cc
@@ -28,9 +28,9 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-#include "gtest/gtest-typed-test.h"
+#include "gtest-typed-test.h"
 
-#include "gtest/gtest.h"
+#include "gtest.h"
 
 namespace testing {
 namespace internal {
diff --git a/bazaar/plugin/gtest/gtest-typed-test.h b/bazaar/plugin/gtest/gtest-typed-test.h
index 095ce0580..68eb7cf0a 100644
--- a/bazaar/plugin/gtest/gtest-typed-test.h
+++ b/bazaar/plugin/gtest/gtest-typed-test.h
@@ -170,8 +170,8 @@ INSTANTIATE_TYPED_TEST_SUITE_P(My, FooTest, MyTypes);
 
 #endif  // 0
 
-#include "gtest/internal/gtest-port.h"
-#include "gtest/internal/gtest-type-util.h"
+#include "internal/gtest-port.h"
+#include "internal/gtest-type-util.h"
 
 // Implements typed tests.
 
diff --git a/bazaar/plugin/gtest/gtest.cc b/bazaar/plugin/gtest/gtest.cc
index 957e3683b..53aab5e57 100644
--- a/bazaar/plugin/gtest/gtest.cc
+++ b/bazaar/plugin/gtest/gtest.cc
@@ -30,9 +30,9 @@
 //
 // The Google C++ Testing and Mocking Framework (Google Test)
 
-#include "gtest/gtest.h"
-#include "gtest/internal/custom/gtest.h"
-#include "gtest/gtest-spi.h"
+#include "gtest.h"
+#include "internal/custom/gtest.h"
+#include "gtest-spi.h"
 
 #include <ctype.h>
 #include <math.h>
diff --git a/bazaar/plugin/gtest/gtest.h b/bazaar/plugin/gtest/gtest.h
index f7b31d0ad..80243064d 100644
--- a/bazaar/plugin/gtest/gtest.h
+++ b/bazaar/plugin/gtest/gtest.h
@@ -373,7 +373,7 @@ GTEST_API_ AssertionResult AssertionFailure(const Message& msg);
 // Includes the auto-generated header that implements a family of generic
 // predicate assertion macros. This include comes late because it relies on
 // APIs declared above.
-#include "gtest/gtest_pred_impl.h"
+#include "gtest_pred_impl.h"
 
 namespace testing {
 
diff --git a/bazaar/plugin/gtest/internal/gtest-death-test-internal.h b/bazaar/plugin/gtest/internal/gtest-death-test-internal.h
index 68bd35306..1951f0395 100644
--- a/bazaar/plugin/gtest/internal/gtest-death-test-internal.h
+++ b/bazaar/plugin/gtest/internal/gtest-death-test-internal.h
@@ -36,8 +36,8 @@
 #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
 #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_
 
-#include "gtest/gtest-matchers.h"
-#include "gtest/internal/gtest-internal.h"
+#include "../gtest-matchers.h"
+#include "gtest-internal.h"
 
 #include <stdio.h>
 #include <memory>
diff --git a/bazaar/plugin/gtest/internal/gtest-filepath.h b/bazaar/plugin/gtest/internal/gtest-filepath.h
index c11b10151..3019dad33 100644
--- a/bazaar/plugin/gtest/internal/gtest-filepath.h
+++ b/bazaar/plugin/gtest/internal/gtest-filepath.h
@@ -40,7 +40,7 @@
 #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
 #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_
 
-#include "gtest/internal/gtest-string.h"
+#include "gtest-string.h"
 
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \
 /* class A needs to have dll-interface to be used by clients of class B */)
diff --git a/bazaar/plugin/gtest/internal/gtest-internal.h b/bazaar/plugin/gtest/internal/gtest-internal.h
index 94c816a28..f3f4784c7 100644
--- a/bazaar/plugin/gtest/internal/gtest-internal.h
+++ b/bazaar/plugin/gtest/internal/gtest-internal.h
@@ -37,7 +37,7 @@
 #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
 #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_
 
-#include "gtest/internal/gtest-port.h"
+#include "gtest-port.h"
 
 #if GTEST_OS_LINUX
 # include <stdlib.h>
@@ -61,10 +61,10 @@
 #include <type_traits>
 #include <vector>
 
-#include "gtest/gtest-message.h"
-#include "gtest/internal/gtest-filepath.h"
-#include "gtest/internal/gtest-string.h"
-#include "gtest/internal/gtest-type-util.h"
+#include "../gtest-message.h"
+#include "gtest-filepath.h"
+#include "gtest-string.h"
+#include "gtest-type-util.h"
 
 // Due to C++ preprocessor weirdness, we need double indirection to
 // concatenate two tokens when one of them is __LINE__.  Writing
diff --git a/bazaar/plugin/gtest/internal/gtest-param-util.h b/bazaar/plugin/gtest/internal/gtest-param-util.h
index 97533993c..df0481fa3 100644
--- a/bazaar/plugin/gtest/internal/gtest-param-util.h
+++ b/bazaar/plugin/gtest/internal/gtest-param-util.h
@@ -45,9 +45,9 @@
 #include <utility>
 #include <vector>
 
-#include "gtest/internal/gtest-internal.h"
-#include "gtest/internal/gtest-port.h"
-#include "gtest/gtest-printers.h"
+#include "gtest-internal.h"
+#include "gtest-port.h"
+#include "../gtest-printers.h"
 
 namespace testing {
 // Input to a parameterized test name generator, describing a test parameter.
diff --git a/bazaar/plugin/gtest/internal/gtest-port.h b/bazaar/plugin/gtest/internal/gtest-port.h
index 063fcb108..4498e6b37 100644
--- a/bazaar/plugin/gtest/internal/gtest-port.h
+++ b/bazaar/plugin/gtest/internal/gtest-port.h
@@ -269,8 +269,8 @@
 #include <utility>
 #include <vector>  // NOLINT
 
-#include "gtest/internal/gtest-port-arch.h"
-#include "gtest/internal/custom/gtest-port.h"
+#include "gtest-port-arch.h"
+#include "custom/gtest-port.h"
 
 #if !defined(GTEST_DEV_EMAIL_)
 # define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com"
diff --git a/bazaar/plugin/gtest/internal/gtest-string.h b/bazaar/plugin/gtest/internal/gtest-string.h
index 82aaa63bf..6350c9af5 100644
--- a/bazaar/plugin/gtest/internal/gtest-string.h
+++ b/bazaar/plugin/gtest/internal/gtest-string.h
@@ -49,7 +49,7 @@
 #include <string.h>
 #include <string>
 
-#include "gtest/internal/gtest-port.h"
+#include "gtest-port.h"
 
 namespace testing {
 namespace internal {
diff --git a/bazaar/plugin/gtest/internal/gtest-type-util.h b/bazaar/plugin/gtest/internal/gtest-type-util.h
index 3d7542d1f..d7f41eca9 100644
--- a/bazaar/plugin/gtest/internal/gtest-type-util.h
+++ b/bazaar/plugin/gtest/internal/gtest-type-util.h
@@ -44,7 +44,7 @@
 #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
 #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_
 
-#include "gtest/internal/gtest-port.h"
+#include "gtest-port.h"
 
 // #ifdef __GNUC__ is too general here.  It is possible to use gcc without using
 // libstdc++ (which is where cxxabi.h comes from).