diff --git a/bench/ColorSpaceXformBench.cpp b/bench/ColorSpaceXformBench.cpp
index 7bddac6..c877ff9 100644
--- a/bench/ColorSpaceXformBench.cpp
+++ b/bench/ColorSpaceXformBench.cpp
@@ -11,7 +11,7 @@
 #include "SkColorSpaceXformer.h"
 #include "SkColorSpaceXformSteps.h"
 #include "SkMakeUnique.h"
-#include "SkPM4fPriv.h"
+#include "SkPM4f.h"
 #include "SkRandom.h"
 #include "SkRasterPipeline.h"
 
diff --git a/dm/DM.cpp b/dm/DM.cpp
index cf210ab..e8e77a9 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -32,7 +32,6 @@
 #include "SkMutex.h"
 #include "SkOSFile.h"
 #include "SkOSPath.h"
-#include "SkPM4fPriv.h"
 #include "SkPngEncoder.h"
 #include "SkScan.h"
 #include "SkSpinlock.h"
diff --git a/gm/gamma.cpp b/gm/gamma.cpp
index afb1c2b..c1afc69 100644
--- a/gm/gamma.cpp
+++ b/gm/gamma.cpp
@@ -11,7 +11,6 @@
 #include "Resources.h"
 #include "SkBlendModePriv.h"
 #include "SkGradientShader.h"
