diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 78742e00bc..d8232a4c25 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -87,8 +87,6 @@
             '../../webrtc_overrides',
           ],
           'sources!': [
-            'basictypes.h',
-            'constructormagic.h',
             'logging.cc',
             'logging.h',
           ],
@@ -349,9 +347,6 @@
         'worker.h',
         'x11windowpicker.cc',
         'x11windowpicker.h',
-        '../../webrtc_overrides/webrtc/base/logging.cc',
-        '../../webrtc_overrides/webrtc/base/logging.h',
-        '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
       ],
       # TODO(henrike): issue 3307, make rtc_base build without disabling
       # these flags.
@@ -382,6 +377,11 @@
             '../../webrtc_overrides',
             '../../boringssl/src/include',
           ],
+          'sources': [
+            '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
+            '../../webrtc_overrides/webrtc/base/logging.cc',
+            '../../webrtc_overrides/webrtc/base/logging.h',
+          ],
           'sources!': [
             'atomicops.h',
             'bandwidthsmoother.cc',
@@ -493,11 +493,6 @@
               ],
             }],
           ],
-          'sources!': [
-            '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
-            '../../webrtc_overrides/webrtc/base/logging.cc',
-            '../../webrtc_overrides/webrtc/base/logging.h',
-          ],
         }],
         ['OS == "android"', {
           'link_settings': {