diff --git a/bench/RecordingBench.cpp b/bench/RecordingBench.cpp
index 303bf823ac..1050348f2e 100644
--- a/bench/RecordingBench.cpp
+++ b/bench/RecordingBench.cpp
@@ -6,9 +6,7 @@
  */
 
 #include "bench/RecordingBench.h"
-
 #include "include/core/SkBBHFactory.h"
-#include "include/core/SkData.h"
 #include "include/core/SkPictureRecorder.h"
 
 PictureCentricBench::PictureCentricBench(const char* name, const SkPicture* pic) : fName(name) {
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 28224dc9c9..de26f4c3a0 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -26,7 +26,6 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkData.h"
 #include "include/core/SkGraphics.h"
-#include "include/core/SkImageEncoder.h"
 #include "include/core/SkPictureRecorder.h"
 #include "include/core/SkString.h"
 #include "include/core/SkSurface.h"
diff --git a/fuzz/FuzzEncoders.cpp b/fuzz/FuzzEncoders.cpp
index ac65b4a4f7..01e3940da4 100644
--- a/fuzz/FuzzEncoders.cpp
+++ b/fuzz/FuzzEncoders.cpp
@@ -10,7 +10,6 @@
 #include "include/core/SkImage.h"
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkPixmap.h"
-#include "include/core/SkStream.h"
 #include "include/encode/SkJpegEncoder.h"
 #include "include/encode/SkPngEncoder.h"
 #include "include/encode/SkWebpEncoder.h"
diff --git a/fuzz/oss_fuzz/FuzzRegionDeserialize.cpp b/fuzz/oss_fuzz/FuzzRegionDeserialize.cpp
index 4b3610ecc1..bdbde040f3 100644
--- a/fuzz/oss_fuzz/FuzzRegionDeserialize.cpp
+++ b/fuzz/oss_fuzz/FuzzRegionDeserialize.cpp
@@ -7,7 +7,6 @@
 
 
 #include "include/core/SkCanvas.h"
-#include "include/core/SkData.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkSurface.h"
 #include "src/core/SkRegionPriv.h"
diff --git a/gm/lazytiling.cpp b/gm/lazytiling.cpp
index 63c559bfa4..44a703d6d9 100644
--- a/gm/lazytiling.cpp
+++ b/gm/lazytiling.cpp
@@ -6,13 +6,13 @@
  */
 
 #include "gm/gm.h"
-#include "include/core/SkBitmap.h"
 #include "include/core/SkCanvas.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkSize.h"
 #include "include/core/SkString.h"
 #include "include/gpu/GrDirectContext.h"
+
 #include "src/core/SkCanvasPriv.h"
 #include "src/core/SkConvertPixels.h"
 #include "src/gpu/GrDirectContextPriv.h"
@@ -22,6 +22,7 @@
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/v1/SurfaceDrawContext_v1.h"
+
 #include "tools/gpu/ProxyUtils.h"
 
 static GrSurfaceProxyView create_view(GrDirectContext* dContext,
diff --git a/gm/userfont.cpp b/gm/userfont.cpp
index 9e9942594e..b40410ea90 100644
--- a/gm/userfont.cpp
+++ b/gm/userfont.cpp
@@ -11,7 +11,6 @@
 #include "include/core/SkPaint.h"
 #include "include/core/SkPath.h"
 #include "include/core/SkSize.h"
-#include "include/core/SkStream.h"
 #include "include/core/SkString.h"
 #include "include/utils/SkCustomTypeface.h"
 #include "tools/Resources.h"
diff --git a/gm/yuv420_odd_dim.cpp b/gm/yuv420_odd_dim.cpp
index 3af7a042b4..f66bbfef12 100644
--- a/gm/yuv420_odd_dim.cpp
+++ b/gm/yuv420_odd_dim.cpp
@@ -11,7 +11,6 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkPixmap.h"
-#include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
 #include "include/encode/SkJpegEncoder.h"
 #include "include/gpu/GrRecordingContext.h"
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index d06d715f50..28d9d5c6f5 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -8,6 +8,7 @@
 #ifndef SkImage_DEFINED
 #define SkImage_DEFINED
 
+#include "include/core/SkImageEncoder.h"
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSamplingOptions.h"
@@ -27,27 +28,24 @@
 #include <android/hardware_buffer.h>
 #endif
 
-class GrBackendFormat;
-class GrBackendTexture;
-class GrContextThreadSafeProxy;
-class GrDirectContext;
-class GrRecordingContext;
-class GrYUVABackendTextureInfo;
-class GrYUVABackendTextures;
-class SkCanvas;
 class SkData;
+class SkCanvas;
 class SkImage;
 class SkImageFilter;
 class SkImageGenerator;
 class SkMipmap;
 class SkPaint;
 class SkPicture;
-class SkPixmap;
 class SkPromiseImageTexture;
 class SkSurface;
 class SkYUVAPixmaps;
-
-enum class SkEncodedImageFormat;
+class GrBackendFormat;
+class GrBackendTexture;
+class GrDirectContext;
+class GrRecordingContext;
+class GrContextThreadSafeProxy;
+class GrYUVABackendTextureInfo;
+class GrYUVABackendTextures;
 
 #if SK_GRAPHITE_ENABLED
 namespace skgpu {
diff --git a/modules/androidkit/src/Image.cpp b/modules/androidkit/src/Image.cpp
index 597f7e428c..9304ddc5af 100644
--- a/modules/androidkit/src/Image.cpp
+++ b/modules/androidkit/src/Image.cpp
@@ -7,11 +7,9 @@
 
 #include <jni.h>
 
-#include "include/core/SkData.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkM44.h"
 #include "include/core/SkTileMode.h"
-#include "include/private/SkTo.h"
 #include "modules/androidkit/src/Utils.h"
 
 namespace {
diff --git a/modules/skottie/tests/AudioLayer.cpp b/modules/skottie/tests/AudioLayer.cpp
index 36355bd70c..080f37bcf4 100644
--- a/modules/skottie/tests/AudioLayer.cpp
+++ b/modules/skottie/tests/AudioLayer.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "include/core/SkStream.h"
 #include "modules/skottie/include/Skottie.h"
+
 #include "tests/Test.h"
 
 using namespace skottie;
diff --git a/modules/skottie/tests/Expression.cpp b/modules/skottie/tests/Expression.cpp
index 35e8373843..8df1886d4d 100644
--- a/modules/skottie/tests/Expression.cpp
+++ b/modules/skottie/tests/Expression.cpp
@@ -6,7 +6,6 @@
  */
 
 #include <iostream>
-#include "include/core/SkStream.h"
 #include "modules/skottie/include/Skottie.h"
 #include "modules/skottie/include/SkottieProperty.h"
 #include "tests/Test.h"
diff --git a/modules/skottie/tests/Image.cpp b/modules/skottie/tests/Image.cpp
index 18abc5e744..8299d7ea59 100644
--- a/modules/skottie/tests/Image.cpp
+++ b/modules/skottie/tests/Image.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
 #include "modules/skottie/include/Skottie.h"
 #include "tests/Test.h"
diff --git a/platform_tools/android/apps/skottie/skottielib/src/main/cpp/native-lib.cpp b/platform_tools/android/apps/skottie/skottielib/src/main/cpp/native-lib.cpp
index 0fe2f2d983..9291e28ca1 100644
--- a/platform_tools/android/apps/skottie/skottielib/src/main/cpp/native-lib.cpp
+++ b/platform_tools/android/apps/skottie/skottielib/src/main/cpp/native-lib.cpp
@@ -9,7 +9,6 @@
 #include "include/core/SkBitmap.h"
 #include "include/core/SkCanvas.h"
 #include "include/core/SkColor.h"
-#include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
 #include "include/core/SkTime.h"
 #include <jni.h>
diff --git a/samplecode/Sample3D.cpp b/samplecode/Sample3D.cpp
index 03a8814581..7e958bc1b7 100644
--- a/samplecode/Sample3D.cpp
+++ b/samplecode/Sample3D.cpp
@@ -9,7 +9,6 @@
 #include "include/core/SkM44.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkRRect.h"
-#include "include/core/SkStream.h"
 #include "include/core/SkVertices.h"
 #include "include/utils/SkRandom.h"
 #include "samplecode/Sample.h"
diff --git a/src/core/SkGlyphRunPainter.cpp b/src/core/SkGlyphRunPainter.cpp
index 231f4aee6d..a1e1291da6 100644
--- a/src/core/SkGlyphRunPainter.cpp
+++ b/src/core/SkGlyphRunPainter.cpp
@@ -19,7 +19,6 @@
 #include "src/gpu/v1/SurfaceDrawContext_v1.h"
 #endif // SK_SUPPORT_GPU
 
-#include "include/core/SkBitmap.h"
 #include "include/core/SkColorFilter.h"
 #include "include/core/SkMaskFilter.h"
 #include "include/core/SkPathEffect.h"
diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index 30c9f69391..4ed0971527 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -9,14 +9,8 @@
 
 #if SK_GPU_V1
 
-#include "include/core/SkBitmap.h"
-#include "include/core/SkPaint.h"
 #include "include/gpu/GrDirectContext.h"
 #include "include/gpu/GrRecordingContext.h"
-#include "src/core/SkDraw.h"
-#include "src/core/SkMaskFilterBase.h"
-#include "src/core/SkMatrixProvider.h"
-#include "src/core/SkTLazy.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrFixedClip.h"
@@ -28,11 +22,17 @@
 #include "src/gpu/GrThreadSafeCache.h"
 #include "src/gpu/GrUtil.h"
 #include "src/gpu/SkGr.h"
-#include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 #include "src/gpu/v1/SurfaceDrawContext_v1.h"
 
+#include "include/core/SkPaint.h"
+#include "src/core/SkDraw.h"
+#include "src/core/SkMaskFilterBase.h"
+#include "src/core/SkMatrixProvider.h"
+#include "src/core/SkTLazy.h"
+#include "src/gpu/SkGr.h"
+
 static bool clip_bounds_quick_reject(const SkIRect& clipBounds, const SkIRect& rect) {
     return clipBounds.isEmpty() || rect.isEmpty() || !SkIRect::Intersects(clipBounds, rect);
 }
diff --git a/src/gpu/GrDirectContextPriv.cpp b/src/gpu/GrDirectContextPriv.cpp
index 04e3736026..163d250e56 100644
--- a/src/gpu/GrDirectContextPriv.cpp
+++ b/src/gpu/GrDirectContextPriv.cpp
@@ -7,7 +7,6 @@
 
 #include "src/gpu/GrDirectContextPriv.h"
 
-#include "include/core/SkBitmap.h"
 #include "include/gpu/GrContextThreadSafeProxy.h"
 #include "include/gpu/GrDirectContext.h"
 #include "src/core/SkRuntimeEffectPriv.h"
diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp
index b8a901bc1f..3501789ecf 100644
--- a/src/gpu/GrSWMaskHelper.cpp
+++ b/src/gpu/GrSWMaskHelper.cpp
@@ -7,7 +7,6 @@
 
 #include "src/gpu/GrSWMaskHelper.h"
 
-#include "include/core/SkBitmap.h"
 #include "include/gpu/GrRecordingContext.h"
 #include "src/core/SkMatrixProvider.h"
 #include "src/gpu/GrCaps.h"
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index 064591d913..dc37d9398b 100644
--- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -6,7 +6,6 @@
  */
 #include "src/gpu/effects/GrMatrixConvolutionEffect.h"
 
-#include "include/core/SkBitmap.h"
 #include "include/private/SkHalf.h"
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrProxyProvider.h"
diff --git a/src/gpu/ops/ShadowRRectOp.cpp b/src/gpu/ops/ShadowRRectOp.cpp
index 92dc53a66b..f0ce9c0bd0 100644
--- a/src/gpu/ops/ShadowRRectOp.cpp
+++ b/src/gpu/ops/ShadowRRectOp.cpp
@@ -7,7 +7,6 @@
 
 #include "src/gpu/ops/ShadowRRectOp.h"
 
-#include "include/core/SkBitmap.h"
 #include "include/gpu/GrRecordingContext.h"
 #include "src/core/SkRRectPriv.h"
 #include "src/gpu/GrMemoryPool.h"
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index 08afce0e7f..3d3ad0f107 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -8,7 +8,6 @@
 #ifndef SkImage_Base_DEFINED
 #define SkImage_Base_DEFINED
 
-#include "include/core/SkData.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkSurface.h"
 #include "src/core/SkMipmap.h"
diff --git a/src/image/SkImage_GpuYUVA.cpp b/src/image/SkImage_GpuYUVA.cpp
index 871c82c1a4..4a49e57e4d 100644
--- a/src/image/SkImage_GpuYUVA.cpp
+++ b/src/image/SkImage_GpuYUVA.cpp
@@ -9,7 +9,6 @@
 #include <cstring>
 #include <type_traits>
 
-#include "include/core/SkBitmap.h"
 #include "include/core/SkYUVAPixmaps.h"
 #include "include/gpu/GrDirectContext.h"
 #include "include/gpu/GrRecordingContext.h"
diff --git a/src/pdf/SkPDFBitmap.cpp b/src/pdf/SkPDFBitmap.cpp
index a2de621cf3..2d5e77b8a9 100644
--- a/src/pdf/SkPDFBitmap.cpp
+++ b/src/pdf/SkPDFBitmap.cpp
@@ -9,7 +9,6 @@
 
 #include "include/core/SkBitmap.h"
 #include "include/core/SkData.h"
-#include "include/core/SkEncodedImageFormat.h"
 #include "include/core/SkExecutor.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkStream.h"
diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp
index 8101dc800a..55948779c6 100644
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@@ -14,7 +14,6 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRegion.h"
 #include "include/core/SkScalar.h"
-#include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkTDArray.h"
diff --git a/tests/DMSAATest.cpp b/tests/DMSAATest.cpp
index f57ce21749..0533c4691e 100644
--- a/tests/DMSAATest.cpp
+++ b/tests/DMSAATest.cpp
@@ -7,7 +7,6 @@
 
 #include "tests/Test.h"
 
-#include "include/core/SkBitmap.h"
 #include "include/core/SkVertices.h"
 #include "src/core/SkBlendModePriv.h"
 #include "src/core/SkMatrixProvider.h"
diff --git a/tests/EncodeTest.cpp b/tests/EncodeTest.cpp
index d2bec213a8..c5f7937c64 100644
--- a/tests/EncodeTest.cpp
+++ b/tests/EncodeTest.cpp
@@ -13,7 +13,6 @@
 #include "include/core/SkColorPriv.h"
 #include "include/core/SkEncodedImageFormat.h"
 #include "include/core/SkImage.h"
-#include "include/core/SkImageEncoder.h"
 #include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
 #include "include/encode/SkJpegEncoder.h"
diff --git a/tests/FontMgrAndroidParserTest.cpp b/tests/FontMgrAndroidParserTest.cpp
index 149c175dbb..df358b7df6 100644
--- a/tests/FontMgrAndroidParserTest.cpp
+++ b/tests/FontMgrAndroidParserTest.cpp
@@ -10,7 +10,6 @@
 #include "include/core/SkBitmap.h"
 #include "include/core/SkCanvas.h"
 #include "include/core/SkFont.h"
-#include "include/core/SkStream.h"
 #include "include/core/SkTypeface.h"
 #include "include/ports/SkFontMgr_android.h"
 #include "include/private/SkFixed.h"
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index 241f4f930c..64894a91ef 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "include/core/SkBitmap.h"
 #include "include/core/SkCanvas.h"
 #include "include/core/SkColorPriv.h"
 #include "include/core/SkImage.h"
diff --git a/tests/SkRuntimeEffectTest.cpp b/tests/SkRuntimeEffectTest.cpp
index 839683e0bd..ba38f38625 100644
--- a/tests/SkRuntimeEffectTest.cpp
+++ b/tests/SkRuntimeEffectTest.cpp
@@ -11,7 +11,6 @@
 #include "include/core/SkColorFilter.h"
 #include "include/core/SkData.h"
 #include "include/core/SkPaint.h"
-#include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
 #include "include/effects/SkBlenders.h"
 #include "include/effects/SkRuntimeEffect.h"
diff --git a/tests/SkSLInterpreterTest.cpp b/tests/SkSLInterpreterTest.cpp
index e69ac914dc..2bb832746f 100644
--- a/tests/SkSLInterpreterTest.cpp
+++ b/tests/SkSLInterpreterTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "include/core/SkM44.h"
-#include "include/core/SkStream.h"
 #include "src/sksl/SkSLCompiler.h"
 #include "src/sksl/codegen/SkSLVMCodeGenerator.h"
 #include "src/sksl/ir/SkSLExternalFunction.h"
diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp
index 6d7b17e18d..08ac867962 100644
--- a/tests/TestUtils.cpp
+++ b/tests/TestUtils.cpp
@@ -7,7 +7,6 @@
 
 #include "tests/TestUtils.h"
 
-#include "include/core/SkStream.h"
 #include "include/encode/SkPngEncoder.h"
 #include "include/utils/SkBase64.h"
 #include "src/core/SkAutoPixmapStorage.h"
diff --git a/tools/Resources.h b/tools/Resources.h
index 0ab7fdf23c..81bdd1bdb0 100644
--- a/tools/Resources.h
+++ b/tools/Resources.h
@@ -8,8 +8,6 @@
 #ifndef Resources_DEFINED
 #define Resources_DEFINED
 
-#include "include/core/SkBitmap.h"
-#include "include/core/SkData.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkString.h"
 
diff --git a/tools/SkSharingProc.cpp b/tools/SkSharingProc.cpp
index 41bd4d6e25..67d824131b 100644
--- a/tools/SkSharingProc.cpp
+++ b/tools/SkSharingProc.cpp
@@ -11,7 +11,6 @@
 #include "include/core/SkData.h"
 #include "include/core/SkImage.h"
 #include "include/core/SkSerialProcs.h"
-#include "include/core/SkStream.h"
 
 namespace {
     sk_sp<SkData> collectNonTextureImagesProc(SkImage* img, void* ctx) {
diff --git a/tools/skottie_ios_app/SkiaUIContext.mm b/tools/skottie_ios_app/SkiaUIContext.mm
index a82eef9969..529f32f593 100644
--- a/tools/skottie_ios_app/SkiaUIContext.mm
+++ b/tools/skottie_ios_app/SkiaUIContext.mm
@@ -3,9 +3,7 @@
 
 #include "tools/skottie_ios_app/SkiaContext.h"
 
-#include "include/core/SkBitmap.h"
 #include "include/core/SkCanvas.h"
-#include "include/core/SkSize.h"
 #include "include/core/SkTime.h"
 #include "include/utils/mac/SkCGUtils.h"
 
diff --git a/tools/skqp/src/skqp.cpp b/tools/skqp/src/skqp.cpp
index 634127fef8..182d114fdb 100644
--- a/tools/skqp/src/skqp.cpp
+++ b/tools/skqp/src/skqp.cpp
@@ -8,7 +8,6 @@
 #include "tools/skqp/src/skqp.h"
 
 #include "gm/gm.h"
-#include "include/core/SkBitmap.h"
 #include "include/core/SkFontStyle.h"
 #include "include/core/SkGraphics.h"
 #include "include/core/SkStream.h"
diff --git a/tools/viewer/SkSLDebuggerSlide.cpp b/tools/viewer/SkSLDebuggerSlide.cpp
index 4b2183b88f..1979b451d1 100644
--- a/tools/viewer/SkSLDebuggerSlide.cpp
+++ b/tools/viewer/SkSLDebuggerSlide.cpp
@@ -8,7 +8,6 @@
 #include "tools/viewer/SkSLDebuggerSlide.h"
 
 #include "include/core/SkCanvas.h"
-#include "include/core/SkStream.h"
 #include "tools/viewer/Viewer.h"
 
 #include <algorithm>
diff --git a/tools/viewer/SkSLSlide.cpp b/tools/viewer/SkSLSlide.cpp
index 6eeedad884..b5d8828873 100644
--- a/tools/viewer/SkSLSlide.cpp
+++ b/tools/viewer/SkSLSlide.cpp
@@ -9,7 +9,6 @@
 
 #include "include/core/SkCanvas.h"
 #include "include/core/SkFont.h"
-#include "include/core/SkStream.h"
 #include "include/effects/SkGradientShader.h"
 #include "include/effects/SkPerlinNoiseShader.h"
 #include "include/sksl/SkSLDebugTrace.h"