8 files changed, 64 insertions, 17 deletions
diff --git a/tests/BadIcoTest.cpp b/tests/BadIcoTest.cpp
index 21343a2a5c..e549b86b0b 100644
--- a/tests/BadIcoTest.cpp
+++ b/tests/BadIcoTest.cpp
@@ -6,13 +6,16 @@
  */
 
 #include "Resources.h"
-#include "Test.h"
-
 #include "SkBitmap.h"
 #include "SkCodec.h"
-#include "SkOSFile.h"
 #include "SkOSPath.h"
 #include "SkStream.h"
+#include "SkString.h"
+#include "SkTypes.h"
+#include "Test.h"
+
+#include <memory>
+#include <utility>
 
 DEF_TEST(BadImage, reporter) {
     const char* const badImages [] = {
diff --git a/tests/BitSetTest.cpp b/tests/BitSetTest.cpp
index 6fc8351b3c..e055fbc33c 100644
--- a/tests/BitSetTest.cpp
+++ b/tests/BitSetTest.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "SkBitSet.h"
+#include "SkTDArray.h"
 #include "Test.h"
 
 DEF_TEST(BitSet, reporter) {
diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index 09e44ceb16..b1b079c531 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -6,8 +6,14 @@
  */
 
 #include "SkBitmap.h"
+#include "SkColor.h"
+#include "SkColorSpace.h"
+#include "SkImageInfo.h"
+#include "SkPoint.h"
 #include "SkRect.h"
-#include "SkTemplates.h"
+#include "SkRefCnt.h"
+#include "SkSize.h"
+#include "SkTypes.h"
 #include "Test.h"
 #include "sk_tool_utils.h"
 
diff --git a/tests/BitmapGetColorTest.cpp b/tests/BitmapGetColorTest.cpp
index bf3ba67ecb..89c8ecbe4c 100644
--- a/tests/BitmapGetColorTest.cpp
+++ b/tests/BitmapGetColorTest.cpp
@@ -6,8 +6,10 @@
  */
 
 #include "SkBitmap.h"
-#include "SkRandom.h"
+#include "SkColor.h"
+#include "SkImageInfo.h"
 #include "SkRect.h"
+#include "SkTypes.h"
 #include "Test.h"
 
 DEF_TEST(GetColor, reporter) {
diff --git a/tests/BitmapTest.cpp b/tests/BitmapTest.cpp
index b4049387ff..439136df2d 100644
--- a/tests/BitmapTest.cpp
+++ b/tests/BitmapTest.cpp
@@ -6,8 +6,14 @@
  */
 
 #include "SkBitmap.h"
+#include "SkColor.h"
+#include "SkImageInfo.h"
 #include "SkMallocPixelRef.h"
+#include "SkPixelRef.h"
+#include "SkPixmap.h"
 #include "SkRandom.h"
+#include "SkRefCnt.h"
+#include "SkTypes.h"
 #include "Test.h"
 #include "sk_tool_utils.h"
 
diff --git a/tests/BlendTest.cpp b/tests/BlendTest.cpp
index 5332b10149..5b2f6faa14 100644
--- a/tests/BlendTest.cpp
+++ b/tests/BlendTest.cpp
@@ -5,26 +5,32 @@
  * found in the LICENSE file.
  */
 
-#include <functional>
 #include "SkBitmap.h"
+#include "SkBlendMode.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
-#include "SkColorPriv.h"
+#include "SkColorSpace.h"
+#include "SkImageInfo.h"
+#include "SkPaint.h"
+#include "SkPoint.h"
+#include "SkRect.h"
+#include "SkRefCnt.h"
 #include "SkSurface.h"
-#include "SkTaskGroup.h"
-#include "SkUtils.h"
+#include "SkTypes.h"
 #include "Test.h"
 
 #if SK_SUPPORT_GPU
+#include "GrBackendSurface.h"
 #include "GrContext.h"
+#include "GrContextFactory.h"
 #include "GrContextPriv.h"
 #include "GrResourceProvider.h"
-#include "GrSurfaceContext.h"
-#include "GrSurfaceProxy.h"
-#include "GrTest.h"
 #include "GrTexture.h"
+#include "GrTypes.h"
 #endif
 
+#include <vector>
+
 struct Results { int diffs, diffs_0x00, diffs_0xff, diffs_by_1; };
 
 static bool acceptable(const Results& r) {
diff --git a/tests/BlitMaskClip.cpp b/tests/BlitMaskClip.cpp
index 21fe562368..240a0cf23f 100644
--- a/tests/BlitMaskClip.cpp
+++ b/tests/BlitMaskClip.cpp
@@ -6,8 +6,12 @@
  */
 
 #include "SkBlitter.h"
+#include "SkColor.h"
 #include "SkMask.h"
+#include "SkRect.h"
+#include "SkTypes.h"
 #include "Test.h"
+
 #include <string.h>
 
 class TestBlitter : public SkBlitter {
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp
index b84fb4ca14..31872a09fa 100644
--- a/tests/BlurTest.cpp
+++ b/tests/BlurTest.cpp
@@ -5,28 +5,49 @@
  * found in the LICENSE file.
  */
 
+#include "SkBitmap.h"
+#include "SkBlendMode.h"
+#include "SkBlurDrawLooper.h"
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
-#include "SkBlurDrawLooper.h"
 #include "SkBlurPriv.h"
+#include "SkBlurTypes.h"
 #include "SkCanvas.h"
-#include "SkColorFilter.h"
+#include "SkColor.h"
 #include "SkColorPriv.h"
+#include "SkDrawLooper.h"
 #include "SkEmbossMaskFilter.h"
+#include "SkFloatBits.h"
+#include "SkImageInfo.h"
 #include "SkLayerDrawLooper.h"
+#include "SkMask.h"
+#include "SkMaskFilter.h"
 #include "SkMaskFilterBase.h"
 #include "SkMath.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkPerlinNoiseShader.h"
+#include "SkPixmap.h"
+#include "SkPoint.h"
+#include "SkRRect.h"
+#include "SkRect.h"
+#include "SkRefCnt.h"
+#include "SkScalar.h"
+#include "SkShader.h"
+#include "SkSize.h"
 #include "SkSurface.h"
+#include "SkTypes.h"
 #include "Test.h"
+#include "sk_pixel_iter.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContextFactory.h"
-#include "SkGpuDevice.h"
 #endif
 
+#include <math.h>
+#include <string.h>
+#include <utility>
+
 #define WRITE_CSV 0
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -672,8 +693,6 @@ DEF_TEST(EmbossPerlinCrash, reporter) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
-#include "SkSurface.h"
-#include "sk_pixel_iter.h"
 
 DEF_TEST(BlurZeroSigma, reporter) {
     auto surf = SkSurface::MakeRasterN32Premul(20, 20);