diff --git a/Makefile b/Makefile
index 9a6faf985..02fc34dd5 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ endif
 PLATFORM ?= linux
 
 
-all: mbgl
+all: mbgl-core mblg-platform mbgl-headless
 
 config.gypi: configure
 	./configure
@@ -18,9 +18,9 @@ config-ios.gypi: configure
 	MASON_PLATFORM=ios ./configure config-ios.gypi
 
 # Builds the regular library
-mbgl: config.gypi mapboxgl.gyp
+mbgl-core: config.gypi mapboxgl.gyp
 	deps/run_gyp mapboxgl.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
-	$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl
+	$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl-core
 
 mbgl-platform: config.gypi mapboxgl.gyp
 	deps/run_gyp mapboxgl.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
@@ -34,10 +34,6 @@ install: config.gypi mapboxgl.gyp
 	deps/run_gyp mapboxgl.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) -Dinstall_prefix=$(PREFIX) --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
 	$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) install
 
-config: config.gypi mapboxgl.gyp
-	deps/run_gyp mapboxgl.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
-	$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl-config
-
 ##### Test cases ###############################################################
 
 build/test/Makefile: src common config.gypi test/test.gyp
@@ -121,5 +117,5 @@ clean: clear_xcode_cache
 distclean: clean
 	-rm -rf ./mason_packages
 
-.PHONY: mbgl install test linux clear_xcode_cache build/test/Makefile clean distclean
+.PHONY: mbgl-core install test linux clear_xcode_cache build/test/Makefile clean distclean
 # DO NOT DELETE
