SERVER-68826 Move basic_types into server_base

13 files changed, 10 insertions, 19 deletions

diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript
index 5ab1d02020b..5285ca44564 100644
--- a/src/mongo/db/query/SConscript
+++ b/src/mongo/db/query/SConscript
@@ -192,8 +192,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/server_base',
-        '$BUILD_DIR/mongo/idl/basic_types',
-        '$BUILD_DIR/mongo/idl/idl_parser',
     ],
 )
 
diff --git a/src/mongo/db/query/analyze_command.idl b/src/mongo/db/query/analyze_command.idl
index 124a6acbead..5ce0f270f4a 100644
--- a/src/mongo/db/query/analyze_command.idl
+++ b/src/mongo/db/query/analyze_command.idl
@@ -32,7 +32,7 @@ global:
 imports:
     - "mongo/db/auth/access_checks.idl"
     - "mongo/db/auth/action_type.idl"
-    - "mongo/idl/basic_types.idl"
+    - "mongo/db/basic_types.idl"
 
 commands:
     analyze:
diff --git a/src/mongo/db/query/collation/SConscript b/src/mongo/db/query/collation/SConscript
index 79578fe98b8..98acc2f2a57 100644
--- a/src/mongo/db/query/collation/SConscript
+++ b/src/mongo/db/query/collation/SConscript
@@ -12,8 +12,7 @@ env.Library(
         "collator_interface.cpp",
     ],
     LIBDEPS=[
-        "$BUILD_DIR/mongo/base",
-        "$BUILD_DIR/mongo/idl/basic_types",
+        "$BUILD_DIR/mongo/db/server_base",
     ],
 )
 
diff --git a/src/mongo/db/query/collation/collation_spec.h b/src/mongo/db/query/collation/collation_spec.h
index f8369c2bd23..4b2cd29c813 100644
--- a/src/mongo/db/query/collation/collation_spec.h
+++ b/src/mongo/db/query/collation/collation_spec.h
@@ -32,7 +32,7 @@
 #include <string>
 
 #include "mongo/bson/bsonobj.h"
-#include "mongo/idl/basic_types_gen.h"
+#include "mongo/db/basic_types_gen.h"
 
 namespace mongo::CollationSpec {
 
diff --git a/src/mongo/db/query/collation/collator_factory_interface.h b/src/mongo/db/query/collation/collator_factory_interface.h
index 193e350ed0e..c13b8c8fbe5 100644
--- a/src/mongo/db/query/collation/collator_factory_interface.h
+++ b/src/mongo/db/query/collation/collator_factory_interface.h
@@ -29,8 +29,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "mongo/db/query/collation/collator_interface.h"
 
 namespace mongo {
diff --git a/src/mongo/db/query/collation/collator_interface.h b/src/mongo/db/query/collation/collator_interface.h
index 9825f5267a8..f5aae85e147 100644
--- a/src/mongo/db/query/collation/collator_interface.h
+++ b/src/mongo/db/query/collation/collator_interface.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include <memory>
 #include <string>
 
 #include "mongo/base/string_data.h"
diff --git a/src/mongo/db/query/count_command.idl b/src/mongo/db/query/count_command.idl
index 10c7a871b5a..d511cd879fb 100644
--- a/src/mongo/db/query/count_command.idl
+++ b/src/mongo/db/query/count_command.idl
@@ -34,7 +34,7 @@ global:
         - "mongo/db/query/max_time_ms_parser.h"
 
 imports:
-    - "mongo/idl/basic_types.idl"
+    - "mongo/db/basic_types.idl"
     - "mongo/crypto/fle_field_schema.idl"
     - "mongo/db/auth/action_type.idl"
     - "mongo/db/auth/access_checks.idl"
diff --git a/src/mongo/db/query/cursor_request.cpp b/src/mongo/db/query/cursor_request.cpp
index 785ac850b35..aaa7c76e950 100644
--- a/src/mongo/db/query/cursor_request.cpp
+++ b/src/mongo/db/query/cursor_request.cpp
@@ -27,13 +27,11 @@
  *    it in the license file.
  */
 
-#include "mongo/platform/basic.h"
-
 #include "mongo/db/query/cursor_request.h"
 
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobj.h"
-#include "mongo/idl/basic_types_gen.h"
+#include "mongo/db/basic_types_gen.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/query/cursor_response.idl b/src/mongo/db/query/cursor_response.idl
index 0975452f329..af264710874 100644
--- a/src/mongo/db/query/cursor_response.idl
+++ b/src/mongo/db/query/cursor_response.idl
@@ -32,11 +32,10 @@ global:
   cpp_namespace: "mongo"
   cpp_includes:
     - "mongo/db/namespace_string.h"
-    - "mongo/idl/basic_types.h"
     - "mongo/db/query/cursor_idl_validator.h"
 
 imports:
-    - "mongo/idl/basic_types.idl"
+    - "mongo/db/basic_types.idl"
 
 enums:
     CursorType:
diff --git a/src/mongo/db/query/distinct_command.idl b/src/mongo/db/query/distinct_command.idl
index 8bfde758758..a632ef06ffa 100644
--- a/src/mongo/db/query/distinct_command.idl
+++ b/src/mongo/db/query/distinct_command.idl
@@ -30,7 +30,7 @@ global:
   cpp_namespace: "mongo"
 
 imports:
-    - "mongo/idl/basic_types.idl"
+    - "mongo/db/basic_types.idl"
 
 commands:
     distinct:
diff --git a/src/mongo/db/query/find_command.idl b/src/mongo/db/query/find_command.idl
index 448d52dc1ca..44e7b02ceb9 100644
--- a/src/mongo/db/query/find_command.idl
+++ b/src/mongo/db/query/find_command.idl
@@ -41,7 +41,7 @@ imports:
     - "mongo/db/auth/access_checks.idl"
     - "mongo/db/session/logical_session_id.idl"
     - "mongo/db/pipeline/legacy_runtime_constants.idl"
-    - "mongo/idl/basic_types.idl"
+    - "mongo/db/basic_types.idl"
     - "mongo/db/query/cursor_response.idl"
     - "mongo/db/query/hint.idl"
 
diff --git a/src/mongo/db/query/getmore_command.idl b/src/mongo/db/query/getmore_command.idl
index 658d2099002..3024313b616 100644
--- a/src/mongo/db/query/getmore_command.idl
+++ b/src/mongo/db/query/getmore_command.idl
@@ -32,7 +32,7 @@ global:
     - "mongo/db/query/query_request_helper.h"
 
 imports:
-    - "mongo/idl/basic_types.idl"
+    - "mongo/db/basic_types.idl"
     - "mongo/db/query/cursor_response.idl"
     - "mongo/db/repl/replication_types.idl"
 
diff --git a/src/mongo/db/query/kill_cursors.idl b/src/mongo/db/query/kill_cursors.idl
index 690589e9848..b507d9530fc 100644
--- a/src/mongo/db/query/kill_cursors.idl
+++ b/src/mongo/db/query/kill_cursors.idl
@@ -34,7 +34,7 @@ global:
 imports:
     - "mongo/db/auth/access_checks.idl"
     - "mongo/db/auth/action_type.idl"
-    - "mongo/idl/basic_types.idl"
+    - "mongo/db/basic_types.idl"
 
 types:
     cursorId: