diff --git a/iree/base/init.h b/iree/base/init.h
index 8d03ac1..cb54d70 100644
--- a/iree/base/init.h
+++ b/iree/base/init.h
@@ -19,7 +19,7 @@
 // should be called early in main(), before other code runs.
 
 #if defined(IREE_CONFIG_GOOGLE_INTERNAL) && IREE_CONFIG_GOOGLE_INTERNAL
-#include "iree/base/google/init_google.h"
+#include "iree/base/google_internal/init_google.h"
 #else
 #include "iree/base/internal/init_internal.h"
 #endif  // IREE_CONFIG_GOOGLE_INTERNAL
diff --git a/iree/base/logging.h b/iree/base/logging.h
index 95d5552..b46f03e 100644
--- a/iree/base/logging.h
+++ b/iree/base/logging.h
@@ -59,7 +59,7 @@
 //   e.g. when validating user input.
 
 #if defined(IREE_CONFIG_GOOGLE_INTERNAL) && IREE_CONFIG_GOOGLE_INTERNAL
-#include "iree/base/google/logging_google.h"
+#include "iree/base/google_internal/logging_google.h"
 #else
 #include "iree/base/internal/logging.h"
 #endif  // IREE_CONFIG_GOOGLE_INTERNAL
diff --git a/iree/base/source_location.h b/iree/base/source_location.h
index 480f787..4ae55c3 100644
--- a/iree/base/source_location.h
+++ b/iree/base/source_location.h
@@ -16,7 +16,7 @@
 #define IREE_BASE_SOURCE_LOCATION_H_
 
 #if defined(IREE_CONFIG_GOOGLE_INTERNAL) && IREE_CONFIG_GOOGLE_INTERNAL
-#include "iree/base/google/source_location_google.h"
+#include "iree/base/google_internal/source_location_google.h"
 #else
 #include "iree/base/internal/source_location.h"
 #endif  // IREE_CONFIG_GOOGLE_INTERNAL
diff --git a/iree/base/status.h b/iree/base/status.h
index 414b166..26bdcbf 100644
--- a/iree/base/status.h
+++ b/iree/base/status.h
@@ -16,7 +16,7 @@
 #define IREE_BASE_STATUS_H_
 
 #if defined(IREE_CONFIG_GOOGLE_INTERNAL) && IREE_CONFIG_GOOGLE_INTERNAL
-#include "iree/base/google/status_google.h"
+#include "iree/base/google_internal/status_google.h"
 #else
 #include "iree/base/internal/status.h"
 #include "iree/base/internal/status_builder.h"
diff --git a/iree/base/status_matchers.h b/iree/base/status_matchers.h
index 20d410a..9a22174 100644
--- a/iree/base/status_matchers.h
+++ b/iree/base/status_matchers.h
@@ -17,7 +17,7 @@
 
 #if defined(IREE_CONFIG_GOOGLE_INTERNAL) && IREE_CONFIG_GOOGLE_INTERNAL
 
-#include "iree/base/google/status_matchers_google.h"  // IWYU pragma: export
+#include "iree/base/google_internal/status_matchers_google.h"  // IWYU pragma: export
 
 #else
 
diff --git a/iree/testing/gtest.h b/iree/testing/gtest.h
index b246126..d1d1892 100644
--- a/iree/testing/gtest.h
+++ b/iree/testing/gtest.h
@@ -16,7 +16,7 @@
 #define IREE_TESTING_GTEST_H_
 
 #if defined(IREE_CONFIG_GOOGLE_INTERNAL) && IREE_CONFIG_GOOGLE_INTERNAL
-#include "iree/testing/google/gtest_google.h"
+#include "iree/testing/google_internal/gtest_google.h"
 #else
 #include "iree/testing/internal/gtest_internal.h"
 #endif  // IREE_CONFIG_GOOGLE_INTERNAL