diff --git a/atom.gyp b/atom.gyp
index 60f8c77941e7..3a03dd51165b 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -329,6 +329,10 @@
       'include_dirs': [
         '.',
         'vendor',
+        # Include directories for uv and node.
+        'vendor/node/src',
+        'vendor/node/deps/http_parser',
+        'vendor/node/deps/uv/include',
         # The `node.h` is using `#include"v8.h"`.
         'vendor/brightray/vendor/download/libchromiumcontent/src/v8/include',
         # The `node.h` is using `#include"ares.h"`.
diff --git a/vendor/node b/vendor/node
index 4e04c9f0a2d9..e8ddf565e882 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 4e04c9f0a2d97e0b20a0980266917e11f2805280
+Subproject commit e8ddf565e88200dd71bf0d8f652ffc7ff10e66fa