diff --git a/.gitignore b/.gitignore
index c63db5085a..bb0d2d2665 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@
 /base/
 /build/
 /docs/
+/ipc/
+/net/
 /out/
 /testing/
 /third_party/gflags/
diff --git a/DEPS b/DEPS
index cb1c01eb67..9c2430dba8 100644
--- a/DEPS
+++ b/DEPS
@@ -28,6 +28,22 @@ deps = {
   "src/build":
     Var("chromium_svn") + "/src/build@" + Var("chromium_rev"),
 
+  # Required by base/metrics/stats_table.cc.
+  "src/ipc":
+    File(Var("chromium_svn") + "/src/ipc/ipc_descriptors.h@" + Var("chromium_rev")),
+
+  # Required by base isolate dependencies, although it is compiled off.
+  # Dependency chain:
+  # base/base.gyp <= base/base_unittests.isolate
+  #               <= base/base.isolate
+  #               <= build/linux/system.isolate
+  #               <= net/third_party/nss/ssl.isolate
+  #               <= net/third_party/nss/ssl_base.isolate
+  # We don't need to pull in the whole directory, but it doesn't seem possible
+  # to just pull in the two *.isolate files (ssl.isolate and ssl_base.isolate).
+  "src/net/third_party/nss":
+    Var("chromium_svn") + "/src/net/third_party/nss@" + Var("chromium_rev"),
+
   "src/testing":
     Var("chromium_svn") + "/src/testing@" + Var("chromium_rev"),
 
diff --git a/ipc/README.packager b/ipc/README.packager
deleted file mode 100644
index bccc3d499d..0000000000
--- a/ipc/README.packager
+++ /dev/null
@@ -1,7 +0,0 @@
-Description:
-This directory is included to resolve base/metrics/stats_table.cc dependency
-on ipc/ipc_descriptors.h.
-
-File(s):
-ipc/ipc_descritors.h
-
diff --git a/ipc/ipc_descriptors.h b/ipc/ipc_descriptors.h
deleted file mode 100644
index 41560df64b..0000000000
--- a/ipc/ipc_descriptors.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef IPC_IPC_DESCRIPTORS_H_
-#define IPC_IPC_DESCRIPTORS_H_
-
-// This is a list of global descriptor keys to be used with the
-// base::GlobalDescriptors object (see base/posix/global_descriptors.h)
-enum {
-  kPrimaryIPCChannel = 0,
-  kStatsTableSharedMemFd,
-
-  // The first key that can be use to register descriptors.
-  kIPCDescriptorMax
-
-};
-
-#endif  // IPC_IPC_DESCRIPTORS_H_
diff --git a/net/README.packager b/net/README.packager
deleted file mode 100644
index d60c263a81..0000000000
--- a/net/README.packager
+++ /dev/null
@@ -1,15 +0,0 @@
-Description:
-This directory is included to resolve gyp dependency on *.isolate when parsing
-base.gyp. Although the involved target is supposed to compiled off, gyp
-still tries to locate the included *.isolate. Refer below for the dependency
-chain.
-
-Dependency Chain:
-base/base.gyp <= base/base_unittests.isolate <= base/base.isolate
-    <= build/linux/system.isolate <= net/third_party/nss/ssl.isolate
-    <= net/third_party/nss/ssl_base.isolate
-
-File(s):
-net/third_party/nss/ssl_base.isolate
-net/third_party/nss/ssl.isolate
-
diff --git a/net/third_party/nss/ssl.isolate b/net/third_party/nss/ssl.isolate
deleted file mode 100644
index f538e82e84..0000000000
--- a/net/third_party/nss/ssl.isolate
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-{
-  'conditions': [
-    ['OS=="mac" and component=="shared_library"', {
-      'variables': {
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/libcrssl.dylib',
-        ],
-      },
-    }],
-    ['OS=="win" and component=="shared_library"', {
-      'variables': {
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/crssl.dll',
-        ],
-      },
-    }],
-  ],
-  'includes': [
-    'ssl_base.isolate',
-  ],
-}
diff --git a/net/third_party/nss/ssl_base.isolate b/net/third_party/nss/ssl_base.isolate
deleted file mode 100644
index 3bae2bdd39..0000000000
--- a/net/third_party/nss/ssl_base.isolate
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-#
-# This is what is included by base_unittests.
-{
-  'conditions': [
-    ['OS=="linux" and component=="shared_library" and use_openssl==0', {
-      'variables': {
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/lib/libcrssl.so',
-        ],
-      },
-    }],
-  ],
-}