diff --git a/gn/gpu.gni b/gn/gpu.gni
index aad169d400..5ac72678b3 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -29,9 +29,7 @@ skia_gpu_sources = [
   "$_include/gpu/GrShaderCaps.h",
   "$_include/gpu/GrShaderVar.h",
   "$_include/gpu/GrSurface.h",
-  "$_include/gpu/GrSurfaceContext.h",
   "$_include/gpu/GrTexture.h",
-  "$_include/gpu/GrTextureContext.h",
   "$_include/gpu/GrSamplerParams.h",
   "$_include/gpu/GrTestUtils.h",
   "$_include/gpu/GrTypes.h",
@@ -201,11 +199,13 @@ skia_gpu_sources = [
   "$_src/gpu/GrSurfacePriv.h",
   "$_src/gpu/GrSurface.cpp",
   "$_src/gpu/GrSurfaceContext.cpp",
+  "$_src/gpu/GrSurfaceContext.h",
   "$_src/gpu/GrSurfaceProxy.cpp",
   "$_src/gpu/GrTexture.cpp",
   "$_src/gpu/GrTextureAdjuster.cpp",
   "$_src/gpu/GrTextureAdjuster.h",
   "$_src/gpu/GrTextureContext.cpp",
+  "$_src/gpu/GrTextureContext.h",
   "$_src/gpu/GrTextureMaker.cpp",
   "$_src/gpu/GrTextureMaker.h",
   "$_src/gpu/GrTexturePriv.h",
diff --git a/include/gpu/GrSurfaceContext.h b/src/gpu/GrSurfaceContext.h
similarity index 100%
rename from include/gpu/GrSurfaceContext.h
rename to src/gpu/GrSurfaceContext.h
diff --git a/include/gpu/GrTextureContext.h b/src/gpu/GrTextureContext.h
similarity index 100%
rename from include/gpu/GrTextureContext.h
rename to src/gpu/GrTextureContext.h