5 files changed, 7 insertions, 3 deletions
diff --git a/src/gpu/GrProcessorSet.h b/src/gpu/GrProcessorSet.h
index 56cbee1cac..b15da1e3f7 100644
--- a/src/gpu/GrProcessorSet.h
+++ b/src/gpu/GrProcessorSet.h
@@ -12,9 +12,9 @@
 #include "GrPaint.h"
 #include "GrProcessorAnalysis.h"
 #include "SkTemplates.h"
+#include "GrXferProcessor.h"
 
 class GrAppliedClip;
-class GrXferProcessor;
 class GrXPFactory;
 
 class GrProcessorSet : private SkNoncopyable {
diff --git a/src/gpu/GrXferProcessor.h b/src/gpu/GrXferProcessor.h
index 3aecf3e686..a739c8b29e 100644
--- a/src/gpu/GrXferProcessor.h
+++ b/src/gpu/GrXferProcessor.h
@@ -12,12 +12,13 @@
 #include "GrColor.h"
 #include "GrNonAtomicRef.h"
 #include "GrProcessor.h"
-#include "GrProcessorSet.h"
+#include "GrProcessorAnalysis.h"
 #include "GrTexture.h"
 #include "GrTypes.h"
 
-class GrShaderCaps;
 class GrGLSLXferProcessor;
+class GrProcessorSet;
+class GrShaderCaps;
 
 /**
  * Barriers for blending. When a shader reads the dst directly, an Xfer barrier is sometimes
diff --git a/src/gpu/ops/GrClearStencilClipOp.h b/src/gpu/ops/GrClearStencilClipOp.h
index 1b7d103998..9de97db02d 100644
--- a/src/gpu/ops/GrClearStencilClipOp.h
+++ b/src/gpu/ops/GrClearStencilClipOp.h
@@ -14,6 +14,7 @@
 #include "GrOp.h"
 #include "GrOpFlushState.h"
 #include "GrRenderTarget.h"
+#include "GrRenderTargetContext.h"
 
 class GrClearStencilClipOp final : public GrOp {
 public:
diff --git a/src/gpu/ops/GrDiscardOp.h b/src/gpu/ops/GrDiscardOp.h
index 5640f308ac..dd5c4ef189 100644
--- a/src/gpu/ops/GrDiscardOp.h
+++ b/src/gpu/ops/GrDiscardOp.h
@@ -12,6 +12,7 @@
 #include "GrOp.h"
 #include "GrOpFlushState.h"
 #include "GrRenderTarget.h"
+#include "GrRenderTargetContext.h"
 
 class GrDiscardOp final : public GrOp {
 public:
diff --git a/src/gpu/ops/GrStencilPathOp.h b/src/gpu/ops/GrStencilPathOp.h
index 93357f74fc..f9a41ec7ad 100644
--- a/src/gpu/ops/GrStencilPathOp.h
+++ b/src/gpu/ops/GrStencilPathOp.h
@@ -14,6 +14,7 @@
 #include "GrPath.h"
 #include "GrPathRendering.h"
 #include "GrRenderTarget.h"
+#include "GrRenderTargetContext.h"
 #include "GrStencilSettings.h"
 
 class GrStencilPathOp final : public GrOp {