diff --git a/core/debugger/remote_debugger.cpp b/core/debugger/remote_debugger.cpp
index 84788f5ca3..b1f2cd21c8 100644
--- a/core/debugger/remote_debugger.cpp
+++ b/core/debugger/remote_debugger.cpp
@@ -39,6 +39,7 @@
 #include "core/input/input.h"
 #include "core/io/resource_loader.h"
 #include "core/math/expression.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/os/os.h"
 #include "servers/display/display_server.h"
diff --git a/core/debugger/remote_debugger.h b/core/debugger/remote_debugger.h
index 8dfc3cecac..8ecc1c483f 100644
--- a/core/debugger/remote_debugger.h
+++ b/core/debugger/remote_debugger.h
@@ -33,7 +33,6 @@
 #include "core/debugger/debugger_marshalls.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/remote_debugger_peer.h"
-#include "core/object/class_db.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"
 #include "core/variant/array.h"
diff --git a/core/extension/extension_api_dump.cpp b/core/extension/extension_api_dump.cpp
index 21884bf969..9094c26f0b 100644
--- a/core/extension/extension_api_dump.cpp
+++ b/core/extension/extension_api_dump.cpp
@@ -35,6 +35,7 @@
 #include "core/extension/gdextension_special_compat_hashes.h"
 #include "core/io/file_access.h"
 #include "core/io/json.h"
+#include "core/object/class_db.h"
 #include "core/templates/pair.h"
 #include "core/version.h"
 
