diff --git a/deps/base64/base64.gyp b/deps/base64/base64.gyp
index 5d0a0c05..bd4f1817 100644
--- a/deps/base64/base64.gyp
+++ b/deps/base64/base64.gyp
@@ -78,9 +78,9 @@
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/ssse3/codec.c' ],
       'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_SSSE3=1' ],
+      'cflags': [ '-mssse3' ],
       'conditions': [
         [ 'OS!="win"', {
-          'cflags': [ '-mssse3' ],
           'xcode_settings': {
             'OTHER_CFLAGS': [ '-mssse3' ]
           },
@@ -94,9 +94,9 @@
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/sse41/codec.c' ],
       'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_SSE41=1' ],
+      'cflags': [ '-msse4.1' ],
       'conditions': [
         [ 'OS!="win"', {
-          'cflags': [ '-msse4.1' ],
           'xcode_settings': {
             'OTHER_CFLAGS': [ '-msse4.1' ]
           },
@@ -110,9 +110,9 @@
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/sse42/codec.c' ],
       'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_SSE42=1' ],
+      'cflags': [ '-msse4.2' ],
       'conditions': [
         [ 'OS!="win"', {
-          'cflags': [ '-msse4.2' ],
           'xcode_settings': {
             'OTHER_CFLAGS': [ '-msse4.2' ]
           },
@@ -126,9 +126,9 @@
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/avx/codec.c' ],
       'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_AVX=1' ],
+      'cflags': [ '-mavx' ],
       'conditions': [
         [ 'OS!="win"', {
-          'cflags': [ '-mavx' ],
           'xcode_settings': {
             'OTHER_CFLAGS': [ '-mavx' ]
           },
@@ -150,9 +150,9 @@
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/avx2/codec.c' ],
       'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_AVX2=1' ],
+      'cflags': [ '-mavx2' ],
       'conditions': [
         [ 'OS!="win"', {
-          'cflags': [ '-mavx2' ],
           'xcode_settings': {
             'OTHER_CFLAGS': [ '-mavx2' ]
           },
@@ -174,9 +174,9 @@
       'include_dirs': [ 'base64/include', 'base64/lib' ],
       'sources': [ 'base64/lib/arch/avx512/codec.c' ],
       'defines': [ 'BASE64_STATIC_DEFINE', 'HAVE_AVX512=1' ],
+      'cflags': [ '-mavx512vl', '-mavx512vbmi' ],
       'conditions': [
         [ 'OS!="win"', {
-          'cflags': [ '-mavx512vl', '-mavx512vbmi' ],
           'xcode_settings': {
             'OTHER_CFLAGS': [ '-mavx512vl', '-mavx512vbmi' ]
           },
diff --git a/deps/llhttp/llhttp.gyp b/deps/llhttp/llhttp.gyp
index c7b8800a..7008d4be 100644
--- a/deps/llhttp/llhttp.gyp
+++ b/deps/llhttp/llhttp.gyp
@@ -10,6 +10,11 @@
     {
       'target_name': 'llhttp',
       'type': 'static_library',
+      'conditions': [
+        [ 'target_arch!="arm64"', {
+          'cflags': [ '-mssse3' ],
+        }],
+      ],
       'include_dirs': [ '.', 'include' ],
       'direct_dependent_settings': {
         'include_dirs': [ 'include' ],
diff --git a/deps/ngtcp2/ngtcp2.gyp b/deps/ngtcp2/ngtcp2.gyp
index 0f2929b7..da78686e 100644
--- a/deps/ngtcp2/ngtcp2.gyp
+++ b/deps/ngtcp2/ngtcp2.gyp
@@ -109,6 +109,7 @@
           'defines': ['HAVE_UNISTD_H']
         }],
         ['OS=="win"', {
+          'cflags': [ '-mssse3' ],
           'defines': [
             'WIN32',
             '_WINDOWS',
diff --git a/deps/uv/uv.gyp b/deps/uv/uv.gyp
index 6c86c3fa..7686e70f 100644
--- a/deps/uv/uv.gyp
+++ b/deps/uv/uv.gyp
@@ -193,6 +193,10 @@
       },
       'conditions': [
         [ 'OS=="win"', {
+          'type': 'static_library',
+          'cflags': [
+            '-Wno-cast-function-type',
+          ],
           'defines': [
             '_WIN32_WINNT=0x0602',
             '_GNU_SOURCE',
diff --git a/node.gyp b/node.gyp
index 18b69f33..fa745523 100644
--- a/node.gyp
+++ b/node.gyp
@@ -455,7 +455,7 @@
     # Putting these explicitly here so not to depend on `common.gypi`.
     # `common.gypi` need to be more general because it is used to build userland native addons.
     # Refs: https://github.com/nodejs/node-gyp/issues/1118
-    'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
+    'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', '-Wno-unused-variable', '-Wno-deprecated-declarations', ],
     'xcode_settings': {
       'WARNING_CFLAGS': [
         '-Wall',
@@ -526,6 +526,7 @@
       ],
 
       'sources': [
+        'src/res/node.rc',
         'src/node_main.cc'
       ],
 
@@ -571,7 +572,7 @@
         }, {
           'dependencies': [ '<(node_lib_target_name)' ],
           'conditions': [
-            ['OS=="win" and node_shared=="true"', {
+            ['OS=="msvc" and node_shared=="true"', {
               'dependencies': ['generate_node_def'],
               'msvs_settings': {
                 'VCLinkerTool': {
@@ -605,9 +606,6 @@
                 '-Wl,--no-whole-archive',
               ],
             }],
-            [ 'OS=="win"', {
-              'sources': [ 'src/res/node.rc' ],
-            }],
           ],
         }],
         [ 'node_shared=="true"', {
@@ -1337,7 +1335,7 @@
         },
       ]
     }], # end aix section
-    ['OS=="win" and node_shared=="true"', {
+    ['OS=="msvc" and node_shared=="true"', {
      'targets': [
        {
          'target_name': 'gen_node_def',
diff --git a/tools/v8_gypfiles/features.gypi b/tools/v8_gypfiles/features.gypi
index be1dfe40..94d22da9 100644
--- a/tools/v8_gypfiles/features.gypi
+++ b/tools/v8_gypfiles/features.gypi
@@ -41,6 +41,11 @@
       }, {
         'is_win': 0,
       }],
+      ['OS == "msvc"', { # Dummy OS, to differentiate between MSVC and MinGW
+        'is_msvc': 1,
+      }, {
+        'is_msvc': 0,
+      }],
       ['OS == "fuchsia"', {
         'is_fuchsia': 1,
       }, {