diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 45ad451..c944378 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -18,6 +18,7 @@
 #include "SkPicture.h"
 #include "SkRefCnt.h"
 #include "SkStream.h"
+#include "SkTArray.h"
 #include "SamplePipeControllers.h"
 
 #if SK_SUPPORT_GPU
diff --git a/include/gpu/GrCustomStageUnitTest.h b/include/gpu/GrCustomStageUnitTest.h
index 9cbadf3..f928727 100644
--- a/include/gpu/GrCustomStageUnitTest.h
+++ b/include/gpu/GrCustomStageUnitTest.h
@@ -9,6 +9,8 @@
 #define GrCustomStageUnitTest_DEFINED
 
 #include "SkRandom.h"
+#include "GrNoncopyable.h"
+#include "SkTArray.h"
 
 #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
 
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index a43ad83..199cc49 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -8,6 +8,10 @@
 
 // This is a GPU-backend specific test. It relies on static intializers to work
 
+#include "SkTypes.h"
+
+#if SK_SUPPORT_GPU && SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
+
 #include "gl/GrGpuGL.h"
 #include "effects/GrColorTableEffect.h"
 #include "effects/GrConvolutionEffect.h"
@@ -17,8 +21,6 @@
 #include "GrRandom.h"
 #include "Test.h"
 
-#if SK_SUPPORT_GPU && SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
-
 namespace {
 
 // GrRandoms nextU() values have patterns in the low bits