diff --git a/Makefile b/Makefile
index ab27176d5..358b3c05c 100644
--- a/Makefile
+++ b/Makefile
@@ -80,10 +80,6 @@ android-all: android-lib-x86 android-lib-x86-64
 android-all: android-lib-mips android-lib-mips-64
 	cd android/java && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE)
 
-.PHONY: node
-# Builds the Node library
-node: ; $(RUN) HTTP=none ASSET=none CACHE=none Makefile/node
-
 .PHONY: test
 test: ; $(RUN) Makefile/test
 test-%: ; $(RUN) test-$*
diff --git a/mbgl.gyp b/mbgl.gyp
index 7c221655e..959a9729d 100644
--- a/mbgl.gyp
+++ b/mbgl.gyp
@@ -15,7 +15,6 @@
     ['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 == "node"', { 'includes': [ './gyp/platform-node.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' ] } ],
diff --git a/gyp/platform-node.gypi b/platform/node/binding.gyp
similarity index 75%
rename from gyp/platform-node.gypi
rename to platform/node/binding.gyp
index 9019135e2..a5fb58339 100644
--- a/gyp/platform-node.gypi
+++ b/platform/node/binding.gyp
@@ -1,23 +1,25 @@
 {
   'targets': [
-    { 'target_name': 'platform-node',
+    { 'target_name': '<(module_name)',
       'dependencies': [
-        'version',
+        './<(mbgl)/mbgl.gyp:core',
+        './<(mbgl)/mbgl.gyp:platform-<(platform_lib)',
+        './<(mbgl)/mbgl.gyp:headless-<(headless_lib)',
       ],
 
       'include_dirs': [ "<!(node -e \"require('nan')\")" ],
 
       'sources': [
-        '../platform/node/src/node_mapbox_gl_native.cpp',
-        '../platform/node/src/node_log.hpp',
-        '../platform/node/src/node_log.cpp',
-        '../platform/node/src/node_file_source.hpp',
-        '../platform/node/src/node_file_source.cpp',
-        '../platform/node/src/node_map.hpp',
-        '../platform/node/src/node_map.cpp',
-        '../platform/node/src/node_request.hpp',
-        '../platform/node/src/node_request.cpp',
-        '../platform/node/src/util/async_queue.hpp',
+        'src/node_mapbox_gl_native.cpp',
+        'src/node_log.hpp',
+        'src/node_log.cpp',
+        'src/node_file_source.hpp',
+        'src/node_file_source.cpp',
+        'src/node_map.hpp',
+        'src/node_map.cpp',
+        'src/node_request.hpp',
+        'src/node_request.cpp',
+        'src/util/async_queue.hpp',
       ],
 
       'conditions': [