SERVER-19252 Move all mongos catalog types to s/catalog

34 files changed, 49 insertions, 75 deletions

diff --git a/src/mongo/dbtests/config_server_fixture.cpp b/src/mongo/dbtests/config_server_fixture.cpp
index a3e7f0c37e9..51f3ea5ae97 100644
--- a/src/mongo/dbtests/config_server_fixture.cpp
+++ b/src/mongo/dbtests/config_server_fixture.cpp
@@ -37,8 +37,8 @@
 #include "mongo/dbtests/dbtests.h"
 #include "mongo/s/catalog/type_chunk.h"
 #include "mongo/s/catalog/legacy/legacy_dist_lock_manager.h"
+#include "mongo/s/catalog/type_config_version.h"
 #include "mongo/s/d_state.h"
-#include "mongo/s/type_config_version.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/util/log.h"
 
diff --git a/src/mongo/dbtests/config_upgrade_tests.cpp b/src/mongo/dbtests/config_upgrade_tests.cpp
index 91157015a81..eea23c6f2b5 100644
--- a/src/mongo/dbtests/config_upgrade_tests.cpp
+++ b/src/mongo/dbtests/config_upgrade_tests.cpp
@@ -30,12 +30,12 @@
 #include "mongo/s/catalog/legacy/cluster_client_internal.h"
 #include "mongo/s/catalog/legacy/config_upgrade.h"
 #include "mongo/s/catalog/type_chunk.h"
+#include "mongo/s/catalog/type_config_version.h"
+#include "mongo/s/catalog/type_mongos.h"
 #include "mongo/s/catalog/type_settings.h"
 #include "mongo/s/catalog/type_shard.h"
 #include "mongo/s/chunk_version.h"
 #include "mongo/s/grid.h"
