SERVER-9666 Collapse the low level cyclic libs into a new base lib

22 files changed, 162 insertions, 72 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 920e08ca950..7c807526d90 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -42,7 +42,7 @@ env.Library(
         'write_concern_options.cpp'
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/index_names',
         '$BUILD_DIR/mongo/util/foundation',
     ]
@@ -109,6 +109,7 @@ env.Library(
         'startup_warnings_common.cpp',
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
     ]
 )
 
@@ -163,6 +164,9 @@ env.Library(
     source=[
         "index_names.cpp",
     ],
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
+    ]
 )
 
 env.Library(
@@ -170,6 +174,11 @@ env.Library(
     source=[
         "hasher.cpp",
     ],
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/util/foundation',
+        '$BUILD_DIR/mongo/util/md5',
+    ]
 )
 
 # Range arithmetic library, used by both mongod and mongos
@@ -179,7 +188,7 @@ env.Library(
         'range_arithmetic.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/util/foundation',
     ],
 )
@@ -199,6 +208,9 @@ env.Library(
     source=[
         'global_timestamp.cpp',
     ],
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
+    ]
 )
 
 env.Library(
@@ -227,7 +239,7 @@ env.Library(
         "server_parameters.cpp",
     ],
     LIBDEPS=[
-        "$BUILD_DIR/mongo/bson/bson",
+        "$BUILD_DIR/mongo/base",
         "$BUILD_DIR/mongo/util/foundation",
     ],
 )
@@ -259,7 +271,7 @@ env.CppUnitTest(
         'update_index_data_test.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         'common',
         'update_index_data',
     ],
@@ -275,7 +287,7 @@ env.Library(
         "server_options.cpp",
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
     ],
 )
 
@@ -285,7 +297,7 @@ env.Library(
         "server_options_helpers.cpp",
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/util/cmdline_utils/cmdline_utils',
         # The dependency on network is a temporary crutch that should go away once the
         # networking library has separate options
@@ -313,8 +325,8 @@ env.Library(
         'range_deleter_mock_env.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/base/base',
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_global',
         '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/util/concurrency/synchronization',
@@ -344,9 +356,15 @@ env.Library(
         "server_extra_log_context.cpp",
     ],
     LIBDEPS=[
+        "$BUILD_DIR/mongo/client/clientdriver",
+        "$BUILD_DIR/mongo/rpc/command_reply",
+        "$BUILD_DIR/mongo/rpc/command_request",
+        "$BUILD_DIR/mongo/rpc/metadata",
         "$BUILD_DIR/mongo/util/net/message_server_port",
         "$BUILD_DIR/mongo/util/net/miniwebserver",
+        "$BUILD_DIR/mongo/util/processinfo",
         "$BUILD_DIR/mongo/util/signal_handlers",
+        "auth/authorization_manager_global",
     ],
 )
 
@@ -664,7 +682,11 @@ env.Library(
     source=[
         'log_process_details.cpp',
     ],
-    LIBDEPS=[],
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/util/net/network',
+        'server_options',
+    ],
 )
 
 env.Library(
@@ -673,5 +695,9 @@ env.Library(
         'conn_pool_options.cpp',
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/client/clientdriver',
+        '$BUILD_DIR/mongo/db/server_parameters',
+        '$BUILD_DIR/mongo/s/client/sharding_client',
     ],
 )
diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript
index 4a9cb6d1a6d..7e89f8fff74 100644
--- a/src/mongo/db/auth/SConscript
+++ b/src/mongo/db/auth/SConscript
@@ -31,24 +31,22 @@ env.Library('authcore', ['action_set.cpp',
                          'user_name.cpp',
                          'user_set.cpp'],
             LIBDEPS=['sasl_options',
-                     '$BUILD_DIR/mongo/base/base',
-                     '$BUILD_DIR/mongo/bson/bson',
+                     '$BUILD_DIR/mongo/base',
                      '$BUILD_DIR/mongo/bson/mutable/mutable_bson',
                      '$BUILD_DIR/mongo/bson/util/bson_extract',
                      '$BUILD_DIR/mongo/crypto/scramauth',
                      '$BUILD_DIR/mongo/db/common',
                      '$BUILD_DIR/mongo/db/ops/update_driver',
                      '$BUILD_DIR/mongo/db/namespace_string',
-                     '$BUILD_DIR/mongo/util/signal_handlers_synchronous',
-                     '$BUILD_DIR/mongo/util/stringutils',
                      '$BUILD_DIR/mongo/util/md5'])
 
 env.Library('authcommon',
             ['internal_user_auth.cpp'],
             LIBDEPS=[
-                '$BUILD_DIR/mongo/bson/bson',
+                '$BUILD_DIR/mongo/base',
                 '$BUILD_DIR/mongo/bson/mutable/mutable_bson',
                 '$BUILD_DIR/mongo/bson/util/bson_extract',
+                '$BUILD_DIR/mongo/db/server_options_core',
             ])
 
 env.Library('authorization_manager_global',
@@ -88,10 +86,20 @@ env.Library('authservercommon',
             ])
 
 env.Library('security_file',
-            ['security_file.cpp'])
+            ['security_file.cpp'],
+            LIBDEPS=[
+                '$BUILD_DIR/mongo/base',
+            ],
+)
 
 env.Library('sasl_options',
-            ['sasl_options.cpp'])
+            ['sasl_options.cpp'],
+            LIBDEPS=[
+                '$BUILD_DIR/mongo/base',
+                '$BUILD_DIR/mongo/db/server_parameters',
+                '$BUILD_DIR/mongo/util/options_parser/options_parser',
+            ],
+)
 
 env.Library('saslauth',
              ['native_sasl_authentication_session.cpp',
@@ -101,6 +109,7 @@ env.Library('saslauth',
              'sasl_server_conversation.cpp'],
              LIBDEPS=[
                 'authcore',
+                'authmocks', # Wat?
                 'sasl_options',
                 '$BUILD_DIR/mongo/crypto/scramauth',
                 '$BUILD_DIR/mongo/util/net/network'])
@@ -133,6 +142,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/matcher/expressions',
         '$BUILD_DIR/mongo/db/ops/update_driver',
         '$BUILD_DIR/mongo/db/service_context',
+        'authcore'
     ]
 )
 
diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript
index 118363ff1a7..e8f07ceb4d7 100644
--- a/src/mongo/db/catalog/SConscript
+++ b/src/mongo/db/catalog/SConscript
@@ -2,7 +2,7 @@
 
 Import("env")
 
-env.Library('collection_options', ['collection_options.cpp'], LIBDEPS=['$BUILD_DIR/mongo/bson/bson'])
+env.Library('collection_options', ['collection_options.cpp'], LIBDEPS=['$BUILD_DIR/mongo/base'])
 
 env.CppUnitTest('collection_options_test', ['collection_options_test.cpp'],
                 LIBDEPS=['collection_options'])
@@ -13,7 +13,7 @@ env.Library(
         "index_key_validate.cpp",
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/db/index_names',
     ],
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index 2c617b8e56c..52fd1f95b9e 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -9,7 +9,7 @@ env.Library(
         'server_status_metric.cpp',
         ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson'
+        '$BUILD_DIR/mongo/base'
         ]
     )
 
diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript
index 32ac7a41570..ebe267a5d03 100644
--- a/src/mongo/db/concurrency/SConscript
+++ b/src/mongo/db/concurrency/SConscript
@@ -22,7 +22,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/util/background_job',
-        '$BUILD_DIR/mongo/base/base',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/util/foundation',
         # Temporary crutch since the ssl cleanup is hard coded in background.cpp
         '$BUILD_DIR/mongo/util/net/network',
diff --git a/src/mongo/db/exec/SConscript b/src/mongo/db/exec/SConscript
index 282a49887d5..268d032418e 100644
--- a/src/mongo/db/exec/SConscript
+++ b/src/mongo/db/exec/SConscript
@@ -9,7 +9,7 @@ env.Library(
         "working_set.cpp",
     ],
     LIBDEPS = [
-        "$BUILD_DIR/mongo/bson/bson",
+        "$BUILD_DIR/mongo/base",
     ],
 )
 
@@ -29,6 +29,7 @@ env.Library(
         "scoped_timer.cpp",
     ],
     LIBDEPS = [
+        '$BUILD_DIR/mongo/util/net/network',
     ],
 )
 
