diff --git a/deps/histogram/histogram.gyp b/deps/histogram/histogram.gyp
index 3ab9bb070c64d6..5f2351c572a258 100644
--- a/deps/histogram/histogram.gyp
+++ b/deps/histogram/histogram.gyp
@@ -13,6 +13,29 @@
       'xcode_settings': {
         'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',  # -fvisibility=hidden
       },
+      'conditions': [
+        [ 'clang==1', {
+          'conditions': [
+            [ 'OS=="win"', {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'AdditionalOptions': [
+                    '-Wno-atomic-alignment',
+                    '-Wno-incompatible-pointer-types',
+                    '-Wno-unused-function'
+                  ],
+                },
+              },
+            }, {
+              'cflags': [
+                '-Wno-atomic-alignment',
+                '-Wno-incompatible-pointer-types',
+                '-Wno-unused-function'
+              ],
+            }],
+          ],
+        }],
+      ],
       'include_dirs': ['src', 'include'],
       'direct_dependent_settings': {
         'include_dirs': [ 'src', 'include' ]