re-org structure and catalog directories part 2

38 files changed, 47 insertions, 44 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 57e989b2136..295859cd5a3 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -574,7 +574,7 @@ serverOnlyFiles = [ "db/curop.cpp",
                     "db/index/haystack_access_method.cpp",
                     "db/index/s2_access_method.cpp",
                     "db/cloner.cpp",
-                    "db/namespace_details.cpp",
+                    "db/structure/catalog/namespace_details.cpp",
                     "db/structure/catalog/namespace_index.cpp",
                     "db/cap.cpp",
                     "db/dbeval.cpp",
@@ -595,7 +595,7 @@ serverOnlyFiles = [ "db/curop.cpp",
                     "db/storage/data_file.cpp",
                     "db/storage/extent.cpp",
                     "db/storage/extent_manager.cpp",
-                    "db/storage/index_details.cpp",
+                    "db/structure/catalog/index_details.cpp",
                     "db/structure/record_store.cpp",
                     "db/extsort.cpp",
                     "db/index_builder.cpp",
diff --git a/src/mongo/db/auth/auth_index_d.cpp b/src/mongo/db/auth/auth_index_d.cpp
index 8c69d5e1de0..5b1277f7d2a 100644
--- a/src/mongo/db/auth/auth_index_d.cpp
+++ b/src/mongo/db/auth/auth_index_d.cpp
@@ -34,7 +34,7 @@
 #include "mongo/db/client.h"
 #include "mongo/db/dbhelpers.h"
 #include "mongo/db/jsobj.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/catalog/collection.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/log.h"
diff --git a/src/mongo/db/catalog/collection.cpp b/src/mongo/db/catalog/collection.cpp
index 67c6d04a668..4343fac2d75 100644
--- a/src/mongo/db/catalog/collection.cpp
+++ b/src/mongo/db/catalog/collection.cpp
@@ -37,7 +37,7 @@
 #include "mongo/db/curop.h"
 #include "mongo/db/catalog/database.h"
 #include "mongo/db/index/index_access_method.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/repl/rs.h"
 #include "mongo/db/storage/extent.h"
 #include "mongo/db/storage/extent_manager.h"
diff --git a/src/mongo/db/catalog/collection_info_cache.cpp b/src/mongo/db/catalog/collection_info_cache.cpp
index 9e77fd603f6..49eca9cee2c 100644
--- a/src/mongo/db/catalog/collection_info_cache.cpp
+++ b/src/mongo/db/catalog/collection_info_cache.cpp
@@ -31,13 +31,13 @@
 #include "mongo/db/catalog/collection_info_cache.h"
 
 #include "mongo/db/d_concurrency.h"
-#include "mongo/db/namespace_details.h"
-#include "mongo/db/namespace_details-inl.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details-inl.h"
 #include "mongo/db/query/plan_cache.h"
 #include "mongo/db/catalog/collection.h"
 #include "mongo/util/debug_util.h"
 
-#include "mongo/db/storage/index_details.h" // XXX
+#include "mongo/db/structure/catalog/index_details.h" // XXX
 #include "mongo/db/pdfile.h" // XXX
 
 namespace mongo {
diff --git a/src/mongo/db/catalog/database.cpp b/src/mongo/db/catalog/database.cpp
index 9b69802a0a6..8c2fe0e1f2c 100644
--- a/src/mongo/db/catalog/database.cpp
+++ b/src/mongo/db/catalog/database.cpp
@@ -41,7 +41,7 @@
 #include "mongo/db/clientcursor.h"
 #include "mongo/db/catalog/database_holder.h"
 #include "mongo/db/dbhelpers.h"
-#include "mongo/db/storage/index_details.h"
+#include "mongo/db/structure/catalog/index_details.h"
 #include "mongo/db/instance.h"
 #include "mongo/db/introspect.h"
 #include "mongo/db/pdfile.h"
diff --git a/src/mongo/db/catalog/database.h b/src/mongo/db/catalog/database.h
index 3bb175dce82..00bc52a23d3 100644
--- a/src/mongo/db/catalog/database.h
+++ b/src/mongo/db/catalog/database.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/storage/extent_manager.h"
 #include "mongo/db/storage/record.h"
 #include "mongo/db/storage_options.h"
diff --git a/src/mongo/db/catalog/index_create.cpp b/src/mongo/db/catalog/index_create.cpp
index 304e883257c..05ba18599f6 100644
--- a/src/mongo/db/catalog/index_create.cpp
+++ b/src/mongo/db/catalog/index_create.cpp
@@ -36,9 +36,9 @@
 #include "mongo/db/structure/btree/btreebuilder.h"
 #include "mongo/db/clientcursor.h"
 #include "mongo/db/extsort.h"
-#include "mongo/db/storage/index_details.h"
+#include "mongo/db/structure/catalog/index_details.h"
 #include "mongo/db/kill_current_op.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/pdfile_private.h"
 #include "mongo/db/query/internal_plans.h"
 #include "mongo/db/query/runner_yield_policy.h"
diff --git a/src/mongo/db/commands/collection_to_capped.cpp b/src/mongo/db/commands/collection_to_capped.cpp
index 9f624f657b7..e78e6528aa7 100644
--- a/src/mongo/db/commands/collection_to_capped.cpp
+++ b/src/mongo/db/commands/collection_to_capped.cpp
@@ -33,7 +33,7 @@
 #include "mongo/db/clientcursor.h" // XXX-remove
 #include "mongo/db/commands.h"
 #include "mongo/db/instance.h" // XXX-remove
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/query/internal_plans.h"
 #include "mongo/db/query/new_find.h"
 #include "mongo/db/repl/oplog.h"
diff --git a/src/mongo/db/commands/geonear.cpp b/src/mongo/db/commands/geonear.cpp
index 818d8195ef4..1e755d2fa89 100644
--- a/src/mongo/db/commands/geonear.cpp
+++ b/src/mongo/db/commands/geonear.cpp
@@ -39,7 +39,7 @@
 #include "mongo/db/index_names.h"
 #include "mongo/db/index/index_descriptor.h"
 #include "mongo/db/jsobj.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/pdfile.h"
 #include "mongo/db/query/get_runner.h"
 #include "mongo/db/query/type_explain.h"
diff --git a/src/mongo/db/commands/index_stats.cpp b/src/mongo/db/commands/index_stats.cpp
index f4062cfbc66..de1bd4bf834 100644
--- a/src/mongo/db/commands/index_stats.cpp
+++ b/src/mongo/db/commands/index_stats.cpp
@@ -33,10 +33,10 @@
 #include "mongo/db/structure/btree/btree.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/db.h"
-#include "mongo/db/storage/index_details.h"
+#include "mongo/db/structure/catalog/index_details.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/kill_current_op.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/util/descriptive_stats.h"
 
 namespace mongo {
diff --git a/src/mongo/db/commands/storage_details.cpp b/src/mongo/db/commands/storage_details.cpp
index 8d6deb47156..374f353d010 100644
--- a/src/mongo/db/commands/storage_details.cpp
+++ b/src/mongo/db/commands/storage_details.cpp
@@ -26,7 +26,7 @@
 #include "mongo/db/db.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/kill_current_op.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/catalog/collection.h"
 #include "mongo/util/processinfo.h"
 #include "mongo/util/mongoutils/str.h"
diff --git a/src/mongo/db/commands/touch.cpp b/src/mongo/db/commands/touch.cpp
index 9a1acbc941e..e742058e02c 100644
--- a/src/mongo/db/commands/touch.cpp
+++ b/src/mongo/db/commands/touch.cpp
@@ -43,8 +43,8 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/d_concurrency.h"
 #include "mongo/db/curop-inl.h"
-#include "mongo/db/namespace_details.h"
-#include "mongo/db/storage/index_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
+#include "mongo/db/structure/catalog/index_details.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/pdfile.h"
 #include "mongo/db/catalog/collection.h"
diff --git a/src/mongo/db/commands/validate.cpp b/src/mongo/db/commands/validate.cpp
index a70970ed367..f4c71e71493 100644
--- a/src/mongo/db/commands/validate.cpp
+++ b/src/mongo/db/commands/validate.cpp
@@ -30,7 +30,7 @@
 
 #include "mongo/db/commands.h"
 #include "mongo/db/kill_current_op.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/pdfile.h"
 #include "mongo/db/query/internal_plans.h"
 #include "mongo/db/query/runner.h"
diff --git a/src/mongo/db/exec/stagedebug_cmd.cpp b/src/mongo/db/exec/stagedebug_cmd.cpp
index 4ea0d37f466..2d3437c30cc 100644
--- a/src/mongo/db/exec/stagedebug_cmd.cpp
+++ b/src/mongo/db/exec/stagedebug_cmd.cpp
@@ -44,7 +44,7 @@
 #include "mongo/db/index/fts_access_method.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/matcher/expression_parser.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/pdfile.h"
 #include "mongo/db/query/plan_executor.h"
 
diff --git a/src/mongo/db/extsort.h b/src/mongo/db/extsort.h
index cdcbe631cd3..9471e2f7876 100644
--- a/src/mongo/db/extsort.h
+++ b/src/mongo/db/extsort.h
@@ -32,7 +32,7 @@
 
 #include "mongo/pch.h"
 
-#include "mongo/db/storage/index_details.h"
+#include "mongo/db/structure/catalog/index_details.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/curop-inl.h"
 #include "mongo/util/array.h"
diff --git a/src/mongo/db/geo/haystack.cpp b/src/mongo/db/geo/haystack.cpp
index 4b9517c47eb..27a78ba1511 100644
--- a/src/mongo/db/geo/haystack.cpp
+++ b/src/mongo/db/geo/haystack.cpp
@@ -38,7 +38,7 @@
 #include "mongo/db/index/index_access_method.h"
 #include "mongo/db/index_names.h"
 #include "mongo/db/jsobj.h"
-#include "mongo/db/namespace_details-inl.h"
+#include "mongo/db/structure/catalog/namespace_details-inl.h"
 #include "mongo/db/pdfile.h"
 #include "mongo/db/catalog/collection.h"
 #include "mongo/db/commands.h"
diff --git a/src/mongo/db/index/index_descriptor.h b/src/mongo/db/index/index_descriptor.h
index 3e0a821c5e1..753091c7b5b 100644
--- a/src/mongo/db/index/index_descriptor.h
+++ b/src/mongo/db/index/index_descriptor.h
@@ -30,9 +30,9 @@
 
 #include <string>
 
-#include "mongo/db/storage/index_details.h"  // For IndexDetails.
+#include "mongo/db/structure/catalog/index_details.h"  // For IndexDetails.
 #include "mongo/db/jsobj.h"
-#include "mongo/db/namespace_details.h"  // For NamespaceDetails.
+#include "mongo/db/structure/catalog/namespace_details.h"  // For NamespaceDetails.
 #include "mongo/db/catalog/collection.h"
 
 #include "mongo/util/stacktrace.h"
diff --git a/src/mongo/db/index_legacy.cpp b/src/mongo/db/index_legacy.cpp
index 681844a6128..eb65e5861a2 100644
--- a/src/mongo/db/index_legacy.cpp
+++ b/src/mongo/db/index_legacy.cpp
@@ -33,7 +33,7 @@
 #include "mongo/db/index_names.h"
 #include "mongo/db/index/hash_access_method.h"
 #include "mongo/db/jsobj.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/ops/delete.cpp b/src/mongo/db/ops/delete.cpp
index fe7e005a0d7..07f942e778f 100644
--- a/src/mongo/db/ops/delete.cpp
+++ b/src/mongo/db/ops/delete.cpp
@@ -31,7 +31,7 @@
 #include "mongo/db/client.h"
 #include "mongo/db/clientcursor.h"
 #include "mongo/db/catalog/database.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/query/get_runner.h"
 #include "mongo/db/query/query_planner_common.h"
 #include "mongo/db/repl/oplog.h"
diff --git a/src/mongo/db/ops/update.cpp b/src/mongo/db/ops/update.cpp
index eb6d2ea61e5..454786e89b3 100644
--- a/src/mongo/db/ops/update.cpp
+++ b/src/mongo/db/ops/update.cpp
@@ -40,7 +40,7 @@
 #include "mongo/client/dbclientinterface.h"
 #include "mongo/db/clientcursor.h"
 #include "mongo/db/index_set.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/ops/update_driver.h"
 #include "mongo/db/ops/update_lifecycle.h"
 #include "mongo/db/pagefault.h"
diff --git a/src/mongo/db/pdfile.h b/src/mongo/db/pdfile.h
index 28b22223fa3..3b95001e43d 100644
--- a/src/mongo/db/pdfile.h
+++ b/src/mongo/db/pdfile.h
@@ -44,7 +44,7 @@
 #include "mongo/db/storage/data_file.h"
 #include "mongo/db/storage/durable_mapped_file.h"
 #include "mongo/db/storage/extent.h"
-#include "mongo/db/namespace_details-inl.h"
+#include "mongo/db/structure/catalog/namespace_details-inl.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/pdfile_version.h"
 #include "mongo/platform/cstdint.h"
diff --git a/src/mongo/db/prefetch.cpp b/src/mongo/db/prefetch.cpp
index 3ca1878f22a..218a5e6ddcc 100644
--- a/src/mongo/db/prefetch.cpp
+++ b/src/mongo/db/prefetch.cpp
@@ -33,10 +33,10 @@
 #include "mongo/db/dbhelpers.h"
 #include "mongo/db/diskloc.h"
 #include "mongo/db/index/index_access_method.h"
-#include "mongo/db/storage/index_details.h"
+#include "mongo/db/structure/catalog/index_details.h"
 #include "mongo/db/catalog/collection.h"
 #include "mongo/db/jsobj.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/repl/rs.h"
 #include "mongo/db/stats/timer_stats.h"
 #include "mongo/db/commands/server_status.h"
diff --git a/src/mongo/db/query/stage_builder.cpp b/src/mongo/db/query/stage_builder.cpp
index 93553606742..11cf7f76174 100644
--- a/src/mongo/db/query/stage_builder.cpp
+++ b/src/mongo/db/query/stage_builder.cpp
@@ -45,7 +45,7 @@
 #include "mongo/db/exec/skip.h"
 #include "mongo/db/exec/text.h"
 #include "mongo/db/index/fts_access_method.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/catalog/collection.h"
 
 namespace mongo {
diff --git a/src/mongo/db/repl/rs.h b/src/mongo/db/repl/rs.h
index e767c8c0cde..5ed04571bd2 100644
--- a/src/mongo/db/repl/rs.h
+++ b/src/mongo/db/repl/rs.h
@@ -33,7 +33,7 @@
 #include "mongo/bson/optime.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/index/index_descriptor.h"
-#include "mongo/db/storage/index_details.h"
+#include "mongo/db/structure/catalog/index_details.h"
 #include "mongo/db/repl/oplogreader.h"
 #include "mongo/db/repl/rs_config.h"
 #include "mongo/db/repl/rs_exception.h"
diff --git a/src/mongo/db/repl/sync.cpp b/src/mongo/db/repl/sync.cpp
index 4f62e49ea00..acdab2d4275 100644
--- a/src/mongo/db/repl/sync.cpp
+++ b/src/mongo/db/repl/sync.cpp
@@ -33,7 +33,7 @@
 #include "mongo/db/jsobj.h"
 #include "mongo/db/client.h"
 #include "mongo/db/diskloc.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/pdfile.h"
 #include "mongo/db/repl/oplogreader.h"
 #include "mongo/db/catalog/collection.h"
diff --git a/src/mongo/db/storage/extent_manager.cpp b/src/mongo/db/storage/extent_manager.cpp
index bd7b399a227..72320faaf3e 100644
--- a/src/mongo/db/storage/extent_manager.cpp
+++ b/src/mongo/db/storage/extent_manager.cpp
@@ -34,7 +34,7 @@
 
 #include "mongo/db/client.h"
 #include "mongo/db/d_concurrency.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/storage/data_file.h"
 #include "mongo/db/storage/extent.h"
 #include "mongo/db/storage/extent_manager.h"
diff --git a/src/mongo/db/storage/record.h b/src/mongo/db/storage/record.h
index 15b2e9c236c..789be741939 100644
--- a/src/mongo/db/storage/record.h
+++ b/src/mongo/db/storage/record.h
@@ -144,6 +144,7 @@ namespace mongo {
     };
 #pragma pack()
 
+    // TODO: this probably moves to record_store.h
     class DeletedRecord {
     public:
 
@@ -173,6 +174,8 @@ namespace mongo {
         DiskLoc _nextDeleted;
     };
 
+    BOOST_STATIC_ASSERT( 16 == sizeof(DeletedRecord) );
+
     struct RecordStats {
         void record( BSONObjBuilder& b );
 
diff --git a/src/mongo/db/storage/index_details.cpp b/src/mongo/db/structure/catalog/index_details.cpp
index f637f299caa..8c2cb50a60e 100644
--- a/src/mongo/db/storage/index_details.cpp
+++ b/src/mongo/db/structure/catalog/index_details.cpp
@@ -30,7 +30,7 @@
 
 #include "mongo/pch.h"
 
-#include "mongo/db/storage/index_details.h"
+#include "mongo/db/structure/catalog/index_details.h"
 
 #include <boost/checked_delete.hpp>
 
diff --git a/src/mongo/db/storage/index_details.h b/src/mongo/db/structure/catalog/index_details.h
index 216f2126a9f..216f2126a9f 100644
--- a/src/mongo/db/storage/index_details.h
+++ b/src/mongo/db/structure/catalog/index_details.h
diff --git a/src/mongo/db/namespace_details-inl.h b/src/mongo/db/structure/catalog/namespace_details-inl.h
index d06c107993b..755d9606290 100644
--- a/src/mongo/db/namespace_details-inl.h
+++ b/src/mongo/db/structure/catalog/namespace_details-inl.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/namespace_details.cpp b/src/mongo/db/structure/catalog/namespace_details.cpp
index 9ff9551e57d..e4279bfd772 100644
--- a/src/mongo/db/namespace_details.cpp
+++ b/src/mongo/db/structure/catalog/namespace_details.cpp
@@ -28,7 +28,7 @@
 
 #include "mongo/pch.h"
 
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 
 #include <algorithm>
 #include <list>
diff --git a/src/mongo/db/namespace_details.h b/src/mongo/db/structure/catalog/namespace_details.h
index dff0c9bd70a..502418206b5 100644
--- a/src/mongo/db/namespace_details.h
+++ b/src/mongo/db/structure/catalog/namespace_details.h
@@ -31,7 +31,7 @@
 #include "mongo/pch.h"
 #include "mongo/db/d_concurrency.h"
 #include "mongo/db/diskloc.h"
-#include "mongo/db/storage/index_details.h"
+#include "mongo/db/structure/catalog/index_details.h"
 #include "mongo/db/index_names.h"
 #include "mongo/db/index_set.h"
 #include "mongo/db/jsobj.h"
diff --git a/src/mongo/db/structure/catalog/namespace_index.cpp b/src/mongo/db/structure/catalog/namespace_index.cpp
index bca3deafcbb..7fb427a74dc 100644
--- a/src/mongo/db/structure/catalog/namespace_index.cpp
+++ b/src/mongo/db/structure/catalog/namespace_index.cpp
@@ -32,7 +32,7 @@
 
 #include <boost/filesystem/operations.hpp>
 
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 
 
 namespace mongo {
diff --git a/src/mongo/db/structure/collection_compact.cpp b/src/mongo/db/structure/collection_compact.cpp
index dfced432ec8..5645bf94180 100644
--- a/src/mongo/db/structure/collection_compact.cpp
+++ b/src/mongo/db/structure/collection_compact.cpp
@@ -38,7 +38,7 @@
 #include "mongo/db/catalog/database.h"
 #include "mongo/db/index/index_access_method.h"
 #include "mongo/db/kill_current_op.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/storage/extent.h"
 #include "mongo/db/storage/extent_manager.h"
 #include "mongo/db/structure/collection_iterator.h"
diff --git a/src/mongo/db/structure/collection_iterator.cpp b/src/mongo/db/structure/collection_iterator.cpp
index f2712a3cf05..d9f6548232b 100644
--- a/src/mongo/db/structure/collection_iterator.cpp
+++ b/src/mongo/db/structure/collection_iterator.cpp
@@ -28,7 +28,7 @@
 
 #include "mongo/db/structure/collection_iterator.h"
 
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/storage/extent.h"
 #include "mongo/db/storage/extent_manager.h"
 #include "mongo/db/catalog/collection.h"
diff --git a/src/mongo/dbtests/matchertests.cpp b/src/mongo/dbtests/matchertests.cpp
index 1ada4be5d38..870b03f0aaa 100644
--- a/src/mongo/dbtests/matchertests.cpp
+++ b/src/mongo/dbtests/matchertests.cpp
@@ -34,7 +34,7 @@
 #include "mongo/db/json.h"
 #include "mongo/db/matcher.h"
 #include "mongo/db/matcher/matcher.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/dbtests/dbtests.h"
 #include "mongo/util/timer.h"
 
diff --git a/src/mongo/s/strategy.cpp b/src/mongo/s/strategy.cpp
index aa0cc37674b..86c7a1f8189 100644
--- a/src/mongo/s/strategy.cpp
+++ b/src/mongo/s/strategy.cpp
@@ -41,7 +41,7 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/max_time.h"
 #include "mongo/db/server_parameters.h"
-#include "mongo/db/storage/index_details.h"
+#include "mongo/db/structure/catalog/index_details.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/query/lite_parsed_query.h"
 #include "mongo/db/stats/counters.h"
diff --git a/src/mongo/tools/tool.cpp b/src/mongo/tools/tool.cpp
index e90e46257c7..6f3e4978b5b 100644
--- a/src/mongo/tools/tool.cpp
+++ b/src/mongo/tools/tool.cpp
@@ -41,7 +41,7 @@
 #include "mongo/db/auth/authorization_manager_global.h"
 #include "mongo/db/auth/authz_manager_external_state_mock.h"
 #include "mongo/db/json.h"
-#include "mongo/db/namespace_details.h"
+#include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/storage_options.h"
 #include "mongo/platform/posix_fadvise.h"
 #include "mongo/util/file_allocator.h"