20 files changed, 5 insertions, 19 deletions

diff --git a/gm/aaxfermodes.cpp b/gm/aaxfermodes.cpp
index 43b441c6cc..1420e3d579 100644
--- a/gm/aaxfermodes.cpp
+++ b/gm/aaxfermodes.cpp
@@ -6,9 +6,8 @@
  */
 
 #include "gm.h"
-#include "GrColor.h"
 #include "sk_tool_utils.h"
-#include "SkColorPriv.h"
+#include "SkBlendModePriv.h"
 #include "SkPath.h"
 #include "SkShader.h"
 
diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp
index 8033ff739d..ac5457faf4 100644
--- a/gm/composeshader.cpp
+++ b/gm/composeshader.cpp
@@ -7,7 +7,6 @@
 
 #include "gm.h"
 
-#include "SkColorPriv.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkGraphics.h"
diff --git a/gm/filterbug.cpp b/gm/filterbug.cpp
index 258374f73a..181ba7c4e2 100644
--- a/gm/filterbug.cpp
+++ b/gm/filterbug.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "gm.h"
-#include "SkColorPriv.h"
 #include "SkImageShader.h"
 
 static const sk_sp<SkImage> make_image(int firstBlackRow, int lastBlackRow) {
diff --git a/gm/image.cpp b/gm/image.cpp
index fc91d6b7f1..e98daef42d 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -9,7 +9,6 @@
 #include "gm.h"
 #include "sk_tool_utils.h"
 #include "SkAutoPixmapStorage.h"
-#include "SkColorPriv.h"
 #include "SkData.h"
 #include "SkCanvas.h"
 #include "SkRandom.h"
diff --git a/gm/jpg_color_cube.cpp b/gm/jpg_color_cube.cpp
index b083428345..408cc90ea2 100644
--- a/gm/jpg_color_cube.cpp
+++ b/gm/jpg_color_cube.cpp
@@ -7,7 +7,6 @@
 #include "gm.h"
 #include "sk_tool_utils.h"
 #include "SkCanvas.h"
-#include "SkColorPriv.h"
 #include "SkData.h"
 #include "SkImage.h"
 #include "SkImageEncoder.h"
diff --git a/gm/shapes_as_paths.cpp b/gm/shapes_as_paths.cpp
index 4ad760dcc7..774ceed31d 100644
--- a/gm/shapes_as_paths.cpp
+++ b/gm/shapes_as_paths.cpp
@@ -8,7 +8,6 @@
 #include "gm.h"
 
 #include "SkAutoPixmapStorage.h"
-#include "SkColorPriv.h"
 #include "SkImage.h"
 #include "SkPath.h"
 #include "SkSurface.h"
diff --git a/gm/showmiplevels.cpp b/gm/showmiplevels.cpp
index 6f0975da7e..4f27365788 100644
--- a/gm/showmiplevels.cpp
+++ b/gm/showmiplevels.cpp
@@ -9,7 +9,6 @@
 #include "sk_tool_utils.h"
 
 #include "Resources.h"
-#include "SkColorPriv.h"
 #include "SkGradientShader.h"
 #include "SkTypeface.h"
 #include "SkStream.h"
diff --git a/gm/simple_magnification.cpp b/gm/simple_magnification.cpp
index ef5f9c6dd8..14dade1307 100644
--- a/gm/simple_magnification.cpp
+++ b/gm/simple_magnification.cpp
@@ -7,7 +7,6 @@
 
 #include "gm.h"
 #include "sk_tool_utils.h"
-#include "SkColorPriv.h"
 #include "SkImageSource.h"
 #include "SkMagnifierImageFilter.h"
 #include "SkSurface.h"
diff --git a/gn/gpu.gni b/gn/gpu.gni
index 8e6f76b653..4d8f3d8973 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -12,6 +12,7 @@ skia_gpu_sources = [
   "$_include/gpu/GrBackendSurface.h",
   "$_include/gpu/GrBlend.h",
   "$_include/gpu/GrCaps.h",
+  "$_include/gpu/GrColor.h",
   "$_include/gpu/GrConfig.h",
   "$_include/gpu/GrContextOptions.h",
   "$_include/gpu/GrContext.h",
@@ -33,7 +34,6 @@ skia_gpu_sources = [
 
   # Private includes
   "$_include/private/GrAuditTrail.h",
-  "$_include/private/GrColor.h",
   "$_include/private/GrGLSL.h",
   "$_include/private/GrOpList.h",
   "$_include/private/GrSingleOwner.h",
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 9e4e237db4..deb0313faf 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -8,7 +8,6 @@
 #ifndef SkImage_DEFINED
 #define SkImage_DEFINED
 
-#include "GrTypes.h"
 #include "SkFilterQuality.h"
 #include "SkImageInfo.h"
 #include "SkImageEncoder.h"
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index a5ba12ec2f..290d09fc87 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -9,11 +9,11 @@
 #define SkShader_DEFINED
 
 #include "SkBlendMode.h"
-#include "SkColor.h"
 #include "SkFilterQuality.h"
 #include "SkFlattenable.h"
 #include "SkImageInfo.h"
 #include "SkMatrix.h"
+#include "../gpu/GrColor.h"
 
 class SkArenaAlloc;
 class SkBitmap;
diff --git a/include/gpu/GrBlend.h b/include/gpu/GrBlend.h
index 8c968f2d2e..30b0b9b6e0 100644
--- a/include/gpu/GrBlend.h
+++ b/include/gpu/GrBlend.h
@@ -9,7 +9,7 @@
 #ifndef GrBlend_DEFINED
 #define GrBlend_DEFINED
 
-#include "GrTypes.h"
+#include "GrColor.h"
 #include "../private/SkTLogic.h"
 
 /**
diff --git a/include/private/GrColor.h b/include/gpu/GrColor.h
index b4a461d738..b4a461d738 100644
--- a/include/private/GrColor.h
+++ b/include/gpu/GrColor.h
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index df9b85bacd..d0ca90e0f0 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -9,6 +9,7 @@
 #define GrContext_DEFINED
 
 #include "GrCaps.h"
+#include "GrColor.h"
 #include "SkMatrix.h"
 #include "SkPathEffect.h"
 #include "SkTypes.h"
diff --git a/src/core/SkPixmap.cpp b/src/core/SkPixmap.cpp
index 42e2c66029..7873a9b8ce 100644
--- a/src/core/SkPixmap.cpp
+++ b/src/core/SkPixmap.cpp
@@ -19,7 +19,6 @@
 #include "SkReadPixelsRec.h"
 #include "SkSurface.h"
 #include "SkTemplates.h"
-#include "SkUnPreMultiply.h"
 #include "SkUtils.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkUnPreMultiplyPriv.h b/src/core/SkUnPreMultiplyPriv.h
index f25e78f96a..073e239ed7 100644
--- a/src/core/SkUnPreMultiplyPriv.h
+++ b/src/core/SkUnPreMultiplyPriv.h
@@ -9,7 +9,6 @@
 #define SkUnPreMultiplyPriv_DEFINED
 
 #include "SkColor.h"
-#include "SkUnPreMultiply.h"
 
 template <bool kSwapRB>
 void SkUnpremultiplyRow(uint32_t* dst, const uint32_t* src, int count) {
diff --git a/src/effects/SkBlurMask.cpp b/src/effects/SkBlurMask.cpp
index 59d70205c9..f06e2b9f1e 100644
--- a/src/effects/SkBlurMask.cpp
+++ b/src/effects/SkBlurMask.cpp
@@ -7,7 +7,6 @@
 
 
 #include "SkBlurMask.h"
-#include "SkColorPriv.h"
 #include "SkMaskBlurFilter.h"
 #include "SkMath.h"
 #include "SkTemplates.h"
diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp
index 9fa26c5731..4caef9ef0b 100644
--- a/src/effects/SkEmbossMaskFilter.cpp
+++ b/src/effects/SkEmbossMaskFilter.cpp
@@ -8,7 +8,6 @@
 #include "SkEmbossMaskFilter.h"
 #include "SkBlurMaskFilter.h"
 #include "SkBlurMask.h"
-#include "SkColorPriv.h"
 #include "SkEmbossMask.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
diff --git a/src/gpu/GrBlend.cpp b/src/gpu/GrBlend.cpp
index 436829ce63..1bb4dd3c9c 100644
--- a/src/gpu/GrBlend.cpp
+++ b/src/gpu/GrBlend.cpp
@@ -6,7 +6,6 @@
 */
 
 #include "GrBlend.h"
-#include "../private/GrColor.h"
 
 /**
  * MaskedColor is used to evaluate the color and valid color component flags through the
diff --git a/tests/EncodeTest.cpp b/tests/EncodeTest.cpp
index 8d5db7ddcd..40e99565cb 100644
--- a/tests/EncodeTest.cpp
+++ b/tests/EncodeTest.cpp
@@ -9,7 +9,6 @@
 #include "Test.h"
 
 #include "SkBitmap.h"
-#include "SkColorPriv.h"
 #include "SkEncodedImageFormat.h"
 #include "SkImage.h"
 #include "SkJpegEncoder.h"