diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index ded5cdd43c..d6781feb47 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -161,6 +161,8 @@ static_library("rtc_base") {
     "asynchttprequest.h",
     "asyncpacketsocket.cc",
     "asyncpacketsocket.h",
+    "asyncresolverinterface.cc",
+    "asyncresolverinterface.h",
     "asyncsocket.cc",
     "asyncsocket.h",
     "asynctcpsocket.cc",
@@ -172,6 +174,8 @@ static_library("rtc_base") {
     "base64.cc",
     "base64.h",
     "basicdefs.h",
+    "buffer.cc",
+    "buffer.h",
     "bytebuffer.cc",
     "bytebuffer.h",
     "byteorder.h",
@@ -322,16 +326,12 @@ static_library("rtc_base") {
       "asyncinvoker.cc",
       "asyncinvoker.h",
       "asyncinvoker-inl.h",
-      "asyncresolverinterface.cc",
-      "asyncresolverinterface.h",
       "atomicops.h",
       "bandwidthsmoother.cc",
       "bandwidthsmoother.h",
       "basictypes.h",
       "bind.h",
       "bind.h.pump",
-      "buffer.cc",
-      "buffer.h",
       "callback.h",
       "callback.h.pump",
       "constructormagic.h",
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 57ef4f47df..fdb28ff200 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -357,16 +357,12 @@
             'asyncinvoker.cc',
             'asyncinvoker.h',
             'asyncinvoker-inl.h',
-            'asyncresolverinterface.cc',
-            'asyncresolverinterface.h',
             'atomicops.h',
             'bandwidthsmoother.cc',
             'bandwidthsmoother.h',
             'basictypes.h',
             'bind.h',
             'bind.h.pump',
-            'buffer.cc',
-            'buffer.h',
             'callback.h',
             'callback.h.pump',
             'constructormagic.h',