header cleanup

Change-Id: I3f7667a1357194ae2bdd341ad9d46eb93920f404
Reviewed-on: https://skia-review.googlesource.com/21374
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/src/codec/SkFrameHolder.h b/src/codec/SkFrameHolder.h
index 0f30b65..29539ff 100644
--- a/src/codec/SkFrameHolder.h
+++ b/src/codec/SkFrameHolder.h
@@ -11,6 +11,7 @@
 #include "SkTypes.h"
 #include "SkCodecAnimation.h"
 #include "SkCodecAnimationPriv.h"
+#include "SkRect.h"
 
 /**
  *  Base class for a single frame of an animated image.
diff --git a/src/core/SkDrawShadowRec.h b/src/core/SkDrawShadowRec.h
index 62f1460..cc55804 100644
--- a/src/core/SkDrawShadowRec.h
+++ b/src/core/SkDrawShadowRec.h
@@ -8,7 +8,9 @@
 #ifndef SkDrawShadowRec_DEFINED
 #define SkDrawShadowRec_DEFINED
 
+#include "SkColor.h"
 #include "SkPath.h"
+#include "SkPoint3.h"
 
 struct SkDrawShadowRec {
     SkPoint3    fZPlaneParams;
diff --git a/src/core/SkICCPriv.h b/src/core/SkICCPriv.h
index eb5c13d..0b2f33b 100644
--- a/src/core/SkICCPriv.h
+++ b/src/core/SkICCPriv.h
@@ -8,6 +8,7 @@
 #ifndef SkICCPriv_DEFINED
 #define SkICCPriv_DEFINED
 
+#include "SkColorSpace.h"
 #include "SkTypes.h"
 
 // This is equal to the header size according to the ICC specification (128)
diff --git a/src/gpu/GrMesh.h b/src/gpu/GrMesh.h
index feced48..bdb62f5 100644
--- a/src/gpu/GrMesh.h
+++ b/src/gpu/GrMesh.h
@@ -9,6 +9,7 @@
 #define GrMesh_DEFINED
 
 #include "GrBuffer.h"
+#include "GrGpuResourceRef.h"
 
 class GrPrimitiveProcessor;
 
diff --git a/src/gpu/gl/GrGLGpuCommandBuffer.h b/src/gpu/gl/GrGLGpuCommandBuffer.h
index 324b4d0..c67aeaf 100644
--- a/src/gpu/gl/GrGLGpuCommandBuffer.h
+++ b/src/gpu/gl/GrGLGpuCommandBuffer.h
@@ -10,6 +10,8 @@
 
 #include "GrGpuCommandBuffer.h"
 
+#include "GrGLGpu.h"
+#include "GrGLRenderTarget.h"
 #include "GrOpFlushState.h"
 
 class GrGLGpu;
diff --git a/src/gpu/mock/GrMockGpu.h b/src/gpu/mock/GrMockGpu.h
index eb0a74a..e5d97ce 100644
--- a/src/gpu/mock/GrMockGpu.h
+++ b/src/gpu/mock/GrMockGpu.h
@@ -4,9 +4,13 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#ifndef GrMockGpu_DEFINED
+#define GrMockGpu_DEFINED
 
+#include "GrCaps.h"
 #include "GrGpu.h"
 #include "GrSemaphore.h"
+#include "GrTexture.h"
 
 class GrPipeline;
 
@@ -152,3 +156,4 @@
 
     typedef GrGpu INHERITED;
 };
+#endif  // GrMockGpu_DEFINED
diff --git a/src/gpu/ops/GrClearStencilClipOp.h b/src/gpu/ops/GrClearStencilClipOp.h
index 4218146..87a2b4d 100644
--- a/src/gpu/ops/GrClearStencilClipOp.h
+++ b/src/gpu/ops/GrClearStencilClipOp.h
@@ -12,6 +12,7 @@
 #include "GrGpuCommandBuffer.h"
 #include "GrOp.h"
 #include "GrOpFlushState.h"
+#include "GrRenderTargetProxy.h"
 
 class GrClearStencilClipOp final : public GrOp {
 public:
diff --git a/src/gpu/ops/GrDiscardOp.h b/src/gpu/ops/GrDiscardOp.h
index 0d14036..822f818 100644
--- a/src/gpu/ops/GrDiscardOp.h
+++ b/src/gpu/ops/GrDiscardOp.h
@@ -8,6 +8,7 @@
 #ifndef GrDiscardOp_DEFINED
 #define GrDiscardOp_DEFINED
 
+#include "GrGpuCommandBuffer.h"
 #include "GrOp.h"
 #include "GrOpFlushState.h"
 #include "GrRenderTargetProxy.h"
diff --git a/src/opts/SkUtils_opts.h b/src/opts/SkUtils_opts.h
index c9390af..ba93305 100644
--- a/src/opts/SkUtils_opts.h
+++ b/src/opts/SkUtils_opts.h
@@ -8,6 +8,8 @@
 #ifndef SkUtils_opts_DEFINED
 #define SkUtils_opts_DEFINED
 
+#include "stdint.h"
+
 namespace SK_OPTS_NS {
 
     static void memset16(uint16_t buffer[], uint16_t value, int count) {
diff --git a/tools/check-headers-self-sufficient b/tools/check-headers-self-sufficient
index 674289b..9b676c1 100755
--- a/tools/check-headers-self-sufficient
+++ b/tools/check-headers-self-sufficient
@@ -65,6 +65,7 @@
     '-Isrc/pathops',
     '-Isrc/ports',
     '-Isrc/sfnt',
+    '-Isrc/shaders',
     '-Isrc/sksl',
     '-Isrc/utils',
     '-Isrc/utils/win',
@@ -93,6 +94,7 @@
     'experimental/*',
     'include/config/*',
     'include/core/SkPostConfig.h',
+    'include/gpu/vk/*',
     'include/ports/SkFontMgr_android.h',
     'include/ports/SkFontMgr_fontconfig.h',
     'include/ports/SkTypeface_win.h',
@@ -106,6 +108,7 @@
     'src/core/SkLinearBitmapPipeline.h',
     'src/core/SkLinearBitmapPipeline_*.h',
     'src/core/SkUnPreMultiplyPriv.h',
+    'src/gpu/vk/*',
     'src/opts/*_SSE2.h',
     'src/opts/*_SSSE3.h',
     'src/opts/*_neon.h',