diff --git a/gyp/common.gypi b/gyp/common.gypi
index 3a2024415..67a8dcd9d 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -1,36 +1,11 @@
 {
+  'includes': [
+    './variables.gypi',
+  ],
   'variables': {
     'install_prefix%': '',
     'standalone_product_dir':'<!@(pwd)/build',
-    'core_library%': 'mbgl-core',
-    'headless_library%': 'mbgl-headless',
   },
-  'conditions': [
-    ['platform == "osx"', {
-      'variables': {
-        'platform_library%': 'mbgl-osx',
-        'storage_library%': 'mbgl-storage-cocoa',
-      },
-    }],
-    ['platform == "ios"', {
-      'variables': {
-        'platform_library%': 'mbgl-ios',
-        'storage_library%': 'mbgl-storage-cocoa',
-      },
-    }],
-    ['platform == "linux"', {
-      'variables': {
-        'platform_library%': 'mbgl-linux',
-        'storage_library%': 'mbgl-storage-curl',
-      },
-    }],
-    ['platform == "android"', {
-      'variables': {
-        'platform_library%': 'mbgl-android',
-        'storage_library%': 'mbgl-storage-curl',
-      },
-    }],
-  ],
   'target_defaults': {
     'default_configuration': 'Release',
     'conditions': [
diff --git a/gyp/variables.gypi b/gyp/variables.gypi
new file mode 100644
index 000000000..fd76adfb7
--- /dev/null
+++ b/gyp/variables.gypi
@@ -0,0 +1,32 @@
+{
+  'variables': {
+    'core_library%': 'mbgl-core',
+    'headless_library%': 'mbgl-headless',
+  },
+  'conditions': [
+    ['platform == "osx"', {
+      'variables': {
+        'platform_library%': 'mbgl-osx',
+        'storage_library%': 'mbgl-storage-cocoa',
+      },
+    }],
+    ['platform == "ios"', {
+      'variables': {
+        'platform_library%': 'mbgl-ios',
+        'storage_library%': 'mbgl-storage-cocoa',
+      },
+    }],
+    ['platform == "linux"', {
+      'variables': {
+        'platform_library%': 'mbgl-linux',
+        'storage_library%': 'mbgl-storage-curl',
+      },
+    }],
+    ['platform == "android"', {
+      'variables': {
+        'platform_library%': 'mbgl-android',
+        'storage_library%': 'mbgl-storage-curl',
+      },
+    }],
+  ],
+}
\ No newline at end of file