@@ -75,7 +76,8 @@ env.Library(
     ],
     LIBDEPS = [
         "scoped_timer",
-        "$BUILD_DIR/mongo/bson/bson",
+        "working_set",
+        "$BUILD_DIR/mongo/base",
     ],
 )
 
diff --git a/src/mongo/db/fts/SConscript b/src/mongo/db/fts/SConscript
index 564eb28ce0c..5c9c28dcd05 100644
--- a/src/mongo/db/fts/SConscript
+++ b/src/mongo/db/fts/SConscript
@@ -41,7 +41,7 @@ baseEnv.Library('base', [
         'stop_words.cpp',
         'stop_words_list.cpp',
         'tokenizer.cpp',
-        ], LIBDEPS=["$BUILD_DIR/mongo/base/base",
+        ], LIBDEPS=["$BUILD_DIR/mongo/base",
                     "$BUILD_DIR/mongo/db/common",
                     "$BUILD_DIR/mongo/platform/platform",
                     "$BUILD_DIR/third_party/shim_stemmer"
@@ -49,7 +49,12 @@ baseEnv.Library('base', [
 
 env.Library( 'server_common', [
              'fts_enabled.cpp'
-             ] )
+             ],
+             LIBDEPS=[
+                 '$BUILD_DIR/mongo/base',
+                 '$BUILD_DIR/mongo/db/server_parameters',
+             ],
+)
 
 env.Library('ftsmongod', [
         ], LIBDEPS=["base","server_common"])
diff --git a/src/mongo/db/geo/SConscript b/src/mongo/db/geo/SConscript
index 518f52ec4e7..9c8e13d1268 100644
--- a/src/mongo/db/geo/SConscript
+++ b/src/mongo/db/geo/SConscript
@@ -7,14 +7,15 @@ env.Library("geometry", [ "hash.cpp",
                           "shapes.cpp",
                           "big_polygon.cpp",
                           "r2_region_coverer.cpp" ],
-            LIBDEPS = [ "$BUILD_DIR/mongo/bson/bson",
+            LIBDEPS = [ "$BUILD_DIR/mongo/base",
+                        "$BUILD_DIR/mongo/db/common",
                         "$BUILD_DIR/third_party/s2/s2" ])
 
 # Geometry / BSON parsing and wrapping
 env.Library("geoparser", [ "geoparser.cpp",
                            "geometry_container.cpp" ],
             LIBDEPS = [ "geometry",
-                        "$BUILD_DIR/mongo/bson/bson",
+                        "$BUILD_DIR/mongo/base",
                         "$BUILD_DIR/third_party/s2/s2" ])
 
 env.CppUnitTest("hash_test", [ "hash_test.cpp" ],
diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript
index abe30cdf819..1eca5ca05e3 100644
--- a/src/mongo/db/index/SConscript
+++ b/src/mongo/db/index/SConscript
@@ -8,6 +8,7 @@ env.Library(
             'index_descriptor.cpp',
         ],
         LIBDEPS=[
+            '$BUILD_DIR/mongo/base',
         ],
 )
 
@@ -20,7 +21,7 @@ env.Library(
         LIBDEPS=[
             'expression_params',
             's2_keys',
-            '$BUILD_DIR/mongo/bson/bson',
+            '$BUILD_DIR/mongo/base',
             '$BUILD_DIR/mongo/db/fts/base',
             '$BUILD_DIR/mongo/db/geo/geoparser',
             '$BUILD_DIR/mongo/db/index_names',
@@ -38,7 +39,7 @@ env.Library(
         LIBDEPS=[
             'key_generator',
             'expression_params',
-            '$BUILD_DIR/mongo/bson/bson',
+            '$BUILD_DIR/mongo/base',
         ],
 )
 
@@ -49,7 +50,7 @@ env.Library(
             's2_indexing_params.cpp',
         ],
         LIBDEPS=[
-            '$BUILD_DIR/mongo/bson/bson',
+            '$BUILD_DIR/mongo/base',
             '$BUILD_DIR/mongo/bson/util/bson_extract',
             '$BUILD_DIR/mongo/db/mongohasher',
             '$BUILD_DIR/third_party/s2/s2',
@@ -71,4 +72,4 @@ env.Library('s2_keys', [ 's2_keys.cpp' ],
         LIBDEPS=[
                 '$BUILD_DIR/mongo/db/geo/geometry',
         ],
-)
\ No newline at end of file
+)
diff --git a/src/mongo/db/matcher/SConscript b/src/mongo/db/matcher/SConscript
index 9d3dca01633..f91ca8b2b34 100644
--- a/src/mongo/db/matcher/SConscript
+++ b/src/mongo/db/matcher/SConscript
@@ -9,7 +9,7 @@ env.Library(
         'path_internal.cpp'
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/common',
     ],
 )
@@ -39,7 +39,7 @@ env.Library(
         "matcher.cpp",
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/third_party/shim_pcrecpp',
         'path',
diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript
index c445a91a7a4..de1bd249580 100644
--- a/src/mongo/db/ops/SConscript
+++ b/src/mongo/db/ops/SConscript
@@ -10,7 +10,7 @@ env.Library(
         'path_support.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/bson/mutable/mutable_bson',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/util/foundation',
@@ -207,7 +207,7 @@ env.Library(
         'update_driver.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/db/query/query_planner',
         '$BUILD_DIR/mongo/db/update_index_data',
diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript
index f84f7a20a40..19776fa8321 100644
--- a/src/mongo/db/pipeline/SConscript
+++ b/src/mongo/db/pipeline/SConscript
@@ -27,7 +27,7 @@ env.Library(
         ],
     LIBDEPS=[
         'field_path',
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/intrusive_counter',
         ]
diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript
index 8dc72cdc256..98497eeceee 100644
--- a/src/mongo/db/query/SConscript
+++ b/src/mongo/db/query/SConscript
@@ -26,7 +26,7 @@ env.Library(
         "command_request_response",
         "index_bounds",
         "lite_parsed_query",
-        "$BUILD_DIR/mongo/bson/bson",
+        "$BUILD_DIR/mongo/base",
         "$BUILD_DIR/mongo/db/matcher/expression_algo",
         "$BUILD_DIR/mongo/db/matcher/expressions",
         "$BUILD_DIR/mongo/db/matcher/expressions_text",
@@ -80,7 +80,7 @@ env.Library(
         "interval.cpp",
     ],
     LIBDEPS=[
-        "$BUILD_DIR/mongo/bson/bson",
+        "$BUILD_DIR/mongo/base",
         "$BUILD_DIR/mongo/db/index_names",
         "$BUILD_DIR/mongo/db/index/expression_params",
         "$BUILD_DIR/mongo/db/index/s2_keys",
@@ -96,7 +96,7 @@ env.Library(
         "explain_common.cpp"
     ],
     LIBDEPS=[
-        "$BUILD_DIR/mongo/bson/bson",
+        "$BUILD_DIR/mongo/base",
     ],
 )
 
@@ -112,7 +112,7 @@ env.Library(
         'killcursors_response.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/db/namespace_string',
         '$BUILD_DIR/mongo/rpc/command_status',
@@ -140,6 +140,9 @@ env.Library(
         "internal_plans.cpp"
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/db/exec/exec',
+        '$BUILD_DIR/mongo/db/exec/working_set',
     ],
 )
 
@@ -149,7 +152,7 @@ env.Library(
         "lite_parsed_query.cpp"
     ],
     LIBDEPS=[
-        "$BUILD_DIR/mongo/bson/bson",
+        "$BUILD_DIR/mongo/base",
         "$BUILD_DIR/mongo/db/repl/read_concern_args",
     ],
 )
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index f3e9a5a196b..f82cae2ec44 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -24,14 +24,14 @@ env.Library(
 env.Library('repl_settings',
             'repl_settings.cpp',
             LIBDEPS=[
-                '$BUILD_DIR/mongo/base/base',
+                '$BUILD_DIR/mongo/base',
                 '$BUILD_DIR/mongo/db/server_parameters'
             ])
 
 env.Library('rslog',
             'rslog.cpp',
             LIBDEPS=[
-                '$BUILD_DIR/mongo/logger/logger',
+                '$BUILD_DIR/mongo/base',
             ])
 
 env.Library('storage_interface',
@@ -109,6 +109,7 @@ env.Library(
         'oplog_interface_mock.cpp',
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
     ],
 )
 
@@ -157,7 +158,7 @@ env.Library(
         'rollback_source_impl.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/client/clientdriver',
     ],
 )
@@ -168,8 +169,12 @@ env.Library(
         'sync_tail.cpp',
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/db/auth/authorization_manager_global',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception',
+        '$BUILD_DIR/mongo/db/curop',
+        '$BUILD_DIR/mongo/util/concurrency/thread_pool',
+        'repl_coordinator_global',
     ],
 )
 
@@ -204,6 +209,7 @@ env.Library('topology_coordinator_impl',
             ],
             LIBDEPS=[
                 'replication_executor',
+                'replica_set_messages',
                 'repl_settings',
                 'rslog',
                 'topology_coordinator',
@@ -255,9 +261,10 @@ env.Library('repl_coordinator_test_fixture',
                 'replication_coordinator_test_fixture.cpp',
             ],
             LIBDEPS=[
+                '$BUILD_DIR/mongo/unittest/unittest',
                 'repl_coordinator_impl',
                 'replmocks',
-                'topology_coordinator_impl',
+                'topology_coordinator_impl',\
             ])
 
 env.CppUnitTest('repl_coordinator_impl_test',
@@ -334,6 +341,7 @@ env.Library('repl_coordinator_interface',
             ['replication_coordinator.cpp',
              'replication_coordinator_external_state.cpp'],
             LIBDEPS=[
+                '$BUILD_DIR/mongo/db/service_context',
                 '$BUILD_DIR/mongo/util/net/hostandport',
                 'optime',
             ])
@@ -363,7 +371,7 @@ env.Library('read_concern_args',
                 'read_concern_args.cpp'
             ],
             LIBDEPS=[
-                '$BUILD_DIR/mongo/base/base',
+                '$BUILD_DIR/mongo/base',
                 '$BUILD_DIR/mongo/bson/util/bson_extract',
                 'optime',
             ])
@@ -388,7 +396,7 @@ env.Library('replica_set_messages',
             ],
             LIBDEPS=[
                 'read_concern_args',
-                '$BUILD_DIR/mongo/bson/bson',
+                '$BUILD_DIR/mongo/base',
                 '$BUILD_DIR/mongo/bson/util/bson_extract',
                 '$BUILD_DIR/mongo/util/net/hostandport',
                 '$BUILD_DIR/mongo/db/common',
@@ -426,7 +434,8 @@ env.Library(
         'repl_set_declare_election_winner.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/logger/logger',
+        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/db/coredb',
     ],
 )
 
@@ -437,7 +446,7 @@ env.Library(
     ],
     LIBDEPS=[
         'replication_executor',
-        '$BUILD_DIR/mongo/logger/logger',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/namespace_string',
         '$BUILD_DIR/mongo/rpc/command_status',
     ],
@@ -471,7 +480,7 @@ env.Library(
         'replication_executor',
         '$BUILD_DIR/mongo/db/catalog/collection_options',
         '$BUILD_DIR/mongo/client/fetcher',
-        '$BUILD_DIR/mongo/logger/logger',
+        '$BUILD_DIR/mongo/base',
     ],
 )
 
@@ -523,6 +532,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/unittest/concurrency',
         '$BUILD_DIR/mongo/util/decorable',
+        '$BUILD_DIR/mongo/unittest/unittest',
     ],
 )
 
@@ -577,7 +587,7 @@ env.Library(target='optime',
                 'optime.cpp',
             ],
             LIBDEPS=[
-                '$BUILD_DIR/mongo/bson/bson',
+                '$BUILD_DIR/mongo/base',
             ])
 
 env.Library(
@@ -609,6 +619,7 @@ env.Library(
         'applier',
         'collection_cloner',
         'database_cloner',
+        'optime',
         'reporter',
         '$BUILD_DIR/mongo/client/fetcher',
     ],
@@ -633,8 +644,7 @@ env.Library(
         'roll_back_local_operations.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
-        '$BUILD_DIR/mongo/logger/logger',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/util/foundation',
     ],
 )
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index dd07491dcf8..5fd7ae83820 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -9,8 +9,7 @@ env.Library(
         'metadata_loader.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/base/base',
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/db/range_arithmetic',
         '$BUILD_DIR/mongo/s/catalog/catalog_types',
@@ -27,8 +26,7 @@ env.Library(
         'sharding_state.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/base/base',
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/bson/util/bson_extract',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/s/sharding_initialization',
@@ -51,4 +49,4 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/s/coreshard',
         '$BUILD_DIR/mongo/s/mongoscore',
     ]
-)
\ No newline at end of file
+)
diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript
index af46ba98832..0dea68e45da 100644
--- a/src/mongo/db/stats/SConscript
+++ b/src/mongo/db/stats/SConscript
@@ -8,7 +8,7 @@ env.Library(
         'timer_stats.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/util/foundation',
         '$BUILD_DIR/mongo/util/concurrency/spin_lock',
     ],
@@ -50,5 +50,7 @@ env.Library(
         'counters.cpp',
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/util/concurrency/spin_lock',
     ],
 )
diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript
index d77d3c5351d..d564a784e06 100644
--- a/src/mongo/db/storage/SConscript
+++ b/src/mongo/db/storage/SConscript
@@ -16,7 +16,9 @@ env.Library(
     source=[
         'index_entry_comparison.cpp',
         ],
-    LIBDEPS=[]
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
+        ],
     )
 
 env.Library(
@@ -24,7 +26,9 @@ env.Library(
     source=[
         'key_string.cpp',
         ],
-    LIBDEPS=[]
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
+        ],
     )
 
 
@@ -45,7 +49,7 @@ env.Library(
         'oplog_hack.cpp',
         ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         ]
     )
 
@@ -55,6 +59,7 @@ env.Library(
         'paths.cpp',
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
     ],
 )
 
@@ -80,6 +85,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/unittest/unittest',
         'index_entry_comparison',
     ],
 )
@@ -105,6 +111,7 @@ env.Library(
         'record_store_test_validate.cpp',
         ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/unittest/unittest',
         '$BUILD_DIR/mongo/db/service_context',
         ]
     )
@@ -115,6 +122,7 @@ env.Library(
         'storage_engine_lock_file_${TARGET_OS_FAMILY}.cpp',
         ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/platform/platform',
         'paths',
         ]
     )
@@ -133,7 +141,7 @@ env.Library(
         'storage_engine_metadata.cpp',
         ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         ]
     )
 
