diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index 41221cd54..8ad4c110d 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -310,210 +310,6 @@
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
       ],
       'sources': [
-        'base/asyncfile.cc',
-        'base/asyncfile.h',
-        'base/asynchttprequest.cc',
-        'base/asynchttprequest.h',
-        'base/asyncinvoker.cc',
-        'base/asyncinvoker.h',
-        'base/asyncpacketsocket.h',
-        'base/asyncresolverinterface.h',
-        'base/asyncsocket.cc',
-        'base/asyncsocket.h',
-        'base/asynctcpsocket.cc',
-        'base/asynctcpsocket.h',
-        'base/asyncudpsocket.cc',
-        'base/asyncudpsocket.h',
-        'base/atomicops.h',
-        'base/autodetectproxy.cc',
-        'base/autodetectproxy.h',
-        'base/bandwidthsmoother.cc',
-        'base/bandwidthsmoother.h',
-        'base/base64.cc',
-        'base/base64.h',
-        'base/basicdefs.h',
-        'base/basictypes.h',
-        'base/bind.h',
-        'base/buffer.h',
-        'base/bytebuffer.cc',
-        'base/bytebuffer.h',
-        'base/byteorder.h',
-        'base/callback.h',
-        'base/checks.cc',
-        'base/checks.h',
-        'base/common.cc',
-        'base/common.h',
-        'base/constructormagic.h',
-        'base/cpumonitor.cc',
-        'base/cpumonitor.h',
-        'base/crc32.cc',
-        'base/crc32.h',
-        'base/criticalsection.h',
-        'base/cryptstring.h',
-        'base/diskcache.cc',
-        'base/diskcache.h',
-        'base/event.cc',
-        'base/event.h',
-        'base/filelock.cc',
-        'base/filelock.h',
-        'base/fileutils.cc',
-        'base/fileutils.h',
-        'base/fileutils_mock.h',
-        'base/firewallsocketserver.cc',
-        'base/firewallsocketserver.h',
-        'base/flags.cc',
-        'base/flags.h',
-        'base/gunit_prod.h',
-        'base/helpers.cc',
-        'base/helpers.h',
-        'base/httpbase.cc',
-        'base/httpbase.h',
-        'base/httpclient.cc',
-        'base/httpclient.h',
-        'base/httpcommon-inl.h',
-        'base/httpcommon.cc',
-        'base/httpcommon.h',
-        'base/httprequest.cc',
-        'base/httprequest.h',
-        'base/httpserver.cc',
-        'base/httpserver.h',
-        'base/ifaddrs-android.cc',
-        'base/ifaddrs-android.h',
-        'base/ipaddress.cc',
-        'base/ipaddress.h',
-        'base/json.cc',
-        'base/json.h',
-        'base/linked_ptr.h',
-        'base/linuxfdwalk.h',
-        'base/logging.cc',
-        'base/logging.h',
-        'base/maccocoathreadhelper.h',
-        'base/maccocoathreadhelper.mm',
-        'base/mathutils.h',
-        'base/md5.cc',
-        'base/md5.h',
-        'base/md5digest.h',
-        'base/messagedigest.cc',
-        'base/messagedigest.h',
-        'base/messagehandler.cc',
-        'base/messagehandler.h',
-        'base/messagequeue.cc',
-        'base/messagequeue.h',
-        'base/multipart.cc',
-        'base/multipart.h',
-        'base/natserver.cc',
-        'base/natserver.h',
-        'base/natsocketfactory.cc',
-        'base/natsocketfactory.h',
-        'base/nattypes.cc',
-        'base/nattypes.h',
-        'base/nethelpers.cc',
-        'base/nethelpers.h',
-        'base/network.cc',
-        'base/network.h',
-        'base/nssidentity.cc',
-        'base/nssidentity.h',
-        'base/nssstreamadapter.cc',
-        'base/nssstreamadapter.h',
-        'base/nullsocketserver.h',
-        'base/optionsfile.cc',
-        'base/optionsfile.h',
-        'base/pathutils.cc',
-        'base/pathutils.h',
-        'base/physicalsocketserver.cc',
-        'base/physicalsocketserver.h',
-        'base/profiler.cc',
-        'base/profiler.h',
-        'base/proxydetect.cc',
-        'base/proxydetect.h',
-        'base/proxyinfo.cc',
-        'base/proxyinfo.h',
-        'base/proxyserver.cc',
-        'base/proxyserver.h',
-        'base/ratelimiter.cc',
-        'base/ratelimiter.h',
-        'base/ratetracker.cc',
-        'base/ratetracker.h',
-        'base/refcount.h',
-        'base/referencecountedsingletonfactory.h',
-        'base/rollingaccumulator.h',
-        'base/scoped_autorelease_pool.h',
-        'base/scoped_ptr.h',
-        'base/scoped_ref_ptr.h',
-        'base/scopedptrcollection.h',
-        'base/sec_buffer.h',
-        'base/sha1.cc',
-        'base/sha1.h',
-        'base/sha1digest.h',
-        'base/sharedexclusivelock.cc',
-        'base/sharedexclusivelock.h',
-        'base/signalthread.cc',
-        'base/signalthread.h',
-        'base/sigslot.h',
-        'base/sigslotrepeater.h',
-        'base/socket.h',
-        'base/socketadapters.cc',
-        'base/socketadapters.h',
-        'base/socketaddress.cc',
-        'base/socketaddress.h',
-        'base/socketaddresspair.cc',
-        'base/socketaddresspair.h',
-        'base/socketfactory.h',
-        'base/socketpool.cc',
-        'base/socketpool.h',
-        'base/socketserver.h',
-        'base/socketstream.cc',
-        'base/socketstream.h',
-        'base/ssladapter.cc',
-        'base/ssladapter.h',
-        'base/sslconfig.h',
-        'base/sslfingerprint.cc',
-        'base/sslfingerprint.h',
-        'base/sslidentity.cc',
-        'base/sslidentity.h',
-        'base/sslroots.h',
-        'base/sslsocketfactory.cc',
-        'base/sslsocketfactory.h',
-        'base/sslstreamadapter.cc',
-        'base/sslstreamadapter.h',
-        'base/sslstreamadapterhelper.cc',
-        'base/sslstreamadapterhelper.h',
-        'base/stream.cc',
-        'base/stream.h',
-        'base/stringdigest.h',
-        'base/stringencode.cc',
-        'base/stringencode.h',
-        'base/stringutils.cc',
-        'base/stringutils.h',
-        'base/systeminfo.cc',
-        'base/systeminfo.h',
-        'base/task.cc',
-        'base/task.h',
-        'base/taskparent.cc',
-        'base/taskparent.h',
-        'base/taskrunner.cc',
-        'base/taskrunner.h',
-        'base/testclient.cc',
-        'base/testclient.h',
-        'base/thread.cc',
-        'base/thread.h',
-        'base/timeutils.cc',
-        'base/timeutils.h',
-        'base/timing.cc',
-        'base/timing.h',
-        'base/transformadapter.cc',
-        'base/transformadapter.h',
-        'base/urlencode.cc',
-        'base/urlencode.h',
-        'base/versionparsing.cc',
-        'base/versionparsing.h',
-        'base/virtualsocketserver.cc',
-        'base/virtualsocketserver.h',
-        'base/window.h',
-        'base/windowpicker.h',
-        'base/windowpickerfactory.h',
-        'base/worker.cc',
-        'base/worker.h',
         'xmllite/qname.cc',
         'xmllite/qname.h',
         'xmllite/xmlbuilder.cc',
@@ -602,183 +398,6 @@
         'xmpp/xmppthread.cc',
         'xmpp/xmppthread.h',
       ],
