10 files changed, 39 insertions, 15 deletions
diff --git a/include/core/SkAnnotation.h b/include/core/SkAnnotation.h
index d7b9b84529..62c844a3ca 100644
--- a/include/core/SkAnnotation.h
+++ b/include/core/SkAnnotation.h
@@ -10,12 +10,11 @@
 
 #include "SkRefCnt.h"
 #include "SkString.h"
+#include "SkTypes.h"
 
 class SkData;
 class SkReadBuffer;
 class SkWriteBuffer;
-class SkStream;
-class SkWStream;
 struct SkPoint;
 
 /**
diff --git a/include/core/SkBBHFactory.h b/include/core/SkBBHFactory.h
index f0c49f1f4f..ca7040409d 100644
--- a/include/core/SkBBHFactory.h
+++ b/include/core/SkBBHFactory.h
@@ -8,9 +8,9 @@
 #ifndef SkBBHFactory_DEFINED
 #define SkBBHFactory_DEFINED
 
-#include "SkRect.h"
-
+#include "SkTypes.h"
 class SkBBoxHierarchy;
+struct SkRect;
 
 class SK_API SkBBHFactory {
 public:
diff --git a/include/core/SkBitmapDevice.h b/include/core/SkBitmapDevice.h
index ae637f92b0..d1cb9ad0f8 100644
--- a/include/core/SkBitmapDevice.h
+++ b/include/core/SkBitmapDevice.h
@@ -9,7 +9,28 @@
 #ifndef SkBitmapDevice_DEFINED
 #define SkBitmapDevice_DEFINED
 
+#include "SkBitmap.h"
+#include "SkCanvas.h"
+#include "SkColor.h"
 #include "SkDevice.h"
+#include "SkImageFilter.h"
+#include "SkImageInfo.h"
+#include "SkRect.h"
+#include "SkScalar.h"
+#include "SkSize.h"
+#include "SkSurfaceProps.h"
+#include "SkTypes.h"
+
+class SkDraw;
+class SkMatrix;
+class SkPaint;
+class SkPath;
+class SkPixelRef;
+class SkPixmap;
+class SkRRect;
+class SkSurface;
+class SkXfermode;
+struct SkPoint;
 
 ///////////////////////////////////////////////////////////////////////////////
 class SK_API SkBitmapDevice : public SkBaseDevice {
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 45f5c9cbd3..bc39ec2850 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -11,31 +11,31 @@
 #include "SkTypes.h"
 #include "SkBitmap.h"
 #include "SkDeque.h"
-#include "SkClipStack.h"
 #include "SkPaint.h"
 #include "SkRefCnt.h"
-#include "SkPath.h"
 #include "SkRegion.h"
 #include "SkSurfaceProps.h"
 #include "SkXfermode.h"
 
+class GrContext;
+class GrRenderTarget;
 class SkBaseDevice;
 class SkCanvasClipVisitor;
+class SkClipStack;
 class SkDraw;
 class SkDrawable;
 class SkDrawFilter;
 class SkImage;
+class SkImageFilter;
 class SkMetaData;
+class SkPath;
 class SkPicture;
+class SkPixmap;
 class SkRRect;
 struct SkRSXform;
 class SkSurface;
 class SkSurface_Base;
 class SkTextBlob;
-class GrContext;
-class GrRenderTarget;
-
-class SkCanvasState;
 
 /** \class SkCanvas
 
diff --git a/include/core/SkColor.h b/include/core/SkColor.h
index 4c1f9ff45f..1ba1331c1a 100644
--- a/include/core/SkColor.h
+++ b/include/core/SkColor.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkColor_DEFINED
 #define SkColor_DEFINED
 
 #include "SkScalar.h"
+#include "SkTypes.h"
 
 /** \file SkColor.h
 
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h
index 729eb4603d..df006ed140 100644
--- a/include/core/SkColorFilter.h
+++ b/include/core/SkColorFilter.h
@@ -13,10 +13,10 @@
 #include "SkTDArray.h"
 #include "SkXfermode.h"
 
-class SkBitmap;
-class GrProcessor;
 class GrContext;
+class GrFragmentProcessor;
 class GrProcessorDataManager;
+class SkBitmap;
 
 /**
  *  ColorFilters are optional objects in the drawing pipeline. When present in
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h
index 461f4248fa..3715b1d615 100644
--- a/include/core/SkDevice.h
+++ b/include/core/SkDevice.h
@@ -9,12 +9,12 @@
 #define SkDevice_DEFINED
 
 #include "SkRefCnt.h"
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkImageFilter.h"
 #include "SkSurfaceProps.h"
 
+class SkBitmap;
 class SkClipStack;
 class SkDraw;
 class SkDrawFilter;
diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h
index 6f3e2d1fc7..8ff1f06921 100644
--- a/include/core/SkPostConfig.h
+++ b/include/core/SkPostConfig.h
@@ -5,6 +5,8 @@
  * found in the LICENSE file.
  */
 
+// IWYU pragma: private, include "SkTypes.h"
+
 #ifndef SkPostConfig_DEFINED
 #define SkPostConfig_DEFINED
 
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h
index b590825957..0715fc9ac6 100644
--- a/include/core/SkPreConfig.h
+++ b/include/core/SkPreConfig.h
@@ -5,6 +5,8 @@
  * found in the LICENSE file.
  */
 
+// IWYU pragma: private, include "SkTypes.h"
+
 #ifndef SkPreConfig_DEFINED
 #define SkPreConfig_DEFINED
 
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 1a165a148a..2e495117d8 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -145,6 +145,7 @@ inline void operator delete(void* p) {
     #define SK_TO_STRING_PUREVIRT()
     #define SK_TO_STRING_OVERRIDE()
 #else
+    class SkString;
     // the 'toString' helper functions convert Sk* objects to human-readable
     // form in developer mode
     #define SK_TO_STRING_NONVIRT() void toString(SkString* str) const;