diff --git a/deps/v8/build/common.gypi b/deps/v8/build/common.gypi
index 4e896e019a8..34508913fed 100644
--- a/deps/v8/build/common.gypi
+++ b/deps/v8/build/common.gypi
@@ -184,6 +184,9 @@
           }],
         ],
       }],
+      ['OS=="solaris"', {
+        'defines': [ '__C99FEATURES__=1' ],  # isinf() etc.
+      }],
     ],
     'configurations': {
       'Debug': {
diff --git a/deps/v8/tools/gyp/v8-node.gyp b/deps/v8/tools/gyp/v8-node.gyp
deleted file mode 100644
index f2b3a337bd8..00000000000
--- a/deps/v8/tools/gyp/v8-node.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  'includes': [
-    '../../build/common.gypi',
-    'v8.gyp'
-  ],
-  'target_defaults': {
-    'conditions': [
-      [ 'OS=="solaris"', {
-        'defines': [ '__C99FEATURES__=1' ],
-      }],
-    ],
-  },
-}
diff --git a/node.gyp b/node.gyp
index abc83c51b37..e2413979124 100644
--- a/node.gyp
+++ b/node.gyp
@@ -55,7 +55,7 @@
 
       'dependencies': [
         'deps/http_parser/http_parser.gyp:http_parser',
-        'deps/v8/tools/gyp/v8-node.gyp:v8',
+        'deps/v8/tools/gyp/v8.gyp:v8',
         'deps/uv/uv.gyp:uv',
         'deps/zlib/zlib.gyp:zlib',
         'node_js2c#host',