-      'conditions': [
-        ['OS=="android"', {
-          'sources': [
-            'base/ifaddrs-android.cc',
-          ],
-          'link_settings': {
-            'libraries': [
-              '-llog',
-              '-lGLESv2',
-            ],
-          },
-        }],
-        ['OS=="linux" or OS=="android"', {
-          'sources': [
-            'base/linux.cc',
-            'base/linux.h',
-          ],
-        }],
-        ['OS=="linux"', {
-          'sources': [
-            'base/dbus.cc',
-            'base/dbus.h',
-            'base/libdbusglibsymboltable.cc',
-            'base/libdbusglibsymboltable.h',
-            'base/linuxfdwalk.c',
-            'base/linuxwindowpicker.cc',
-            'base/linuxwindowpicker.h',
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lcrypto',
-              '-ldl',
-              '-lrt',
-              '-lXext',
-              '-lX11',
-              '-lXcomposite',
-              '-lXrender',
-              '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
-            ],
-          },
-          'cflags': [
-            '<!@(<(pkg-config) --cflags nss)',
-          ],
-          'ldflags': [
-            '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
-          ],
-        }],
-        ['OS=="mac"', {
-          'sources': [
-            'base/macasyncsocket.cc',
-            'base/macasyncsocket.h',
-            'base/maccocoasocketserver.h',
-            'base/maccocoasocketserver.mm',
-            'base/macconversion.cc',
-            'base/macconversion.h',
-            'base/macsocketserver.cc',
-            'base/macsocketserver.h',
-            'base/macutils.cc',
-            'base/macutils.h',
-            'base/macwindowpicker.cc',
-            'base/macwindowpicker.h',
-            'base/scoped_autorelease_pool.mm',
-          ],
-          'link_settings': {
-            'libraries': [
-              '$(SDKROOT)/usr/lib/libcrypto.dylib',
-              '$(SDKROOT)/usr/lib/libssl.dylib',
-            ],
-          },
-          'all_dependent_settings': {
-            'link_settings': {
-              'xcode_settings': {
-                'OTHER_LDFLAGS': [
-                  '-framework Cocoa',
-                  '-framework Foundation',
-                  '-framework IOKit',
-                  '-framework Security',
-                  '-framework SystemConfiguration',
-                ],
-              },
-            },
-          },
-          'conditions': [
-            ['target_arch=="ia32"', {
-              'all_dependent_settings': {
-                'link_settings': {
-                  'xcode_settings': {
-                    'OTHER_LDFLAGS': [
-                      '-framework Carbon',
-                    ],
-                  },
-                },
-              },
-            }],
-          ],
-        }],
-        ['OS=="ios"', {
-          'sources': [
-            'base/iosfilesystem.mm',
-            'base/scoped_autorelease_pool.mm',
-          ],
-          'dependencies': [
-            '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
-          ],
-          'all_dependent_settings': {
-            'xcode_settings': {
-              'OTHER_LDFLAGS': [
-                '-framework Foundation',
-                '-framework Security',
-                '-framework SystemConfiguration',
-                '-framework UIKit',
-              ],
-            },
-          },
-        }],
-        ['OS=="win"', {
-          'sources': [
-            'base/diskcache_win32.cc',
-            'base/diskcache_win32.h',
-            'base/schanneladapter.cc',
-            'base/schanneladapter.h',
-            'base/win32.cc',
-            'base/win32.h',
-            'base/win32filesystem.cc',
-            'base/win32filesystem.h',
-            'base/win32regkey.cc',
-            'base/win32regkey.h',
-            'base/win32securityerrors.cc',
-            'base/win32socketinit.cc',
-            'base/win32socketinit.h',
-            'base/win32socketserver.cc',
-            'base/win32socketserver.h',
-            'base/win32window.cc',
-            'base/win32window.h',
-            'base/win32windowpicker.cc',
-            'base/win32windowpicker.h',
-            'base/winfirewall.cc',
-            'base/winfirewall.h',
-            'base/winping.cc',
-            'base/winping.h',
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lcrypt32.lib',
-              '-liphlpapi.lib',
-              '-lsecur32.lib',
-            ],
-          },
-          # Suppress warnings about WIN32_LEAN_AND_MEAN.
-          'msvs_disabled_warnings': [4005],
-        }],
-        ['os_posix==1', {
-          'sources': [
-            'base/latebindingsymboltable.cc',
-            'base/latebindingsymboltable.h',
-            'base/posix.cc',
-            'base/posix.h',
-            'base/unixfilesystem.cc',
-            'base/unixfilesystem.h',
-          ],
-          'conditions': [
-            ['OS!="ios"', {
-              'sources': [
-                'base/openssl.h',
-                'base/openssladapter.cc',
-                'base/openssladapter.h',
-                'base/openssldigest.cc',
-                'base/openssldigest.h',
-                'base/opensslidentity.cc',
-                'base/opensslidentity.h',
-                'base/opensslstreamadapter.cc',
-                'base/opensslstreamadapter.h',
-              ],
-            }],
-          ],
-        }],
-      ],  # conditions
     },  # target libjingle
     {
       'target_name': 'libjingle_sound',