diff --git a/gyp/core.gyp b/gyp/core.gyp
index 64cc79bf5b..164ddfbb9a 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -15,6 +15,7 @@
       'include_dirs': [
         '../include/config',
         '../include/core',
+        '../include/gpu',
         '../include/pathops',
         '../include/pipe',
         '../include/ports',
@@ -91,8 +92,7 @@
         }],
         ['skia_gpu == 1', {
           'include_dirs': [
-              '../include/gpu',
-              '../src/gpu',
+            '../src/gpu',
           ],
         }],
       ],
@@ -100,6 +100,7 @@
         'include_dirs': [
           '../include/config',
           '../include/core',
+          '../include/gpu',
           '../include/pathops',
           '../include/pipe',
         ],
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index e5af40dd7a..db40882b89 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -14,7 +14,7 @@
 #include "SkMask.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
-#include "../gpu/GrColor.h"
+#include "GrColor.h"
 
 class SkPath;
 class SkPicture;