@@ -150,6 +158,6 @@ env.CppUnitTest(
     source='key_string_test.cpp',
     LIBDEPS=[
         'key_string',
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         ]
 )
diff --git a/src/mongo/db/storage/devnull/SConscript b/src/mongo/db/storage/devnull/SConscript
index 3c64dc8108d..e3355801c3c 100644
--- a/src/mongo/db/storage/devnull/SConscript
+++ b/src/mongo/db/storage/devnull/SConscript
@@ -7,6 +7,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/storage/in_memory/in_memory_record_store',
+        '$BUILD_DIR/mongo/db/storage/kv/kv_storage_engine',
     ],
 )
 
diff --git a/src/mongo/db/storage/in_memory/SConscript b/src/mongo/db/storage/in_memory/SConscript
index 70676b463d1..b077784f505 100644
--- a/src/mongo/db/storage/in_memory/SConscript
+++ b/src/mongo/db/storage/in_memory/SConscript
@@ -6,7 +6,7 @@ env.Library(
         'in_memory_record_store.cpp'
         ],
     LIBDEPS= [
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/storage/oplog_hack',
         '$BUILD_DIR/mongo/util/foundation',
         ]
@@ -21,7 +21,7 @@ env.Library(
         ],
     LIBDEPS= [
         'in_memory_record_store',
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/namespace_string',
         '$BUILD_DIR/mongo/db/catalog/collection_options',
         '$BUILD_DIR/mongo/db/index/index_descriptor',
diff --git a/src/mongo/db/storage/kv/SConscript b/src/mongo/db/storage/kv/SConscript
index 2e1b78fc748..15635a09912 100644
--- a/src/mongo/db/storage/kv/SConscript
+++ b/src/mongo/db/storage/kv/SConscript
@@ -9,6 +9,7 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/index/index_descriptor',
+        '$BUILD_DIR/mongo/db/namespace_string',
         '$BUILD_DIR/mongo/db/storage/bson_collection_catalog_entry',
         ]
     )