-#include "SkPM4fPriv.h"
 
 DEF_SIMPLE_GM(gamma, canvas, 850, 200) {
     SkPaint p;
diff --git a/gm/gamut.cpp b/gm/gamut.cpp
index 1e109a9..947bb3d 100644
--- a/gm/gamut.cpp
+++ b/gm/gamut.cpp
@@ -10,7 +10,6 @@
 
 #include "SkGradientShader.h"
 #include "SkImagePriv.h"
-#include "SkPM4fPriv.h"
 #include "SkSurface.h"
 #include "SkVertices.h"
 
diff --git a/gm/tosrgb_colorfilter.cpp b/gm/tosrgb_colorfilter.cpp
index d4485b8..3835142 100644
--- a/gm/tosrgb_colorfilter.cpp
+++ b/gm/tosrgb_colorfilter.cpp
@@ -7,7 +7,7 @@
 
 #include "gm.h"
 
-#include "SkPM4fPriv.h"
+#include "SkColorPriv.h"
 #include "SkToSRGBColorFilter.h"
 
 DEF_SIMPLE_GM_BG(tosrgb_colorfilter, canvas, 130, 130, SK_ColorBLACK) {
diff --git a/src/core/SkBlitter_Sprite.cpp b/src/core/SkBlitter_Sprite.cpp
index 0fdb5e1..fe8bcaa 100644
--- a/src/core/SkBlitter_Sprite.cpp
+++ b/src/core/SkBlitter_Sprite.cpp
@@ -11,7 +11,6 @@
 #include "SkColorSpaceXformSteps.h"
 #include "SkCoreBlitters.h"
 #include "SkOpts.h"
-#include "SkPM4fPriv.h"
 #include "SkRasterPipeline.h"
 #include "SkSpriteBlitter.h"
 #include "../jumper/SkJumper.h"
diff --git a/src/core/SkColor.cpp b/src/core/SkColor.cpp
index ffbecd6..7977867 100644
--- a/src/core/SkColor.cpp
+++ b/src/core/SkColor.cpp
@@ -104,8 +104,9 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "SkPM4fPriv.h"
+
 #include "SkHalf.h"
+#include "SkPM4f.h"
 
 SkPM4f SkPM4f::FromPMColor(SkPMColor c) {
     return From4f(swizzle_rb_if_bgra(Sk4f_fromL32(c)));
diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp
index 2307b7b..dcf8238 100644
--- a/src/core/SkColorMatrixFilterRowMajor255.cpp
+++ b/src/core/SkColorMatrixFilterRowMajor255.cpp
@@ -8,7 +8,6 @@
 #include "SkColorMatrixFilterRowMajor255.h"
 #include "SkColorData.h"
 #include "SkNx.h"
-#include "SkPM4fPriv.h"
 #include "SkRasterPipeline.h"
 #include "SkReadBuffer.h"
 #include "SkRefCnt.h"
diff --git a/src/core/SkConvertPixels.cpp b/src/core/SkConvertPixels.cpp
index b613a8b..a8a5c0e 100644
--- a/src/core/SkConvertPixels.cpp
+++ b/src/core/SkConvertPixels.cpp
@@ -5,12 +5,13 @@
  * found in the LICENSE file.
  */
 
+#include "SkColorData.h"
 #include "SkColorSpacePriv.h"
+#include "SkColorSpaceXformSteps.h"
 #include "SkConvertPixels.h"
 #include "SkHalf.h"
 #include "SkImageInfoPriv.h"
 #include "SkOpts.h"
-#include "SkPM4fPriv.h"
 #include "SkRasterPipeline.h"
 #include "SkUnPreMultiply.h"
 #include "SkUnPreMultiplyPriv.h"
diff --git a/src/core/SkMipMap.cpp b/src/core/SkMipMap.cpp
index 7dbe319..4231f62 100644
--- a/src/core/SkMipMap.cpp
+++ b/src/core/SkMipMap.cpp
@@ -13,7 +13,6 @@
 #include "SkImageInfoPriv.h"
 #include "SkMathPriv.h"
 #include "SkNx.h"
-#include "SkPM4fPriv.h"
 #include "SkTo.h"
 #include "SkTypes.h"
 #include <new>
diff --git a/src/effects/SkToSRGBColorFilter.cpp b/src/effects/SkToSRGBColorFilter.cpp
index 4b5558d..510db12 100644
--- a/src/effects/SkToSRGBColorFilter.cpp
+++ b/src/effects/SkToSRGBColorFilter.cpp
@@ -7,7 +7,6 @@
 
 #include "SkColorSpacePriv.h"
 #include "SkColorSpaceXformSteps.h"
-#include "SkPM4fPriv.h"
 #include "SkRasterPipeline.h"
 #include "SkReadBuffer.h"
 #include "SkString.h"
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 358a932..23d92b5 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -28,7 +28,6 @@
 #include "SkMaskFilterBase.h"
 #include "SkMessageBus.h"
 #include "SkMipMap.h"
-#include "SkPM4fPriv.h"
 #include "SkPaintPriv.h"
 #include "SkPixelRef.h"
 #include "SkResourceCache.h"
diff --git a/src/gpu/gradients/GrGradientBitmapCache.cpp b/src/gpu/gradients/GrGradientBitmapCache.cpp
index dd4e842..9caa081 100644
--- a/src/gpu/gradients/GrGradientBitmapCache.cpp
+++ b/src/gpu/gradients/GrGradientBitmapCache.cpp
@@ -11,7 +11,7 @@
 #include "SkMalloc.h"
 #include "SkFloatBits.h"
 #include "SkHalf.h"
-#include "SkPM4fPriv.h"
+#include "SkPM4f.h"
 #include "SkTemplates.h"
 
 #include <functional>
diff --git a/src/shaders/SkBitmapProcShader.cpp b/src/shaders/SkBitmapProcShader.cpp
index adb6750..402fa2f 100644
--- a/src/shaders/SkBitmapProcShader.cpp
+++ b/src/shaders/SkBitmapProcShader.cpp
@@ -10,7 +10,6 @@
 #include "SkArenaAlloc.h"
 #include "SkBitmapProcState.h"
 #include "SkBitmapProvider.h"
-#include "SkPM4fPriv.h"
 #include "SkXfermodePriv.h"
 
 static bool only_scale_and_translate(const SkMatrix& matrix) {
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index 632302d..39c5757 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -14,7 +14,6 @@
 #include "SkEmptyShader.h"
 #include "SkImage_Base.h"
 #include "SkImageShader.h"
-#include "SkPM4fPriv.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "../jumper/SkJumper.h"
diff --git a/src/shaders/SkShader.cpp b/src/shaders/SkShader.cpp
index b3b2c9a..0f190a9 100644
--- a/src/shaders/SkShader.cpp
+++ b/src/shaders/SkShader.cpp
@@ -15,7 +15,6 @@
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkPictureShader.h"
-#include "SkPM4fPriv.h"
 #include "SkRasterPipeline.h"
 #include "SkReadBuffer.h"
 #include "SkScalar.h"
diff --git a/src/shaders/gradients/Sk4fGradientPriv.h b/src/shaders/gradients/Sk4fGradientPriv.h
index 2a654ba..f0c475b 100644
--- a/src/shaders/gradients/Sk4fGradientPriv.h
+++ b/src/shaders/gradients/Sk4fGradientPriv.h
@@ -13,7 +13,6 @@
 #include "SkImageInfo.h"
 #include "SkNx.h"
 #include "SkPM4f.h"
-#include "SkPM4fPriv.h"
 #include "SkUtils.h"
 
 // Templates shared by various 4f gradient flavors.
diff --git a/src/shaders/gradients/SkGradientShaderPriv.h b/src/shaders/gradients/SkGradientShaderPriv.h
index c9efe50..8f0785a 100644
--- a/src/shaders/gradients/SkGradientShaderPriv.h
+++ b/src/shaders/gradients/SkGradientShaderPriv.h
@@ -12,7 +12,7 @@
 
 #include "SkArenaAlloc.h"
 #include "SkMatrix.h"
-#include "SkPM4fPriv.h"
+#include "SkPM4f.h"
 #include "SkShaderBase.h"
 #include "SkTArray.h"
 #include "SkTemplates.h"
diff --git a/src/shaders/gradients/SkSweepGradient.cpp b/src/shaders/gradients/SkSweepGradient.cpp
index d36c5ba..d3f1c86 100644
--- a/src/shaders/gradients/SkSweepGradient.cpp
+++ b/src/shaders/gradients/SkSweepGradient.cpp
@@ -7,7 +7,6 @@
 
 #include "SkColorSpaceXformer.h"
 #include "SkFloatingPoint.h"
-#include "SkPM4fPriv.h"
 #include "SkRasterPipeline.h"
 #include "SkReadBuffer.h"
 #include "SkSweepGradient.h"
diff --git a/tools/skiaserve/Request.cpp b/tools/skiaserve/Request.cpp
index 70b4457..982bd36 100644
--- a/tools/skiaserve/Request.cpp
+++ b/tools/skiaserve/Request.cpp
@@ -8,7 +8,6 @@
 #include "Request.h"
 
 #include "SkPictureRecorder.h"
-#include "SkPM4fPriv.h"
 #include "sk_tool_utils.h"
 
 using namespace sk_gpu_test;