diff --git a/bin/render.gypi b/bin/render.gypi
index 45c9ebb0e..c200350a4 100644
--- a/bin/render.gypi
+++ b/bin/render.gypi
@@ -8,13 +8,13 @@
       'type': 'executable',
 
       'dependencies': [
-        '../mbgl.gyp:core',
-        '../mbgl.gyp:platform-<(platform_lib)',
-        '../mbgl.gyp:headless-<(headless_lib)',
-        '../mbgl.gyp:http-<(http_lib)',
-        '../mbgl.gyp:asset-<(asset_lib)',
-        '../mbgl.gyp:cache-<(cache_lib)',
-        '../mbgl.gyp:copy_certificate_bundle',
+        'mbgl.gyp:core',
+        'mbgl.gyp:platform-<(platform_lib)',
+        'mbgl.gyp:headless-<(headless_lib)',
+        'mbgl.gyp:http-<(http_lib)',
+        'mbgl.gyp:asset-<(asset_lib)',
+        'mbgl.gyp:cache-<(cache_lib)',
+        'mbgl.gyp:copy_certificate_bundle',
       ],
 
       'include_dirs': [
diff --git a/binding.gyp b/binding.gyp
index 759b8d91d..98e0f4e1c 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -5,9 +5,9 @@
   'targets': [
     { 'target_name': '<(module_name)',
       'dependencies': [
-        'mbgl.gyp:core',
-        'mbgl.gyp:platform-<(platform_lib)',
-        'mbgl.gyp:headless-<(headless_lib)',
+        'gyp/mbgl.gyp:core',
+        'gyp/mbgl.gyp:platform-<(platform_lib)',
+        'gyp/mbgl.gyp:headless-<(headless_lib)',
       ],
 
       'include_dirs': [
diff --git a/gyp/core.gypi b/gyp/core.gypi
index 1156059e0..a1bf41a0e 100644
--- a/gyp/core.gypi
+++ b/gyp/core.gypi
@@ -11,14 +11,14 @@
       ],
 
       'sources': [
-        '<!@(find src -name "*.hpp")',
-        '<!@(find src -name "*.cpp")',
-        '<!@(find src -name "*.c")',
-        '<!@(find src -name "*.h")',
-        '<!@(find include -name "*.hpp")',
-        '<!@(find include -name "*.h")',
-        '<!@(find src -name "*.glsl")',
-        'bin/style.json'
+        '<!@(find ../src -name "*.hpp")',
+        '<!@(find ../src -name "*.cpp")',
+        '<!@(find ../src -name "*.c")',
+        '<!@(find ../src -name "*.h")',
+        '<!@(find ../include -name "*.hpp")',
+        '<!@(find ../include -name "*.h")',
+        '<!@(find ../src -name "*.glsl")',
+        '../bin/style.json'
       ],
 
       'include_dirs': [
diff --git a/gyp/mbgl.gyp b/gyp/mbgl.gyp
new file mode 100644
index 000000000..c2c8d9c26
--- /dev/null
+++ b/gyp/mbgl.gyp
@@ -0,0 +1,27 @@
+{
+  'includes': [
+    'common.gypi',
+    'shaders.gypi',
+    'version.gypi',
+    'certificates.gypi',
+    'standalone.gypi',
+    'core.gypi',
+    'none.gypi',
+  ],
+  'conditions': [
+    ['headless_lib == "cgl" and host == "osx"', { 'includes': [ 'headless-cgl.gypi' ] } ],
+    ['headless_lib == "glx" and host == "linux"', { 'includes': [ 'headless-glx.gypi' ] } ],
+    ['platform_lib == "osx" and host == "osx"', { 'includes': [ 'platform-osx.gypi' ] } ],
+    ['platform_lib == "ios" and host == "ios"', { 'includes': [ 'platform-ios.gypi' ] } ],
+    ['platform_lib == "linux"', { 'includes': [ 'platform-linux.gypi' ] } ],
+    ['platform_lib == "android" and host == "android"', { 'includes': [ 'platform-android.gypi' ] } ],
+    ['http_lib == "curl"', { 'includes': [ 'http-curl.gypi' ] } ],
+    ['http_lib == "nsurl" and (host == "osx" or host == "ios")', { 'includes': [ 'http-nsurl.gypi' ] } ],
+    ['http_lib == "android" and host == "android"', { 'includes': [ 'http-android.gypi' ] } ],
+    ['asset_lib == "fs"', { 'includes': [ 'asset-fs.gypi' ] } ],
+    ['asset_lib == "zip"', { 'includes': [ 'asset-zip.gypi' ] } ],
+    ['cache_lib == "sqlite"', { 'includes': [ 'cache-sqlite.gypi' ] } ],
+
+    ['install_prefix != ""', { 'includes': ['install.gypi' ] } ],
+  ],
+}
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index 6b9dd5027..3dabc1986 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -94,7 +94,7 @@
         'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
         'CLANG_ENABLE_OBJC_ARC': 'YES',
         'CLANG_ENABLE_MODULES': 'YES',
-        'FRAMEWORK_SEARCH_PATHS': './platform/ios/vendor',
+        'FRAMEWORK_SEARCH_PATHS': '../platform/ios/vendor',
       },
 
       'link_settings': {
@@ -109,7 +109,7 @@
           '../include',
         ],
         'mac_bundle_resources': [
-          '<!@(find ./platform/ios/resources -type f \! -name "README")',
+          '<!@(find ../platform/ios/resources -type f \! -name "README")',
         ],
       },
     },
diff --git a/gyp/shaders.gypi b/gyp/shaders.gypi
index fbf8e3197..800487437 100644
--- a/gyp/shaders.gypi
+++ b/gyp/shaders.gypi
@@ -9,14 +9,14 @@
           'action_name': 'Build Shaders',
           'inputs': [
             '../scripts/build-shaders.py',
-            '<!@(find src -name "*.glsl")'
+            '<!@(find ../src -name "*.glsl")'
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/shader/shaders.hpp',
             '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gl.cpp',
             '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gles2.cpp',
           ],
-          'action': ['scripts/build-shaders.py', '<(SHARED_INTERMEDIATE_DIR)', '<@(_inputs)'],
+          'action': ['../scripts/build-shaders.py', '<(SHARED_INTERMEDIATE_DIR)', '<@(_inputs)'],
         }
       ],
       'direct_dependent_settings': {
diff --git a/ios/app/mapboxgl-app.gypi b/ios/app/mapboxgl-app.gypi
index b07bfc27e..799cb62e7 100644
--- a/ios/app/mapboxgl-app.gypi
+++ b/ios/app/mapboxgl-app.gypi
@@ -18,11 +18,11 @@
       ],
 
       'dependencies': [
-        '../mbgl.gyp:core',
-        '../mbgl.gyp:platform-<(platform_lib)',
-        '../mbgl.gyp:http-<(http_lib)',
-        '../mbgl.gyp:asset-<(asset_lib)',
-        '../mbgl.gyp:cache-<(cache_lib)',
+        'mbgl.gyp:core',
+        'mbgl.gyp:platform-<(platform_lib)',
+        'mbgl.gyp:http-<(http_lib)',
+        'mbgl.gyp:asset-<(asset_lib)',
+        'mbgl.gyp:cache-<(cache_lib)',
       ],
 
       'sources': [
diff --git a/ios/benchmark/benchmark-ios.gypi b/ios/benchmark/benchmark-ios.gypi
index 01f4e8afb..ccdcc10f3 100644
--- a/ios/benchmark/benchmark-ios.gypi
+++ b/ios/benchmark/benchmark-ios.gypi
@@ -16,11 +16,11 @@
       ],
 
       'dependencies': [
-        '../mbgl.gyp:core',
-        '../mbgl.gyp:platform-<(platform_lib)',
-        '../mbgl.gyp:http-<(http_lib)',
-        '../mbgl.gyp:asset-<(asset_lib)',
-        '../mbgl.gyp:cache-<(cache_lib)',
+        'mbgl.gyp:core',
+        'mbgl.gyp:platform-<(platform_lib)',
+        'mbgl.gyp:http-<(http_lib)',
+        'mbgl.gyp:asset-<(asset_lib)',
+        'mbgl.gyp:cache-<(cache_lib)',
       ],
 
       'sources': [
diff --git a/linux/mapboxgl-app.gypi b/linux/mapboxgl-app.gypi
index 39061434e..0c9e03ce3 100644
--- a/linux/mapboxgl-app.gypi
+++ b/linux/mapboxgl-app.gypi
@@ -8,12 +8,12 @@
       'type': 'executable',
 
       'dependencies': [
-        '../mbgl.gyp:core',
-        '../mbgl.gyp:platform-<(platform_lib)',
-        '../mbgl.gyp:http-<(http_lib)',
-        '../mbgl.gyp:asset-<(asset_lib)',
-        '../mbgl.gyp:cache-<(cache_lib)',
-        '../mbgl.gyp:copy_certificate_bundle',
+        'mbgl.gyp:core',
+        'mbgl.gyp:platform-<(platform_lib)',
+        'mbgl.gyp:http-<(http_lib)',
+        'mbgl.gyp:asset-<(asset_lib)',
+        'mbgl.gyp:cache-<(cache_lib)',
+        'mbgl.gyp:copy_certificate_bundle',
       ],
 
       'sources': [
diff --git a/macosx/mapboxgl-app.gypi b/macosx/mapboxgl-app.gypi
index 283e001c4..67e5e211e 100644
--- a/macosx/mapboxgl-app.gypi
+++ b/macosx/mapboxgl-app.gypi
@@ -13,11 +13,11 @@
       ],
 
       'dependencies': [
-        '../mbgl.gyp:core',
-        '../mbgl.gyp:platform-<(platform_lib)',
-        '../mbgl.gyp:http-<(http_lib)',
-        '../mbgl.gyp:asset-<(asset_lib)',
-        '../mbgl.gyp:cache-<(cache_lib)',
+        'mbgl.gyp:core',
+        'mbgl.gyp:platform-<(platform_lib)',
+        'mbgl.gyp:http-<(http_lib)',
+        'mbgl.gyp:asset-<(asset_lib)',
+        'mbgl.gyp:cache-<(cache_lib)',
       ],
 
       'sources': [
diff --git a/mbgl.gyp b/mbgl.gyp
deleted file mode 100644
index 6085b4735..000000000
--- a/mbgl.gyp
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  'includes': [
-    './gyp/common.gypi',
-    './gyp/shaders.gypi',
-    './gyp/version.gypi',
-    './gyp/certificates.gypi',
-    './gyp/standalone.gypi',
-    './gyp/core.gypi',
-    './gyp/none.gypi',
-  ],
-  'conditions': [
-    ['headless_lib == "cgl" and host == "osx"', { 'includes': [ './gyp/headless-cgl.gypi' ] } ],
-    ['headless_lib == "glx" and host == "linux"', { 'includes': [ './gyp/headless-glx.gypi' ] } ],
-    ['platform_lib == "osx" and host == "osx"', { 'includes': [ './gyp/platform-osx.gypi' ] } ],
-    ['platform_lib == "ios" and host == "ios"', { 'includes': [ './gyp/platform-ios.gypi' ] } ],
-    ['platform_lib == "linux"', { 'includes': [ './gyp/platform-linux.gypi' ] } ],
-    ['platform_lib == "android" and host == "android"', { 'includes': [ './gyp/platform-android.gypi' ] } ],
-    ['http_lib == "curl"', { 'includes': [ './gyp/http-curl.gypi' ] } ],
-    ['http_lib == "nsurl" and (host == "osx" or host == "ios")', { 'includes': [ './gyp/http-nsurl.gypi' ] } ],
-    ['http_lib == "android" and host == "android"', { 'includes': [ './gyp/http-android.gypi' ] } ],
-    ['asset_lib == "fs"', { 'includes': [ './gyp/asset-fs.gypi' ] } ],
-    ['asset_lib == "zip"', { 'includes': [ './gyp/asset-zip.gypi' ] } ],
-    ['cache_lib == "sqlite"', { 'includes': [ './gyp/cache-sqlite.gypi' ] } ],
-
-    ['install_prefix != ""', { 'includes': ['./gyp/install.gypi' ] } ],
-  ],
-}
diff --git a/platform/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi
index 9ab743b5e..e856c7810 100644
--- a/platform/android/mapboxgl-app.gypi
+++ b/platform/android/mapboxgl-app.gypi
@@ -9,11 +9,11 @@
       'hard_dependency': 1,
 
       'dependencies': [
-        '../mbgl.gyp:core',
-        '../mbgl.gyp:platform-<(platform_lib)',
-        '../mbgl.gyp:http-<(http_lib)',
-        '../mbgl.gyp:asset-<(asset_lib)',
-        '../mbgl.gyp:cache-<(cache_lib)',
+        'mbgl.gyp:core',
+        'mbgl.gyp:platform-<(platform_lib)',
+        'mbgl.gyp:http-<(http_lib)',
+        'mbgl.gyp:asset-<(asset_lib)',
+        'mbgl.gyp:cache-<(cache_lib)',
       ],
 
       'sources': [
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
index d719440fd..58ff3e265 100755
--- a/scripts/ios/package.sh
+++ b/scripts/ios/package.sh
@@ -55,7 +55,7 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
         GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \
         ENABLE_BITCODE=YES \
         DEPLOYMENT_POSTPROCESSING=YES \
-        -project ./build/ios-all/mbgl.xcodeproj \
+        -project ./build/ios-all/gyp/mbgl.xcodeproj \
         -configuration ${BUILDTYPE} \
         -target everything \
         -jobs ${JOBS}
@@ -66,7 +66,7 @@ xcodebuild -sdk iphonesimulator${IOS_SDK_VERSION} \
     ARCHS="x86_64 i386" \
     ONLY_ACTIVE_ARCH=NO \
     GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \
-    -project ./build/ios-all/mbgl.xcodeproj \
+    -project ./build/ios-all/gyp/mbgl.xcodeproj \
     -configuration ${BUILDTYPE} \
     -target everything \
     -jobs ${JOBS}
@@ -79,14 +79,14 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
         `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \
         `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` \
         -o ${OUTPUT}/static/lib${NAME}.a \
-        ${LIBS[@]/#/build/${BUILDTYPE}-iphoneos/libmbgl-} \
-        ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-}
+        ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphoneos/libmbgl-} \
+        ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphonesimulator/libmbgl-}
 else
     libtool -static -no_warning_for_no_symbols \
         `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \
         `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` \
         -o ${OUTPUT}/static/lib${NAME}.a \
-        ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-}
+        ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphonesimulator/libmbgl-}
 fi
 echo "Created ${OUTPUT}/static/lib${NAME}.a"
 
diff --git a/test/test.gypi b/test/test.gypi
index 1f9496662..7c0b0d6c2 100644
--- a/test/test.gypi
+++ b/test/test.gypi
@@ -20,12 +20,12 @@
       'include_dirs': [ '../include', '../src', '../platform/default' ],
       'dependencies': [
         'symlink_TEST_DATA',
-        '../mbgl.gyp:core',
-        '../mbgl.gyp:platform-<(platform_lib)',
-        '../mbgl.gyp:http-<(http_lib)',
-        '../mbgl.gyp:asset-<(asset_lib)',
-        '../mbgl.gyp:cache-<(cache_lib)',
-        '../mbgl.gyp:headless-<(headless_lib)',
+        'mbgl.gyp:core',
+        'mbgl.gyp:platform-<(platform_lib)',
+        'mbgl.gyp:http-<(http_lib)',
+        'mbgl.gyp:asset-<(asset_lib)',
+        'mbgl.gyp:cache-<(cache_lib)',
+        'mbgl.gyp:headless-<(headless_lib)',
       ],
       'sources': [
         'fixtures/main.cpp',