diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 9e6f2e41c..94b9637b3 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -40,6 +40,7 @@
         'asynchttprequest.h',
         'asyncinvoker.cc',
         'asyncinvoker.h',
+        'asyncinvoker-inl.h',
         'asyncpacketsocket.h',
         'asyncresolverinterface.h',
         'asyncsocket.cc',
@@ -58,11 +59,13 @@
         'basicdefs.h',
         'basictypes.h',
         'bind.h',
+        'bind.h.pump',
         'buffer.h',
         'bytebuffer.cc',
         'bytebuffer.h',
         'byteorder.h',
         'callback.h',
+        'callback.h.pump',
         'checks.cc',
         'checks.h',
         'common.cc',
@@ -113,12 +116,15 @@
         'json.cc',
         'json.h',
         'latebindingsymboltable.cc',
+        'latebindingsymboltable.cc.def',
         'latebindingsymboltable.h',
+        'latebindingsymboltable.h.def',
         'libdbusglibsymboltable.cc',
         'libdbusglibsymboltable.h',
         'linux.cc',
         'linux.h',
         'linuxfdwalk.c',
+        'linuxfdwalk.h',
         'linuxwindowpicker.cc',
         'linuxwindowpicker.h',
         'linked_ptr.h',
@@ -197,6 +203,8 @@
         'refcount.h',
         'referencecountedsingletonfactory.h',
         'rollingaccumulator.h',
+        'safe_conversions.h',
+        'safe_conversions_impl.h',
         'schanneladapter.cc',
         'schanneladapter.h',
         'scoped_autorelease_pool.h',
@@ -351,10 +359,6 @@
             'dbus.h',
             'diskcache_win32.cc',
             'diskcache_win32.h',
-            'fakecpumonitor.h',
-            'fakenetwork.h',
-            'fakesslidentity.h',
-            'faketaskrunner.h',
             'filelock.cc',
             'filelock.h',
             'fileutils_mock.h',
@@ -389,7 +393,6 @@
             'multipart.h',
             'natserver.cc',
             'natserver.h',
-            'natserver_main.cc',
             'natsocketfactory.cc',
             'natsocketfactory.h',
             'nattypes.cc',
@@ -419,8 +422,6 @@
             'testbase64.h',
             'testclient.cc',
             'testclient.h',
-            'testechoserver.h',
-            'testutils.h',
             'transformadapter.cc',
             'transformadapter.h',
             'versionparsing.cc',
@@ -433,7 +434,6 @@
             'win32socketinit.h',
             'win32socketserver.cc',
             'win32socketserver.h',
-            'win32toolhelp.h',
             'window.h',
             'windowpickerfactory.h',
             'windowpicker.h',
diff --git a/webrtc/base/base_tests.gyp b/webrtc/base/base_tests.gyp
index 406c73e1e..b5ab23f04 100644
--- a/webrtc/base/base_tests.gyp
+++ b/webrtc/base/base_tests.gyp
@@ -22,6 +22,7 @@
         'gunit.h',
         'testbase64.h',
         'testechoserver.h',
+        'testutils.h',
         'win32toolhelp.h',
       ],
       'dependencies': [
@@ -83,6 +84,8 @@
         'sharedexclusivelock_unittest.cc',
         'signalthread_unittest.cc',
         'sigslot_unittest.cc',
+        'sigslottester.h',
+        'sigslottester.h.pump',
         'socket_unittest.cc',
         'socket_unittest.h',
         'socketaddress_unittest.cc',
diff --git a/webrtc/base/natserver_main.cc b/webrtc/base/natserver_main.cc
deleted file mode 100644
index 3ad2113a6..000000000
--- a/webrtc/base/natserver_main.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <iostream>
-
-#include "webrtc/base/natserver.h"
-#include "webrtc/base/host.h"
-#include "webrtc/base/physicalsocketserver.h"
-
-using namespace rtc;
-
-int main(int argc, char* argv[]) {
-  if (argc != 3) {
-    std::cerr << "usage: natserver <internal-ip> <external-ip>" << std::endl;
-    exit(1);
-  }
-
-  SocketAddress internal = SocketAddress(argv[1]);
-  SocketAddress external = SocketAddress(argv[2]);
-  if (internal.EqualIPs(external)) {
-    std::cerr << "internal and external IPs must differ" << std::endl;
-    exit(1);
-  }
-
-  Thread* pthMain = Thread::Current();
-  PhysicalSocketServer* ss = new PhysicalSocketServer();
-  pthMain->set_socketserver(ss);
-  NATServer* server = new NATServer(NAT_OPEN_CONE, ss, internal, ss, external);
-  server = server;
-
-  pthMain->Run();
-  return 0;
-}