diff --git a/core/core_bind.h b/core/core_bind.h
index 9848393e1d..3accebb7bc 100644
--- a/core/core_bind.h
+++ b/core/core_bind.h
@@ -33,6 +33,7 @@
 #include "core/debugger/engine_profiler.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 #include "core/object/script_backtrace.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
diff --git a/core/io/http_client_tcp.cpp b/core/io/http_client_tcp.cpp
index f6495585a7..a9ee5a0157 100644
--- a/core/io/http_client_tcp.cpp
+++ b/core/io/http_client_tcp.cpp
@@ -33,6 +33,7 @@
 #include "http_client_tcp.h"
 
 #include "core/io/stream_peer_tls.h"
+#include "core/object/class_db.h"
 #include "core/version.h"
 
 HTTPClient *HTTPClientTCP::_create_func(bool p_notify_postinitialize) {
diff --git a/core/io/image_loader.h b/core/io/image_loader.h
index 5a638747f6..81ab00ffae 100644
--- a/core/io/image_loader.h
+++ b/core/io/image_loader.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/core_bind.h"
 #include "core/io/file_access.h"
 #include "core/io/image.h"
 #include "core/io/resource_loader.h"
diff --git a/core/io/resource.cpp b/core/io/resource.cpp
index c1926aebc2..a19f0d816f 100644
--- a/core/io/resource.cpp
+++ b/core/io/resource.cpp
@@ -38,6 +38,14 @@
 #include "core/variant/container_type_validate.h"
 #include "scene/main/node.h" //only so casting works
 
+void Resource::register_custom_data_to_otdb() {
+	ClassDB::add_resource_base_extension("res", get_class_static());
+}
+
+void Resource::_add_resource_base_extension_to_classdb(const String &p_extension, const String &p_class) {
+	ClassDB::add_resource_base_extension(p_extension, p_class);
+}
+
 void Resource::emit_changed() {
 	if (emit_changed_state != EMIT_CHANGED_UNBLOCKED) {
 		emit_changed_state = EMIT_CHANGED_BLOCKED_PENDING_EMIT;
diff --git a/core/io/resource.h b/core/io/resource.h
index 5a071b1377..6528a87166 100644
--- a/core/io/resource.h
+++ b/core/io/resource.h
@@ -31,18 +31,18 @@
 #pragma once
 
 #include "core/io/resource_uid.h"
-#include "core/object/class_db.h"
 #include "core/object/gdvirtual.gen.h"
 #include "core/object/ref_counted.h"
 #include "core/templates/safe_refcount.h"
 #include "core/templates/self_list.h"
 
 class Node;
+class RWLock;
 
 #define RES_BASE_EXTENSION(m_ext) \
 public: \
 	static void register_custom_data_to_otdb() { \
-		ClassDB::add_resource_base_extension(m_ext, get_class_static()); \
+		Resource::_add_resource_base_extension_to_classdb(m_ext, get_class_static()); \
 	} \
 	virtual String get_base_extension() const override { \
 		return m_ext; \
@@ -56,10 +56,11 @@ class Resource : public RefCounted {
 public:
 	static constexpr AncestralClass static_ancestral_class = AncestralClass::RESOURCE;
 
-	static void register_custom_data_to_otdb() { ClassDB::add_resource_base_extension("res", get_class_static()); }
+	static void register_custom_data_to_otdb();
 	virtual String get_base_extension() const { return "res"; }
 
 protected:
+	static void _add_resource_base_extension_to_classdb(const String &p_extension, const String &p_class);
 	struct DuplicateParams {
 		bool deep = false;
 		ResourceDeepDuplicateMode subres_mode = RESOURCE_DEEP_DUPLICATE_MAX;
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index 8446e10413..0889810c3c 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -34,6 +34,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access_compressed.h"
 #include "core/io/missing_resource.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/version.h"
 #include "scene/property_utils.h"
diff --git a/core/io/stream_peer_gzip.h b/core/io/stream_peer_gzip.h
index e712253c20..9641f778b9 100644
--- a/core/io/stream_peer_gzip.h
+++ b/core/io/stream_peer_gzip.h
@@ -32,7 +32,6 @@
 
 #include "core/io/stream_peer.h"
 
-#include "core/core_bind.h"
 #include "core/io/compression.h"
 #include "core/templates/ring_buffer.h"
 
diff --git a/core/variant/container_type_validate.h b/core/variant/container_type_validate.h
index 369205ddb6..e76d172476 100644
--- a/core/variant/container_type_validate.h
+++ b/core/variant/container_type_validate.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/variant/variant.h"
 
diff --git a/core/variant/variant_parser.cpp b/core/variant/variant_parser.cpp
index ccb73872fe..b4cc58b81d 100644
--- a/core/variant/variant_parser.cpp
+++ b/core/variant/variant_parser.cpp
@@ -33,6 +33,7 @@
 #include "core/crypto/crypto_core.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_uid.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/string/string_buffer.h"
 
diff --git a/drivers/metal/metal_objects_shared.cpp b/drivers/metal/metal_objects_shared.cpp
index 5cd831c03a..d66c6aae53 100644
--- a/drivers/metal/metal_objects_shared.cpp
+++ b/drivers/metal/metal_objects_shared.cpp
@@ -34,6 +34,7 @@
 
 #include <os/signpost.h>
 #include <simd/simd.h>
+#include <shared_mutex>
 #include <string>
 
 #pragma mark - Resource Factory
diff --git a/editor/asset_library/editor_asset_installer.cpp b/editor/asset_library/editor_asset_installer.cpp
index 523e9d66e8..6d7cb1c408 100644
--- a/editor/asset_library/editor_asset_installer.cpp
+++ b/editor/asset_library/editor_asset_installer.cpp
@@ -33,6 +33,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/zip_io.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_file_system.h"
diff --git a/editor/doc/doc_tools.cpp b/editor/doc/doc_tools.cpp
index e8fcced165..63fe9bd57c 100644
--- a/editor/doc/doc_tools.cpp
+++ b/editor/doc/doc_tools.cpp
@@ -37,6 +37,7 @@
 #include "core/io/compression.h"
 #include "core/io/dir_access.h"
 #include "core/io/resource_importer.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/string/translation_server.h"
 #include "editor/export/editor_export_platform.h"
diff --git a/editor/docks/dock_tab_container.cpp b/editor/docks/dock_tab_container.cpp
index faf65d0632..dc9e7eec87 100644
--- a/editor/docks/dock_tab_container.cpp
+++ b/editor/docks/dock_tab_container.cpp
@@ -30,6 +30,7 @@
 
 #include "dock_tab_container.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_node.h"
diff --git a/editor/editor_main_screen.cpp b/editor/editor_main_screen.cpp
index 7f582a7d95..a68b90d4d1 100644
--- a/editor/editor_main_screen.cpp
+++ b/editor/editor_main_screen.cpp
@@ -31,6 +31,7 @@
 #include "editor_main_screen.h"
 
 #include "core/io/config_file.h"
+#include "core/object/callable_method_pointer.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/plugins/editor_plugin.h"
diff --git a/editor/file_system/editor_file_system.cpp b/editor/file_system/editor_file_system.cpp
index 7c8505dda3..e21557062c 100644
--- a/editor/file_system/editor_file_system.cpp
+++ b/editor/file_system/editor_file_system.cpp
@@ -240,6 +240,12 @@ EditorFileSystemDirectory::~EditorFileSystemDirectory() {
 	}
 }
 
+void EditorFileSystemImportFormatSupportQuery::_bind_methods() {
+	GDVIRTUAL_BIND(_is_active);
+	GDVIRTUAL_BIND(_get_file_extensions);
+	GDVIRTUAL_BIND(_query);
+}
+
 EditorFileSystem::ScannedDirectory::~ScannedDirectory() {
 	for (ScannedDirectory *dir : subdirs) {
 		memdelete(dir);
diff --git a/editor/file_system/editor_file_system.h b/editor/file_system/editor_file_system.h
index 843b3757f5..6201834e75 100644
--- a/editor/file_system/editor_file_system.h
+++ b/editor/file_system/editor_file_system.h
@@ -121,11 +121,7 @@ protected:
 	GDVIRTUAL0RC_REQUIRED(bool, _is_active)
 	GDVIRTUAL0RC_REQUIRED(Vector<String>, _get_file_extensions)
 	GDVIRTUAL0RC_REQUIRED(bool, _query)
-	static void _bind_methods() {
-		GDVIRTUAL_BIND(_is_active);
-		GDVIRTUAL_BIND(_get_file_extensions);
-		GDVIRTUAL_BIND(_query);
-	}
+	static void _bind_methods();
 
 public:
 	virtual bool is_active() const {
diff --git a/editor/gui/credits_roll.cpp b/editor/gui/credits_roll.cpp
index 22c67bbe48..8a7ca74538 100644
--- a/editor/gui/credits_roll.cpp
+++ b/editor/gui/credits_roll.cpp
@@ -34,6 +34,7 @@
 #include "core/donors.gen.h"
 #include "core/input/input.h"
 #include "core/license.gen.h"
+#include "core/object/callable_method_pointer.h"
 #include "core/string/string_builder.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp
index 32720f012a..9b59700cd9 100644
--- a/editor/gui/editor_bottom_panel.cpp
+++ b/editor/gui/editor_bottom_panel.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_bottom_panel.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/docks/editor_dock_manager.h"
diff --git a/editor/gui/editor_title_bar.cpp b/editor/gui/editor_title_bar.cpp
index 145d85b3c8..8544b4d5bd 100644
--- a/editor/gui/editor_title_bar.cpp
+++ b/editor/gui/editor_title_bar.cpp
@@ -30,6 +30,8 @@
 
 #include "editor_title_bar.h"
 
+#include "core/object/callable_method_pointer.h"
+
 void EditorTitleBar::gui_input(const Ref<InputEvent> &p_event) {
 	if (!can_move) {
 		return;
diff --git a/editor/gui/editor_validation_panel.cpp b/editor/gui/editor_validation_panel.cpp
index df273425de..3a8b7bed48 100644
--- a/editor/gui/editor_validation_panel.cpp
+++ b/editor/gui/editor_validation_panel.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_validation_panel.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/box_container.h"
diff --git a/editor/gui/progress_dialog.cpp b/editor/gui/progress_dialog.cpp
index 9c9d93837a..c7f02f035c 100644
--- a/editor/gui/progress_dialog.cpp
+++ b/editor/gui/progress_dialog.cpp
@@ -30,6 +30,7 @@
 
 #include "progress_dialog.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"
diff --git a/editor/gui/touch_actions_panel.cpp b/editor/gui/touch_actions_panel.cpp
index 854a9f6ab9..073691f942 100644
--- a/editor/gui/touch_actions_panel.cpp
+++ b/editor/gui/touch_actions_panel.cpp
@@ -31,6 +31,7 @@
 #include "touch_actions_panel.h"
 
 #include "core/input/input.h"
+#include "core/object/callable_method_pointer.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/gui/box_container.h"
diff --git a/editor/import/editor_atlas_packer.cpp b/editor/import/editor_atlas_packer.cpp
index fb6f2a0da8..d7fc6580dc 100644
--- a/editor/import/editor_atlas_packer.cpp
+++ b/editor/import/editor_atlas_packer.cpp
@@ -31,6 +31,7 @@
 #include "editor_atlas_packer.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/math/math_funcs_binary.h"
 #include "core/math/vector2.h"
 #include "core/math/vector2i.h"
 #include "scene/resources/bit_map.h"
diff --git a/editor/inspector/sub_viewport_preview_editor_plugin.cpp b/editor/inspector/sub_viewport_preview_editor_plugin.cpp
index 479d58cf47..5904dc82fb 100644
--- a/editor/inspector/sub_viewport_preview_editor_plugin.cpp
+++ b/editor/inspector/sub_viewport_preview_editor_plugin.cpp
@@ -32,6 +32,8 @@
 
 #include "scene/main/viewport.h"
 
+#include "core/object/callable_method_pointer.h"
+
 bool EditorInspectorPluginSubViewportPreview::can_handle(Object *p_object) {
 	return Object::cast_to<SubViewport>(p_object) != nullptr;
 }
diff --git a/editor/inspector/tool_button_editor_plugin.cpp b/editor/inspector/tool_button_editor_plugin.cpp
index ab2936dd3f..1fd66c5413 100644
--- a/editor/inspector/tool_button_editor_plugin.cpp
+++ b/editor/inspector/tool_button_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "tool_button_editor_plugin.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/editor_node.h"
 #include "editor/inspector/multi_node_edit.h"
 
diff --git a/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp
index 79ee6b488a..c9906b73d8 100644
--- a/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp
+++ b/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "joint_3d_gizmo_plugin.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/editor_node.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/3d/physics/joints/cone_twist_joint_3d.h"
diff --git a/editor/scene/3d/mesh_editor_plugin.cpp b/editor/scene/3d/mesh_editor_plugin.cpp
index 0963f2e56e..53f2686667 100644
--- a/editor/scene/3d/mesh_editor_plugin.cpp
+++ b/editor/scene/3d/mesh_editor_plugin.cpp
@@ -31,6 +31,7 @@
 #include "mesh_editor_plugin.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/callable_method_pointer.h"
 #include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/button.h"
diff --git a/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp b/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp
index f09ab022d7..fca19af074 100644
--- a/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp
+++ b/editor/scene/3d/skeleton_ik_3d_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "skeleton_ik_3d_editor_plugin.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "scene/3d/skeleton_ik_3d.h"
diff --git a/editor/scene/gui/margin_container_editor_plugin.cpp b/editor/scene/gui/margin_container_editor_plugin.cpp
index 138b1ff36f..bc86b026c1 100644
--- a/editor/scene/gui/margin_container_editor_plugin.cpp
+++ b/editor/scene/gui/margin_container_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "margin_container_editor_plugin.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 
diff --git a/editor/scene/gui/style_box_editor_plugin.cpp b/editor/scene/gui/style_box_editor_plugin.cpp
index 8098b9be70..209316c9ae 100644
--- a/editor/scene/gui/style_box_editor_plugin.cpp
+++ b/editor/scene/gui/style_box_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "style_box_editor_plugin.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/button.h"
 #include "scene/resources/style_box_texture.h"
diff --git a/editor/scene/gui/virtual_joystick_editor_plugin.cpp b/editor/scene/gui/virtual_joystick_editor_plugin.cpp
index 05ecb9b1a1..1f1f21bc62 100644
--- a/editor/scene/gui/virtual_joystick_editor_plugin.cpp
+++ b/editor/scene/gui/virtual_joystick_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "virtual_joystick_editor_plugin.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/virtual_joystick.h"
diff --git a/editor/scene/packed_scene_editor_plugin.cpp b/editor/scene/packed_scene_editor_plugin.cpp
index 339331d632..497a168588 100644
--- a/editor/scene/packed_scene_editor_plugin.cpp
+++ b/editor/scene/packed_scene_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "packed_scene_editor_plugin.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/editor_node.h"
 #include "scene/resources/packed_scene.h"
 
diff --git a/editor/scene/texture/bit_map_editor_plugin.cpp b/editor/scene/texture/bit_map_editor_plugin.cpp
index 22805d3d9a..19fa26b024 100644
--- a/editor/scene/texture/bit_map_editor_plugin.cpp
+++ b/editor/scene/texture/bit_map_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "bit_map_editor_plugin.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/aspect_ratio_container.h"
diff --git a/editor/shader/shader_file_editor_plugin.cpp b/editor/shader/shader_file_editor_plugin.cpp
index 50982c12a0..4275731e73 100644
--- a/editor/shader/shader_file_editor_plugin.cpp
+++ b/editor/shader/shader_file_editor_plugin.cpp
@@ -39,6 +39,7 @@
 #include "scene/gui/item_list.h"
 #include "scene/gui/split_container.h"
 #include "servers/display/display_server.h"
+#include "servers/rendering/rendering_device_binds.h"
 
 /*** SHADER SCRIPT EDITOR ****/
 
diff --git a/editor/shader/shader_file_editor_plugin.h b/editor/shader/shader_file_editor_plugin.h
index 031b13b4c3..426918ad47 100644
--- a/editor/shader/shader_file_editor_plugin.h
+++ b/editor/shader/shader_file_editor_plugin.h
@@ -33,10 +33,11 @@
 #include "editor/docks/editor_dock.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/rich_text_label.h"
-#include "servers/rendering/rendering_device_binds.h"
+#include "servers/rendering/rendering_device.h"
 
 class HFlowContainer;
 class ItemList;
+class RDShaderFile;
 
 class ShaderFileEditor : public EditorDock {
 	GDCLASS(ShaderFileEditor, EditorDock);
diff --git a/editor/translations/editor_translation_preview_button.cpp b/editor/translations/editor_translation_preview_button.cpp
index 4ab6217451..6a385a6701 100644
--- a/editor/translations/editor_translation_preview_button.cpp
+++ b/editor/translations/editor_translation_preview_button.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_translation_preview_button.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_node.h"
 
diff --git a/editor/translations/packed_scene_translation_parser_plugin.cpp b/editor/translations/packed_scene_translation_parser_plugin.cpp
index 2bb4e1da78..237b8fb1d3 100644
--- a/editor/translations/packed_scene_translation_parser_plugin.cpp
+++ b/editor/translations/packed_scene_translation_parser_plugin.cpp
@@ -31,6 +31,7 @@
 #include "packed_scene_translation_parser_plugin.h"
 
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "scene/resources/packed_scene.h"
 
diff --git a/modules/betsy/image_compress_betsy.cpp b/modules/betsy/image_compress_betsy.cpp
index 39f9fc3fbb..1412691c0c 100644
--- a/modules/betsy/image_compress_betsy.cpp
+++ b/modules/betsy/image_compress_betsy.cpp
@@ -42,6 +42,7 @@
 #include "servers/display/display_server.h"
 #include "servers/rendering/rendering_context_driver.h"
 #include "servers/rendering/rendering_device.h"
+#include "servers/rendering/rendering_device_binds.h"
 #include "servers/rendering/rendering_server.h"
 
 #if defined(VULKAN_ENABLED)
diff --git a/modules/betsy/image_compress_betsy.h b/modules/betsy/image_compress_betsy.h
index 393910d02f..1eae808643 100644
--- a/modules/betsy/image_compress_betsy.h
+++ b/modules/betsy/image_compress_betsy.h
@@ -33,8 +33,8 @@
 #include "core/io/image.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/templates/command_queue_mt.h"
-#include "servers/rendering/rendering_device_binds.h" // RDShaderFile
 
+class RDShaderFile;
 class RenderingDevice;
 class RenderingContextDriver;
 
diff --git a/modules/csg/register_types.cpp b/modules/csg/register_types.cpp
index b157e32952..57347ef946 100644
--- a/modules/csg/register_types.cpp
+++ b/modules/csg/register_types.cpp
@@ -32,6 +32,8 @@
 
 #include "csg_shape.h"
 
+#include "core/object/class_db.h"
+
 #ifdef TOOLS_ENABLED
 #include "editor/csg_gizmos.h"
 #endif
diff --git a/modules/dds/register_types.cpp b/modules/dds/register_types.cpp
index fc831b9f59..e0681c4c40 100644
--- a/modules/dds/register_types.cpp
+++ b/modules/dds/register_types.cpp
@@ -33,6 +33,7 @@
 #include "image_saver_dds.h"
 #include "texture_loader_dds.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/texture.h"
 
 static Ref<ResourceFormatDDS> resource_loader_dds;
diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp
index 037adaf798..8db4f6a9fe 100644
--- a/modules/dds/texture_loader_dds.cpp
+++ b/modules/dds/texture_loader_dds.cpp
@@ -34,6 +34,7 @@
 
 #include "core/io/file_access.h"
 #include "core/io/file_access_memory.h"
+#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 
 DDSFormat _dxgi_to_dds_format(uint32_t p_dxgi_format) {
diff --git a/modules/gdscript/gdscript_byte_codegen.cpp b/modules/gdscript/gdscript_byte_codegen.cpp
index 2961a67e05..1407628038 100644
--- a/modules/gdscript/gdscript_byte_codegen.cpp
+++ b/modules/gdscript/gdscript_byte_codegen.cpp
@@ -31,6 +31,7 @@
 #include "gdscript_byte_codegen.h"
 
 #include "core/debugger/engine_debugger.h"
+#include "core/object/class_db.h"
 
 uint32_t GDScriptByteCodeGenerator::add_parameter(const StringName &p_name, bool p_is_optional, const GDScriptDataType &p_type) {
 	function->_argument_count++;
diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp
index 3138a9c80c..2bf42ee503 100644
--- a/modules/gdscript/gdscript_compiler.cpp
+++ b/modules/gdscript/gdscript_compiler.cpp
@@ -38,6 +38,7 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 
 #include "scene/scene_string_names.h"
 
diff --git a/modules/gdscript/gdscript_disassembler.cpp b/modules/gdscript/gdscript_disassembler.cpp
index 1f8ee55691..d8cb1e89ab 100644
--- a/modules/gdscript/gdscript_disassembler.cpp
+++ b/modules/gdscript/gdscript_disassembler.cpp
@@ -33,6 +33,7 @@
 #include "gdscript.h"
 #include "gdscript_function.h"
 
+#include "core/object/class_db.h"
 #include "core/string/string_builder.h"
 
 static String _get_variant_string(const Variant &p_variant) {
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp
index afd896f61d..809b801a1a 100644
--- a/modules/gdscript/gdscript_editor.cpp
+++ b/modules/gdscript/gdscript_editor.cpp
@@ -44,6 +44,7 @@
 #include "core/core_constants.h"
 #include "core/io/file_access.h"
 #include "core/math/expression.h"
+#include "core/object/class_db.h"
 #include "core/variant/container_type_validate.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/modules/gdscript/gdscript_function.cpp b/modules/gdscript/gdscript_function.cpp
index dfcc428da6..e81d4ca8a7 100644
--- a/modules/gdscript/gdscript_function.cpp
+++ b/modules/gdscript/gdscript_function.cpp
@@ -34,6 +34,123 @@
 
 #include "core/object/class_db.h"
 
+bool GDScriptDataType::is_type(const Variant &p_variant, bool p_allow_implicit_conversion) const {
+	switch (kind) {
+		case VARIANT: {
+			return true;
+		} break;
+		case BUILTIN: {
+			Variant::Type var_type = p_variant.get_type();
+			bool valid = builtin_type == var_type;
+			if (valid && builtin_type == Variant::ARRAY && has_container_element_type(0)) {
+				Array array = p_variant;
+				if (array.is_typed()) {
+					const GDScriptDataType &elem_type = container_element_types[0];
+					Variant::Type array_builtin_type = (Variant::Type)array.get_typed_builtin();
+					StringName array_native_type = array.get_typed_class_name();
+					Ref<Script> array_script_type_ref = array.get_typed_script();
+
+					if (array_script_type_ref.is_valid()) {
+						valid = (elem_type.kind == SCRIPT || elem_type.kind == GDSCRIPT) && elem_type.script_type == array_script_type_ref.ptr();
+					} else if (array_native_type != StringName()) {
+						valid = elem_type.kind == NATIVE && elem_type.native_type == array_native_type;
+					} else {
+						valid = elem_type.kind == BUILTIN && elem_type.builtin_type == array_builtin_type;
+					}
+				} else {
+					valid = false;
+				}
+			} else if (valid && builtin_type == Variant::DICTIONARY && has_container_element_types()) {
+				Dictionary dictionary = p_variant;
+				if (dictionary.is_typed()) {
+					if (dictionary.is_typed_key()) {
+						GDScriptDataType key = get_container_element_type_or_variant(0);
+						Variant::Type key_builtin_type = (Variant::Type)dictionary.get_typed_key_builtin();
+						StringName key_native_type = dictionary.get_typed_key_class_name();
+						Ref<Script> key_script_type_ref = dictionary.get_typed_key_script();
+
+						if (key_script_type_ref.is_valid()) {
+							valid = (key.kind == SCRIPT || key.kind == GDSCRIPT) && key.script_type == key_script_type_ref.ptr();
+						} else if (key_native_type != StringName()) {
+							valid = key.kind == NATIVE && key.native_type == key_native_type;
+						} else {
+							valid = key.kind == BUILTIN && key.builtin_type == key_builtin_type;
+						}
+					}
+
+					if (valid && dictionary.is_typed_value()) {
+						GDScriptDataType value = get_container_element_type_or_variant(1);
+						Variant::Type value_builtin_type = (Variant::Type)dictionary.get_typed_value_builtin();
+						StringName value_native_type = dictionary.get_typed_value_class_name();
+						Ref<Script> value_script_type_ref = dictionary.get_typed_value_script();
+
+						if (value_script_type_ref.is_valid()) {
+							valid = (value.kind == SCRIPT || value.kind == GDSCRIPT) && value.script_type == value_script_type_ref.ptr();
+						} else if (value_native_type != StringName()) {
+							valid = value.kind == NATIVE && value.native_type == value_native_type;
+						} else {
+							valid = value.kind == BUILTIN && value.builtin_type == value_builtin_type;
+						}
+					}
+				} else {
+					valid = false;
+				}
+			} else if (!valid && p_allow_implicit_conversion) {
+				valid = Variant::can_convert_strict(var_type, builtin_type);
+			}
+			return valid;
+		} break;
+		case NATIVE: {
+			if (p_variant.get_type() == Variant::NIL) {
+				return true;
+			}
+			if (p_variant.get_type() != Variant::OBJECT) {
+				return false;
+			}
+
+			bool was_freed = false;
+			Object *obj = p_variant.get_validated_object_with_check(was_freed);
+			if (!obj) {
+				return !was_freed;
+			}
+
+			if (!ClassDB::is_parent_class(obj->get_class_name(), native_type)) {
+				return false;
+			}
+			return true;
+		} break;
+		case SCRIPT:
+		case GDSCRIPT: {
+			if (p_variant.get_type() == Variant::NIL) {
+				return true;
+			}
+			if (p_variant.get_type() != Variant::OBJECT) {
+				return false;
+			}
+
+			bool was_freed = false;
+			Object *obj = p_variant.get_validated_object_with_check(was_freed);
+			if (!obj) {
+				return !was_freed;
+			}
+
+			Ref<Script> base = obj && obj->get_script_instance() ? obj->get_script_instance()->get_script() : nullptr;
+			bool valid = false;
+			while (base.is_valid()) {
+				if (base == script_type) {
+					valid = true;
+					break;
+				}
+				base = base->get_base_script();
+			}
+			return valid;
+		} break;
+	}
+	return false;
+}
+
+/////////////////////
+
 Variant GDScriptFunction::get_constant(int p_idx) const {
 	ERR_FAIL_INDEX_V(p_idx, constants.size(), "<errconst>");
 	return constants[p_idx];
diff --git a/modules/gdscript/gdscript_function.h b/modules/gdscript/gdscript_function.h
index fe965bb223..df758e80e2 100644
--- a/modules/gdscript/gdscript_function.h
+++ b/modules/gdscript/gdscript_function.h
@@ -64,120 +64,7 @@ public:
 
 	_FORCE_INLINE_ bool has_type() const { return kind != VARIANT; }
 
-	bool is_type(const Variant &p_variant, bool p_allow_implicit_conversion = false) const {
-		switch (kind) {
-			case VARIANT: {
-				return true;
-			} break;
-			case BUILTIN: {
-				Variant::Type var_type = p_variant.get_type();
-				bool valid = builtin_type == var_type;
-				if (valid && builtin_type == Variant::ARRAY && has_container_element_type(0)) {
-					Array array = p_variant;
-					if (array.is_typed()) {
-						const GDScriptDataType &elem_type = container_element_types[0];
-						Variant::Type array_builtin_type = (Variant::Type)array.get_typed_builtin();
-						StringName array_native_type = array.get_typed_class_name();
-						Ref<Script> array_script_type_ref = array.get_typed_script();
-
-						if (array_script_type_ref.is_valid()) {
-							valid = (elem_type.kind == SCRIPT || elem_type.kind == GDSCRIPT) && elem_type.script_type == array_script_type_ref.ptr();
-						} else if (array_native_type != StringName()) {
-							valid = elem_type.kind == NATIVE && elem_type.native_type == array_native_type;
-						} else {
-							valid = elem_type.kind == BUILTIN && elem_type.builtin_type == array_builtin_type;
-						}
-					} else {
-						valid = false;
-					}
-				} else if (valid && builtin_type == Variant::DICTIONARY && has_container_element_types()) {
-					Dictionary dictionary = p_variant;
-					if (dictionary.is_typed()) {
-						if (dictionary.is_typed_key()) {
-							GDScriptDataType key = get_container_element_type_or_variant(0);
-							Variant::Type key_builtin_type = (Variant::Type)dictionary.get_typed_key_builtin();
-							StringName key_native_type = dictionary.get_typed_key_class_name();
-							Ref<Script> key_script_type_ref = dictionary.get_typed_key_script();
-
-							if (key_script_type_ref.is_valid()) {
-								valid = (key.kind == SCRIPT || key.kind == GDSCRIPT) && key.script_type == key_script_type_ref.ptr();
-							} else if (key_native_type != StringName()) {
-								valid = key.kind == NATIVE && key.native_type == key_native_type;
-							} else {
-								valid = key.kind == BUILTIN && key.builtin_type == key_builtin_type;
-							}
-						}
-
-						if (valid && dictionary.is_typed_value()) {
-							GDScriptDataType value = get_container_element_type_or_variant(1);
-							Variant::Type value_builtin_type = (Variant::Type)dictionary.get_typed_value_builtin();
-							StringName value_native_type = dictionary.get_typed_value_class_name();
-							Ref<Script> value_script_type_ref = dictionary.get_typed_value_script();
-
-							if (value_script_type_ref.is_valid()) {
-								valid = (value.kind == SCRIPT || value.kind == GDSCRIPT) && value.script_type == value_script_type_ref.ptr();
-							} else if (value_native_type != StringName()) {
-								valid = value.kind == NATIVE && value.native_type == value_native_type;
-							} else {
-								valid = value.kind == BUILTIN && value.builtin_type == value_builtin_type;
-							}
-						}
-					} else {
-						valid = false;
-					}
-				} else if (!valid && p_allow_implicit_conversion) {
-					valid = Variant::can_convert_strict(var_type, builtin_type);
-				}
-				return valid;
-			} break;
-			case NATIVE: {
-				if (p_variant.get_type() == Variant::NIL) {
-					return true;
-				}
-				if (p_variant.get_type() != Variant::OBJECT) {
-					return false;
-				}
-
-				bool was_freed = false;
-				Object *obj = p_variant.get_validated_object_with_check(was_freed);
-				if (!obj) {
-					return !was_freed;
-				}
-
-				if (!ClassDB::is_parent_class(obj->get_class_name(), native_type)) {
-					return false;
-				}
-				return true;
-			} break;
-			case SCRIPT:
-			case GDSCRIPT: {
-				if (p_variant.get_type() == Variant::NIL) {
-					return true;
-				}
-				if (p_variant.get_type() != Variant::OBJECT) {
-					return false;
-				}
-
-				bool was_freed = false;
-				Object *obj = p_variant.get_validated_object_with_check(was_freed);
-				if (!obj) {
-					return !was_freed;
-				}
-
-				Ref<Script> base = obj && obj->get_script_instance() ? obj->get_script_instance()->get_script() : nullptr;
-				bool valid = false;
-				while (base.is_valid()) {
-					if (base == script_type) {
-						valid = true;
-						break;
-					}
-					base = base->get_base_script();
-				}
-				return valid;
-			} break;
-		}
-		return false;
-	}
+	bool is_type(const Variant &p_variant, bool p_allow_implicit_conversion = false) const;
 
 	bool can_contain_object() const {
 		if (kind == BUILTIN) {
diff --git a/modules/gdscript/gdscript_vm.cpp b/modules/gdscript/gdscript_vm.cpp
index 28d9bc10b8..f56397c308 100644
--- a/modules/gdscript/gdscript_vm.cpp
+++ b/modules/gdscript/gdscript_vm.cpp
@@ -32,6 +32,7 @@
 #include "gdscript_function.h"
 #include "gdscript_lambda_callable.h"
 
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/profiling/profiling.h"
 
diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp
index 00a69d9175..40e9d4b96c 100644
--- a/modules/gdscript/register_types.cpp
+++ b/modules/gdscript/register_types.cpp
@@ -52,6 +52,7 @@
 
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_node.h"
diff --git a/modules/gdscript/tests/gdscript_test_runner.cpp b/modules/gdscript/tests/gdscript_test_runner.cpp
index 494cf3effa..e85fcc174f 100644
--- a/modules/gdscript/tests/gdscript_test_runner.cpp
+++ b/modules/gdscript/tests/gdscript_test_runner.cpp
@@ -40,6 +40,7 @@
 #include "core/core_globals.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access_pack.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/string/string_builder.h"
 #include "scene/resources/packed_scene.h"
diff --git a/modules/gltf/editor/editor_import_blend_runner.cpp b/modules/gltf/editor/editor_import_blend_runner.cpp
index 3ee45d5f2c..4586c98699 100644
--- a/modules/gltf/editor/editor_import_blend_runner.cpp
+++ b/modules/gltf/editor/editor_import_blend_runner.cpp
@@ -31,6 +31,7 @@
 #include "editor_import_blend_runner.h"
 
 #include "core/io/http_client.h"
+#include "core/object/callable_method_pointer.h"
 #include "editor/editor_node.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/settings/editor_settings.h"
diff --git a/modules/godot_physics_3d/register_types.cpp b/modules/godot_physics_3d/register_types.cpp
index 0aae731ea1..9328b8becf 100644
--- a/modules/godot_physics_3d/register_types.cpp
+++ b/modules/godot_physics_3d/register_types.cpp
@@ -31,6 +31,8 @@
 #include "register_types.h"
 
 #include "godot_physics_server_3d.h"
+
+#include "core/object/callable_method_pointer.h"
 #include "servers/physics_3d/physics_server_3d.h"
 #include "servers/physics_3d/physics_server_3d_wrap_mt.h"
 
diff --git a/modules/jolt_physics/register_types.cpp b/modules/jolt_physics/register_types.cpp
index f24033dff9..888988f220 100644
--- a/modules/jolt_physics/register_types.cpp
+++ b/modules/jolt_physics/register_types.cpp
@@ -34,6 +34,7 @@
 #include "jolt_physics_server_3d.h"
 #include "jolt_project_settings.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "servers/physics_3d/physics_server_3d_wrap_mt.h"
 
 PhysicsServer3D *create_jolt_physics_server() {
diff --git a/modules/ktx/register_types.cpp b/modules/ktx/register_types.cpp
index afc57e9ec2..d0be8e7a69 100644
--- a/modules/ktx/register_types.cpp
+++ b/modules/ktx/register_types.cpp
@@ -32,6 +32,7 @@
 
 #include "texture_loader_ktx.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 
 static Ref<ResourceFormatKTX> resource_loader_ktx;
diff --git a/modules/ktx/texture_loader_ktx.cpp b/modules/ktx/texture_loader_ktx.cpp
index cd5b3d979f..a696615911 100644
--- a/modules/ktx/texture_loader_ktx.cpp
+++ b/modules/ktx/texture_loader_ktx.cpp
@@ -32,6 +32,7 @@
 
 #include "core/io/file_access.h"
 #include "core/io/file_access_memory.h"
+#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/texture.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/modules/lightmapper_rd/register_types.cpp b/modules/lightmapper_rd/register_types.cpp
index b00fe167a7..738edc8554 100644
--- a/modules/lightmapper_rd/register_types.cpp
+++ b/modules/lightmapper_rd/register_types.cpp
@@ -33,6 +33,7 @@
 #include "lightmapper_rd.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/3d/lightmapper.h"
 
 #ifndef _3D_DISABLED
diff --git a/modules/mbedtls/crypto_mbedtls.cpp b/modules/mbedtls/crypto_mbedtls.cpp
index 127504bfd1..784deecdda 100644
--- a/modules/mbedtls/crypto_mbedtls.cpp
+++ b/modules/mbedtls/crypto_mbedtls.cpp
@@ -33,6 +33,7 @@
 #include "core/io/certs_compressed.gen.h"
 #include "core/io/compression.h"
 #include "core/io/file_access.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 #include <mbedtls/debug.h>
diff --git a/modules/mbedtls/stream_peer_mbedtls.cpp b/modules/mbedtls/stream_peer_mbedtls.cpp
index dfdad46d4b..0f23ceb272 100644
--- a/modules/mbedtls/stream_peer_mbedtls.cpp
+++ b/modules/mbedtls/stream_peer_mbedtls.cpp
@@ -31,6 +31,7 @@
 #include "stream_peer_mbedtls.h"
 
 #include "core/io/stream_peer_tcp.h"
+#include "core/object/class_db.h"
 
 int StreamPeerMbedTLS::bio_send(void *ctx, const unsigned char *buf, size_t len) {
 	if (buf == nullptr || len == 0) {
diff --git a/modules/mono/editor/code_completion.cpp b/modules/mono/editor/code_completion.cpp
index 1ff9cae612..4747743356 100644
--- a/modules/mono/editor/code_completion.cpp
+++ b/modules/mono/editor/code_completion.cpp
@@ -31,6 +31,7 @@
 #include "code_completion.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/settings/editor_settings.h"
diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp
index 14dd433c56..53ee572f43 100644
--- a/modules/mono/mono_gd/gd_mono.cpp
+++ b/modules/mono/mono_gd/gd_mono.cpp
@@ -38,6 +38,10 @@
 #include "../utils/path_utils.h"
 #include "gd_mono_cache.h"
 
+#ifdef DEBUG_ENABLED
+#include "core/object/class_db.h"
+#endif
+
 #ifdef TOOLS_ENABLED
 #include "../editor/hostfxr_resolver.h"
 #include "../editor/semver.h"
@@ -741,6 +745,23 @@ void GDMono::_init_godot_api_hashes() {
 #endif // DEBUG_ENABLED
 }
 
+#ifdef DEBUG_ENABLED
+uint64_t GDMono::get_api_core_hash() {
+	if (api_core_hash == 0) {
+		api_core_hash = ClassDB::get_api_hash(ClassDB::API_CORE);
+	}
+	return api_core_hash;
+}
+#ifdef TOOLS_ENABLED
+uint64_t GDMono::get_api_editor_hash() {
+	if (api_editor_hash == 0) {
+		api_editor_hash = ClassDB::get_api_hash(ClassDB::API_EDITOR);
+	}
+	return api_editor_hash;
+}
+#endif // TOOLS_ENABLED
+#endif // DEBUG_ENABLED
+
 #ifdef TOOLS_ENABLED
 bool GDMono::_load_project_assembly() {
 	String assembly_name = Path::get_csharp_project_name();
diff --git a/modules/mono/mono_gd/gd_mono.h b/modules/mono/mono_gd/gd_mono.h
index 8765007664..0a9f43b4eb 100644
--- a/modules/mono/mono_gd/gd_mono.h
+++ b/modules/mono/mono_gd/gd_mono.h
@@ -93,19 +93,9 @@ protected:
 
 public:
 #ifdef DEBUG_ENABLED
-	uint64_t get_api_core_hash() {
-		if (api_core_hash == 0) {
-			api_core_hash = ClassDB::get_api_hash(ClassDB::API_CORE);
-		}
-		return api_core_hash;
-	}
+	uint64_t get_api_core_hash();
 #ifdef TOOLS_ENABLED
-	uint64_t get_api_editor_hash() {
-		if (api_editor_hash == 0) {
-			api_editor_hash = ClassDB::get_api_hash(ClassDB::API_EDITOR);
-		}
-		return api_editor_hash;
-	}
+	uint64_t get_api_editor_hash();
 #endif // TOOLS_ENABLED
 #endif // DEBUG_ENABLED
 
diff --git a/modules/mono/register_types.cpp b/modules/mono/register_types.cpp
index d77a3e761f..ef23d222c4 100644
--- a/modules/mono/register_types.cpp
+++ b/modules/mono/register_types.cpp
@@ -33,6 +33,7 @@
 #include "csharp_script.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 CSharpLanguage *script_language_cs = nullptr;
 Ref<ResourceFormatLoaderCSharpScript> resource_loader_cs;
diff --git a/modules/noise/editor/noise_editor_plugin.cpp b/modules/noise/editor/noise_editor_plugin.cpp
index 4a92243808..e260448f27 100644
--- a/modules/noise/editor/noise_editor_plugin.cpp
+++ b/modules/noise/editor/noise_editor_plugin.cpp
@@ -33,6 +33,7 @@
 #include "../noise.h"
 #include "../noise_texture_2d.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/inspector/editor_inspector.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/button.h"
diff --git a/modules/noise/register_types.cpp b/modules/noise/register_types.cpp
index 363b7bdc31..9c25ee08f6 100644
--- a/modules/noise/register_types.cpp
+++ b/modules/noise/register_types.cpp
@@ -35,6 +35,8 @@
 #include "noise_texture_2d.h"
 #include "noise_texture_3d.h"
 
+#include "core/object/class_db.h"
+
 #ifdef TOOLS_ENABLED
 #include "editor/noise_editor_plugin.h"
 #endif
diff --git a/modules/objectdb_profiler/editor/data_viewers/class_view.cpp b/modules/objectdb_profiler/editor/data_viewers/class_view.cpp
index c33a39dc8c..cba670332f 100644
--- a/modules/objectdb_profiler/editor/data_viewers/class_view.cpp
+++ b/modules/objectdb_profiler/editor/data_viewers/class_view.cpp
@@ -32,6 +32,7 @@
 
 #include "shared_controls.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/split_container.h"
diff --git a/modules/objectdb_profiler/editor/objectdb_profiler_plugin.cpp b/modules/objectdb_profiler/editor/objectdb_profiler_plugin.cpp
index 96a5070636..88b4baba05 100644
--- a/modules/objectdb_profiler/editor/objectdb_profiler_plugin.cpp
+++ b/modules/objectdb_profiler/editor/objectdb_profiler_plugin.cpp
@@ -32,6 +32,8 @@
 
 #include "objectdb_profiler_panel.h"
 
+#include "core/object/callable_method_pointer.h"
+
 bool ObjectDBProfilerDebuggerPlugin::has_capture(const String &p_capture) const {
 	return p_capture == "snapshot";
 }
diff --git a/modules/ogg/register_types.cpp b/modules/ogg/register_types.cpp
index 218a253542..46a8f87549 100644
--- a/modules/ogg/register_types.cpp
+++ b/modules/ogg/register_types.cpp
@@ -32,6 +32,8 @@
 
 #include "ogg_packet_sequence.h"
 
+#include "core/object/class_db.h"
+
 void initialize_ogg_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
 		return;
diff --git a/modules/text_server_adv/register_types.cpp b/modules/text_server_adv/register_types.cpp
index ba67fef70f..23e7584faa 100644
--- a/modules/text_server_adv/register_types.cpp
+++ b/modules/text_server_adv/register_types.cpp
@@ -32,6 +32,8 @@
 
 #include "text_server_adv.h"
 
+#include "core/object/class_db.h"
+
 void initialize_text_server_adv_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
 		return;
diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp
index c80bf9debd..83fd9e62bf 100644
--- a/modules/text_server_adv/text_server_adv.cpp
+++ b/modules/text_server_adv/text_server_adv.cpp
@@ -30,6 +30,8 @@
 
 #include "text_server_adv.h"
 
+#include "core/object/callable_method_pointer.h"
+
 #ifdef GDEXTENSION
 // Headers for building as GDExtension plug-in.
 
diff --git a/modules/text_server_fb/register_types.cpp b/modules/text_server_fb/register_types.cpp
index 3dd359f0ce..eb89e945e4 100644
--- a/modules/text_server_fb/register_types.cpp
+++ b/modules/text_server_fb/register_types.cpp
@@ -32,6 +32,8 @@
 
 #include "text_server_fb.h"
 
+#include "core/object/class_db.h"
+
 void initialize_text_server_fb_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
 		return;
diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp
index 84ec0440ff..08962b092f 100644
--- a/modules/text_server_fb/text_server_fb.cpp
+++ b/modules/text_server_fb/text_server_fb.cpp
@@ -30,6 +30,8 @@
 
 #include "text_server_fb.h"
 
+#include "core/object/callable_method_pointer.h"
+
 #ifdef GDEXTENSION
 // Headers for building as GDExtension plug-in.
 
diff --git a/modules/theora/register_types.cpp b/modules/theora/register_types.cpp
index 84013efa8f..14e8c214dd 100644
--- a/modules/theora/register_types.cpp
+++ b/modules/theora/register_types.cpp
@@ -32,6 +32,8 @@
 
 #include "video_stream_theora.h"
 
+#include "core/object/class_db.h"
+
 #ifdef TOOLS_ENABLED
 #include "editor/movie_writer_ogv.h"
 #endif
diff --git a/platform/android/export/android_editor_gradle_runner.cpp b/platform/android/export/android_editor_gradle_runner.cpp
index 199776b694..fbca188387 100644
--- a/platform/android/export/android_editor_gradle_runner.cpp
+++ b/platform/android/export/android_editor_gradle_runner.cpp
@@ -31,6 +31,7 @@
 #ifdef ANDROID_ENABLED
 #include "android_editor_gradle_runner.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "editor/editor_interface.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/gui/dialogs.h"
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp
index fd34203d67..b4f4b89484 100644
--- a/platform/android/export/export_plugin.cpp
+++ b/platform/android/export/export_plugin.cpp
@@ -66,6 +66,10 @@
 #include "android_editor_gradle_runner.h"
 #endif
 
+#ifndef ANDROID_ENABLED
+#include "core/object/callable_method_pointer.h"
+#endif
+
 static const char *ANDROID_PERMS[] = {
 	"ACCESS_CHECKIN_PROPERTIES",
 	"ACCESS_COARSE_LOCATION",
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp
index a66139d3be..23500025e4 100644
--- a/platform/android/os_android.cpp
+++ b/platform/android/os_android.cpp
@@ -47,6 +47,7 @@
 #include "drivers/unix/dir_access_unix.h"
 #include "drivers/unix/file_access_unix.h"
 #ifdef TOOLS_ENABLED
+#include "core/object/callable_method_pointer.h"
 #include "editor/editor_node.h"
 #include "editor/run/game_view_plugin.h"
 #endif
diff --git a/platform/ios/export/export.cpp b/platform/ios/export/export.cpp
index 5e9ca3e025..c2c6f196cb 100644
--- a/platform/ios/export/export.cpp
+++ b/platform/ios/export/export.cpp
@@ -32,6 +32,7 @@
 
 #include "export_plugin.h"
 
+#include "core/object/class_db.h"
 #include "editor/export/editor_export.h"
 
 void register_ios_exporter_types() {
diff --git a/platform/linuxbsd/export/export.cpp b/platform/linuxbsd/export/export.cpp
index a512714758..d8c407cd02 100644
--- a/platform/linuxbsd/export/export.cpp
+++ b/platform/linuxbsd/export/export.cpp
@@ -32,6 +32,7 @@
 
 #include "export_plugin.h"
 
+#include "core/object/class_db.h"
 #include "editor/export/editor_export.h"
 
 void register_linuxbsd_exporter_types() {
diff --git a/platform/linuxbsd/freedesktop_portal_desktop.cpp b/platform/linuxbsd/freedesktop_portal_desktop.cpp
index f093715285..cdb1d98563 100644
--- a/platform/linuxbsd/freedesktop_portal_desktop.cpp
+++ b/platform/linuxbsd/freedesktop_portal_desktop.cpp
@@ -34,6 +34,7 @@
 
 #include "core/crypto/crypto_core.h"
 #include "core/error/error_macros.h"
+#include "core/object/callable_method_pointer.h"
 #include "core/os/os.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
diff --git a/platform/linuxbsd/tts_linux.cpp b/platform/linuxbsd/tts_linux.cpp
index 4284ac43a9..5be46ee86a 100644
--- a/platform/linuxbsd/tts_linux.cpp
+++ b/platform/linuxbsd/tts_linux.cpp
@@ -31,6 +31,7 @@
 #include "tts_linux.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/callable_method_pointer.h"
 #include "servers/text/text_server.h"
 
 TTS_Linux *TTS_Linux::singleton = nullptr;
diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp
index 560d173e39..dbfbdaa346 100644
--- a/platform/linuxbsd/x11/display_server_x11.cpp
+++ b/platform/linuxbsd/x11/display_server_x11.cpp
@@ -38,6 +38,7 @@
 #include "core/input/input.h"
 #include "core/io/file_access.h"
 #include "core/math/math_funcs.h"
+#include "core/object/callable_method_pointer.h"
 #include "core/os/main_loop.h"
 #include "core/string/print_string.h"
 #include "core/string/ustring.h"
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm
index 464113edfd..d791bd4f85 100644
--- a/platform/macos/display_server_macos.mm
+++ b/platform/macos/display_server_macos.mm
@@ -55,6 +55,7 @@
 #include "core/io/file_access.h"
 #include "core/io/marshalls.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/callable_method_pointer.h"
 #include "core/os/keyboard.h"
 #include "core/os/main_loop.h"
 #include "drivers/png/png_driver_common.h"
diff --git a/platform/macos/export/export.cpp b/platform/macos/export/export.cpp
index 707d66bfc4..cc53de6ab1 100644
--- a/platform/macos/export/export.cpp
+++ b/platform/macos/export/export.cpp
@@ -32,6 +32,8 @@
 
 #include "export_plugin.h"
 
+#include "core/object/class_db.h"
+
 void register_macos_exporter_types() {
 	GDREGISTER_VIRTUAL_CLASS(EditorExportPlatformMacOS);
 }
diff --git a/platform/macos/export/export_plugin.cpp b/platform/macos/export/export_plugin.cpp
index 7ffa5003d3..305e8dbcac 100644
--- a/platform/macos/export/export_plugin.cpp
+++ b/platform/macos/export/export_plugin.cpp
@@ -35,6 +35,7 @@
 
 #include "core/io/image_loader.h"
 #include "core/io/plist.h"
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "drivers/png/png_driver_common.h"
 #include "editor/editor_node.h"
diff --git a/platform/macos/native_menu_macos.mm b/platform/macos/native_menu_macos.mm
index 2b3c54f7c5..d15139e3e9 100644
--- a/platform/macos/native_menu_macos.mm
+++ b/platform/macos/native_menu_macos.mm
@@ -34,6 +34,7 @@
 #import "godot_menu_item.h"
 #import "key_mapping_macos.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "scene/resources/image_texture.h"
 
 void NativeMenuMacOS::_register_system_menus(NSMenu *p_main_menu, NSMenu *p_application_menu, NSMenu *p_window_menu, NSMenu *p_help_menu, NSMenu *p_dock_menu) {
diff --git a/platform/visionos/export/export.cpp b/platform/visionos/export/export.cpp
index 50acb1740c..f7f91ad818 100644
--- a/platform/visionos/export/export.cpp
+++ b/platform/visionos/export/export.cpp
@@ -32,6 +32,7 @@
 
 #include "export_plugin.h"
 
+#include "core/object/class_db.h"
 #include "editor/export/editor_export.h"
 
 void register_visionos_exporter_types() {
diff --git a/platform/web/display_server_web.cpp b/platform/web/display_server_web.cpp
index c5f9e023dd..c95c453b24 100644
--- a/platform/web/display_server_web.cpp
+++ b/platform/web/display_server_web.cpp
@@ -42,6 +42,10 @@
 #include "servers/display/native_menu.h"
 #include "servers/rendering/dummy/rasterizer_dummy.h"
 
+#ifdef PROXY_TO_PTHREAD_ENABLED
+#include "core/object/callable_method_pointer.h"
+#endif
+
 #ifdef GLES3_ENABLED
 #include "drivers/gles3/rasterizer_gles3.h"
 #endif
diff --git a/platform/web/editor/web_tools_editor_plugin.cpp b/platform/web/editor/web_tools_editor_plugin.cpp
index 1154ef2d3d..f7eeedd864 100644
--- a/platform/web/editor/web_tools_editor_plugin.cpp
+++ b/platform/web/editor/web_tools_editor_plugin.cpp
@@ -34,6 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
+#include "core/object/callable_method_pointer.h"
 #include "core/os/time.h"
 #include "editor/editor_node.h"
 #include "editor/export/project_zip_packer.h"
diff --git a/platform/web/http_client_web.cpp b/platform/web/http_client_web.cpp
index c481ef55a6..e708d370b0 100644
--- a/platform/web/http_client_web.cpp
+++ b/platform/web/http_client_web.cpp
@@ -30,6 +30,8 @@
 
 #include "http_client_web.h"
 
+#include "core/object/class_db.h"
+
 void HTTPClientWeb::_parse_headers(int p_len, const char **p_headers, void *p_ref) {
 	HTTPClientWeb *client = static_cast<HTTPClientWeb *>(p_ref);
 	for (int i = 0; i < p_len; i++) {
diff --git a/platform/web/javascript_bridge_singleton.cpp b/platform/web/javascript_bridge_singleton.cpp
index d41fd64a38..1d59ea025c 100644
--- a/platform/web/javascript_bridge_singleton.cpp
+++ b/platform/web/javascript_bridge_singleton.cpp
@@ -34,6 +34,10 @@
 
 #include <emscripten.h>
 
+#ifdef PROXY_TO_PTHREAD_ENABLED
+#include "core/object/callable_method_pointer.h"
+#endif
+
 extern "C" {
 extern void godot_js_os_download_buffer(const uint8_t *p_buf, int p_buf_size, const char *p_name, const char *p_mime);
 }
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
index 95d012eff3..af63fac7ac 100644
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -40,6 +40,7 @@
 #include "core/io/file_access.h"
 #include "core/io/marshalls.h"
 #include "core/io/xml_parser.h"
+#include "core/object/callable_method_pointer.h"
 #include "core/os/main_loop.h"
 #include "core/version.h"
 #include "drivers/png/png_driver_common.h"
diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp
index bf52006c20..811ceaa738 100644
--- a/platform/windows/export/export.cpp
+++ b/platform/windows/export/export.cpp
@@ -32,6 +32,7 @@
 
 #include "export_plugin.h"
 
+#include "core/object/class_db.h"
 #include "editor/export/editor_export.h"
 
 void register_windows_exporter_types() {
diff --git a/scene/gui/color_picker_shape.cpp b/scene/gui/color_picker_shape.cpp
index 582cd110a7..12878da058 100644
--- a/scene/gui/color_picker_shape.cpp
+++ b/scene/gui/color_picker_shape.cpp
@@ -31,6 +31,7 @@
 #include "color_picker_shape.h"
 
 #include "core/input/input.h"
+#include "core/object/callable_method_pointer.h"
 #include "scene/gui/margin_container.h"
 #include "scene/resources/material.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/property_utils.cpp b/scene/property_utils.cpp
index 99d21ae931..849be77975 100644
--- a/scene/property_utils.cpp
+++ b/scene/property_utils.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/engine.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/templates/local_vector.h"
 #include "scene/resources/packed_scene.h"
diff --git a/scene/resources/animated_texture.h b/scene/resources/animated_texture.h
index 29811d32e9..c5557819ef 100644
--- a/scene/resources/animated_texture.h
+++ b/scene/resources/animated_texture.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/os/rw_lock.h"
 #include "scene/resources/texture.h"
 
 class AnimatedTexture : public Texture2D {
diff --git a/scene/resources/resource_format_text.cpp b/scene/resources/resource_format_text.cpp
index 95dd7f63f4..321292c6a0 100644
--- a/scene/resources/resource_format_text.cpp
+++ b/scene/resources/resource_format_text.cpp
@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/missing_resource.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "scene/property_utils.h"
 
diff --git a/scene/theme/theme_owner.cpp b/scene/theme/theme_owner.cpp
index 75b3c8f4f5..febe95fe2a 100644
--- a/scene/theme/theme_owner.cpp
+++ b/scene/theme/theme_owner.cpp
@@ -30,6 +30,7 @@
 
 #include "theme_owner.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "scene/gui/control.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
diff --git a/servers/physics_3d/physics_server_3d_wrap_mt.cpp b/servers/physics_3d/physics_server_3d_wrap_mt.cpp
index 744b551074..c5e6896ec0 100644
--- a/servers/physics_3d/physics_server_3d_wrap_mt.cpp
+++ b/servers/physics_3d/physics_server_3d_wrap_mt.cpp
@@ -30,6 +30,8 @@
 
 #include "physics_server_3d_wrap_mt.h"
 
+#include "core/object/callable_method_pointer.h"
+
 void PhysicsServer3DWrapMT::_assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id) {
 	server_thread = Thread::get_caller_id();
 	server_task_id = p_pump_task_id;
diff --git a/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp b/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp
index 6dc11b857e..4e45779a9f 100644
--- a/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp
+++ b/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp
@@ -31,6 +31,7 @@
 #include "framebuffer_cache_rd.h"
 
 #include "core/object/class_db.h"
+#include "servers/rendering/rendering_device_binds.h"
 
 FramebufferCacheRD *FramebufferCacheRD::singleton = nullptr;
 
diff --git a/servers/rendering/renderer_rd/framebuffer_cache_rd.h b/servers/rendering/renderer_rd/framebuffer_cache_rd.h
index 383e231a1d..839b5b40fe 100644
--- a/servers/rendering/renderer_rd/framebuffer_cache_rd.h
+++ b/servers/rendering/renderer_rd/framebuffer_cache_rd.h
@@ -33,7 +33,6 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/paged_allocator.h"
 #include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_device_binds.h"
 
 class FramebufferCacheRD : public Object {
 	GDCLASS(FramebufferCacheRD, Object)
diff --git a/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp b/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp
index 83b6df09a9..8a577dc85c 100644
--- a/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp
+++ b/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp
@@ -33,6 +33,7 @@
 
 #include "core/object/class_db.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
+#include "servers/rendering/rendering_device_binds.h"
 #include "servers/rendering/rendering_server.h" // IWYU pragma: Needed to bind RSE enums.
 #include "servers/rendering/rendering_server_enums.h"
 
diff --git a/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h b/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h
index e8d9952805..86b9b3e0d8 100644
--- a/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h
+++ b/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h
@@ -39,7 +39,6 @@
 #include "servers/rendering/renderer_rd/storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_buffer_custom_data_rd.h"
 #include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_device_binds.h"
 #include "servers/rendering/storage/render_scene_buffers.h"
 
 #define RB_SCOPE_BUFFERS SNAME("render_buffers")
diff --git a/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp b/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp
index 0a7ea9bd7e..ff4602aa61 100644
--- a/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp
+++ b/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp
@@ -31,6 +31,7 @@
 #include "uniform_set_cache_rd.h"
 
 #include "core/object/class_db.h"
+#include "servers/rendering/rendering_device_binds.h"
 
 UniformSetCacheRD *UniformSetCacheRD::singleton = nullptr;
 
diff --git a/servers/rendering/renderer_rd/uniform_set_cache_rd.h b/servers/rendering/renderer_rd/uniform_set_cache_rd.h
index ffbd5cf398..f8f807db52 100644
--- a/servers/rendering/renderer_rd/uniform_set_cache_rd.h
+++ b/servers/rendering/renderer_rd/uniform_set_cache_rd.h
@@ -33,7 +33,6 @@
 #include "core/templates/local_vector.h"
 #include "core/templates/paged_allocator.h"
 #include "servers/rendering/rendering_device.h"
-#include "servers/rendering/rendering_device_binds.h"
 
 class UniformSetCacheRD : public Object {
 	GDCLASS(UniformSetCacheRD, Object)
diff --git a/servers/rendering/renderer_scene_cull.cpp b/servers/rendering/renderer_scene_cull.cpp
index be5387b67a..c99daff54e 100644
--- a/servers/rendering/renderer_scene_cull.cpp
+++ b/servers/rendering/renderer_scene_cull.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/math/geometry_3d.h"
+#include "core/object/callable_method_pointer.h"
 #include "core/object/worker_thread_pool.h"
 #include "servers/rendering/rendering_light_culler.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/servers/rendering/rendering_device_binds.h b/servers/rendering/rendering_device_binds.h
index 1de5cd870b..86654df99f 100644
--- a/servers/rendering/rendering_device_binds.h
+++ b/servers/rendering/rendering_device_binds.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_device.h"
 
 #define RD_SETGET(m_type, m_member) \
diff --git a/servers/rendering/rendering_server_default.cpp b/servers/rendering/rendering_server_default.cpp
index 683a74f6c3..44562643ae 100644
--- a/servers/rendering/rendering_server_default.cpp
+++ b/servers/rendering/rendering_server_default.cpp
@@ -30,6 +30,7 @@
 
 #include "rendering_server_default.h"
 
+#include "core/object/callable_method_pointer.h"
 #include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #include "renderer_canvas_cull.h"
diff --git a/servers/rendering/storage/render_data_extension.cpp b/servers/rendering/storage/render_data_extension.cpp
index a5b5054bba..cc798e6c06 100644
--- a/servers/rendering/storage/render_data_extension.cpp
+++ b/servers/rendering/storage/render_data_extension.cpp
@@ -32,6 +32,8 @@
 
 #include "servers/rendering/rendering_server.h" // IWYU pragma: Needed to bind RSE enums.
 
+#include "core/object/class_db.h"
+
 // RenderSceneBuffersExtension
 
 void RenderSceneBuffersExtension::_bind_methods() {
diff --git a/tests/core/io/test_resource.cpp b/tests/core/io/test_resource.cpp
index f79c674c1c..2b95f7e943 100644
--- a/tests/core/io/test_resource.cpp
+++ b/tests/core/io/test_resource.cpp
@@ -35,6 +35,7 @@ TEST_FORCE_LINK(test_resource)
 #include "core/io/resource.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 #include "scene/main/node.h"
 #include "tests/test_utils.h"
 
diff --git a/tests/scene/test_instance_placeholder.cpp b/tests/scene/test_instance_placeholder.cpp
index c10f96b0fb..8b54b92758 100644
--- a/tests/scene/test_instance_placeholder.cpp
+++ b/tests/scene/test_instance_placeholder.cpp
@@ -35,6 +35,7 @@ TEST_FORCE_LINK(test_instance_placeholder)
 #include "core/io/dir_access.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 #include "scene/main/instance_placeholder.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
diff --git a/tests/scene/test_packed_scene.cpp b/tests/scene/test_packed_scene.cpp
index 1489ee2aef..fff34cb828 100644
--- a/tests/scene/test_packed_scene.cpp
+++ b/tests/scene/test_packed_scene.cpp
@@ -32,6 +32,7 @@
 
 TEST_FORCE_LINK(test_packed_scene)
 
+#include "core/object/class_db.h"
 #include "scene/resources/packed_scene.h"
 
 namespace TestPackedScene {