diff --git a/Makefile b/Makefile
index 2e740f38e..c74a32806 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ config-ios.gypi:
 
 # Builds the regular library
 mbgl: config.gypi mapboxgl.gyp node
-	deps/run_gyp mapboxgl.gyp --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
+	deps/run_gyp mapboxgl.gyp -Iconfig.gypi --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
 	$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mapboxgl
 
 node:
@@ -21,7 +21,7 @@ node:
 ##### Test cases ###############################################################
 
 build/test/Makefile: src common config.gypi test/test.gyp
-	deps/run_gyp test/test.gyp --depth=. -Goutput_dir=.. --generator-output=./build/test -f make
+	deps/run_gyp test/test.gyp -Iconfig.gypi --depth=. -Goutput_dir=.. --generator-output=./build/test -f make
 
 test: build/test/Makefile
 	$(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) test
@@ -32,7 +32,7 @@ test_%: build/test/Makefile
 
 # build Mac OS X project for Xcode
 xtest: config.gypi clear_xcode_cache node
-	deps/run_gyp test/test.gyp --depth=. -Goutput_dir=.. --generator-output=./build -f xcode
+	deps/run_gyp test/test.gyp -Iconfig.gypi --depth=. -Goutput_dir=.. --generator-output=./build -f xcode
 	open ./build/test/test.xcodeproj
 
 ##### Makefile builds ##########################################################
@@ -40,7 +40,7 @@ xtest: config.gypi clear_xcode_cache node
 
 # Builds the linux app with make.
 linux: config.gypi linux/mapboxgl-app.gyp node
-	deps/run_gyp linux/mapboxgl-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make
+	deps/run_gyp linux/mapboxgl-app.gyp -Iconfig.gypi --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make
 	$(MAKE) -C build/linux BUILDTYPE=$(BUILDTYPE) V=$(V) linuxapp
 
 # Executes the Linux binary
@@ -51,7 +51,7 @@ run-linux: linux
 
 # Builds the OS X app with make.
 osx: config.gypi macosx/mapboxgl-app.gyp node
-	deps/run_gyp macosx/mapboxgl-app.gyp --depth=. -Goutput_dir=.. --generator-output=./build/macosx -f make
+	deps/run_gyp macosx/mapboxgl-app.gyp -Iconfig.gypi --depth=. -Goutput_dir=.. --generator-output=./build/macosx -f make
 	$(MAKE) -C build/macosx BUILDTYPE=$(BUILDTYPE) V=$(V) osxapp
 
 # Executes the OS X binary
@@ -73,21 +73,21 @@ clear_xcode_cache:
 
 # build Mac OS X project for Xcode
 xproj-cli: config.gypi macosx/mapboxgl-app.gyp clear_xcode_cache node
-	deps/run_gyp macosx/mapboxgl-app.gyp --depth=. --generator-output=./build -f xcode
+	deps/run_gyp macosx/mapboxgl-app.gyp -Iconfig.gypi --depth=. --generator-output=./build -f xcode
 
 xproj: xproj-cli
 	open ./build/macosx/mapboxgl-app.xcodeproj
 
 # build iOS project for Xcode
 iproj-cli: config-ios.gypi ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp clear_xcode_cache node
-	deps/run_gyp ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp --depth=. --generator-output=./build -f xcode
+	deps/run_gyp ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp -Iconfig-ios.gypi --depth=. --generator-output=./build -f xcode
 
 iproj: iproj-cli
 	open ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj
 
 # build Linux project for Xcode (Runs on Mac OS X too, but without platform-specific code)
 lproj: config.gypi linux/mapboxgl-app.gyp clear_xcode_cache node
-	deps/run_gyp linux/mapboxgl-app.gyp --depth=. --generator-output=./build -f xcode
+	deps/run_gyp linux/mapboxgl-app.gyp -Iconfig.gypi --depth=. --generator-output=./build -f xcode
 	open ./build/linux/mapboxgl-app.xcodeproj
 
 
diff --git a/mapboxgl.gyp b/mapboxgl.gyp
index 339e819fa..a0ad3212d 100644
--- a/mapboxgl.gyp
+++ b/mapboxgl.gyp
@@ -1,7 +1,6 @@
 {
   'includes': [
     './common.gypi',
-    './config.gypi',
   ],
   'targets': [
     {