--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -117,16 +117,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3
 
 if CONFIG['MOZ_ENABLE_SKIA']:
     SOURCES += [
         'ConvolutionFilter.cpp',
         'DrawTargetSkia.cpp',
         'PathSkia.cpp',
         'SourceSurfaceSkia.cpp',
     ]
+    if not CONFIG['MOZ_ENABLE_SKIA_GPU']:
+        DEFINES['SK_SUPPORT_GPU'] = 0
     if CONFIG['CC_TYPE'] == 'clang':
         # Suppress warnings from Skia header files.
         SOURCES['DrawTargetSkia.cpp'].flags += ['-Wno-implicit-fallthrough']
         SOURCES['PathSkia.cpp'].flags += ['-Wno-implicit-fallthrough']
         SOURCES['SourceSurfaceSkia.cpp'].flags += ['-Wno-implicit-fallthrough']
     EXPORTS.mozilla.gfx += [
         'ConvolutionFilter.h',
         'HelpersSkia.h',

--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -565,8 +565,10 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc')
     CXXFLAGS += [
         '-Wno-maybe-uninitialized'
     ]
 
 if CONFIG['MOZ_ENABLE_SKIA']:
   UNIFIED_SOURCES += [
     'composite/PaintCounter.cpp',
   ]
+  if not CONFIG['MOZ_ENABLE_SKIA_GPU']:
+      DEFINES['SK_SUPPORT_GPU'] = 0

--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -225,16 +225,18 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
         EXPORTS.mozilla.gfx += [
             'PrintTargetEMF.h',
         ]
         UNIFIED_SOURCES += [
             'PrintTargetEMF.cpp',
         ]
 
 if CONFIG['MOZ_ENABLE_SKIA_PDF']:
+    if not CONFIG['MOZ_ENABLE_SKIA_GPU']:
+        DEFINES['SK_SUPPORT_GPU'] = 0
     EXPORTS.mozilla.gfx += [
         'PrintTargetSkPDF.h',
     ]
     SOURCES += [
         'PrintTargetSkPDF.cpp',
     ]
 
 # We use ICU for normalization functions:

--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -949,28 +949,24 @@ def sfntly_includes(skia_pdf_sfntly):
     if skia_pdf_sfntly:
         includes += [
             '/gfx/sfntly/cpp/src',
         ]
     return includes
 
 set_config('SFNTLY_INCLUDES', sfntly_includes)
 
-@depends(skia, skia_gpu)
-def skia_includes(skia, skia_gpu):
+@depends(skia)
+def skia_includes(skia):
     includes = []
     if skia:
         includes += [
             '/gfx/skia',
             '/gfx/skia/skia/include/config',
             '/gfx/skia/skia/include/core',
-        ]
-
-    if skia_gpu:
-        includes += [
             '/gfx/skia/skia/include/gpu',
             '/gfx/skia/skia/include/utils',
         ]
 
     return includes
 
 set_config('SKIA_INCLUDES', skia_includes)