diff --git a/third_party/gflags b/third_party/gflags
index 56e77c6a2..f126a3a94 160000
--- a/third_party/gflags
+++ b/third_party/gflags
@@ -1 +1 @@
-Subproject commit 56e77c6a2f10020f775cb68022f92fbb38e61804
+Subproject commit f126a3a9467c6147a6f22c317d45682d59665bd0
diff --git a/third_party/gflags.gypi b/third_party/gflags.gypi
index 9a511fd72..a1865a14e 100644
--- a/third_party/gflags.gypi
+++ b/third_party/gflags.gypi
@@ -6,15 +6,24 @@
       'type': 'static_library',
 
       'direct_dependent_settings': {
-        'include_dirs': [
-          'gflags/src/',
+        'conditions': [
+          ['OS != "win"', {
+            'include_dirs': [
+              'gflags/src/',
+            ],
+          }],
+          ['OS == "win"', {
+            'include_dirs': [
+              'gflags/src/windows/',
+            ],
+            'defines': [
+              'GFLAGS_DLL_DECL=',
+              'GFLAGS_DLL_DEFINE_FLAG=',
+            ],
+          }],
         ],
       },
 
-      'include_dirs': [
-        'gflags/src/',
-      ],
-
       'sources': [
         'gflags/src/gflags.cc',
         'gflags/src/gflags_completions.cc',
@@ -23,10 +32,23 @@
       ],
 
       'conditions': [
+        ['OS != "win"', {
+          'include_dirs': [
+            'gflags/src/',
+          ],
+        }],
         ['OS == "win"', {
-          'sources!': [
+          'include_dirs': [
+            'gflags/src/windows/',
+            'gflags/src/',
+          ],
+          'sources+': [
             'gflags/src/windows/port.cc',
           ],
+          'defines': [
+            'GFLAGS_DLL_DECL=',
+            'GFLAGS_DLL_DEFINE_FLAG=',
+          ],
         }],
       ],
     }