-#include "mongo/s/type_mongos.h"
-#include "mongo/s/type_config_version.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/version.h"
 
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index 28f82ab5a6e..a6fa1c3fc50 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -11,21 +11,6 @@ env.SConscript(
 )
 
 env.Library(
-    target='base',
-    source=[
-        'type_locks.cpp',
-        'type_lockpings.cpp',
-        'type_config_version.cpp',
-        'type_mongos.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base/base',
-        '$BUILD_DIR/mongo/bson/bson',
-        '$BUILD_DIR/mongo/db/common',
-    ]
-)
-
-env.Library(
     target='shard_util',
     source=[
         'shard_util.cpp',
@@ -36,24 +21,7 @@ env.Library(
 )
 
 env.CppUnitTest('chunk_version_test', 'chunk_version_test.cpp',
-                LIBDEPS=['base',
-                         '$BUILD_DIR/mongo/db/common'])
-
-env.CppUnitTest('type_config_version_test', 'type_config_version_test.cpp',
-                LIBDEPS=['base',
-                         '$BUILD_DIR/mongo/db/common'])
-
-env.CppUnitTest('type_locks_test', 'type_locks_test.cpp',
-                LIBDEPS=['base',
-                         '$BUILD_DIR/mongo/db/common'])
-
-env.CppUnitTest('type_lockpings_test', 'type_lockpings_test.cpp',
-                LIBDEPS=['base',
-                         '$BUILD_DIR/mongo/db/common'])
-
-env.CppUnitTest('type_mongos_test', 'type_mongos_test.cpp',
-                LIBDEPS=['base',
-                         '$BUILD_DIR/mongo/db/common'])
+                LIBDEPS=['$BUILD_DIR/mongo/db/common'])
 
 #
 # Support for maintaining persistent sharding state and data.
@@ -66,7 +34,6 @@ env.Library(
         'metadata_loader.cpp',
     ],
     LIBDEPS=[
-        'base',
         'catalog/catalog_types',
         '$BUILD_DIR/mongo/bson/bson',
         '$BUILD_DIR/mongo/base/base',
@@ -250,8 +217,8 @@ env.Library(
         'version_manager.cpp',
     ],
     LIBDEPS=[
-        'base',
         'catalog/catalog_manager',
+        'catalog/catalog_types',
         'client/sharding_client',
         'cluster_ops_impl',
         'shard_util',
diff --git a/src/mongo/s/balance.cpp b/src/mongo/s/balance.cpp
index 7b836bb26d8..b3afa0d48ae 100644
--- a/src/mongo/s/balance.cpp
+++ b/src/mongo/s/balance.cpp
@@ -48,6 +48,7 @@
 #include "mongo/s/catalog/type_actionlog.h"
 #include "mongo/s/catalog/type_chunk.h"
 #include "mongo/s/catalog/type_collection.h"
+#include "mongo/s/catalog/type_mongos.h"
 #include "mongo/s/catalog/type_settings.h"
 #include "mongo/s/catalog/type_tags.h"
 #include "mongo/s/chunk_manager.h"
@@ -56,7 +57,6 @@
 #include "mongo/s/grid.h"
 #include "mongo/s/client/shard.h"
 #include "mongo/s/client/shard_registry.h"
-#include "mongo/s/type_mongos.h"
 #include "mongo/util/exit.h"
 #include "mongo/util/fail_point_service.h"
 #include "mongo/util/log.h"
diff --git a/src/mongo/s/catalog/SConscript b/src/mongo/s/catalog/SConscript
index a22f760d478..1771abffae3 100644
--- a/src/mongo/s/catalog/SConscript
+++ b/src/mongo/s/catalog/SConscript
@@ -16,7 +16,11 @@ env.Library(
         'type_changelog.cpp',
         'type_chunk.cpp',
         'type_collection.cpp',
+        'type_config_version.cpp',
         'type_database.cpp',
+        'type_lockpings.cpp',
+        'type_locks.cpp',
+        'type_mongos.cpp',
         'type_settings.cpp',
         'type_shard.cpp',
         'type_tags.cpp',
@@ -63,7 +67,11 @@ env.CppUnitTest(
         'type_changelog_test.cpp',
         'type_chunk_test.cpp',
         'type_collection_test.cpp',
+        'type_config_version_test.cpp',
         'type_database_test.cpp',
+        'type_lockpings_test.cpp',
+        'type_locks_test.cpp',
+        'type_mongos_test.cpp',
         'type_settings_test.cpp',
         'type_shard_test.cpp',
         'type_tags_test.cpp',
@@ -109,13 +117,13 @@ env.Library(
         'dist_lock_catalog_impl.cpp',
     ],
     LIBDEPS=[
+        'catalog_types',
         '$BUILD_DIR/mongo/base/base',
         '$BUILD_DIR/mongo/client/read_preference',
         '$BUILD_DIR/mongo/client/remote_command_targeter',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/db/query/command_request_response',
         '$BUILD_DIR/mongo/rpc/command_status',
-        '$BUILD_DIR/mongo/s/base',
         '$BUILD_DIR/mongo/s/client/sharding_client',
         '$BUILD_DIR/mongo/util/net/hostandport',
         'dist_lock_catalog_interface',
@@ -146,7 +154,6 @@ env.Library(
     LIBDEPS=[
         'catalog_types',
         'dist_lock_catalog_interface',
-        '$BUILD_DIR/mongo/s/base',
     ]
 )
 
diff --git a/src/mongo/s/catalog/dist_lock_catalog_impl.cpp b/src/mongo/s/catalog/dist_lock_catalog_impl.cpp
index 636bf6b295d..ff8b0845ca8 100644
--- a/src/mongo/s/catalog/dist_lock_catalog_impl.cpp
+++ b/src/mongo/s/catalog/dist_lock_catalog_impl.cpp
@@ -41,9 +41,9 @@
 #include "mongo/db/query/find_and_modify_request.h"
 #include "mongo/rpc/get_status_from_command_result.h"
 #include "mongo/rpc/metadata/sharding_metadata.h"
+#include "mongo/s/catalog/type_lockpings.h"
+#include "mongo/s/catalog/type_locks.h"
 #include "mongo/s/client/shard_registry.h"
-#include "mongo/s/type_lockpings.h"
-#include "mongo/s/type_locks.h"
 #include "mongo/s/write_ops/wc_error_detail.h"
 #include "mongo/util/time_support.h"
 
diff --git a/src/mongo/s/catalog/dist_lock_catalog_impl_test.cpp b/src/mongo/s/catalog/dist_lock_catalog_impl_test.cpp
index a2f17bdfc60..421a4347042 100644
--- a/src/mongo/s/catalog/dist_lock_catalog_impl_test.cpp
+++ b/src/mongo/s/catalog/dist_lock_catalog_impl_test.cpp
@@ -43,9 +43,9 @@
 #include "mongo/executor/network_test_env.h"
 #include "mongo/s/catalog/catalog_manager_mock.h"
 #include "mongo/s/catalog/dist_lock_catalog_impl.h"
+#include "mongo/s/catalog/type_lockpings.h"
+#include "mongo/s/catalog/type_locks.h"
 #include "mongo/s/client/shard_registry.h"
-#include "mongo/s/type_lockpings.h"
-#include "mongo/s/type_locks.h"
 #include "mongo/stdx/future.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/stdx/thread.h"
diff --git a/src/mongo/s/catalog/dist_lock_catalog_mock.cpp b/src/mongo/s/catalog/dist_lock_catalog_mock.cpp
index 260d4dce6f3..f689a71fc36 100644
--- a/src/mongo/s/catalog/dist_lock_catalog_mock.cpp
+++ b/src/mongo/s/catalog/dist_lock_catalog_mock.cpp
@@ -32,8 +32,8 @@
 
 #include "mongo/base/status.h"
 #include "mongo/base/status_with.h"
-#include "mongo/s/type_lockpings.h"
-#include "mongo/s/type_locks.h"
+#include "mongo/s/catalog/type_lockpings.h"
+#include "mongo/s/catalog/type_locks.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/mongoutils/str.h"
 
diff --git a/src/mongo/s/catalog/dist_lock_catalog_mock.h b/src/mongo/s/catalog/dist_lock_catalog_mock.h
index 6a8ffa01f33..2a1aa449a31 100644
--- a/src/mongo/s/catalog/dist_lock_catalog_mock.h
+++ b/src/mongo/s/catalog/dist_lock_catalog_mock.h
@@ -30,8 +30,8 @@
 
 #include "mongo/base/status_with.h"
 #include "mongo/s/catalog/dist_lock_catalog.h"
-#include "mongo/s/type_lockpings.h"
-#include "mongo/s/type_locks.h"
+#include "mongo/s/catalog/type_lockpings.h"
+#include "mongo/s/catalog/type_locks.h"
 #include "mongo/stdx/functional.h"
 #include "mongo/stdx/mutex.h"
 
diff --git a/src/mongo/s/catalog/legacy/SConscript b/src/mongo/s/catalog/legacy/SConscript
index 25408427142..1f5fd91fcc6 100644
--- a/src/mongo/s/catalog/legacy/SConscript
+++ b/src/mongo/s/catalog/legacy/SConscript
@@ -30,7 +30,7 @@ env.Library(
         'mongo_version_range.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/s/base',
+        '$BUILD_DIR/mongo/s/catalog/catalog_types',
     ]
 )
 
diff --git a/src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp b/src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp
index 8c540b4af16..e40d437e99d 100644
--- a/src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp
+++ b/src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp
@@ -67,9 +67,9 @@
 #include "mongo/s/config.h"
 #include "mongo/s/catalog/dist_lock_manager.h"
 #include "mongo/s/catalog/legacy/legacy_dist_lock_manager.h"
+#include "mongo/s/catalog/type_config_version.h"
 #include "mongo/s/grid.h"
 #include "mongo/s/shard_key_pattern.h"
-#include "mongo/s/type_config_version.h"
 #include "mongo/s/write_ops/batched_command_request.h"
 #include "mongo/s/write_ops/batched_command_response.h"
 #include "mongo/stdx/memory.h"
diff --git a/src/mongo/s/catalog/legacy/cluster_client_internal.cpp b/src/mongo/s/catalog/legacy/cluster_client_internal.cpp
index c8b60c9c9dc..12f91f3c41d 100644
--- a/src/mongo/s/catalog/legacy/cluster_client_internal.cpp
+++ b/src/mongo/s/catalog/legacy/cluster_client_internal.cpp
@@ -37,8 +37,8 @@
 #include "mongo/client/connpool.h"
 #include "mongo/db/field_parser.h"
 #include "mongo/s/catalog/catalog_manager.h"
+#include "mongo/s/catalog/type_mongos.h"
 #include "mongo/s/catalog/type_shard.h"
-#include "mongo/s/type_mongos.h"
 #include "mongo/util/log.h"
 #include "mongo/util/stringutils.h"
 
diff --git a/src/mongo/s/catalog/legacy/config_upgrade.cpp b/src/mongo/s/catalog/legacy/config_upgrade.cpp
index 4c87e65c9ba..20dbbf14bf8 100644
--- a/src/mongo/s/catalog/legacy/config_upgrade.cpp
+++ b/src/mongo/s/catalog/legacy/config_upgrade.cpp
@@ -40,10 +40,10 @@
 #include "mongo/s/catalog/legacy/cluster_client_internal.h"
 #include "mongo/s/catalog/legacy/mongo_version_range.h"
 #include "mongo/s/catalog/type_collection.h"
+#include "mongo/s/catalog/type_config_version.h"
 #include "mongo/s/catalog/type_database.h"
 #include "mongo/s/catalog/type_settings.h"
 #include "mongo/s/catalog/type_shard.h"
-#include "mongo/s/type_config_version.h"
 #include "mongo/stdx/functional.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/log.h"
diff --git a/src/mongo/s/catalog/legacy/config_upgrade_helpers.cpp b/src/mongo/s/catalog/legacy/config_upgrade_helpers.cpp
index 41bc88eeb41..4542948062b 100644
--- a/src/mongo/s/catalog/legacy/config_upgrade_helpers.cpp
+++ b/src/mongo/s/catalog/legacy/config_upgrade_helpers.cpp
@@ -39,7 +39,7 @@
 #include "mongo/db/write_concern.h"
 #include "mongo/s/catalog/catalog_manager.h"
 #include "mongo/s/catalog/legacy/cluster_client_internal.h"
-#include "mongo/s/type_config_version.h"
+#include "mongo/s/catalog/type_config_version.h"
 #include "mongo/util/log.h"
 #include "mongo/util/timer.h"
 
diff --git a/src/mongo/s/catalog/legacy/config_upgrade_v0_to_v7.cpp b/src/mongo/s/catalog/legacy/config_upgrade_v0_to_v7.cpp
index f086fabc521..1802c95d1aa 100644
--- a/src/mongo/s/catalog/legacy/config_upgrade_v0_to_v7.cpp
+++ b/src/mongo/s/catalog/legacy/config_upgrade_v0_to_v7.cpp
@@ -33,7 +33,7 @@
 #include "mongo/s/catalog/legacy/config_upgrade.h"
 
 #include "mongo/s/catalog/catalog_manager.h"
-#include "mongo/s/type_config_version.h"
+#include "mongo/s/catalog/type_config_version.h"
 #include "mongo/util/log.h"
 #include "mongo/util/mongoutils/str.h"
 
diff --git a/src/mongo/s/catalog/legacy/config_upgrade_v6_to_v7.cpp b/src/mongo/s/catalog/legacy/config_upgrade_v6_to_v7.cpp
index 430d2eedb6e..039dfe38b23 100644
--- a/src/mongo/s/catalog/legacy/config_upgrade_v6_to_v7.cpp
+++ b/src/mongo/s/catalog/legacy/config_upgrade_v6_to_v7.cpp
@@ -35,7 +35,7 @@
 #include "mongo/s/catalog/catalog_manager.h"
 #include "mongo/s/catalog/legacy/cluster_client_internal.h"
 #include "mongo/s/catalog/legacy/config_upgrade_helpers.h"
-#include "mongo/s/type_config_version.h"
+#include "mongo/s/catalog/type_config_version.h"
 #include "mongo/util/log.h"
 
 namespace mongo {
diff --git a/src/mongo/s/catalog/legacy/distlock.cpp b/src/mongo/s/catalog/legacy/distlock.cpp
index fa9c7a90fde..04e6fbc1e70 100644
--- a/src/mongo/s/catalog/legacy/distlock.cpp
+++ b/src/mongo/s/catalog/legacy/distlock.cpp
@@ -34,8 +34,8 @@
 #include "mongo/db/server_options.h"
 #include "mongo/client/dbclientcursor.h"
 #include "mongo/client/connpool.h"
-#include "mongo/s/type_locks.h"
-#include "mongo/s/type_lockpings.h"
+#include "mongo/s/catalog/type_locks.h"
+#include "mongo/s/catalog/type_lockpings.h"
 #include "mongo/util/concurrency/thread_name.h"
 #include "mongo/util/concurrency/threadlocal.h"
 #include "mongo/util/log.h"
diff --git a/src/mongo/s/catalog/legacy/legacy_dist_lock_manager.cpp b/src/mongo/s/catalog/legacy/legacy_dist_lock_manager.cpp
index e375c792f28..0ecb077f6dc 100644
--- a/src/mongo/s/catalog/legacy/legacy_dist_lock_manager.cpp
+++ b/src/mongo/s/catalog/legacy/legacy_dist_lock_manager.cpp
@@ -32,7 +32,7 @@
 
 #include "mongo/s/catalog/legacy/legacy_dist_lock_manager.h"
 
-#include "mongo/s/type_locks.h"
+#include "mongo/s/catalog/type_locks.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/util/log.h"
 #include "mongo/util/timer.h"
diff --git a/src/mongo/s/catalog/legacy/legacy_dist_lock_pinger.cpp b/src/mongo/s/catalog/legacy/legacy_dist_lock_pinger.cpp
index ef5299fd558..134848af105 100644
--- a/src/mongo/s/catalog/legacy/legacy_dist_lock_pinger.cpp
+++ b/src/mongo/s/catalog/legacy/legacy_dist_lock_pinger.cpp
@@ -34,8 +34,8 @@
 
 #include "mongo/client/connpool.h"
 #include "mongo/s/catalog/legacy/distlock.h"
-#include "mongo/s/type_lockpings.h"
-#include "mongo/s/type_locks.h"
+#include "mongo/s/catalog/type_lockpings.h"
+#include "mongo/s/catalog/type_locks.h"
 #include "mongo/stdx/thread.h"
 #include "mongo/util/exit.h"
 #include "mongo/util/log.h"
diff --git a/src/mongo/s/catalog/replset/replset_dist_lock_manager.cpp b/src/mongo/s/catalog/replset/replset_dist_lock_manager.cpp
index 90f8288c3db..99c09a47cb3 100644
--- a/src/mongo/s/catalog/replset/replset_dist_lock_manager.cpp
+++ b/src/mongo/s/catalog/replset/replset_dist_lock_manager.cpp
@@ -36,8 +36,8 @@
 #include "mongo/base/status_with.h"
 #include "mongo/db/service_context.h"
 #include "mongo/s/catalog/dist_lock_catalog.h"
-#include "mongo/s/type_lockpings.h"
-#include "mongo/s/type_locks.h"
+#include "mongo/s/catalog/type_lockpings.h"
+#include "mongo/s/catalog/type_locks.h"
 #include "mongo/stdx/chrono.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/util/concurrency/thread_name.h"
diff --git a/src/mongo/s/catalog/replset/replset_dist_lock_manager_test.cpp b/src/mongo/s/catalog/replset/replset_dist_lock_manager_test.cpp
index 3b9156c152e..b0e64bf77f5 100644
--- a/src/mongo/s/catalog/replset/replset_dist_lock_manager_test.cpp
+++ b/src/mongo/s/catalog/replset/replset_dist_lock_manager_test.cpp
@@ -42,8 +42,8 @@
 #include "mongo/db/jsobj.h"
 #include "mongo/db/service_context_noop.h"
 #include "mongo/s/catalog/dist_lock_catalog_mock.h"
-#include "mongo/s/type_lockpings.h"
-#include "mongo/s/type_locks.h"
+#include "mongo/s/catalog/type_lockpings.h"
+#include "mongo/s/catalog/type_locks.h"
 #include "mongo/stdx/condition_variable.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/stdx/mutex.h"
diff --git a/src/mongo/s/type_config_version.cpp b/src/mongo/s/catalog/type_config_version.cpp
index 78a920904ba..63c927d859b 100644
--- a/src/mongo/s/type_config_version.cpp
+++ b/src/mongo/s/catalog/type_config_version.cpp
@@ -25,7 +25,7 @@
  *    delete this exception statement from all source files in the program,
  *    then also delete it in the license file.
  */
-#include "mongo/s/type_config_version.h"
+#include "mongo/s/catalog/type_config_version.h"
 
 #include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
diff --git a/src/mongo/s/type_config_version.h b/src/mongo/s/catalog/type_config_version.h
index c98bf531234..c98bf531234 100644
--- a/src/mongo/s/type_config_version.h
+++ b/src/mongo/s/catalog/type_config_version.h
diff --git a/src/mongo/s/type_config_version_test.cpp b/src/mongo/s/catalog/type_config_version_test.cpp
index 618238402b9..db4b37ee87a 100644
--- a/src/mongo/s/type_config_version_test.cpp
+++ b/src/mongo/s/catalog/type_config_version_test.cpp
@@ -28,7 +28,7 @@
 
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/oid.h"
-#include "mongo/s/type_config_version.h"
+#include "mongo/s/catalog/type_config_version.h"
 #include "mongo/unittest/unittest.h"
 
 /**
diff --git a/src/mongo/s/type_lockpings.cpp b/src/mongo/s/catalog/type_lockpings.cpp
index c24d09a3506..33d869d17f1 100644
--- a/src/mongo/s/type_lockpings.cpp
+++ b/src/mongo/s/catalog/type_lockpings.cpp
@@ -25,7 +25,7 @@
  *    delete this exception statement from all source files in the program,
  *    then also delete it in the license file.
  */
-#include "mongo/s/type_lockpings.h"
+#include "mongo/s/catalog/type_lockpings.h"
 
 #include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
diff --git a/src/mongo/s/type_lockpings.h b/src/mongo/s/catalog/type_lockpings.h
index 845b544d206..845b544d206 100644
--- a/src/mongo/s/type_lockpings.h
+++ b/src/mongo/s/catalog/type_lockpings.h
diff --git a/src/mongo/s/type_lockpings_test.cpp b/src/mongo/s/catalog/type_lockpings_test.cpp
index 1bf6c29048a..71cb34022ee 100644
--- a/src/mongo/s/type_lockpings_test.cpp
+++ b/src/mongo/s/catalog/type_lockpings_test.cpp
@@ -26,7 +26,7 @@
  *    then also delete it in the license file.
  */
 
-#include "mongo/s/type_lockpings.h"
+#include "mongo/s/catalog/type_lockpings.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/time_support.h"
 
diff --git a/src/mongo/s/type_locks.cpp b/src/mongo/s/catalog/type_locks.cpp
index af4ccda0f83..8d1dc69c782 100644
--- a/src/mongo/s/type_locks.cpp
+++ b/src/mongo/s/catalog/type_locks.cpp
@@ -25,7 +25,7 @@
  *    delete this exception statement from all source files in the program,
  *    then also delete it in the license file.
  */
-#include "mongo/s/type_locks.h"
+#include "mongo/s/catalog/type_locks.h"
 
 #include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
diff --git a/src/mongo/s/type_locks.h b/src/mongo/s/catalog/type_locks.h
index e77da7c188c..e77da7c188c 100644
--- a/src/mongo/s/type_locks.h
+++ b/src/mongo/s/catalog/type_locks.h
diff --git a/src/mongo/s/type_locks_test.cpp b/src/mongo/s/catalog/type_locks_test.cpp
index 024be534dc8..750594cc3ca 100644
--- a/src/mongo/s/type_locks_test.cpp
+++ b/src/mongo/s/catalog/type_locks_test.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "mongo/bson/oid.h"
-#include "mongo/s/type_locks.h"
+#include "mongo/s/catalog/type_locks.h"
 #include "mongo/unittest/unittest.h"
 
 namespace {
diff --git a/src/mongo/s/type_mongos.cpp b/src/mongo/s/catalog/type_mongos.cpp
index 34e9f94efa5..91c2255247e 100644
--- a/src/mongo/s/type_mongos.cpp
+++ b/src/mongo/s/catalog/type_mongos.cpp
@@ -25,7 +25,7 @@
  *    delete this exception statement from all source files in the program,
  *    then also delete it in the license file.
  */
-#include "mongo/s/type_mongos.h"
+#include "mongo/s/catalog/type_mongos.h"
 
 #include "mongo/db/field_parser.h"
 #include "mongo/util/mongoutils/str.h"
diff --git a/src/mongo/s/type_mongos.h b/src/mongo/s/catalog/type_mongos.h
index 2bf0a372359..2bf0a372359 100644
--- a/src/mongo/s/type_mongos.h
+++ b/src/mongo/s/catalog/type_mongos.h
diff --git a/src/mongo/s/type_mongos_test.cpp b/src/mongo/s/catalog/type_mongos_test.cpp
index 210c1ae4169..bfb6f5e1c6a 100644
--- a/src/mongo/s/type_mongos_test.cpp
+++ b/src/mongo/s/catalog/type_mongos_test.cpp
@@ -26,7 +26,7 @@
  *    then also delete it in the license file.
  */
 
-#include "mongo/s/type_mongos.h"
+#include "mongo/s/catalog/type_mongos.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/time_support.h"
 
diff --git a/src/mongo/s/config.cpp b/src/mongo/s/config.cpp
index 66d8ec752be..fc5f9d3bb72 100644
--- a/src/mongo/s/config.cpp
+++ b/src/mongo/s/config.cpp
@@ -43,6 +43,8 @@
 #include "mongo/s/catalog/type_collection.h"
 #include "mongo/s/catalog/type_chunk.h"
 #include "mongo/s/catalog/type_database.h"
+#include "mongo/s/catalog/type_lockpings.h"
+#include "mongo/s/catalog/type_locks.h"
 #include "mongo/s/catalog/type_settings.h"
 #include "mongo/s/catalog/type_shard.h"
 #include "mongo/s/catalog/type_tags.h"
@@ -51,8 +53,6 @@
 #include "mongo/s/client/shard_registry.h"
 #include "mongo/s/cluster_write.h"
 #include "mongo/s/grid.h"
-#include "mongo/s/type_locks.h"
-#include "mongo/s/type_lockpings.h"
 #include "mongo/util/log.h"
 
 namespace mongo {