diff --git a/gyp/install.gypi b/gyp/install.gypi
index 8b79a4518..58b8bd072 100644
--- a/gyp/install.gypi
+++ b/gyp/install.gypi
@@ -6,12 +6,12 @@
           'type': 'none',
           'hard_dependency': 1,
           'dependencies': [
-            'mbgl',
+            'mbgl-core',
             'mbgl-headless',
             'mbgl-<(platform)',
           ],
           'copies': [
-            { 'files': [ '<(PRODUCT_DIR)/libmbgl.a' ], 'destination': '<(install_prefix)/lib' },
+            { 'files': [ '<(PRODUCT_DIR)/libmbgl-core.a' ], 'destination': '<(install_prefix)/lib' },
             { 'files': [ '<(PRODUCT_DIR)/libmbgl-headless.a' ], 'destination': '<(install_prefix)/lib' },
             { 'files': [ '<(PRODUCT_DIR)/libmbgl-<(platform).a' ], 'destination': '<(install_prefix)/lib' },
             { 'files': [ '../include/mbgl' ], 'destination': '<(install_prefix)/include' }
diff --git a/gyp/mbgl.gypi b/gyp/mbgl-core.gypi
similarity index 94%
rename from gyp/mbgl.gypi
rename to gyp/mbgl-core.gypi
index fd5c586c2..a9c10f111 100644
--- a/gyp/mbgl.gypi
+++ b/gyp/mbgl-core.gypi
@@ -1,8 +1,9 @@
 {
   'targets': [
-    { 'target_name': 'mbgl',
-      'product_name': 'mbgl',
+    { 'target_name': 'mbgl-core',
+      'product_name': 'mbgl-core',
       'type': 'static_library',
+      'standalone_static_library': 1,
       'hard_dependency': 1,
       'dependencies': [
           'shaders',
diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp
index 92175d1c0..77e4a5ab0 100644
--- a/linux/mapboxgl-app.gyp
+++ b/linux/mapboxgl-app.gyp
@@ -45,7 +45,7 @@
         }],
       ],
       'dependencies': [
-        '../mapboxgl.gyp:mbgl',
+        '../mapboxgl.gyp:mbgl-core',
         '../mapboxgl.gyp:mbgl-linux',
         '../mapboxgl.gyp:copy_styles',
         '../mapboxgl.gyp:copy_certificate_bundle',
diff --git a/macosx/mapboxgl-app.gyp b/macosx/mapboxgl-app.gyp
index b6881c1a5..95b7e1d31 100644
--- a/macosx/mapboxgl-app.gyp
+++ b/macosx/mapboxgl-app.gyp
@@ -40,7 +40,7 @@
       ],
       'dependencies': [
         '../mapboxgl.gyp:bundle_styles',
-        '../mapboxgl.gyp:mbgl',
+        '../mapboxgl.gyp:mbgl-core',
         '../mapboxgl.gyp:mbgl-osx',
       ]
     }
diff --git a/mapboxgl.gyp b/mapboxgl.gyp
index 9126a1a62..cca803b33 100644
--- a/mapboxgl.gyp
+++ b/mapboxgl.gyp
@@ -6,7 +6,7 @@
     './gyp/styles.gypi',
     './gyp/fixtures.gypi',
     './gyp/certificates.gypi',
-    './gyp/mbgl.gypi',
+    './gyp/mbgl-core.gypi',
     './gyp/mbgl-platform.gypi',
     './gyp/mbgl-headless.gypi',
     './gyp/install.gypi',
diff --git a/test/test.gyp b/test/test.gyp
index a01d1b32b..43e166938 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -13,7 +13,7 @@
       ],
       'dependencies': [
         '../deps/gtest/gtest.gyp:gtest',
-        '../mapboxgl.gyp:mbgl',
+        '../mapboxgl.gyp:mbgl-core',
       ]
     },
     { 'target_name': 'clip_ids',
@@ -25,7 +25,7 @@
       ],
       'dependencies': [
         '../deps/gtest/gtest.gyp:gtest',
-        '../mapboxgl.gyp:mbgl',
+        '../mapboxgl.gyp:mbgl-core',
       ]
     },
     { 'target_name': 'enums',
@@ -37,7 +37,7 @@
       ],
       'dependencies': [
         '../deps/gtest/gtest.gyp:gtest',
-        '../mapboxgl.gyp:mbgl',
+        '../mapboxgl.gyp:mbgl-core',
       ]
     },
     { 'target_name': 'style_parser',
@@ -51,7 +51,7 @@
       ],
       'dependencies': [
         '../deps/gtest/gtest.gyp:gtest',
-        '../mapboxgl.gyp:mbgl',
+        '../mapboxgl.gyp:mbgl-core',
         '../mapboxgl.gyp:copy_fixtures',
       ]
     },
@@ -64,7 +64,7 @@
       ],
       'dependencies': [
         '../deps/gtest/gtest.gyp:gtest',
-        '../mapboxgl.gyp:mbgl',
+        '../mapboxgl.gyp:mbgl-core',
       ]
     },
     { 'target_name': 'comparisons',
@@ -76,7 +76,7 @@
       ],
       'dependencies': [
         '../deps/gtest/gtest.gyp:gtest',
-        '../mapboxgl.gyp:mbgl',
+        '../mapboxgl.gyp:mbgl-core',
       ]
     },
     { 'target_name': 'tile',
@@ -88,7 +88,7 @@
       ],
       'dependencies': [
         '../deps/gtest/gtest.gyp:gtest',
-        '../mapboxgl.gyp:mbgl',
+        '../mapboxgl.gyp:mbgl-core',
       ]
     },
     { 'target_name': 'functions',
@@ -100,7 +100,7 @@
       ],
       'dependencies': [
         '../deps/gtest/gtest.gyp:gtest',
-        '../mapboxgl.gyp:mbgl',
+        '../mapboxgl.gyp:mbgl-core',
         ]
     },
     { 'target_name': 'headless',
@@ -128,7 +128,7 @@
       ],
       'dependencies': [
         '../deps/gtest/gtest.gyp:gtest',
-        '../mapboxgl.gyp:mbgl',
+        '../mapboxgl.gyp:mbgl-core',
         '../mapboxgl.gyp:mbgl-headless',
         '<(platform_library)',
       ],