@@ -17,15 +18,23 @@ env.Library(
 env.Library(
     target='kv_database_catalog_entry_core',
     source=['kv_database_catalog_entry.cpp'],
-    LIBDEPS=[]
-    )
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/db/storage/bson_collection_catalog_entry',
+        '$BUILD_DIR/mongo/db/storage/kv/kv_engine_core',
+    ],
+)
 
 # Should not be referenced outside this SConscript file.
 env.Library(
     target='kv_storage_engine',
     source=['kv_storage_engine.cpp'],
-    LIBDEPS=[]
-    )
+    LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/db/storage/kv/kv_engine_core',
+        'kv_database_catalog_entry_core',
+    ],
+)
 
 # KVDatabaseCatalogEntry::getIndex() depends on index access methods
 # in $BUILD_DIR/mongo/serveronly.
@@ -62,6 +71,7 @@ env.Library(
         ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/unittest/unittest',
         'kv_engine_core',
         ]
     )
diff --git a/src/mongo/db/storage/mmap_v1/SConscript b/src/mongo/db/storage/mmap_v1/SConscript
index 841e8f9ce48..d12321d6e15 100644
--- a/src/mongo/db/storage/mmap_v1/SConscript
+++ b/src/mongo/db/storage/mmap_v1/SConscript
@@ -36,6 +36,7 @@ env.Library(
         'file_allocator',
         'logfile',
         'compress',
+        '$BUILD_DIR/mongo/db/catalog/collection_options',
         '$BUILD_DIR/mongo/db/storage/paths',
     ]
     )
