diff --git a/experimental/iOSSampleApp/SkSampleUIView.mm b/experimental/iOSSampleApp/SkSampleUIView.mm
index 0e8a6740c9..908786d757 100644
--- a/experimental/iOSSampleApp/SkSampleUIView.mm
+++ b/experimental/iOSSampleApp/SkSampleUIView.mm
@@ -12,7 +12,7 @@
 
 #include "SkCanvas.h"
 #include "GrContext.h"
-#include "GrGLInterface.h"
+#include "gl/GrGLInterface.h"
 #include "SkGpuDevice.h"
 #include "SkCGUtils.h"
 class SkiOSDeviceManager : public SampleWindow::DeviceManager {
diff --git a/src/gpu/app-android.cpp b/src/gpu/app-android.cpp
index ae8b7ddaea..2dad1f902e 100644
--- a/src/gpu/app-android.cpp
+++ b/src/gpu/app-android.cpp
@@ -17,7 +17,7 @@
 #include "SkString.h"
 #include "SkTime.h"
 
-#include "GrGLConfig.h"
+#include "gl/GrGLConfig.h"
 
 static GrContext* make_context() {
     SkDebugf("---- before create\n");
diff --git a/src/gpu/gr_hello_world.cpp b/src/gpu/gr_hello_world.cpp
index b475fb8de9..b19f9b4164 100644
--- a/src/gpu/gr_hello_world.cpp
+++ b/src/gpu/gr_hello_world.cpp
@@ -5,10 +5,10 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "SkGLCanvas.h"
+#include "gl/SkGLCanvas.h"
 #include "SkBitmap.h"
 #include "SkPaint.h"
-#include "SkGpuGLShaders.h"
+#include "gl/SkGpuGLShaders.h"
 
 extern "C" {
     void gr_hello_world();