diff --git a/core/extension/godot_instance.h b/core/extension/godot_instance.h
index 8d1ecf453d..5014f68a6b 100644
--- a/core/extension/godot_instance.h
+++ b/core/extension/godot_instance.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/extension/gdextension_interface.gen.h"
-#include "core/object/class_db.h"
+#include "core/object/object.h"
 
 class GodotInstance : public Object {
 	GDCLASS(GodotInstance, Object);
diff --git a/core/io/packet_peer.h b/core/io/packet_peer.h
index c9a7d0ed5c..ecb664b41f 100644
--- a/core/io/packet_peer.h
+++ b/core/io/packet_peer.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/io/stream_peer.h"
-#include "core/object/class_db.h"
 #include "core/templates/ring_buffer.h"
 
 #include "core/extension/ext_wrappers.gen.h"
diff --git a/core/object/undo_redo.h b/core/object/undo_redo.h
index 8ba10882a9..249e030cbc 100644
--- a/core/object/undo_redo.h
+++ b/core/object/undo_redo.h
@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
+#include "core/variant/binder_common.h"
 
 class UndoRedo : public Object {
 	GDCLASS(UndoRedo, Object);
diff --git a/core/os/time.h b/core/os/time.h
index 3d1958dc7d..83596b1a43 100644
--- a/core/os/time.h
+++ b/core/os/time.h
@@ -30,7 +30,8 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
+#include "core/object/object.h"
+#include "core/variant/binder_common.h"
 #include "time_enums.h"
 
 // This Time class conforms with as many of the ISO 8601 standards as possible.
diff --git a/core/variant/variant_construct.h b/core/variant/variant_construct.h
index 2f6b5d00f2..9fdb6d2313 100644
--- a/core/variant/variant_construct.h
+++ b/core/variant/variant_construct.h
@@ -35,9 +35,10 @@
 #include "core/crypto/crypto_core.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/io/compression.h"
-#include "core/object/class_db.h"
 #include "core/templates/a_hash_map.h"
 #include "core/templates/local_vector.h"
+#include "core/variant/native_ptr.h"
+#include "core/variant/variant_internal.h"
 
 template <typename T>
 struct PtrConstruct {};
diff --git a/core/variant/variant_destruct.h b/core/variant/variant_destruct.h
index 39fc20f5ce..9ad3fb9691 100644
--- a/core/variant/variant_destruct.h
+++ b/core/variant/variant_destruct.h
@@ -30,10 +30,9 @@
 
 #pragma once
 
+#include "core/variant/type_info.h"
 #include "core/variant/variant.h"
 
-#include "core/object/class_db.h"
-
 template <typename T>
 struct VariantDestruct {};
 
diff --git a/core/variant/variant_op.h b/core/variant/variant_op.h
index c4f4642011..3ddea025d6 100644
--- a/core/variant/variant_op.h
+++ b/core/variant/variant_op.h
@@ -33,7 +33,7 @@
 #include "variant.h"
 
 #include "core/debugger/engine_debugger.h"
-#include "core/object/class_db.h"
+#include "core/variant/native_ptr.h"
 
 template <typename Evaluator>
 class CommonEvaluate {
diff --git a/core/variant/variant_setget.h b/core/variant/variant_setget.h
index db3be67a79..c8176c2fff 100644
--- a/core/variant/variant_setget.h
+++ b/core/variant/variant_setget.h
@@ -33,7 +33,7 @@
 #include "variant.h"
 
 #include "core/debugger/engine_debugger.h"
-#include "core/object/class_db.h"
+#include "core/variant/native_ptr.h"
 #include "core/variant/variant_internal.h"
 
 /**** NAMED SETTERS AND GETTERS ****/
diff --git a/drivers/alsa/audio_driver_alsa.cpp b/drivers/alsa/audio_driver_alsa.cpp
index 3fb624b038..14b87d33f2 100644
--- a/drivers/alsa/audio_driver_alsa.cpp
+++ b/drivers/alsa/audio_driver_alsa.cpp
@@ -34,6 +34,7 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
+#include "core/math/math_funcs_binary.h"
 #include "core/os/os.h"
 
 #include <cerrno>
diff --git a/drivers/apple_embedded/apple_embedded.h b/drivers/apple_embedded/apple_embedded.h
index f06d5796ba..3047670d56 100644
--- a/drivers/apple_embedded/apple_embedded.h
+++ b/drivers/apple_embedded/apple_embedded.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
+#include "core/object/object.h"
 
 #import <CoreHaptics/CoreHaptics.h>
 
diff --git a/drivers/coreaudio/audio_driver_coreaudio.mm b/drivers/coreaudio/audio_driver_coreaudio.mm
index 7109756f8a..fbd73c8d73 100644
--- a/drivers/coreaudio/audio_driver_coreaudio.mm
+++ b/drivers/coreaudio/audio_driver_coreaudio.mm
@@ -34,6 +34,7 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
+#include "core/math/math_funcs_binary.h"
 #include "core/os/os.h"
 
 #define kOutputBus 0
diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/drivers/pulseaudio/audio_driver_pulseaudio.cpp
index 89b4b79bd2..8b8e21c5f1 100644
--- a/drivers/pulseaudio/audio_driver_pulseaudio.cpp
+++ b/drivers/pulseaudio/audio_driver_pulseaudio.cpp
@@ -34,6 +34,7 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
+#include "core/math/math_funcs_binary.h"
 #include "core/os/os.h"
 #include "core/version.h"
 
diff --git a/editor/editor_interface.h b/editor/editor_interface.h
index fdeaec9d77..190227f4f5 100644
--- a/editor/editor_interface.h
+++ b/editor/editor_interface.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "core/object/script_language.h"
 
diff --git a/editor/file_system/editor_paths.h b/editor/file_system/editor_paths.h
index ab81e825d0..4dcf37b579 100644
--- a/editor/file_system/editor_paths.h
+++ b/editor/file_system/editor_paths.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "core/string/ustring.h"
 
diff --git a/editor/inspector/editor_preview_plugins.cpp b/editor/inspector/editor_preview_plugins.cpp
index 447a3e6fcd..083e9d2a33 100644
--- a/editor/inspector/editor_preview_plugins.cpp
+++ b/editor/inspector/editor_preview_plugins.cpp
@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/image.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/settings/editor_settings.h"
diff --git a/editor/inspector/editor_properties_array_dict.cpp b/editor/inspector/editor_properties_array_dict.cpp
index a55fdefba7..ad7c666392 100644
--- a/editor/inspector/editor_properties_array_dict.cpp
+++ b/editor/inspector/editor_properties_array_dict.cpp
@@ -33,6 +33,7 @@
 #include "core/input/input.h"
 #include "core/io/marshalls.h"
 #include "core/object/callable_mp.h"
+#include "core/object/class_db.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/project_upgrade/project_converter_3_to_4.cpp b/editor/project_upgrade/project_converter_3_to_4.cpp
index 74c4c43988..dd34c735ec 100644
--- a/editor/project_upgrade/project_converter_3_to_4.cpp
+++ b/editor/project_upgrade/project_converter_3_to_4.cpp
@@ -35,6 +35,7 @@
 #include "core/error/error_macros.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
+#include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
 #include "core/os/keyboard.h"
 #include "core/os/time.h"
diff --git a/editor/project_upgrade/project_upgrade_tool.h b/editor/project_upgrade/project_upgrade_tool.h
index 1ab4307cce..b7176aec3c 100644
--- a/editor/project_upgrade/project_upgrade_tool.h
+++ b/editor/project_upgrade/project_upgrade_tool.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
+#include "core/object/object.h"
 
 class ConfirmationDialog;
 class EditorFileSystemDirectory;
diff --git a/editor/register_editor_types.cpp b/editor/register_editor_types.cpp
index af3e1089ef..ddd9e49512 100644
--- a/editor/register_editor_types.cpp
+++ b/editor/register_editor_types.cpp
@@ -31,6 +31,7 @@
 #include "register_editor_types.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/os/os.h"
 #include "editor/animation/animation_tree_editor_plugin.h"
diff --git a/editor/scene/2d/scene_paint_2d_editor_plugin.cpp b/editor/scene/2d/scene_paint_2d_editor_plugin.cpp
index 13d4ee608a..512c3dd39a 100644
--- a/editor/scene/2d/scene_paint_2d_editor_plugin.cpp
+++ b/editor/scene/2d/scene_paint_2d_editor_plugin.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/callable_mp.h"
+#include "core/object/class_db.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/docks/scene_tree_dock.h"
diff --git a/editor/scene/2d/tiles/atlas_merging_dialog.cpp b/editor/scene/2d/tiles/atlas_merging_dialog.cpp
index 0e10b58433..786fb17ce9 100644
--- a/editor/scene/2d/tiles/atlas_merging_dialog.cpp
+++ b/editor/scene/2d/tiles/atlas_merging_dialog.cpp
@@ -31,6 +31,7 @@
 #include "atlas_merging_dialog.h"
 
 #include "core/object/callable_mp.h"
+#include "core/object/class_db.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_scale.h"
diff --git a/editor/scene/2d/tiles/tile_set_editor.cpp b/editor/scene/2d/tiles/tile_set_editor.cpp
index 101891326d..4909ac5c7c 100644
--- a/editor/scene/2d/tiles/tile_set_editor.cpp
+++ b/editor/scene/2d/tiles/tile_set_editor.cpp
@@ -34,6 +34,7 @@
 #include "tiles_editor_plugin.h"
 
 #include "core/object/callable_mp.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/file_system/editor_file_system.h"
diff --git a/editor/script/script_text_editor.cpp b/editor/script/script_text_editor.cpp
index 0134b068c9..7756839a8f 100644
--- a/editor/script/script_text_editor.cpp
+++ b/editor/script/script_text_editor.cpp
@@ -36,6 +36,7 @@
 #include "core/io/json.h"
 #include "core/math/expression.h"
 #include "core/object/callable_mp.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/doc/editor_help.h"
diff --git a/main/main.cpp b/main/main.cpp
index 1b388d912e..98c75fadbf 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -48,6 +48,7 @@
 #include "core/io/image_loader.h"
 #include "core/io/ip.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/object/message_queue.h"
 #include "core/object/script_language.h"
 #include "core/os/os.h"
diff --git a/main/performance.h b/main/performance.h
index f3d0668ff4..c52839d48e 100644
--- a/main/performance.h
+++ b/main/performance.h
@@ -30,8 +30,9 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
+#include "core/object/object.h"
 #include "core/templates/hash_map.h"
+#include "core/variant/binder_common.h"
 
 #define PERF_WARN_OFFLINE_FUNCTION
 #define PERF_WARN_PROCESS_SYNC
diff --git a/modules/csg/editor/csg_gizmos.cpp b/modules/csg/editor/csg_gizmos.cpp
index 1cc5707859..91e6e17ffc 100644
--- a/modules/csg/editor/csg_gizmos.cpp
+++ b/modules/csg/editor/csg_gizmos.cpp
@@ -32,6 +32,7 @@
 
 #include "core/math/geometry_3d.h"
 #include "core/object/callable_mp.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/3d/gizmos/gizmo_3d_helper.h"
diff --git a/modules/enet/register_types.cpp b/modules/enet/register_types.cpp
index 5787f9c2da..6c87de7956 100644
--- a/modules/enet/register_types.cpp
+++ b/modules/enet/register_types.cpp
@@ -35,6 +35,7 @@
 #include "enet_packet_peer.h"
 
 #include "core/error/error_macros.h"
+#include "core/object/class_db.h"
 
 static bool enet_ok = false;
 
diff --git a/modules/fbx/register_types.cpp b/modules/fbx/register_types.cpp
index 73615d426e..e246551913 100644
--- a/modules/fbx/register_types.cpp
+++ b/modules/fbx/register_types.cpp
@@ -34,6 +34,7 @@
 #include "fbx_document.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_scene_importer_fbx2gltf.h"
diff --git a/modules/gdscript/editor/gdscript_highlighter.cpp b/modules/gdscript/editor/gdscript_highlighter.cpp
index a6f03409d5..9d38d6cef0 100644
--- a/modules/gdscript/editor/gdscript_highlighter.cpp
+++ b/modules/gdscript/editor/gdscript_highlighter.cpp
@@ -35,6 +35,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/core_constants.h"
+#include "core/object/class_db.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/text_edit.h"
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 13a5361484..26731118c2 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -36,6 +36,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"
+#include "core/object/class_db.h"
 #include "scene/main/multiplayer_api.h"
 
 #ifdef DEBUG_ENABLED
diff --git a/modules/gltf/register_types.cpp b/modules/gltf/register_types.cpp
index de54a26ace..2969ebb7c4 100644
--- a/modules/gltf/register_types.cpp
+++ b/modules/gltf/register_types.cpp
@@ -39,6 +39,7 @@
 #include "structures/gltf_object_model_property.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 #ifndef PHYSICS_3D_DISABLED
 #include "extensions/physics/gltf_document_extension_physics.h"
diff --git a/modules/jpg/register_types.cpp b/modules/jpg/register_types.cpp
index fe5a46be3a..9af3d4264d 100644
--- a/modules/jpg/register_types.cpp
+++ b/modules/jpg/register_types.cpp
@@ -33,6 +33,8 @@
 #include "image_loader_libjpeg_turbo.h"
 #include "movie_writer_mjpeg.h"
 
+#include "core/object/class_db.h"
+
 static Ref<ImageLoaderLibJPEGTurbo> image_loader_libjpeg_turbo;
 static MovieWriterMJPEG *writer_mjpeg = nullptr;
 
diff --git a/modules/jsonrpc/jsonrpc.h b/modules/jsonrpc/jsonrpc.h
index 254bb3fcac..9f1ab5bdfa 100644
--- a/modules/jsonrpc/jsonrpc.h
+++ b/modules/jsonrpc/jsonrpc.h
@@ -30,7 +30,8 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
+#include "core/object/object.h"
+#include "core/variant/binder_common.h"
 #include "core/variant/variant.h"
 
 class JSONRPC : public Object {
diff --git a/modules/mbedtls/dtls_server_mbedtls.cpp b/modules/mbedtls/dtls_server_mbedtls.cpp
index c1fd74299f..1351a1d760 100644
--- a/modules/mbedtls/dtls_server_mbedtls.cpp
+++ b/modules/mbedtls/dtls_server_mbedtls.cpp
@@ -32,6 +32,8 @@
 
 #include "packet_peer_mbed_dtls.h"
 
+#include "core/object/class_db.h"
+
 Error DTLSServerMbedTLS::setup(Ref<TLSOptions> p_options) {
 	ERR_FAIL_COND_V(p_options.is_null() || !p_options->is_server(), ERR_INVALID_PARAMETER);
 	ERR_FAIL_COND_V(cookies->setup() != OK, ERR_ALREADY_IN_USE);
diff --git a/modules/mbedtls/packet_peer_mbed_dtls.cpp b/modules/mbedtls/packet_peer_mbed_dtls.cpp
index 8c568d35b9..3316ac8593 100644
--- a/modules/mbedtls/packet_peer_mbed_dtls.cpp
+++ b/modules/mbedtls/packet_peer_mbed_dtls.cpp
@@ -30,6 +30,8 @@
 
 #include "packet_peer_mbed_dtls.h"
 
+#include "core/object/class_db.h"
+
 int PacketPeerMbedDTLS::bio_send(void *ctx, const unsigned char *buf, size_t len) {
 	if (buf == nullptr || len == 0) {
 		return 0;
diff --git a/modules/mp3/register_types.cpp b/modules/mp3/register_types.cpp
index 79a780f3d3..59220995d0 100644
--- a/modules/mp3/register_types.cpp
+++ b/modules/mp3/register_types.cpp
@@ -32,6 +32,8 @@
 
 #include "audio_stream_mp3.h"
 
+#include "core/object/class_db.h"
+
 #ifdef TOOLS_ENABLED
 #include "core/config/engine.h"
 #include "editor/editor_node.h"
diff --git a/modules/multiplayer/register_types.cpp b/modules/multiplayer/register_types.cpp
index 03a63246e9..d9d58645a8 100644
--- a/modules/multiplayer/register_types.cpp
+++ b/modules/multiplayer/register_types.cpp
@@ -37,6 +37,8 @@
 #include "scene_replication_interface.h"
 #include "scene_rpc_interface.h"
 
+#include "core/object/class_db.h"
+
 #ifdef TOOLS_ENABLED
 #include "editor/multiplayer_editor_plugin.h"
 #endif
diff --git a/modules/multiplayer/tests/test_multiplayer_spawner.h b/modules/multiplayer/tests/test_multiplayer_spawner.h
index a2969c630f..d1f8adae8a 100644
--- a/modules/multiplayer/tests/test_multiplayer_spawner.h
+++ b/modules/multiplayer/tests/test_multiplayer_spawner.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/object/class_db.h"
 #include "tests/test_macros.h"
 #include "tests/test_utils.h"
 
diff --git a/modules/navigation_2d/2d/nav_mesh_generator_2d.h b/modules/navigation_2d/2d/nav_mesh_generator_2d.h
index 23dd606a1b..9b93c6816d 100644
--- a/modules/navigation_2d/2d/nav_mesh_generator_2d.h
+++ b/modules/navigation_2d/2d/nav_mesh_generator_2d.h
@@ -32,7 +32,7 @@
 
 #ifdef CLIPPER2_ENABLED
 
-#include "core/object/class_db.h"
+#include "core/object/object.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/templates/rid_owner.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
diff --git a/modules/navigation_2d/nav_agent_2d.h b/modules/navigation_2d/nav_agent_2d.h
index a8bee213a3..db1df666b9 100644
--- a/modules/navigation_2d/nav_agent_2d.h
+++ b/modules/navigation_2d/nav_agent_2d.h
@@ -32,8 +32,10 @@
 
 #include "nav_rid_2d.h"
 
-#include "core/object/class_db.h"
+#include "core/math/vector2.h"
 #include "core/templates/self_list.h"
+#include "core/variant/callable.h"
+#include "core/variant/dictionary.h"
 #include "servers/navigation_2d/navigation_constants_2d.h"
 
 #include <Agent2d.h>
diff --git a/modules/navigation_2d/nav_obstacle_2d.h b/modules/navigation_2d/nav_obstacle_2d.h
index b18d095f59..e2204b6324 100644
--- a/modules/navigation_2d/nav_obstacle_2d.h
+++ b/modules/navigation_2d/nav_obstacle_2d.h
@@ -32,8 +32,9 @@
 
 #include "nav_rid_2d.h"
 
-#include "core/object/class_db.h"
+#include "core/math/vector2.h"
 #include "core/templates/self_list.h"
+#include "core/templates/vector.h"
 
 class NavAgent2D;
 class NavMap2D;
diff --git a/modules/navigation_3d/3d/nav_mesh_generator_3d.h b/modules/navigation_3d/3d/nav_mesh_generator_3d.h
index 8c5cca50d0..7d6154ff7d 100644
--- a/modules/navigation_3d/3d/nav_mesh_generator_3d.h
+++ b/modules/navigation_3d/3d/nav_mesh_generator_3d.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
+#include "core/object/object.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/templates/rid_owner.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
diff --git a/modules/navigation_3d/nav_agent_3d.h b/modules/navigation_3d/nav_agent_3d.h
index fc3be0c2e2..b45368ccd7 100644
--- a/modules/navigation_3d/nav_agent_3d.h
+++ b/modules/navigation_3d/nav_agent_3d.h
@@ -32,8 +32,10 @@
 
 #include "nav_rid_3d.h"
 
-#include "core/object/class_db.h"
+#include "core/math/vector3.h"
 #include "core/templates/self_list.h"
+#include "core/variant/callable.h"
+#include "core/variant/dictionary.h"
 #include "servers/navigation_3d/navigation_constants_3d.h"
 
 #include <Agent2d.h>
diff --git a/modules/navigation_3d/nav_obstacle_3d.h b/modules/navigation_3d/nav_obstacle_3d.h
index fe5a952888..4ffd161928 100644
--- a/modules/navigation_3d/nav_obstacle_3d.h
+++ b/modules/navigation_3d/nav_obstacle_3d.h
@@ -32,7 +32,7 @@
 
 #include "nav_rid_3d.h"
 
-#include "core/object/class_db.h"
+#include "core/math/vector3.h"
 #include "core/templates/self_list.h"
 
 class NavAgent3D;
diff --git a/modules/navigation_3d/register_types.cpp b/modules/navigation_3d/register_types.cpp
index aed4bd48fa..f93839f633 100644
--- a/modules/navigation_3d/register_types.cpp
+++ b/modules/navigation_3d/register_types.cpp
@@ -44,6 +44,7 @@
 
 #include "core/config/engine.h"
 #include "core/object/callable_mp.h"
+#include "core/object/class_db.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
 #ifndef DISABLE_DEPRECATED
diff --git a/modules/openxr/editor/openxr_select_runtime.cpp b/modules/openxr/editor/openxr_select_runtime.cpp
index 5cd139d044..389547fbc1 100644
--- a/modules/openxr/editor/openxr_select_runtime.cpp
+++ b/modules/openxr/editor/openxr_select_runtime.cpp
@@ -38,6 +38,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
 #include "core/object/callable_mp.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "editor/settings/editor_settings.h"
 
diff --git a/modules/openxr/extensions/openxr_extension_wrapper.h b/modules/openxr/extensions/openxr_extension_wrapper.h
index a29dec218b..2fb8373671 100644
--- a/modules/openxr/extensions/openxr_extension_wrapper.h
+++ b/modules/openxr/extensions/openxr_extension_wrapper.h
@@ -32,7 +32,6 @@
 
 #include "core/error/error_macros.h"
 #include "core/math/projection.h"
-#include "core/object/class_db.h"
 #include "core/object/gdvirtual.gen.h"
 #include "core/object/ref_counted.h"
 #include "core/templates/hash_map.h"
diff --git a/modules/openxr/register_types.cpp b/modules/openxr/register_types.cpp
index 611948409a..283a9ffa8f 100644
--- a/modules/openxr/register_types.cpp
+++ b/modules/openxr/register_types.cpp
@@ -38,6 +38,7 @@
 #include "action_map/openxr_haptic_feedback.h"
 #include "action_map/openxr_interaction_profile.h"
 #include "action_map/openxr_interaction_profile_metadata.h"
+#include "core/object/class_db.h"
 #include "openxr_api_extension.h"
 #include "openxr_interface.h"
 
diff --git a/modules/vorbis/register_types.cpp b/modules/vorbis/register_types.cpp
index 880727aac9..5a8cbfe260 100644
--- a/modules/vorbis/register_types.cpp
+++ b/modules/vorbis/register_types.cpp
@@ -32,6 +32,8 @@
 
 #include "audio_stream_ogg_vorbis.h"
 
+#include "core/object/class_db.h"
+
 #ifdef TOOLS_ENABLED
 #include "editor/editor_node.h"
 #include "resource_importer_ogg_vorbis.h"
diff --git a/modules/webrtc/register_types.cpp b/modules/webrtc/register_types.cpp
index 28ce36f1e8..e745055fe8 100644
--- a/modules/webrtc/register_types.cpp
+++ b/modules/webrtc/register_types.cpp
@@ -37,6 +37,7 @@
 #include "webrtc_peer_connection_extension.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 
 void initialize_webrtc_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
diff --git a/modules/websocket/emws_peer.cpp b/modules/websocket/emws_peer.cpp
index 9a6e6581f4..882a34795d 100644
--- a/modules/websocket/emws_peer.cpp
+++ b/modules/websocket/emws_peer.cpp
@@ -33,6 +33,11 @@
 #ifdef WEB_ENABLED
 
 #include "core/io/ip.h"
+#include "core/object/class_db.h"
+
+WebSocketPeer *EMWSPeer::_create(bool p_notify_postinitialize) {
+	return static_cast<WebSocketPeer *>(ClassDB::creator<EMWSPeer>(p_notify_postinitialize));
+}
 
 void EMWSPeer::_esws_on_connect(void *p_obj, char *p_proto) {
 	EMWSPeer *peer = static_cast<EMWSPeer *>(p_obj);
diff --git a/modules/websocket/emws_peer.h b/modules/websocket/emws_peer.h
index b43b43f6fa..1feca30c4b 100644
--- a/modules/websocket/emws_peer.h
+++ b/modules/websocket/emws_peer.h
@@ -66,7 +66,7 @@ private:
 	String selected_protocol;
 	String requested_url;
 
-	static WebSocketPeer *_create(bool p_notify_postinitialize) { return static_cast<WebSocketPeer *>(ClassDB::creator<EMWSPeer>(p_notify_postinitialize)); }
+	static WebSocketPeer *_create(bool p_notify_postinitialize);
 	static void _esws_on_connect(void *obj, char *proto);
 	static void _esws_on_message(void *obj, const uint8_t *p_data, int p_data_size, int p_is_string);
 	static void _esws_on_error(void *obj);
diff --git a/modules/websocket/register_types.cpp b/modules/websocket/register_types.cpp
index f945684c8a..29acf69265 100644
--- a/modules/websocket/register_types.cpp
+++ b/modules/websocket/register_types.cpp
@@ -46,6 +46,7 @@
 
 #include "core/debugger/engine_debugger.h"
 #include "core/error/error_macros.h"
+#include "core/object/class_db.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/debugger/editor_debugger_server.h"
diff --git a/modules/websocket/wsl_peer.cpp b/modules/websocket/wsl_peer.cpp
index 4cc123da8d..ae3e34fc42 100644
--- a/modules/websocket/wsl_peer.cpp
+++ b/modules/websocket/wsl_peer.cpp
@@ -33,6 +33,7 @@
 #ifndef WEB_ENABLED
 
 #include "core/io/stream_peer_tls.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 CryptoCore::RandomGenerator *WSLPeer::_static_rng = nullptr;
@@ -50,6 +51,10 @@ void WSLPeer::deinitialize() {
 	}
 }
 
+WebSocketPeer *WSLPeer::_create(bool p_notify_postinitialize) {
+	return static_cast<WebSocketPeer *>(ClassDB::creator<WSLPeer>(p_notify_postinitialize));
+}
+
 ///
 /// Resolver
 ///
diff --git a/modules/websocket/wsl_peer.h b/modules/websocket/wsl_peer.h
index 0f460b1330..e06ab85bf8 100644
--- a/modules/websocket/wsl_peer.h
+++ b/modules/websocket/wsl_peer.h
@@ -45,7 +45,7 @@
 class WSLPeer : public WebSocketPeer {
 private:
 	static CryptoCore::RandomGenerator *_static_rng;
-	static WebSocketPeer *_create(bool p_notify_postinitialize) { return static_cast<WebSocketPeer *>(ClassDB::creator<WSLPeer>(p_notify_postinitialize)); }
+	static WebSocketPeer *_create(bool p_notify_postinitialize);
 
 	// Callbacks.
 	static ssize_t _wsl_recv_callback(wslay_event_context_ptr ctx, uint8_t *data, size_t len, int flags, void *user_data);
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 7fe0ecb9da..520eeb6b2d 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -32,6 +32,7 @@
 
 #include "export_plugin.h"
 
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "editor/export/editor_export.h"
 #include "editor/file_system/editor_paths.h"
diff --git a/platform/web/api/javascript_bridge_singleton.h b/platform/web/api/javascript_bridge_singleton.h
index eb07d979a8..a3825abfab 100644
--- a/platform/web/api/javascript_bridge_singleton.h
+++ b/platform/web/api/javascript_bridge_singleton.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
 
 class JavaScriptObject : public RefCounted {
diff --git a/platform/web/export/export.cpp b/platform/web/export/export.cpp
index f07d4d48d1..fa17b6c7c2 100644
--- a/platform/web/export/export.cpp
+++ b/platform/web/export/export.cpp
@@ -32,6 +32,7 @@
 
 #include "export_plugin.h"
 
+#include "core/object/class_db.h"
 #include "editor/export/editor_export.h"
 #include "editor/settings/editor_settings.h"
 
diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h
index 5df9eddb6a..fce9f60846 100644
--- a/platform/windows/display_server_windows.h
+++ b/platform/windows/display_server_windows.h
@@ -38,6 +38,7 @@
 #include "core/input/input_event.h"
 #include "core/io/image.h"
 #include "core/os/process_id.h"
+#include "core/templates/a_hash_map.h"
 #include "core/templates/rb_map.h"
 #include "drivers/wasapi/audio_driver_wasapi.h"
 #include "drivers/winmidi/midi_driver_winmidi.h"
diff --git a/scene/debugger/scene_debugger.cpp b/scene/debugger/scene_debugger.cpp
index 33d7c0f32c..d725282c73 100644
--- a/scene/debugger/scene_debugger.cpp
+++ b/scene/debugger/scene_debugger.cpp
@@ -40,6 +40,7 @@
 #include "core/io/resource_saver.h"
 #include "core/math/math_fieldwise.h"
 #include "core/object/callable_mp.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/os/time.h"
 #include "core/templates/local_vector.h"
diff --git a/servers/audio/audio_server.h b/servers/audio/audio_server.h
index 0f80572ffd..104b162f28 100644
--- a/servers/audio/audio_server.h
+++ b/servers/audio/audio_server.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/math/audio_frame.h"
-#include "core/object/class_db.h"
 #include "core/templates/safe_list.h"
 #include "core/variant/variant.h"
 #include "servers/audio/audio_effect.h"
diff --git a/servers/display/native_menu.h b/servers/display/native_menu.h
index dfc200be1b..2240b2f86d 100644
--- a/servers/display/native_menu.h
+++ b/servers/display/native_menu.h
@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "core/os/keyboard.h"
+#include "core/variant/binder_common.h"
 #include "core/variant/callable.h"
 
 class Texture2D;
diff --git a/servers/navigation_2d/navigation_server_2d.h b/servers/navigation_2d/navigation_server_2d.h
index e75502d5ca..a750baddb1 100644
--- a/servers/navigation_2d/navigation_server_2d.h
+++ b/servers/navigation_2d/navigation_server_2d.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
 #include "core/templates/rid_owner.h"
 
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
diff --git a/servers/navigation_3d/navigation_server_3d.h b/servers/navigation_3d/navigation_server_3d.h
index 07f8cd430f..4ec8b825f6 100644
--- a/servers/navigation_3d/navigation_server_3d.h
+++ b/servers/navigation_3d/navigation_server_3d.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
 #include "core/templates/rid_owner.h"
 
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
diff --git a/servers/physics_2d/physics_server_2d.h b/servers/physics_2d/physics_server_2d.h
index 2bbc9d6449..d185fcd202 100644
--- a/servers/physics_2d/physics_server_2d.h
+++ b/servers/physics_2d/physics_server_2d.h
@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/io/resource.h"
-#include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
 
 constexpr int MAX_CONTACTS_REPORTED_2D_MAX = 4096;
diff --git a/servers/rendering/shader_include_db.h b/servers/rendering/shader_include_db.h
index c73e5bf1f8..314ea0e4ed 100644
--- a/servers/rendering/shader_include_db.h
+++ b/servers/rendering/shader_include_db.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/object/class_db.h"
+#include "core/object/object.h"
 
 class ShaderIncludeDB : public Object {
 	GDCLASS(ShaderIncludeDB, Object)
diff --git a/tests/core/object/test_undo_redo.cpp b/tests/core/object/test_undo_redo.cpp
index 21824daeef..87bc14808d 100644
--- a/tests/core/object/test_undo_redo.cpp
+++ b/tests/core/object/test_undo_redo.cpp
@@ -33,6 +33,7 @@
 TEST_FORCE_LINK(test_undo_redo)
 
 #include "core/object/callable_mp.h"
+#include "core/object/class_db.h"
 #include "core/object/undo_redo.h"
 
 namespace TestUndoRedo {
diff --git a/tests/servers/test_navigation_server_3d.cpp b/tests/servers/test_navigation_server_3d.cpp
index d90605f044..059f3d8162 100644
--- a/tests/servers/test_navigation_server_3d.cpp
+++ b/tests/servers/test_navigation_server_3d.cpp
@@ -37,6 +37,7 @@ TEST_FORCE_LINK(test_navigation_server_3d)
 #ifdef MODULE_NAVIGATION_3D_ENABLED
 
 #include "core/object/callable_mp.h"
+#include "core/object/class_db.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/main/window.h"
 #include "scene/resources/3d/primitive_meshes.h"