@@ -50,6 +51,7 @@ compressEnv.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/storage/paths',
+        '$BUILD_DIR/third_party/shim_snappy',
     ],
 )
 
@@ -60,7 +62,7 @@ env.Library(
         'extent_manager.cpp',
         ],
     LIBDEPS= [
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/util/foundation',
         ]
     )
@@ -72,6 +74,9 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/storage/paths',
+        '$BUILD_DIR/mongo/util/fail_point',
+        '$BUILD_DIR/mongo/util/foundation',
+        '$BUILD_DIR/mongo/util/processinfo',
     ],
 )
 
@@ -82,6 +87,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/storage/paths',
+        'mmap',
     ],
 )
 
@@ -94,6 +100,7 @@ env.Library(
     LIBDEPS=[
         'file_allocator',
         '$BUILD_DIR/mongo/util/foundation',
+        '$BUILD_DIR/mongo/util/progress_meter',
     ],
 )
 
@@ -121,6 +128,7 @@ env.Library(
     source=['record_store_v1_test_help.cpp',
             ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/unittest/unittest',
         'record_store_v1'
         ]
     )
@@ -130,6 +138,9 @@ env.Library(
     source=['record_access_tracker.cpp',
             ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/util/net/network',
+        '$BUILD_DIR/mongo/util/processinfo',
         ]
     )
 
@@ -196,8 +207,9 @@ env.Library(
         'btree/key.cpp'
         ],
     LIBDEPS= [
-        '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/service_context',
+        'record_store_v1',
         ]
     )
 
diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript
index 8247ea0ddde..92f8f59258d 100644
--- a/src/mongo/db/storage/wiredtiger/SConscript
+++ b/src/mongo/db/storage/wiredtiger/SConscript
@@ -22,11 +22,12 @@ if wiredtiger:
             'wiredtiger_util.cpp',
             ],
         LIBDEPS= [
-            '$BUILD_DIR/mongo/bson/bson',
+            '$BUILD_DIR/mongo/base',
             '$BUILD_DIR/mongo/db/namespace_string',
             '$BUILD_DIR/mongo/db/catalog/collection_options',
             '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception',
             '$BUILD_DIR/mongo/db/index/index_descriptor',
+            '$BUILD_DIR/mongo/db/service_context',
             '$BUILD_DIR/mongo/db/storage/index_entry_comparison',
             '$BUILD_DIR/mongo/db/storage/key_string',
             '$BUILD_DIR/mongo/db/storage/oplog_hack',