diff --git a/bazel/exporter_tool/main.go b/bazel/exporter_tool/main.go
index c9a7e82..6120fa6 100644
--- a/bazel/exporter_tool/main.go
+++ b/bazel/exporter_tool/main.go
@@ -274,7 +274,6 @@
 		{Var: "skia_ganesh_private",
 			Rules: []string{
 				"//include/private/gpu/ganesh:private_hdrs",
-				"//include/private/gpu/ganesh:gl_private_hdrs",
 				"//src/gpu/ganesh/effects:effects_hdrs",
 				"//src/gpu/ganesh/effects:effects_srcs",
 				"//src/gpu/ganesh/geometry:geometry_hdrs",
@@ -338,7 +337,6 @@
 			}},
 		{Var: "skia_gpu_vk_private",
 			Rules: []string{
-				"//include/private/gpu/ganesh:vk_private_hdrs",
 				"//src/gpu/ganesh/vk:vk_hdrs",
 				"//src/gpu/ganesh/vk:vk_srcs",
 			}},
@@ -359,7 +357,6 @@
 			}},
 		{Var: "skia_gpu_metal_private",
 			Rules: []string{
-				"//include/private/gpu/ganesh:mtl_private_hdrs",
 				"//src/gpu/ganesh/surface:mtl_objc_srcs",
 				"//src/gpu/ganesh/mtl:mtl_hdrs",
 				"//src/gpu/ganesh/mtl:mtl_srcs",
diff --git a/gn/gpu.gni b/gn/gpu.gni
index 12da031..b20a0f8 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -81,7 +81,6 @@
 
 # List generated by Bazel rules:
 #  //include/private/gpu/ganesh:private_hdrs
-#  //include/private/gpu/ganesh:gl_private_hdrs
 #  //src/gpu/ganesh/effects:effects_hdrs
 #  //src/gpu/ganesh/effects:effects_srcs
 #  //src/gpu/ganesh/geometry:geometry_hdrs
@@ -110,10 +109,7 @@
 #  //src/image:android_srcs
 skia_ganesh_private = [
   "$_include/private/gpu/ganesh/GrContext_Base.h",
-  "$_include/private/gpu/ganesh/GrGLTypesPriv.h",
   "$_include/private/gpu/ganesh/GrImageContext.h",
-  "$_include/private/gpu/ganesh/GrMockTypesPriv.h",
-  "$_include/private/gpu/ganesh/GrMtlTypesPriv.h",
   "$_include/private/gpu/ganesh/GrTextureGenerator.h",
   "$_include/private/gpu/ganesh/GrTypesPriv.h",
   "$_src/gpu/ganesh/ClipStack.cpp",
@@ -471,6 +467,7 @@
   "$_src/gpu/ganesh/mock/GrMockSurfaceProxy.h",
   "$_src/gpu/ganesh/mock/GrMockTexture.h",
   "$_src/gpu/ganesh/mock/GrMockTypes.cpp",
+  "$_src/gpu/ganesh/mock/GrMockTypesPriv.h",
   "$_src/gpu/ganesh/ops/AAConvexPathRenderer.cpp",
   "$_src/gpu/ganesh/ops/AAConvexPathRenderer.h",
   "$_src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp",
@@ -640,6 +637,7 @@
   "$_src/gpu/ganesh/gl/GrGLTextureRenderTarget.cpp",
   "$_src/gpu/ganesh/gl/GrGLTextureRenderTarget.h",
   "$_src/gpu/ganesh/gl/GrGLTypesPriv.cpp",
+  "$_src/gpu/ganesh/gl/GrGLTypesPriv.h",
   "$_src/gpu/ganesh/gl/GrGLUniformHandler.cpp",
   "$_src/gpu/ganesh/gl/GrGLUniformHandler.h",
   "$_src/gpu/ganesh/gl/GrGLUtil.cpp",
@@ -761,11 +759,9 @@
     [ "$_include/private/chromium/GrVkSecondaryCBDrawContext.h" ]
 
 # List generated by Bazel rules:
-#  //include/private/gpu/ganesh:vk_private_hdrs
 #  //src/gpu/ganesh/vk:vk_hdrs
 #  //src/gpu/ganesh/vk:vk_srcs
 skia_gpu_vk_private = [
-  "$_include/private/gpu/ganesh/GrVkTypesPriv.h",
   "$_src/gpu/ganesh/vk/AHardwareBufferVk.cpp",
   "$_src/gpu/ganesh/vk/GrVkBackendSurface.cpp",
   "$_src/gpu/ganesh/vk/GrVkBackendSurfacePriv.h",
@@ -824,6 +820,7 @@
   "$_src/gpu/ganesh/vk/GrVkTextureRenderTarget.cpp",
   "$_src/gpu/ganesh/vk/GrVkTextureRenderTarget.h",
   "$_src/gpu/ganesh/vk/GrVkTypesPriv.cpp",
+  "$_src/gpu/ganesh/vk/GrVkTypesPriv.h",
   "$_src/gpu/ganesh/vk/GrVkUniformHandler.cpp",
   "$_src/gpu/ganesh/vk/GrVkUniformHandler.h",
   "$_src/gpu/ganesh/vk/GrVkUtil.cpp",
@@ -903,12 +900,10 @@
 ]
 
 # List generated by Bazel rules:
-#  //include/private/gpu/ganesh:mtl_private_hdrs
 #  //src/gpu/ganesh/surface:mtl_objc_srcs
 #  //src/gpu/ganesh/mtl:mtl_hdrs
 #  //src/gpu/ganesh/mtl:mtl_srcs
 skia_gpu_metal_private = [
-  "$_include/private/gpu/ganesh/GrMtlTypesPriv.h",
   "$_src/gpu/ganesh/mtl/GrMtlAttachment.h",
   "$_src/gpu/ganesh/mtl/GrMtlAttachment.mm",
   "$_src/gpu/ganesh/mtl/GrMtlBuffer.h",
@@ -946,6 +941,7 @@
   "$_src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h",
   "$_src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm",
   "$_src/gpu/ganesh/mtl/GrMtlTrampoline.mm",
+  "$_src/gpu/ganesh/mtl/GrMtlTypesPriv.h",
   "$_src/gpu/ganesh/mtl/GrMtlTypesPriv.mm",
   "$_src/gpu/ganesh/mtl/GrMtlUniformHandler.h",
   "$_src/gpu/ganesh/mtl/GrMtlUniformHandler.mm",
diff --git a/include/private/gpu/ganesh/BUILD.bazel b/include/private/gpu/ganesh/BUILD.bazel
index 96e046b..85eb6f3 100644
--- a/include/private/gpu/ganesh/BUILD.bazel
+++ b/include/private/gpu/ganesh/BUILD.bazel
@@ -1,54 +1,22 @@
-load("//bazel:skia_rules.bzl", "exports_files_legacy", "select_multi", "skia_filegroup")
+load("//bazel:skia_rules.bzl", "exports_files_legacy", "skia_filegroup")
 
 licenses(["notice"])
 
 exports_files_legacy()
 
-# In own group for mapping to //gpu.gni:skia_dawn_sources.
-skia_filegroup(
-    name = "dawn_private_hdrs",
-    srcs = ["GrDawnTypesPriv.h"],
-)
-
-skia_filegroup(
-    name = "gl_private_hdrs",
-    srcs = ["GrGLTypesPriv.h"],
-)
-
-# In own group for mapping to //gpu.gni:skia_gpu_vk_private.
-skia_filegroup(
-    name = "vk_private_hdrs",
-    srcs = ["GrVkTypesPriv.h"],
-)
-
 # In own group for mapping to //gn/gpu.gni:skia_direct3d_sources.
 skia_filegroup(
     name = "d3d_private_hdrs",
     srcs = ["GrD3DTypesMinimal.h"],
 )
 
-# In own group for mapping to //gn/gpu.gni:skia_gpu_metal_private.
-skia_filegroup(
-    name = "mtl_private_hdrs",
-    srcs = ["GrMtlTypesPriv.h"],
-)
-
 skia_filegroup(
     name = "private_hdrs",
     srcs = [
         "GrContext_Base.h",
         "GrImageContext.h",
-        "GrMockTypesPriv.h",
-        "GrMtlTypesPriv.h",
         "GrTextureGenerator.h",
         "GrTypesPriv.h",
-    ] + select_multi(
-        {
-            "//src/gpu:gl_ganesh": [":gl_private_hdrs"],
-            "//src/gpu:vulkan_ganesh": [":vk_private_hdrs"],
-            "//src/gpu:metal_ganesh": [":mtl_private_hdrs"],
-            # TODO(kjlubick) Direct3D Backend
-        },
-    ),
+    ],
     visibility = ["//include/private/gpu:__pkg__"],
 )
diff --git a/public.bzl b/public.bzl
index e568d68..e897925 100644
--- a/public.bzl
+++ b/public.bzl
@@ -284,10 +284,7 @@
     "include/private/chromium/SkImageChromium.h",
     "include/private/chromium/Slug.h",
     "include/private/gpu/ganesh/GrContext_Base.h",
-    "include/private/gpu/ganesh/GrGLTypesPriv.h",
     "include/private/gpu/ganesh/GrImageContext.h",
-    "include/private/gpu/ganesh/GrMockTypesPriv.h",
-    "include/private/gpu/ganesh/GrMtlTypesPriv.h",
     "include/private/gpu/ganesh/GrTextureGenerator.h",
     "include/private/gpu/ganesh/GrTypesPriv.h",
     "include/private/gpu/vk/VulkanTypesPriv.h",
@@ -1153,6 +1150,7 @@
     "src/gpu/ganesh/mock/GrMockSurfaceProxy.h",
     "src/gpu/ganesh/mock/GrMockTexture.h",
     "src/gpu/ganesh/mock/GrMockTypes.cpp",
+    "src/gpu/ganesh/mock/GrMockTypesPriv.h",
     "src/gpu/ganesh/ops/AAConvexPathRenderer.cpp",
     "src/gpu/ganesh/ops/AAConvexPathRenderer.h",
     "src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp",
@@ -1919,6 +1917,7 @@
     "src/gpu/ganesh/gl/GrGLTextureRenderTarget.cpp",
     "src/gpu/ganesh/gl/GrGLTextureRenderTarget.h",
     "src/gpu/ganesh/gl/GrGLTypesPriv.cpp",
+    "src/gpu/ganesh/gl/GrGLTypesPriv.h",
     "src/gpu/ganesh/gl/GrGLUniformHandler.cpp",
     "src/gpu/ganesh/gl/GrGLUniformHandler.h",
     "src/gpu/ganesh/gl/GrGLUtil.cpp",
@@ -2115,6 +2114,7 @@
     "src/gpu/ganesh/mtl/GrMtlTexture.mm",
     "src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm",
     "src/gpu/ganesh/mtl/GrMtlTrampoline.mm",
+    "src/gpu/ganesh/mtl/GrMtlTypesPriv.h",
     "src/gpu/ganesh/mtl/GrMtlTypesPriv.mm",
     "src/gpu/ganesh/mtl/GrMtlUniformHandler.mm",
     "src/gpu/ganesh/mtl/GrMtlUtil.mm",
@@ -2183,6 +2183,7 @@
     "src/gpu/ganesh/vk/GrVkTextureRenderTarget.cpp",
     "src/gpu/ganesh/vk/GrVkTextureRenderTarget.h",
     "src/gpu/ganesh/vk/GrVkTypesPriv.cpp",
+    "src/gpu/ganesh/vk/GrVkTypesPriv.h",
     "src/gpu/ganesh/vk/GrVkUniformHandler.cpp",
     "src/gpu/ganesh/vk/GrVkUniformHandler.h",
     "src/gpu/ganesh/vk/GrVkUtil.cpp",
diff --git a/src/gpu/ganesh/gl/BUILD.bazel b/src/gpu/ganesh/gl/BUILD.bazel
index f49d0aa..2a3ffab 100644
--- a/src/gpu/ganesh/gl/BUILD.bazel
+++ b/src/gpu/ganesh/gl/BUILD.bazel
@@ -46,6 +46,7 @@
     "GrGLTextureRenderTarget.cpp",
     "GrGLTextureRenderTarget.h",
     "GrGLTypesPriv.cpp",
+    "GrGLTypesPriv.h",
     "GrGLUniformHandler.cpp",
     "GrGLUniformHandler.h",
     "GrGLUtil.cpp",
diff --git a/src/gpu/ganesh/gl/GrGLBackendSurface.cpp b/src/gpu/ganesh/gl/GrGLBackendSurface.cpp
index 748f764..a8b4c3c 100644
--- a/src/gpu/ganesh/gl/GrGLBackendSurface.cpp
+++ b/src/gpu/ganesh/gl/GrGLBackendSurface.cpp
@@ -12,12 +12,12 @@
 #include "include/gpu/GrTypes.h"
 #include "include/gpu/gl/GrGLTypes.h"
 #include "include/private/base/SkAssert.h"
-#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
 #include "include/private/gpu/ganesh/GrTypesPriv.h"
 #include "src/gpu/MutableTextureStateRef.h"  // IWYU pragma: keep
 #include "src/gpu/ganesh/GrBackendSurfacePriv.h"
 #include "src/gpu/ganesh/gl/GrGLBackendSurfacePriv.h"
 #include "src/gpu/ganesh/gl/GrGLDefines.h"
+#include "src/gpu/ganesh/gl/GrGLTypesPriv.h"
 #include "src/gpu/ganesh/gl/GrGLUtil.h"
 
 #include <algorithm>
diff --git a/src/gpu/ganesh/gl/GrGLBackendSurfacePriv.h b/src/gpu/ganesh/gl/GrGLBackendSurfacePriv.h
index b796644..809fe5c 100644
--- a/src/gpu/ganesh/gl/GrGLBackendSurfacePriv.h
+++ b/src/gpu/ganesh/gl/GrGLBackendSurfacePriv.h
@@ -11,8 +11,8 @@
 #include "include/core/SkRefCnt.h"
 #include "include/gpu/GrBackendSurface.h"
 #include "include/gpu/GrTypes.h"
-#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
 #include "src/gpu/ganesh/GrBackendSurfacePriv.h"
+#include "src/gpu/ganesh/gl/GrGLTypesPriv.h"
 
 #include <string_view>
 
diff --git a/src/gpu/ganesh/gl/GrGLCaps.h b/src/gpu/ganesh/gl/GrGLCaps.h
index 582db85..3b37f08 100644
--- a/src/gpu/ganesh/gl/GrGLCaps.h
+++ b/src/gpu/ganesh/gl/GrGLCaps.h
@@ -15,11 +15,11 @@
 #include "include/private/base/SkAssert.h"
 #include "include/private/base/SkTArray.h"
 #include "include/private/base/SkTDArray.h"
-#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
 #include "include/private/gpu/ganesh/GrTypesPriv.h"
 #include "src/gpu/Swizzle.h"
 #include "src/gpu/ganesh/GrCaps.h"
 #include "src/gpu/ganesh/GrProgramDesc.h"
+#include "src/gpu/ganesh/gl/GrGLTypesPriv.h"
 
 #include <cstdint>
 #include <memory>
diff --git a/src/gpu/ganesh/gl/GrGLGpu.h b/src/gpu/ganesh/gl/GrGLGpu.h
index f1cfd7e..b89c0c3 100644
--- a/src/gpu/ganesh/gl/GrGLGpu.h
+++ b/src/gpu/ganesh/gl/GrGLGpu.h
@@ -22,7 +22,6 @@
 #include "include/private/base/SkTArray.h"
 #include "include/private/base/SkTemplates.h"
 #include "include/private/base/SkTo.h"
-#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
 #include "include/private/gpu/ganesh/GrTypesPriv.h"
 #include "src/core/SkChecksum.h"
 #include "src/core/SkLRUCache.h"
@@ -46,6 +45,7 @@
 #include "src/gpu/ganesh/gl/GrGLDefines.h"
 #include "src/gpu/ganesh/gl/GrGLRenderTarget.h"
 #include "src/gpu/ganesh/gl/GrGLTexture.h"
+#include "src/gpu/ganesh/gl/GrGLTypesPriv.h"
 #include "src/gpu/ganesh/gl/GrGLUtil.h"
 #include "src/gpu/ganesh/gl/GrGLVertexArray.h"
 
diff --git a/src/gpu/ganesh/gl/GrGLTexture.h b/src/gpu/ganesh/gl/GrGLTexture.h
index 8367e1e..1d792ab 100644
--- a/src/gpu/ganesh/gl/GrGLTexture.h
+++ b/src/gpu/ganesh/gl/GrGLTexture.h
@@ -10,9 +10,9 @@
 #define GrGLTexture_DEFINED
 
 #include "include/gpu/ganesh/SkImageGanesh.h"
-#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
 #include "src/gpu/ganesh/GrGpu.h"
 #include "src/gpu/ganesh/GrTexture.h"
+#include "src/gpu/ganesh/gl/GrGLTypesPriv.h"
 #include "src/gpu/ganesh/gl/GrGLUtil.h"
 
 class GrGLGpu;
diff --git a/src/gpu/ganesh/gl/GrGLTypesPriv.cpp b/src/gpu/ganesh/gl/GrGLTypesPriv.cpp
index 8cdf020..0e36f3a 100644
--- a/src/gpu/ganesh/gl/GrGLTypesPriv.cpp
+++ b/src/gpu/ganesh/gl/GrGLTypesPriv.cpp
@@ -4,9 +4,9 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "src/gpu/ganesh/gl/GrGLTypesPriv.h"
 
 #include "include/core/SkScalar.h"
-#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
 #include "src/gpu/Swizzle.h"
 #include "src/gpu/ganesh/gl/GrGLDefines.h"
 
diff --git a/include/private/gpu/ganesh/GrGLTypesPriv.h b/src/gpu/ganesh/gl/GrGLTypesPriv.h
similarity index 97%
rename from include/private/gpu/ganesh/GrGLTypesPriv.h
rename to src/gpu/ganesh/gl/GrGLTypesPriv.h
index 8f9d2eb..004e67f 100644
--- a/include/private/gpu/ganesh/GrGLTypesPriv.h
+++ b/src/gpu/ganesh/gl/GrGLTypesPriv.h
@@ -11,8 +11,6 @@
 #ifndef GrGLTypesPriv_DEFINED
 #define GrGLTypesPriv_DEFINED
 
-// TODO(b/293490566) Move this to src/ after GrSurfaceInfo.h has been decoupled from GL
-
 static constexpr int kGrGLColorFormatCount = static_cast<int>(GrGLFormat::kLastColorFormat) + 1;
 
 class GrGLTextureParameters : public SkNVRefCnt<GrGLTextureParameters> {
diff --git a/src/gpu/ganesh/mock/BUILD.bazel b/src/gpu/ganesh/mock/BUILD.bazel
index 42ebc31..b159a1e 100644
--- a/src/gpu/ganesh/mock/BUILD.bazel
+++ b/src/gpu/ganesh/mock/BUILD.bazel
@@ -16,6 +16,7 @@
     "GrMockSurfaceProxy.h",
     "GrMockTexture.h",
     "GrMockTypes.cpp",
+    "GrMockTypesPriv.h",
 ]
 
 split_srcs_and_hdrs(
diff --git a/src/gpu/ganesh/mock/GrMockTypes.cpp b/src/gpu/ganesh/mock/GrMockTypes.cpp
index 6e155e5..b77e26c 100644
--- a/src/gpu/ganesh/mock/GrMockTypes.cpp
+++ b/src/gpu/ganesh/mock/GrMockTypes.cpp
@@ -9,7 +9,7 @@
 
 #include "include/core/SkTextureCompressionType.h"
 #include "include/gpu/GrBackendSurface.h"
-#include "include/private/gpu/ganesh/GrMockTypesPriv.h"
+#include "src/gpu/ganesh/mock/GrMockTypesPriv.h"
 
 GrBackendFormat GrMockRenderTargetInfo::getBackendFormat() const {
     return GrBackendFormat::MakeMock(fColorType, SkTextureCompressionType::kNone);
diff --git a/include/private/gpu/ganesh/GrMockTypesPriv.h b/src/gpu/ganesh/mock/GrMockTypesPriv.h
similarity index 100%
rename from include/private/gpu/ganesh/GrMockTypesPriv.h
rename to src/gpu/ganesh/mock/GrMockTypesPriv.h
diff --git a/src/gpu/ganesh/mtl/BUILD.bazel b/src/gpu/ganesh/mtl/BUILD.bazel
index c503e15..363439e 100644
--- a/src/gpu/ganesh/mtl/BUILD.bazel
+++ b/src/gpu/ganesh/mtl/BUILD.bazel
@@ -53,6 +53,7 @@
     "GrMtlTextureRenderTarget.h",
     "GrMtlTextureRenderTarget.mm",
     "GrMtlTrampoline.mm",
+    "GrMtlTypesPriv.h",
     "GrMtlTypesPriv.mm",
     "GrMtlUniformHandler.h",
     "GrMtlUniformHandler.mm",
diff --git a/src/gpu/ganesh/mtl/GrMtlGpu.h b/src/gpu/ganesh/mtl/GrMtlGpu.h
index 93e4cf6..9cf9e90 100644
--- a/src/gpu/ganesh/mtl/GrMtlGpu.h
+++ b/src/gpu/ganesh/mtl/GrMtlGpu.h
@@ -10,7 +10,7 @@
 
 #include "include/gpu/mtl/GrMtlBackendContext.h"
 #include "include/private/base/SkDeque.h"
-#include "include/private/gpu/ganesh/GrMtlTypesPriv.h"
+#include "src/gpu/ganesh/mtl/GrMtlTypesPriv.h"
 
 #include "src/gpu/ganesh/GrFinishCallbacks.h"
 #include "src/gpu/ganesh/GrGpu.h"
diff --git a/include/private/gpu/ganesh/GrMtlTypesPriv.h b/src/gpu/ganesh/mtl/GrMtlTypesPriv.h
similarity index 100%
rename from include/private/gpu/ganesh/GrMtlTypesPriv.h
rename to src/gpu/ganesh/mtl/GrMtlTypesPriv.h
diff --git a/src/gpu/ganesh/mtl/GrMtlTypesPriv.mm b/src/gpu/ganesh/mtl/GrMtlTypesPriv.mm
index 3bb7bcc..b2323fd 100644
--- a/src/gpu/ganesh/mtl/GrMtlTypesPriv.mm
+++ b/src/gpu/ganesh/mtl/GrMtlTypesPriv.mm
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "include/private/gpu/ganesh/GrMtlTypesPriv.h"
+#include "src/gpu/ganesh/mtl/GrMtlTypesPriv.h"
 
 GrMtlSurfaceInfo GrMtlTextureSpecToSurfaceInfo(const GrMtlTextureSpec& mtlSpec,
                                                uint32_t sampleCount,
diff --git a/src/gpu/ganesh/mtl/GrMtlUniformHandler.mm b/src/gpu/ganesh/mtl/GrMtlUniformHandler.mm
index 61c8b30..835f0b2 100644
--- a/src/gpu/ganesh/mtl/GrMtlUniformHandler.mm
+++ b/src/gpu/ganesh/mtl/GrMtlUniformHandler.mm
@@ -7,10 +7,10 @@
 
 #include "src/gpu/ganesh/mtl/GrMtlUniformHandler.h"
 
-#include "include/private/gpu/ganesh/GrMtlTypesPriv.h"
 #include "src/gpu/ganesh/GrTexture.h"
 #include "src/gpu/ganesh/GrUtil.h"
 #include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h"
+#include "src/gpu/ganesh/mtl/GrMtlTypesPriv.h"
 
 #if !__has_feature(objc_arc)
 #error This file must be compiled with Arc. Use -fobjc-arc flag
diff --git a/src/gpu/ganesh/mtl/GrMtlUtil.h b/src/gpu/ganesh/mtl/GrMtlUtil.h
index 079711f..f682df6 100644
--- a/src/gpu/ganesh/mtl/GrMtlUtil.h
+++ b/src/gpu/ganesh/mtl/GrMtlUtil.h
@@ -12,8 +12,8 @@
 
 #include "include/gpu/GrBackendSurface.h"
 #include "include/gpu/GrContextOptions.h"
-#include "include/private/gpu/ganesh/GrMtlTypesPriv.h"
 #include "include/private/gpu/ganesh/GrTypesPriv.h"
+#include "src/gpu/ganesh/mtl/GrMtlTypesPriv.h"
 #include "src/sksl/ir/SkSLProgram.h"
 
 class GrMtlGpu;
diff --git a/src/gpu/ganesh/mtl/GrMtlVaryingHandler.mm b/src/gpu/ganesh/mtl/GrMtlVaryingHandler.mm
index efc98c2..57aa778 100644
--- a/src/gpu/ganesh/mtl/GrMtlVaryingHandler.mm
+++ b/src/gpu/ganesh/mtl/GrMtlVaryingHandler.mm
@@ -7,7 +7,7 @@
 
 #include "src/gpu/ganesh/mtl/GrMtlVaryingHandler.h"
 
-#include "include/private/gpu/ganesh/GrMtlTypesPriv.h"
+#include "src/gpu/ganesh/mtl/GrMtlTypesPriv.h"
 
 #if !__has_feature(objc_arc)
 #error This file must be compiled with Arc. Use -fobjc-arc flag
diff --git a/src/gpu/ganesh/vk/BUILD.bazel b/src/gpu/ganesh/vk/BUILD.bazel
index a8c4ff0..f532dfc 100644
--- a/src/gpu/ganesh/vk/BUILD.bazel
+++ b/src/gpu/ganesh/vk/BUILD.bazel
@@ -64,6 +64,7 @@
     "GrVkTextureRenderTarget.cpp",
     "GrVkTextureRenderTarget.h",
     "GrVkTypesPriv.cpp",
+    "GrVkTypesPriv.h",
     "GrVkUniformHandler.cpp",
     "GrVkUniformHandler.h",
     "GrVkUtil.cpp",
diff --git a/src/gpu/ganesh/vk/GrVkBackendSurface.cpp b/src/gpu/ganesh/vk/GrVkBackendSurface.cpp
index 12a64f4..7ddc50b 100644
--- a/src/gpu/ganesh/vk/GrVkBackendSurface.cpp
+++ b/src/gpu/ganesh/vk/GrVkBackendSurface.cpp
@@ -16,9 +16,9 @@
 #include "include/private/base/SkAssert.h"
 #include "include/private/base/SkTo.h"
 #include "include/private/gpu/ganesh/GrTypesPriv.h"
-#include "include/private/gpu/ganesh/GrVkTypesPriv.h"
 #include "src/gpu/MutableTextureStateRef.h"
 #include "src/gpu/ganesh/GrBackendSurfacePriv.h"
+#include "src/gpu/ganesh/vk/GrVkTypesPriv.h"
 #include "src/gpu/ganesh/vk/GrVkUtil.h"
 #include "src/gpu/vk/VulkanUtilsPriv.h"
 
diff --git a/src/gpu/ganesh/vk/GrVkImage.h b/src/gpu/ganesh/vk/GrVkImage.h
index 7f72841..ab5e52f 100644
--- a/src/gpu/ganesh/vk/GrVkImage.h
+++ b/src/gpu/ganesh/vk/GrVkImage.h
@@ -13,13 +13,13 @@
 #include "include/gpu/ganesh/vk/GrVkBackendSurface.h"
 #include "include/gpu/vk/GrVkTypes.h"
 #include "include/private/gpu/ganesh/GrTypesPriv.h"
-#include "include/private/gpu/ganesh/GrVkTypesPriv.h"
 #include "src/gpu/MutableTextureStateRef.h"
 #include "src/gpu/ganesh/GrAttachment.h"
 #include "src/gpu/ganesh/GrManagedResource.h"
 #include "src/gpu/ganesh/GrRefCnt.h"
 #include "src/gpu/ganesh/GrTexture.h"
 #include "src/gpu/ganesh/vk/GrVkDescriptorSet.h"
+#include "src/gpu/ganesh/vk/GrVkTypesPriv.h"
 
 #include <cinttypes>
 
diff --git a/src/gpu/ganesh/vk/GrVkTypesPriv.cpp b/src/gpu/ganesh/vk/GrVkTypesPriv.cpp
index 8d8cb61..007cf07 100644
--- a/src/gpu/ganesh/vk/GrVkTypesPriv.cpp
+++ b/src/gpu/ganesh/vk/GrVkTypesPriv.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "include/private/gpu/ganesh/GrVkTypesPriv.h"
+#include "src/gpu/ganesh/vk/GrVkTypesPriv.h"
 
 #include "src/gpu/MutableTextureStateRef.h"
 #include "src/gpu/ganesh/vk/GrVkImageLayout.h"
diff --git a/include/private/gpu/ganesh/GrVkTypesPriv.h b/src/gpu/ganesh/vk/GrVkTypesPriv.h
similarity index 100%
rename from include/private/gpu/ganesh/GrVkTypesPriv.h
rename to src/gpu/ganesh/vk/GrVkTypesPriv.h
diff --git a/tests/GLBackendSurfaceTest.cpp b/tests/GLBackendSurfaceTest.cpp
index 36e3288..433c6c1 100644
--- a/tests/GLBackendSurfaceTest.cpp
+++ b/tests/GLBackendSurfaceTest.cpp
@@ -26,12 +26,12 @@
 #include "include/gpu/ganesh/SkSurfaceGanesh.h"
 #include "include/gpu/ganesh/gl/GrGLBackendSurface.h"
 #include "include/gpu/gl/GrGLTypes.h"
-#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
 #include "src/gpu/ganesh/GrDirectContextPriv.h"
 #include "src/gpu/ganesh/GrSurfaceProxy.h"
 #include "src/gpu/ganesh/GrTextureProxy.h"
 #include "src/gpu/ganesh/gl/GrGLCaps.h"
 #include "src/gpu/ganesh/gl/GrGLTexture.h"
+#include "src/gpu/ganesh/gl/GrGLTypesPriv.h"
 #include "tests/CtsEnforcement.h"
 #include "tests/Test.h"
 #include "tools/gpu/ProxyUtils.h"
diff --git a/tests/TraceMemoryDumpTest.cpp b/tests/TraceMemoryDumpTest.cpp
index f8a6264..38fe7bb 100644
--- a/tests/TraceMemoryDumpTest.cpp
+++ b/tests/TraceMemoryDumpTest.cpp
@@ -14,7 +14,6 @@
 #include "include/gpu/GpuTypes.h"
 #include "include/gpu/GrDirectContext.h"
 #include "include/gpu/gl/GrGLTypes.h"
-#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
 #include "include/private/gpu/ganesh/GrTypesPriv.h"
 #include "src/gpu/ganesh/GrDirectContextPriv.h"
 #include "src/gpu/ganesh/gl/GrGLBuffer.h"
@@ -23,6 +22,7 @@
 #include "src/gpu/ganesh/gl/GrGLRenderTarget.h"
 #include "src/gpu/ganesh/gl/GrGLTexture.h"
 #include "src/gpu/ganesh/gl/GrGLTextureRenderTarget.h"
+#include "src/gpu/ganesh/gl/GrGLTypesPriv.h"
 #include "tests/CtsEnforcement.h"
 #include "tests/Test.h"
 
diff --git a/tools/window/MetalWindowContext.h b/tools/window/MetalWindowContext.h
index 8f0f91b..06c2d3e 100644
--- a/tools/window/MetalWindowContext.h
+++ b/tools/window/MetalWindowContext.h
@@ -10,7 +10,7 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSurface.h"
 #include "include/ports/SkCFObject.h"
-#include "include/private/gpu/ganesh/GrMtlTypesPriv.h"
+#include "src/gpu/ganesh/mtl/GrMtlTypesPriv.h"
 
 #include "tools/window/WindowContext.h"