diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 36c91af991..37b8e852f0 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -81,3 +81,6 @@ c5df0cb82bc539eff7dcfb2add99d60771fc50c5
 
 # Move RenderingServer enums to a dedicated RenderingServerEnums (`RSE`) namespace
 f5a290ac462765afca34e64dd39f883511510147
+
+# Style: Add `class_db.h` includes explicitly
+e380a417526c11f15a9ddb3997292409b10da2af
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp
index 49eb3e51e5..3d35846535 100644
--- a/core/config/project_settings.cpp
+++ b/core/config/project_settings.cpp
@@ -38,6 +38,7 @@
 #include "core/io/file_access_pack.h"
 #include "core/io/marshalls.h"
 #include "core/io/resource_uid.h"
+#include "core/object/class_db.h"
 #include "core/object/message_queue.h"
 #include "core/object/script_language.h"
 #include "core/templates/rb_set.h"
diff --git a/core/core_bind.compat.inc b/core/core_bind.compat.inc
index 8bfa66e4b7..260865221c 100644
--- a/core/core_bind.compat.inc
+++ b/core/core_bind.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "core_bind.h"
+
+#include "core/object/class_db.h"
+
 namespace CoreBind {
 
 // Semaphore
diff --git a/core/core_bind.cpp b/core/core_bind.cpp
index 2fd854f48e..ac7ea28431 100644
--- a/core/core_bind.cpp
+++ b/core/core_bind.cpp
@@ -39,6 +39,7 @@
 #include "core/io/marshalls.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/main_loop.h"
 #include "core/os/thread_safe.h"
diff --git a/core/crypto/aes_context.cpp b/core/crypto/aes_context.cpp
index 53ca65021e..8f91d6c759 100644
--- a/core/crypto/aes_context.cpp
+++ b/core/crypto/aes_context.cpp
@@ -30,6 +30,8 @@
 
 #include "core/crypto/aes_context.h"
 
+#include "core/object/class_db.h"
+
 Error AESContext::start(Mode p_mode, const PackedByteArray &p_key, const PackedByteArray &p_iv) {
 	ERR_FAIL_COND_V_MSG(mode != MODE_MAX, ERR_ALREADY_IN_USE, "AESContext already started. Call 'finish' before starting a new one.");
 	ERR_FAIL_COND_V_MSG(p_mode < 0 || p_mode >= MODE_MAX, ERR_INVALID_PARAMETER, "Invalid mode requested.");
diff --git a/core/crypto/crypto.cpp b/core/crypto/crypto.cpp
index 2f0c54763b..1824580110 100644
--- a/core/crypto/crypto.cpp
+++ b/core/crypto/crypto.cpp
@@ -30,6 +30,8 @@
 
 #include "crypto.h"
 
+#include "core/object/class_db.h"
+
 /// Resources
 
 CryptoKey *(*CryptoKey::_create)(bool p_notify_postinitialize) = nullptr;
diff --git a/core/crypto/hashing_context.cpp b/core/crypto/hashing_context.cpp
index 01acbdbc17..d852b4744b 100644
--- a/core/crypto/hashing_context.cpp
+++ b/core/crypto/hashing_context.cpp
@@ -31,6 +31,7 @@
 #include "hashing_context.h"
 
 #include "core/crypto/crypto_core.h"
+#include "core/object/class_db.h"
 
 Error HashingContext::start(HashType p_type) {
 	ERR_FAIL_COND_V(ctx != nullptr, ERR_ALREADY_IN_USE);
diff --git a/core/debugger/engine_profiler.cpp b/core/debugger/engine_profiler.cpp
index abe0a4df77..613525f0e7 100644
--- a/core/debugger/engine_profiler.cpp
+++ b/core/debugger/engine_profiler.cpp
@@ -31,6 +31,7 @@
 #include "engine_profiler.h"
 
 #include "core/debugger/engine_debugger.h"
+#include "core/object/class_db.h"
 
 void EngineProfiler::_bind_methods() {
 	GDVIRTUAL_BIND(_toggle, "enable", "options");
diff --git a/core/extension/gdextension.compat.inc b/core/extension/gdextension.compat.inc
index 9dea865dbd..454f2c5d42 100644
--- a/core/extension/gdextension.compat.inc
+++ b/core/extension/gdextension.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "gdextension.h"
+
+#include "core/object/class_db.h"
+
 Error GDExtension::_open_library_bind_compat_88418(const String &p_path, const String &p_entry_symbol) {
 	return ERR_UNAVAILABLE;
 }
@@ -46,4 +50,4 @@ void GDExtension::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("initialize_library", "level"), &GDExtension::_initialize_library_bind_compat_88418);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/core/extension/gdextension_manager.cpp b/core/extension/gdextension_manager.cpp
index 3c998ffe71..85dcacc66f 100644
--- a/core/extension/gdextension_manager.cpp
+++ b/core/extension/gdextension_manager.cpp
@@ -35,6 +35,7 @@
 #include "core/extension/gdextension_special_compat_hashes.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 
 GDExtensionManager::LoadStatus GDExtensionManager::_load_extension_internal(const Ref<GDExtension> &p_extension, bool p_first_load) {
diff --git a/core/extension/godot_instance.cpp b/core/extension/godot_instance.cpp
index 343c4eb079..5d77201dc4 100644
--- a/core/extension/godot_instance.cpp
+++ b/core/extension/godot_instance.cpp
@@ -31,6 +31,7 @@
 #include "godot_instance.h"
 
 #include "core/extension/gdextension_manager.h"
+#include "core/object/class_db.h"
 #include "core/os/main_loop.h"
 #include "main/main.h"
 #include "servers/display/display_server.h"
diff --git a/core/input/input.compat.inc b/core/input/input.compat.inc
index cbc8b1df0f..7f77baab93 100644
--- a/core/input/input.compat.inc
+++ b/core/input/input.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "input.h"
+
+#include "core/object/class_db.h"
+
 void Input::_vibrate_handheld_bind_compat_91143(int p_duration_ms) {
 	vibrate_handheld(p_duration_ms, -1.0);
 }
diff --git a/core/input/input.cpp b/core/input/input.cpp
index c18e1a2df5..6d716cf91d 100644
--- a/core/input/input.cpp
+++ b/core/input/input.cpp
@@ -34,6 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/input/default_controller_mappings.h"
 #include "core/input/input_map.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 #ifdef DEV_ENABLED
diff --git a/core/input/input_event.cpp b/core/input/input_event.cpp
index 878704c783..4ee09b0734 100644
--- a/core/input/input_event.cpp
+++ b/core/input/input_event.cpp
@@ -32,6 +32,7 @@
 
 #include "core/input/input_map.h"
 #include "core/input/shortcut.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 
diff --git a/core/input/input_map.compat.inc b/core/input/input_map.compat.inc
index da4bd962b6..f54e9c9b6a 100644
--- a/core/input/input_map.compat.inc
+++ b/core/input/input_map.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "input_map.h"
+
+#include "core/object/class_db.h"
+
 void InputMap::_add_action_bind_compat_97281(const StringName &p_action, float p_deadzone) {
 	add_action(p_action, p_deadzone);
 }
diff --git a/core/input/input_map.cpp b/core/input/input_map.cpp
index a808027d43..e5f4bd78c5 100644
--- a/core/input/input_map.cpp
+++ b/core/input/input_map.cpp
@@ -33,6 +33,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/variant/typed_array.h"
diff --git a/core/input/shortcut.cpp b/core/input/shortcut.cpp
index 7264626237..36a4e87674 100644
--- a/core/input/shortcut.cpp
+++ b/core/input/shortcut.cpp
@@ -30,6 +30,8 @@
 
 #include "shortcut.h"
 
+#include "core/object/class_db.h"
+
 void Shortcut::set_events(const Array &p_events) {
 	for (int i = 0; i < p_events.size(); i++) {
 		Ref<InputEventShortcut> ies = p_events[i];
diff --git a/core/io/config_file.cpp b/core/io/config_file.cpp
index 793287079d..dd5c068660 100644
--- a/core/io/config_file.cpp
+++ b/core/io/config_file.cpp
@@ -31,6 +31,7 @@
 #include "config_file.h"
 
 #include "core/io/file_access_encrypted.h"
+#include "core/object/class_db.h"
 #include "core/string/string_builder.h"
 #include "core/variant/variant_parser.h"
 
diff --git a/core/io/dir_access.cpp b/core/io/dir_access.cpp
index fde1fbb796..13d3547890 100644
--- a/core/io/dir_access.cpp
+++ b/core/io/dir_access.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/file_access.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/core/io/dtls_server.cpp b/core/io/dtls_server.cpp
index cdb2235b5f..cbb8bcf029 100644
--- a/core/io/dtls_server.cpp
+++ b/core/io/dtls_server.cpp
@@ -30,6 +30,8 @@
 
 #include "dtls_server.h"
 
+#include "core/object/class_db.h"
+
 DTLSServer *DTLSServer::create(bool p_notify_postinitialize) {
 	if (_create) {
 		return _create(p_notify_postinitialize);
diff --git a/core/io/file_access.compat.inc b/core/io/file_access.compat.inc
index d340100fd7..933c108f89 100644
--- a/core/io/file_access.compat.inc
+++ b/core/io/file_access.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "file_access.h"
+
+#include "core/object/class_db.h"
+
 Ref<FileAccess> FileAccess::_open_encrypted_bind_compat_98918(const String &p_path, ModeFlags p_mode_flags, const Vector<uint8_t> &p_key) {
 	return open_encrypted(p_path, p_mode_flags, p_key, Vector<uint8_t>());
 }
@@ -123,4 +127,4 @@ void FileAccess::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_as_text", "skip_cr"), &FileAccess::get_as_text_bind_compat_110867, DEFVAL(false));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/core/io/file_access.cpp b/core/io/file_access.cpp
index aa4651a2c3..853c764f81 100644
--- a/core/io/file_access.cpp
+++ b/core/io/file_access.cpp
@@ -38,6 +38,7 @@
 #include "core/io/file_access_pack.h"
 #include "core/io/marshalls.h"
 #include "core/io/resource_uid.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/os/time.h"
 
diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp
index a5c4826c2c..d0a2bd01b5 100644
--- a/core/io/http_client.cpp
+++ b/core/io/http_client.cpp
@@ -30,6 +30,8 @@
 
 #include "http_client.h"
 
+#include "core/object/class_db.h"
+
 const char *HTTPClient::_methods[METHOD_MAX] = {
 	"GET",
 	"HEAD",
diff --git a/core/io/image.cpp b/core/io/image.cpp
index 75dea84fd4..0b4900892c 100644
--- a/core/io/image.cpp
+++ b/core/io/image.cpp
@@ -35,6 +35,7 @@
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 #include "core/templates/hash_map.h"
 #include "core/variant/dictionary.h"
 
diff --git a/core/io/image_loader.cpp b/core/io/image_loader.cpp
index df36c515cf..c8e909e281 100644
--- a/core/io/image_loader.cpp
+++ b/core/io/image_loader.cpp
@@ -30,6 +30,8 @@
 
 #include "image_loader.h"
 
+#include "core/object/class_db.h"
+
 void ImageFormatLoader::_bind_methods() {
 	BIND_BITFIELD_FLAG(FLAG_NONE);
 	BIND_BITFIELD_FLAG(FLAG_FORCE_LINEAR);
diff --git a/core/io/ip.cpp b/core/io/ip.cpp
index 0436e30bfd..ec7c72d274 100644
--- a/core/io/ip.cpp
+++ b/core/io/ip.cpp
@@ -30,6 +30,7 @@
 
 #include "ip.h"
 
+#include "core/object/class_db.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
 #include "core/templates/hash_map.h"
diff --git a/core/io/json.cpp b/core/io/json.cpp
index 18d4c37f36..dd91816155 100644
--- a/core/io/json.cpp
+++ b/core/io/json.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/engine.h"
 #include "core/io/file_access.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/variant/container_type_validate.h"
 
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp
index a7260a3a1e..4579fb9393 100644
--- a/core/io/marshalls.cpp
+++ b/core/io/marshalls.cpp
@@ -31,6 +31,7 @@
 #include "marshalls.h"
 
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
 #include "core/object/script_language.h"
 #include "core/variant/container_type_validate.h"
diff --git a/core/io/missing_resource.cpp b/core/io/missing_resource.cpp
index 3bb7c8e90b..e7b598d37c 100644
--- a/core/io/missing_resource.cpp
+++ b/core/io/missing_resource.cpp
@@ -30,6 +30,8 @@
 
 #include "missing_resource.h"
 
+#include "core/object/class_db.h"
+
 bool MissingResource::_set(const StringName &p_name, const Variant &p_value) {
 	if (is_recording_properties()) {
 		properties.insert(p_name, p_value);
diff --git a/core/io/packed_data_container.cpp b/core/io/packed_data_container.cpp
index 222e167919..701bb9c10e 100644
--- a/core/io/packed_data_container.cpp
+++ b/core/io/packed_data_container.cpp
@@ -31,6 +31,7 @@
 #include "packed_data_container.h"
 
 #include "core/io/marshalls.h"
+#include "core/object/class_db.h"
 
 Variant PackedDataContainer::getvar(const Variant &p_key, bool *r_valid) const {
 	bool err = false;
diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp
index 418c90b22c..f5e6b8d5f9 100644
--- a/core/io/packet_peer.cpp
+++ b/core/io/packet_peer.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
+#include "core/object/class_db.h"
 
 /* helpers / binders */
 
diff --git a/core/io/packet_peer_dtls.cpp b/core/io/packet_peer_dtls.cpp
index b37b79914e..c8ad201e0a 100644
--- a/core/io/packet_peer_dtls.cpp
+++ b/core/io/packet_peer_dtls.cpp
@@ -30,6 +30,8 @@
 
 #include "packet_peer_dtls.h"
 
+#include "core/object/class_db.h"
+
 PacketPeerDTLS *PacketPeerDTLS::create(bool p_notify_postinitialize) {
 	if (_create) {
 		return _create(p_notify_postinitialize);
diff --git a/core/io/packet_peer_udp.cpp b/core/io/packet_peer_udp.cpp
index f1338ac063..86076044d1 100644
--- a/core/io/packet_peer_udp.cpp
+++ b/core/io/packet_peer_udp.cpp
@@ -32,6 +32,7 @@
 
 #include "core/io/ip.h"
 #include "core/io/udp_server.h"
+#include "core/object/class_db.h"
 
 void PacketPeerUDP::set_blocking_mode(bool p_enable) {
 	blocking = p_enable;
diff --git a/core/io/pck_packer.cpp b/core/io/pck_packer.cpp
index b6cae15397..b9670ddfd1 100644
--- a/core/io/pck_packer.cpp
+++ b/core/io/pck_packer.cpp
@@ -34,6 +34,7 @@
 #include "core/io/file_access.h"
 #include "core/io/file_access_encrypted.h"
 #include "core/io/file_access_pack.h" // PACK_HEADER_MAGIC, PACK_FORMAT_VERSION
+#include "core/object/class_db.h"
 #include "core/version.h"
 
 static int _get_pad(int p_alignment, int p_n) {
diff --git a/core/io/resource.cpp b/core/io/resource.cpp
index 2d3ab2ae37..c1926aebc2 100644
--- a/core/io/resource.cpp
+++ b/core/io/resource.cpp
@@ -33,6 +33,7 @@
 #include "core/io/resource_loader.h"
 #include "core/math/math_funcs.h"
 #include "core/math/random_pcg.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/variant/container_type_validate.h"
 #include "scene/main/node.h" //only so casting works
diff --git a/core/io/resource_importer.cpp b/core/io/resource_importer.cpp
index fc36e5e131..636dc74396 100644
--- a/core/io/resource_importer.cpp
+++ b/core/io/resource_importer.cpp
@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/config_file.h"
 #include "core/io/image.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/variant/variant_parser.h"
 
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index 0a2e721b2f..64e59f363b 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -35,6 +35,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_importer.h"
+#include "core/object/class_db.h"
 #include "core/object/message_queue.h"
 #include "core/object/script_language.h"
 #include "core/os/condition_variable.h"
diff --git a/core/io/resource_saver.cpp b/core/io/resource_saver.cpp
index be58564a1f..3cc7fc2ac8 100644
--- a/core/io/resource_saver.cpp
+++ b/core/io/resource_saver.cpp
@@ -29,9 +29,11 @@
 /**************************************************************************/
 
 #include "resource_saver.h"
+
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 
 Ref<ResourceFormatSaver> ResourceSaver::saver[MAX_SAVERS];
diff --git a/core/io/resource_uid.cpp b/core/io/resource_uid.cpp
index e8b82594d0..09fff07a2e 100644
--- a/core/io/resource_uid.cpp
+++ b/core/io/resource_uid.cpp
@@ -36,6 +36,7 @@
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/math/random_pcg.h"
+#include "core/object/class_db.h"
 
 // These constants are off by 1, causing the 'z' and '9' characters never to be used.
 // This cannot be fixed without breaking compatibility; see GH-83843.
diff --git a/core/io/socket_server.cpp b/core/io/socket_server.cpp
index 6929f675c9..31abc2c868 100644
--- a/core/io/socket_server.cpp
+++ b/core/io/socket_server.cpp
@@ -30,6 +30,8 @@
 
 #include "socket_server.h"
 
+#include "core/object/class_db.h"
+
 void SocketServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_connection_available"), &SocketServer::is_connection_available);
 	ClassDB::bind_method(D_METHOD("is_listening"), &SocketServer::is_listening);
diff --git a/core/io/stream_peer.cpp b/core/io/stream_peer.cpp
index 2f2c1d3086..3ab5a28463 100644
--- a/core/io/stream_peer.cpp
+++ b/core/io/stream_peer.cpp
@@ -31,6 +31,7 @@
 #include "stream_peer.h"
 
 #include "core/io/marshalls.h"
+#include "core/object/class_db.h"
 
 Error StreamPeer::_put_data(const Vector<uint8_t> &p_data) {
 	int len = p_data.size();
diff --git a/core/io/stream_peer_gzip.cpp b/core/io/stream_peer_gzip.cpp
index 907e3eed67..52c920dad4 100644
--- a/core/io/stream_peer_gzip.cpp
+++ b/core/io/stream_peer_gzip.cpp
@@ -31,6 +31,8 @@
 #include "core/io/stream_peer_gzip.h"
 
 #include "core/io/zip_io.h"
+#include "core/object/class_db.h"
+
 #include <zlib.h>
 
 void StreamPeerGZIP::_bind_methods() {
diff --git a/core/io/stream_peer_socket.compat.inc b/core/io/stream_peer_socket.compat.inc
index 65bd92f107..e7f6ee1117 100644
--- a/core/io/stream_peer_socket.compat.inc
+++ b/core/io/stream_peer_socket.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "stream_peer_socket.h"
+
+#include "core/object/class_db.h"
+
 namespace compat::StreamPeerTCP {
 enum class Status {
 	STATUS_NONE = StreamPeerSocket::STATUS_NONE,
@@ -49,4 +53,4 @@ void StreamPeerSocket::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_status"), &StreamPeerSocket::_get_status_compat_107954);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/core/io/stream_peer_socket.cpp b/core/io/stream_peer_socket.cpp
index a60ea118ed..1439447d06 100644
--- a/core/io/stream_peer_socket.cpp
+++ b/core/io/stream_peer_socket.cpp
@@ -31,6 +31,8 @@
 #include "stream_peer_socket.h"
 #include "stream_peer_socket.compat.inc"
 
+#include "core/object/class_db.h"
+
 Error StreamPeerSocket::poll() {
 	if (status == STATUS_CONNECTED) {
 		Error err;
diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp
index d5b5f34cc7..b4071e04e0 100644
--- a/core/io/stream_peer_tcp.cpp
+++ b/core/io/stream_peer_tcp.cpp
@@ -31,6 +31,7 @@
 #include "stream_peer_tcp.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 
 void StreamPeerTCP::accept_socket(Ref<NetSocket> p_sock, const NetSocket::Address &p_addr) {
 	_sock = p_sock;
diff --git a/core/io/stream_peer_tls.cpp b/core/io/stream_peer_tls.cpp
index f04e217a26..46b0f53195 100644
--- a/core/io/stream_peer_tls.cpp
+++ b/core/io/stream_peer_tls.cpp
@@ -31,6 +31,7 @@
 #include "stream_peer_tls.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 StreamPeerTLS *(*StreamPeerTLS::_create)(bool p_notify_postinitialize) = nullptr;
 
diff --git a/core/io/stream_peer_uds.cpp b/core/io/stream_peer_uds.cpp
index 70e3220ded..aa56b80575 100644
--- a/core/io/stream_peer_uds.cpp
+++ b/core/io/stream_peer_uds.cpp
@@ -31,6 +31,7 @@
 #include "stream_peer_uds.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 
 void StreamPeerUDS::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("bind", "path"), &StreamPeerUDS::bind);
diff --git a/core/io/tcp_server.cpp b/core/io/tcp_server.cpp
index e8728bd946..cf0943effe 100644
--- a/core/io/tcp_server.cpp
+++ b/core/io/tcp_server.cpp
@@ -30,6 +30,8 @@
 
 #include "tcp_server.h"
 
+#include "core/object/class_db.h"
+
 void TCPServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("listen", "port", "bind_address"), &TCPServer::listen, DEFVAL("*"));
 	ClassDB::bind_method(D_METHOD("get_local_port"), &TCPServer::get_local_port);
diff --git a/core/io/udp_server.cpp b/core/io/udp_server.cpp
index ada0e09a48..a2f1fc0778 100644
--- a/core/io/udp_server.cpp
+++ b/core/io/udp_server.cpp
@@ -30,6 +30,8 @@
 
 #include "udp_server.h"
 
+#include "core/object/class_db.h"
+
 void UDPServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("listen", "port", "bind_address"), &UDPServer::listen, DEFVAL("*"));
 	ClassDB::bind_method(D_METHOD("poll"), &UDPServer::poll);
diff --git a/core/io/uds_server.cpp b/core/io/uds_server.cpp
index e93262a01e..8249c80f52 100644
--- a/core/io/uds_server.cpp
+++ b/core/io/uds_server.cpp
@@ -30,6 +30,8 @@
 
 #include "uds_server.h"
 
+#include "core/object/class_db.h"
+
 void UDSServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("listen", "path"), &UDSServer::listen);
 	ClassDB::bind_method(D_METHOD("take_connection"), &UDSServer::take_connection);
diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp
index a50a17231c..40f0e48ef8 100644
--- a/core/io/xml_parser.cpp
+++ b/core/io/xml_parser.cpp
@@ -31,6 +31,7 @@
 #include "xml_parser.h"
 
 #include "core/io/file_access.h"
+#include "core/object/class_db.h"
 
 //#define DEBUG_XML
 
diff --git a/core/math/a_star.compat.inc b/core/math/a_star.compat.inc
index 664d7ffd5e..b2077d020c 100644
--- a/core/math/a_star.compat.inc
+++ b/core/math/a_star.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "a_star.h"
+
+#include "core/object/class_db.h"
+
 Vector<int64_t> AStar3D::_get_id_path_bind_compat_88047(int64_t p_from_id, int64_t p_to_id) {
 	return get_id_path(p_from_id, p_to_id, false);
 }
diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp
index df0db9a184..bbd5be8694 100644
--- a/core/math/a_star.cpp
+++ b/core/math/a_star.cpp
@@ -32,6 +32,7 @@
 #include "a_star.compat.inc"
 
 #include "core/math/geometry_3d.h"
+#include "core/object/class_db.h"
 
 int64_t AStar3D::get_available_point_id() const {
 	if (points.has(last_free_id)) {
diff --git a/core/math/a_star_grid_2d.compat.inc b/core/math/a_star_grid_2d.compat.inc
index e7124c2477..5871d0b087 100644
--- a/core/math/a_star_grid_2d.compat.inc
+++ b/core/math/a_star_grid_2d.compat.inc
@@ -30,6 +30,9 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "a_star_grid_2d.h"
+
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 TypedArray<Vector2i> AStarGrid2D::_get_id_path_bind_compat_88047(const Vector2i &p_from_id, const Vector2i &p_to_id) {
diff --git a/core/math/a_star_grid_2d.cpp b/core/math/a_star_grid_2d.cpp
index e840030ff9..4f6d605153 100644
--- a/core/math/a_star_grid_2d.cpp
+++ b/core/math/a_star_grid_2d.cpp
@@ -31,6 +31,7 @@
 #include "a_star_grid_2d.h"
 #include "a_star_grid_2d.compat.inc"
 
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 static real_t heuristic_euclidean(const Vector2i &p_from, const Vector2i &p_to) {
diff --git a/core/math/random_number_generator.cpp b/core/math/random_number_generator.cpp
index 226d748c52..52d06fba43 100644
--- a/core/math/random_number_generator.cpp
+++ b/core/math/random_number_generator.cpp
@@ -30,6 +30,8 @@
 
 #include "random_number_generator.h"
 
+#include "core/object/class_db.h"
+
 void RandomNumberGenerator::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_seed", "seed"), &RandomNumberGenerator::set_seed);
 	ClassDB::bind_method(D_METHOD("get_seed"), &RandomNumberGenerator::get_seed);
diff --git a/core/math/triangle_mesh.cpp b/core/math/triangle_mesh.cpp
index 3b24b351ea..c991699863 100644
--- a/core/math/triangle_mesh.cpp
+++ b/core/math/triangle_mesh.cpp
@@ -30,6 +30,7 @@
 
 #include "triangle_mesh.h"
 
+#include "core/object/class_db.h"
 #include "core/templates/sort_array.h"
 
 int TriangleMesh::_create_bvh(BVH *p_bvh, BVH **p_bb, int p_from, int p_size, int p_depth, int &r_max_depth, int &r_max_alloc) {
diff --git a/core/object/ref_counted.cpp b/core/object/ref_counted.cpp
index 3f1fb4ffdd..a6834b1312 100644
--- a/core/object/ref_counted.cpp
+++ b/core/object/ref_counted.cpp
@@ -30,6 +30,7 @@
 
 #include "ref_counted.h"
 
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 
 bool RefCounted::init_ref() {
diff --git a/core/object/script_backtrace.cpp b/core/object/script_backtrace.cpp
index b7ff9c38d7..82faffe90d 100644
--- a/core/object/script_backtrace.cpp
+++ b/core/object/script_backtrace.cpp
@@ -30,6 +30,7 @@
 
 #include "script_backtrace.h"
 
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 
 void ScriptBacktrace::_store_variables(const List<String> &p_names, const List<Variant> &p_values, LocalVector<StackVariable> &r_variables) {
diff --git a/core/object/script_language.cpp b/core/object/script_language.cpp
index 4689916cc2..b8d993be93 100644
--- a/core/object/script_language.cpp
+++ b/core/object/script_language.cpp
@@ -35,6 +35,7 @@
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/templates/sort_array.h"
 
 ScriptLanguage *ScriptServer::_languages[MAX_LANGUAGES];
diff --git a/core/object/script_language_extension.cpp b/core/object/script_language_extension.cpp
index 9c5942e973..8773b364d5 100644
--- a/core/object/script_language_extension.cpp
+++ b/core/object/script_language_extension.cpp
@@ -30,6 +30,8 @@
 
 #include "script_language_extension.h"
 
+#include "core/object/class_db.h"
+
 void ScriptExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_editor_can_reload_from_file);
 	GDVIRTUAL_BIND(_placeholder_erased, "placeholder");
diff --git a/core/object/undo_redo.cpp b/core/object/undo_redo.cpp
index 1bde25f553..29963b4780 100644
--- a/core/object/undo_redo.cpp
+++ b/core/object/undo_redo.cpp
@@ -31,6 +31,7 @@
 #include "undo_redo.h"
 
 #include "core/io/resource.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "core/variant/callable_bind.h"
diff --git a/core/object/worker_thread_pool.cpp b/core/object/worker_thread_pool.cpp
index a18c1b34ce..f5574c47a0 100644
--- a/core/object/worker_thread_pool.cpp
+++ b/core/object/worker_thread_pool.cpp
@@ -30,6 +30,7 @@
 
 #include "worker_thread_pool.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/core/os/time.cpp b/core/os/time.cpp
index 7a71e8d961..5c4b4cbf28 100644
--- a/core/os/time.cpp
+++ b/core/os/time.cpp
@@ -30,6 +30,7 @@
 
 #include "time.h" // NOLINT(modernize-deprecated-headers) False positive with C-Header of the same name.
 
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 #define UNIX_EPOCH_YEAR_AD 1970 // 1970
diff --git a/core/string/optimized_translation.cpp b/core/string/optimized_translation.cpp
index ee4bb095e0..06e349bdb9 100644
--- a/core/string/optimized_translation.cpp
+++ b/core/string/optimized_translation.cpp
@@ -30,6 +30,7 @@
 
 #include "optimized_translation.h"
 
+#include "core/object/class_db.h"
 #include "core/templates/pair.h"
 
 extern "C" {
diff --git a/core/string/translation.cpp b/core/string/translation.cpp
index bf48529e88..88161c403e 100644
--- a/core/string/translation.cpp
+++ b/core/string/translation.cpp
@@ -30,6 +30,7 @@
 
 #include "translation.h"
 
+#include "core/object/class_db.h"
 #include "core/os/thread.h"
 #include "core/string/plural_rules.h"
 #include "core/string/translation_server.h"
diff --git a/core/string/translation_domain.cpp b/core/string/translation_domain.cpp
index 90bb24ceed..48e6fcfbad 100644
--- a/core/string/translation_domain.cpp
+++ b/core/string/translation_domain.cpp
@@ -30,6 +30,7 @@
 
 #include "translation_domain.h"
 
+#include "core/object/class_db.h"
 #include "core/string/translation.h"
 #include "core/string/translation_server.h"
 #include "core/variant/typed_array.h"
diff --git a/core/string/translation_server.compat.inc b/core/string/translation_server.compat.inc
index 11f508c654..df24f5b720 100644
--- a/core/string/translation_server.compat.inc
+++ b/core/string/translation_server.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "translation_server.h"
+
+#include "core/object/class_db.h"
+
 String TranslationServer::_standardize_locale_bind_compat_98972(const String &p_locale) const {
 	return standardize_locale(p_locale, false);
 }
diff --git a/core/string/translation_server.cpp b/core/string/translation_server.cpp
index d33bad67b2..8dfc0c2781 100644
--- a/core/string/translation_server.cpp
+++ b/core/string/translation_server.cpp
@@ -33,6 +33,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/os/main_loop.h"
 #include "core/os/os.h"
 #include "core/string/locales.h"
diff --git a/drivers/apple_embedded/apple_embedded.mm b/drivers/apple_embedded/apple_embedded.mm
index 7e8fd4af03..c0a1f5d295 100644
--- a/drivers/apple_embedded/apple_embedded.mm
+++ b/drivers/apple_embedded/apple_embedded.mm
@@ -37,6 +37,8 @@
 #import <UIKit/UIKit.h>
 #include <sys/sysctl.h>
 
+#include "core/object/class_db.h"
+
 void AppleEmbedded::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_rate_url", "app_id"), &AppleEmbedded::get_rate_url);
 	ClassDB::bind_method(D_METHOD("supports_haptic_engine"), &AppleEmbedded::supports_haptic_engine);
diff --git a/editor/animation/animation_bezier_editor.cpp b/editor/animation/animation_bezier_editor.cpp
index ea757aaf88..65bb264752 100644
--- a/editor/animation/animation_bezier_editor.cpp
+++ b/editor/animation/animation_bezier_editor.cpp
@@ -30,6 +30,7 @@
 
 #include "animation_bezier_editor.h"
 
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/animation/animation_player_editor_plugin.h"
 #include "editor/editor_node.h"
diff --git a/editor/animation/animation_blend_space_1d_editor.cpp b/editor/animation/animation_blend_space_1d_editor.cpp
index 382d00b393..225857e2aa 100644
--- a/editor/animation/animation_blend_space_1d_editor.cpp
+++ b/editor/animation/animation_blend_space_1d_editor.cpp
@@ -30,6 +30,7 @@
 
 #include "animation_blend_space_1d_editor.h"
 
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/animation/animation_blend_space_2d_editor.cpp b/editor/animation/animation_blend_space_2d_editor.cpp
index 807188c1dc..aa9bb4e6bc 100644
--- a/editor/animation/animation_blend_space_2d_editor.cpp
+++ b/editor/animation/animation_blend_space_2d_editor.cpp
@@ -32,6 +32,7 @@
 
 #include "core/io/resource_loader.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/animation/animation_blend_tree_editor_plugin.cpp b/editor/animation/animation_blend_tree_editor_plugin.cpp
index 912c661374..1dc91df739 100644
--- a/editor/animation/animation_blend_tree_editor_plugin.cpp
+++ b/editor/animation/animation_blend_tree_editor_plugin.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/templates/rb_set.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/animation/animation_library_editor.cpp b/editor/animation/animation_library_editor.cpp
index 2b6a77b873..422fdfc405 100644
--- a/editor/animation/animation_library_editor.cpp
+++ b/editor/animation/animation_library_editor.cpp
@@ -31,6 +31,7 @@
 #include "animation_library_editor.h"
 
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
 #include "core/variant/variant.h"
diff --git a/editor/animation/animation_player_editor_plugin.cpp b/editor/animation/animation_player_editor_plugin.cpp
index bc691d9363..8fcfd3bc13 100644
--- a/editor/animation/animation_player_editor_plugin.cpp
+++ b/editor/animation/animation_player_editor_plugin.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/animation/animation_tree_editor_plugin.h"
 #include "editor/docks/editor_dock_manager.h"
diff --git a/editor/animation/animation_state_machine_editor.cpp b/editor/animation/animation_state_machine_editor.cpp
index 7e3da07965..f3c1508f11 100644
--- a/editor/animation/animation_state_machine_editor.cpp
+++ b/editor/animation/animation_state_machine_editor.cpp
@@ -32,6 +32,7 @@
 
 #include "core/io/resource_loader.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/editor/animation/animation_track_editor.cpp b/editor/animation/animation_track_editor.cpp
index a3b14dc83e..6bfdbe91ba 100644
--- a/editor/animation/animation_track_editor.cpp
+++ b/editor/animation/animation_track_editor.cpp
@@ -34,6 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/animation/animation_bezier_editor.h"
 #include "editor/animation/animation_player_editor_plugin.h"
diff --git a/editor/asset_library/asset_library_editor_plugin.cpp b/editor/asset_library/asset_library_editor_plugin.cpp
index 7ff49d5b6b..471e780fd3 100644
--- a/editor/asset_library/asset_library_editor_plugin.cpp
+++ b/editor/asset_library/asset_library_editor_plugin.cpp
@@ -33,6 +33,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
 #include "core/io/stream_peer_tls.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/version.h"
 #include "editor/editor_main_screen.h"
diff --git a/editor/audio/audio_stream_preview.cpp b/editor/audio/audio_stream_preview.cpp
index eae31d1aa8..d80753f74a 100644
--- a/editor/audio/audio_stream_preview.cpp
+++ b/editor/audio/audio_stream_preview.cpp
@@ -30,6 +30,8 @@
 
 #include "audio_stream_preview.h"
 
+#include "core/object/class_db.h"
+
 /////////////////////
 
 float AudioStreamPreview::get_length() const {
diff --git a/editor/audio/editor_audio_buses.cpp b/editor/audio/editor_audio_buses.cpp
index e2e4f7e5e6..5852f62dd9 100644
--- a/editor/audio/editor_audio_buses.cpp
+++ b/editor/audio/editor_audio_buses.cpp
@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/docks/filesystem_dock.h"
diff --git a/editor/debugger/debug_adapter/debug_adapter_parser.cpp b/editor/debugger/debug_adapter/debug_adapter_parser.cpp
index 94fcb30822..f50fbfc000 100644
--- a/editor/debugger/debug_adapter/debug_adapter_parser.cpp
+++ b/editor/debugger/debug_adapter/debug_adapter_parser.cpp
@@ -30,6 +30,7 @@
 
 #include "debug_adapter_parser.h"
 
+#include "core/object/class_db.h"
 #include "editor/debugger/debug_adapter/debug_adapter_protocol.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
diff --git a/editor/debugger/editor_debugger_inspector.cpp b/editor/debugger/editor_debugger_inspector.cpp
index ea1ac02aa3..0022e4f708 100644
--- a/editor/debugger/editor_debugger_inspector.cpp
+++ b/editor/debugger/editor_debugger_inspector.cpp
@@ -33,6 +33,7 @@
 #include "core/debugger/debugger_marshalls.h"
 #include "core/io/marshalls.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/variant/typed_dictionary.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_node.h"
diff --git a/editor/debugger/editor_debugger_node.cpp b/editor/debugger/editor_debugger_node.cpp
index 9e521a3215..8aa97de779 100644
--- a/editor/debugger/editor_debugger_node.cpp
+++ b/editor/debugger/editor_debugger_node.cpp
@@ -31,6 +31,7 @@
 #include "editor_debugger_node.h"
 
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/object/undo_redo.h"
 #include "editor/debugger/editor_debugger_plugin.h"
 #include "editor/debugger/editor_debugger_tree.h"
diff --git a/editor/debugger/editor_debugger_plugin.cpp b/editor/debugger/editor_debugger_plugin.cpp
index fbb389ccb4..02c0104005 100644
--- a/editor/debugger/editor_debugger_plugin.cpp
+++ b/editor/debugger/editor_debugger_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_debugger_plugin.h"
 
+#include "core/object/class_db.h"
 #include "editor/debugger/script_editor_debugger.h"
 
 void EditorDebuggerSession::_breaked(bool p_really_did, bool p_can_debug, const String &p_message, bool p_has_stackdump) {
diff --git a/editor/debugger/editor_debugger_tree.cpp b/editor/debugger/editor_debugger_tree.cpp
index 6f7167a5a2..5245f3a41e 100644
--- a/editor/debugger/editor_debugger_tree.cpp
+++ b/editor/debugger/editor_debugger_tree.cpp
@@ -31,6 +31,7 @@
 #include "editor_debugger_tree.h"
 
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
diff --git a/editor/debugger/editor_profiler.cpp b/editor/debugger/editor_profiler.cpp
index 12ecc39873..ecf33ce93b 100644
--- a/editor/debugger/editor_profiler.cpp
+++ b/editor/debugger/editor_profiler.cpp
@@ -31,6 +31,7 @@
 #include "editor_profiler.h"
 
 #include "core/io/image.h"
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_string_names.h"
 #include "editor/run/editor_run_bar.h"
diff --git a/editor/debugger/editor_visual_profiler.cpp b/editor/debugger/editor_visual_profiler.cpp
index 67ede8b981..2e8981e34a 100644
--- a/editor/debugger/editor_visual_profiler.cpp
+++ b/editor/debugger/editor_visual_profiler.cpp
@@ -31,6 +31,7 @@
 #include "editor_visual_profiler.h"
 
 #include "core/io/image.h"
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_string_names.h"
 #include "editor/run/editor_run_bar.h"
diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp
index bac72f46ee..448d828ea5 100644
--- a/editor/debugger/script_editor_debugger.cpp
+++ b/editor/debugger/script_editor_debugger.cpp
@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/debugger/debugger_marshalls.h"
 #include "core/debugger/remote_debugger.h"
+#include "core/object/class_db.h"
 #include "core/string/ustring.h"
 #include "core/variant/typed_dictionary.h"
 #include "core/version.h"
diff --git a/editor/doc/editor_help.cpp b/editor/doc/editor_help.cpp
index 40a8e1ffa7..6a4fd196e4 100644
--- a/editor/doc/editor_help.cpp
+++ b/editor/doc/editor_help.cpp
@@ -35,6 +35,7 @@
 #include "core/extension/gdextension.h"
 #include "core/input/input.h"
 #include "core/io/json.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/os/keyboard.h"
 #include "core/string/string_builder.h"
diff --git a/editor/doc/editor_help_search.cpp b/editor/doc/editor_help_search.cpp
index 5ae03cde0d..d018f59c4e 100644
--- a/editor/doc/editor_help_search.cpp
+++ b/editor/doc/editor_help_search.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_help_search.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/docks/editor_dock.cpp b/editor/docks/editor_dock.cpp
index da05ce0364..fd6c9655c9 100644
--- a/editor/docks/editor_dock.cpp
+++ b/editor/docks/editor_dock.cpp
@@ -32,6 +32,7 @@
 
 #include "core/input/shortcut.h"
 #include "core/io/config_file.h"
+#include "core/object/class_db.h"
 #include "editor/docks/dock_tab_container.h"
 #include "editor/docks/editor_dock_manager.h"
 
diff --git a/editor/docks/editor_dock_manager.cpp b/editor/docks/editor_dock_manager.cpp
index 37b9faadd7..9d097af991 100644
--- a/editor/docks/editor_dock_manager.cpp
+++ b/editor/docks/editor_dock_manager.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_dock_manager.h"
 
+#include "core/object/class_db.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
diff --git a/editor/docks/filesystem_dock.cpp b/editor/docks/filesystem_dock.cpp
index 40c9e2259c..537947f454 100644
--- a/editor/docks/filesystem_dock.cpp
+++ b/editor/docks/filesystem_dock.cpp
@@ -35,6 +35,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/templates/list.h"
diff --git a/editor/docks/groups_editor.cpp b/editor/docks/groups_editor.cpp
index 691aa07d7a..dbf16df4a5 100644
--- a/editor/docks/groups_editor.cpp
+++ b/editor/docks/groups_editor.cpp
@@ -30,6 +30,7 @@
 
 #include "groups_editor.h"
 
+#include "core/object/class_db.h"
 #include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/docks/import_dock.cpp b/editor/docks/import_dock.cpp
index bd628b0bd7..7ed771f29a 100644
--- a/editor/docks/import_dock.cpp
+++ b/editor/docks/import_dock.cpp
@@ -31,6 +31,7 @@
 #include "import_dock.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/editor/docks/inspector_dock.cpp b/editor/docks/inspector_dock.cpp
index fbd20fee95..ce00b9f60e 100644
--- a/editor/docks/inspector_dock.cpp
+++ b/editor/docks/inspector_dock.cpp
@@ -30,6 +30,7 @@
 
 #include "inspector_dock.h"
 
+#include "core/object/class_db.h"
 #include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/docks/filesystem_dock.h"
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp
index 5b25ccf49a..e40f8077ff 100644
--- a/editor/editor_data.cpp
+++ b/editor/editor_data.cpp
@@ -34,6 +34,7 @@
 #include "core/extension/gdextension_manager.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/os/time.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/editor/editor_interface.compat.inc b/editor/editor_interface.compat.inc
index 2622386350..e9c2636759 100644
--- a/editor/editor_interface.compat.inc
+++ b/editor/editor_interface.compat.inc
@@ -28,9 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#ifndef DISABLE_DEPRECATED
+
 #include "editor_interface.h"
 
-#ifndef DISABLE_DEPRECATED
+#include "core/object/class_db.h"
 
 void EditorInterface::_popup_node_selector_bind_compat_94323(const Callable &p_callback, const TypedArray<StringName> &p_valid_types) {
 	popup_node_selector(p_callback, p_valid_types, nullptr);
@@ -50,4 +52,4 @@ void EditorInterface::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("open_scene_from_path", "scene_path"), &EditorInterface::_open_scene_from_path_bind_compat_90057);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/editor/editor_interface.cpp b/editor/editor_interface.cpp
index 4d8adf1b57..5f75c91976 100644
--- a/editor/editor_interface.cpp
+++ b/editor/editor_interface.cpp
@@ -33,6 +33,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_main_screen.h"
diff --git a/editor/editor_undo_redo_manager.compat.inc b/editor/editor_undo_redo_manager.compat.inc
index b44762e311..537b8bbeda 100644
--- a/editor/editor_undo_redo_manager.compat.inc
+++ b/editor/editor_undo_redo_manager.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "editor_undo_redo_manager.h"
+
+#include "core/object/class_db.h"
+
 void EditorUndoRedoManager::_create_action_bind_compat_106121(const String &p_name, UndoRedo::MergeMode p_mode, Object *p_custom_context, bool p_backward_undo_ops) {
 	create_action(p_name, p_mode, p_custom_context, p_backward_undo_ops, true);
 }
@@ -38,4 +42,4 @@ void EditorUndoRedoManager::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("create_action", "name", "merge_mode", "custom_context", "backward_undo_ops"), &EditorUndoRedoManager::_create_action_bind_compat_106121, DEFVAL(UndoRedo::MERGE_DISABLE), DEFVAL((Object *)nullptr), DEFVAL(false));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/editor/editor_undo_redo_manager.cpp b/editor/editor_undo_redo_manager.cpp
index bb5779f4c7..7ef8d6a6af 100644
--- a/editor/editor_undo_redo_manager.cpp
+++ b/editor/editor_undo_redo_manager.cpp
@@ -32,6 +32,7 @@
 #include "editor_undo_redo_manager.compat.inc"
 
 #include "core/io/resource.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/debugger/editor_debugger_node.h"
diff --git a/editor/export/editor_export.cpp b/editor/export/editor_export.cpp
index 38b585342f..0c68516b38 100644
--- a/editor/export/editor_export.cpp
+++ b/editor/export/editor_export.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/config_file.h"
+#include "core/object/class_db.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/main/timer.h"
 
diff --git a/editor/export/editor_export_platform.compat.inc b/editor/export/editor_export_platform.compat.inc
index fca3300a16..a38614c9f4 100644
--- a/editor/export/editor_export_platform.compat.inc
+++ b/editor/export/editor_export_platform.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "editor_export_platform.h"
+
+#include "core/object/class_db.h"
+
 Vector<String> EditorExportPlatform::_get_forced_export_files_bind_compat_71542() {
 	return get_forced_export_files(Ref<EditorExportPreset>());
 }
@@ -38,4 +42,4 @@ void EditorExportPlatform::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_static_method("EditorExportPlatform", D_METHOD("get_forced_export_files"), &EditorExportPlatform::_get_forced_export_files_bind_compat_71542);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/editor/export/editor_export_platform.cpp b/editor/export/editor_export_platform.cpp
index d5dcbd1372..67edf02a94 100644
--- a/editor/export/editor_export_platform.cpp
+++ b/editor/export/editor_export_platform.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "editor_export_platform.h"
-
 #include "editor_export_platform.compat.inc"
 
 #include "core/config/project_settings.h"
@@ -43,6 +42,7 @@
 #include "core/io/image_loader.h"
 #include "core/io/resource_uid.h"
 #include "core/math/random_pcg.h"
+#include "core/object/class_db.h"
 #include "core/os/shared_object.h"
 #include "core/string/translation_server.h"
 #include "core/version.h"
diff --git a/editor/export/editor_export_platform_extension.cpp b/editor/export/editor_export_platform_extension.cpp
index 3a53f3c310..e23b524d28 100644
--- a/editor/export/editor_export_platform_extension.cpp
+++ b/editor/export/editor_export_platform_extension.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_export_platform_extension.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 
 void EditorExportPlatformExtension::_bind_methods() {
diff --git a/editor/export/editor_export_plugin.cpp b/editor/export/editor_export_plugin.cpp
index 2d5e038fc2..fd58ba39a7 100644
--- a/editor/export/editor_export_plugin.cpp
+++ b/editor/export/editor_export_plugin.cpp
@@ -31,6 +31,7 @@
 #include "editor_export_plugin.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "editor/export/editor_export_platform.h"
 
 void EditorExportPlugin::set_export_base_path(const String &p_export_base_path) {
diff --git a/editor/export/editor_export_preset.compat.inc b/editor/export/editor_export_preset.compat.inc
index 84b8446b21..a623a57e20 100644
--- a/editor/export/editor_export_preset.compat.inc
+++ b/editor/export/editor_export_preset.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "editor_export_preset.h"
+
+#include "core/object/class_db.h"
+
 int EditorExportPreset::_get_script_export_mode_bind_compat_107167() const {
 	return get_script_export_mode();
 }
@@ -38,4 +42,4 @@ void EditorExportPreset::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_script_export_mode"), &EditorExportPreset::_get_script_export_mode_bind_compat_107167);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/editor/export/editor_export_preset.cpp b/editor/export/editor_export_preset.cpp
index bf118faad1..5d8fe8d569 100644
--- a/editor/export/editor_export_preset.cpp
+++ b/editor/export/editor_export_preset.cpp
@@ -33,6 +33,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/object/class_db.h"
 #include "editor/export/editor_export.h"
 #include "editor/settings/editor_settings.h"
 
diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp
index 40fd546823..f2bd21b9c1 100644
--- a/editor/export/project_export.cpp
+++ b/editor/export/project_export.cpp
@@ -31,6 +31,7 @@
 #include "project_export.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/file_system/dependency_editor.cpp b/editor/file_system/dependency_editor.cpp
index 6a024e0795..d881428327 100644
--- a/editor/file_system/dependency_editor.cpp
+++ b/editor/file_system/dependency_editor.cpp
@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.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/file_system/editor_file_system.cpp b/editor/file_system/editor_file_system.cpp
index 271d12085e..7c8505dda3 100644
--- a/editor/file_system/editor_file_system.cpp
+++ b/editor/file_system/editor_file_system.cpp
@@ -35,6 +35,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"
 #include "core/variant/variant_parser.h"
diff --git a/editor/file_system/editor_paths.cpp b/editor/file_system/editor_paths.cpp
index b8dc77e7dc..2738dd04fb 100644
--- a/editor/file_system/editor_paths.cpp
+++ b/editor/file_system/editor_paths.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/class_db.h"
 #include "core/os/os.h"
 #include "main/main.h"
 
diff --git a/editor/gui/code_editor.cpp b/editor/gui/code_editor.cpp
index 3e99044c6b..bb8a556555 100644
--- a/editor/gui/code_editor.cpp
+++ b/editor/gui/code_editor.cpp
@@ -31,6 +31,7 @@
 #include "code_editor.h"
 
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/string_builder.h"
 #include "editor/editor_node.h"
diff --git a/editor/gui/editor_dir_dialog.cpp b/editor/gui/editor_dir_dialog.cpp
index 4b9e844e5d..10e9e9ac1d 100644
--- a/editor/gui/editor_dir_dialog.cpp
+++ b/editor/gui/editor_dir_dialog.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_dir_dialog.h"
 
+#include "core/object/class_db.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/gui/directory_create_dialog.h"
diff --git a/editor/gui/editor_file_dialog.cpp b/editor/gui/editor_file_dialog.cpp
index b10f7bd32d..cab4e95b43 100644
--- a/editor/gui/editor_file_dialog.cpp
+++ b/editor/gui/editor_file_dialog.cpp
@@ -31,6 +31,7 @@
 #include "editor_file_dialog.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/dependency_editor.h"
diff --git a/editor/gui/editor_quick_open_dialog.cpp b/editor/gui/editor_quick_open_dialog.cpp
index 223db86ee7..287dd3b2ae 100644
--- a/editor/gui/editor_quick_open_dialog.cpp
+++ b/editor/gui/editor_quick_open_dialog.cpp
@@ -31,6 +31,7 @@
 #include "editor_quick_open_dialog.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/string/fuzzy_search.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/editor_node.h"
diff --git a/editor/gui/editor_spin_slider.cpp b/editor/gui/editor_spin_slider.cpp
index 3c2d903170..d088e72604 100644
--- a/editor/gui/editor_spin_slider.cpp
+++ b/editor/gui/editor_spin_slider.cpp
@@ -32,6 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/math/expression.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/gui/editor_toaster.cpp b/editor/gui/editor_toaster.cpp
index 13974e3110..0cfdee5866 100644
--- a/editor/gui/editor_toaster.cpp
+++ b/editor/gui/editor_toaster.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_toaster.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
diff --git a/editor/gui/editor_zoom_widget.cpp b/editor/gui/editor_zoom_widget.cpp
index 8f046fbc28..44be97db12 100644
--- a/editor/gui/editor_zoom_widget.cpp
+++ b/editor/gui/editor_zoom_widget.cpp
@@ -31,6 +31,7 @@
 #include "editor_zoom_widget.h"
 
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/translation_server.h"
 #include "editor/settings/editor_settings.h"
diff --git a/editor/gui/window_wrapper.cpp b/editor/gui/window_wrapper.cpp
index 833e3ec758..0ccca178d5 100644
--- a/editor/gui/window_wrapper.cpp
+++ b/editor/gui/window_wrapper.cpp
@@ -30,6 +30,7 @@
 
 #include "window_wrapper.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/progress_dialog.h"
diff --git a/editor/import/3d/resource_importer_scene.cpp b/editor/import/3d/resource_importer_scene.cpp
index eba5d261be..c9170bf0e2 100644
--- a/editor/import/3d/resource_importer_scene.cpp
+++ b/editor/import/3d/resource_importer_scene.cpp
@@ -33,6 +33,7 @@
 #include "core/error/error_macros.h"
 #include "core/io/dir_access.h"
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
diff --git a/editor/import/editor_import_plugin.cpp b/editor/import/editor_import_plugin.cpp
index a399801a90..1ac4097f93 100644
--- a/editor/import/editor_import_plugin.cpp
+++ b/editor/import/editor_import_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_import_plugin.h"
 
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/file_system/editor_file_system.h"
 
diff --git a/editor/inspector/editor_context_menu_plugin.cpp b/editor/inspector/editor_context_menu_plugin.cpp
index a8a22aafe3..ed1aea6fcb 100644
--- a/editor/inspector/editor_context_menu_plugin.cpp
+++ b/editor/inspector/editor_context_menu_plugin.cpp
@@ -31,6 +31,7 @@
 #include "editor_context_menu_plugin.h"
 
 #include "core/input/shortcut.h"
+#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/resources/texture.h"
diff --git a/editor/inspector/editor_inspector.compat.inc b/editor/inspector/editor_inspector.compat.inc
index 53c410ba26..b623f4082b 100644
--- a/editor/inspector/editor_inspector.compat.inc
+++ b/editor/inspector/editor_inspector.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "editor_inspector.h"
+
+#include "core/object/class_db.h"
+
 void EditorInspectorPlugin::_add_property_editor_bind_compat_92322(const String &p_for_property, Control *p_prop, bool p_add_to_end) {
 	add_property_editor(p_for_property, p_prop, p_add_to_end, "");
 }
diff --git a/editor/inspector/editor_inspector.cpp b/editor/inspector/editor_inspector.cpp
index 183fd601d7..cd4a155b3a 100644
--- a/editor/inspector/editor_inspector.cpp
+++ b/editor/inspector/editor_inspector.cpp
@@ -32,6 +32,7 @@
 #include "editor_inspector.compat.inc"
 
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/variant/typed_dictionary.h"
 #include "editor/debugger/editor_debugger_inspector.h"
diff --git a/editor/inspector/editor_properties.cpp b/editor/inspector/editor_properties.cpp
index 6fd2d82811..27edf0e84a 100644
--- a/editor/inspector/editor_properties.cpp
+++ b/editor/inspector/editor_properties.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input_map.h"
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/docks/scene_tree_dock.h"
diff --git a/editor/inspector/editor_resource_picker.cpp b/editor/inspector/editor_resource_picker.cpp
index 6e0eed44ce..0cd1a50442 100644
--- a/editor/inspector/editor_resource_picker.cpp
+++ b/editor/inspector/editor_resource_picker.cpp
@@ -31,6 +31,7 @@
 #include "editor_resource_picker.h"
 
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "editor/audio/audio_stream_preview.h"
 #include "editor/doc/editor_help.h"
 #include "editor/docks/filesystem_dock.h"
diff --git a/editor/inspector/editor_resource_preview.cpp b/editor/inspector/editor_resource_preview.cpp
index 55cf23b856..c1a85a6fd3 100644
--- a/editor/inspector/editor_resource_preview.cpp
+++ b/editor/inspector/editor_resource_preview.cpp
@@ -34,6 +34,7 @@
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 #include "core/variant/variant_utility.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/inspector/editor_resource_tooltip_plugins.cpp b/editor/inspector/editor_resource_tooltip_plugins.cpp
index f35549cc8a..20e4ab9fa7 100644
--- a/editor/inspector/editor_resource_tooltip_plugins.cpp
+++ b/editor/inspector/editor_resource_tooltip_plugins.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_resource_tooltip_plugins.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/inspector/editor_sectioned_inspector.cpp b/editor/inspector/editor_sectioned_inspector.cpp
index 1e715d8d9e..d4a94d9183 100644
--- a/editor/inspector/editor_sectioned_inspector.cpp
+++ b/editor/inspector/editor_sectioned_inspector.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_sectioned_inspector.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/inspector/editor_inspector.h"
 #include "editor/inspector/editor_property_name_processor.h"
diff --git a/editor/inspector/multi_node_edit.cpp b/editor/inspector/multi_node_edit.cpp
index 25eae1bf7f..e65593a565 100644
--- a/editor/inspector/multi_node_edit.cpp
+++ b/editor/inspector/multi_node_edit.cpp
@@ -31,6 +31,7 @@
 #include "multi_node_edit.h"
 
 #include "core/math/math_fieldwise.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 
diff --git a/editor/inspector/property_selector.cpp b/editor/inspector/property_selector.cpp
index 334dfd04bb..79ca8ca7b0 100644
--- a/editor/inspector/property_selector.cpp
+++ b/editor/inspector/property_selector.cpp
@@ -30,6 +30,7 @@
 
 #include "property_selector.h"
 
+#include "core/object/class_db.h"
 #include "editor/doc/editor_help.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/plugins/editor_plugin.compat.inc b/editor/plugins/editor_plugin.compat.inc
index 7edf938604..5eeaec9d64 100644
--- a/editor/plugins/editor_plugin.compat.inc
+++ b/editor/plugins/editor_plugin.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "editor_plugin.h"
+
+#include "core/object/class_db.h"
+
 Button *EditorPlugin::_add_control_to_bottom_panel_compat_88081(Control *p_control, const String &p_title) {
 	return add_control_to_bottom_panel(p_control, p_title, nullptr);
 }
@@ -43,4 +47,4 @@ void EditorPlugin::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("add_control_to_dock", "slot", "control"), &EditorPlugin::_add_control_to_dock_compat_88081);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/editor/plugins/editor_plugin.cpp b/editor/plugins/editor_plugin.cpp
index 6029fe8f88..6a4d122422 100644
--- a/editor/plugins/editor_plugin.cpp
+++ b/editor/plugins/editor_plugin.cpp
@@ -31,6 +31,7 @@
 #include "editor_plugin.h"
 #include "editor_plugin.compat.inc"
 
+#include "core/object/class_db.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/editor_debugger_plugin.h"
 #include "editor/docks/editor_dock.h"
diff --git a/editor/plugins/editor_resource_conversion_plugin.cpp b/editor/plugins/editor_resource_conversion_plugin.cpp
index 3209b576b2..b113b8c224 100644
--- a/editor/plugins/editor_resource_conversion_plugin.cpp
+++ b/editor/plugins/editor_resource_conversion_plugin.cpp
@@ -30,6 +30,8 @@
 
 #include "editor_resource_conversion_plugin.h"
 
+#include "core/object/class_db.h"
+
 void EditorResourceConversionPlugin::_bind_methods() {
 	GDVIRTUAL_BIND(_converts_to);
 	GDVIRTUAL_BIND(_handles, "resource");
diff --git a/editor/plugins/plugin_config_dialog.cpp b/editor/plugins/plugin_config_dialog.cpp
index 1fb4ccc160..8f27923320 100644
--- a/editor/plugins/plugin_config_dialog.cpp
+++ b/editor/plugins/plugin_config_dialog.cpp
@@ -32,6 +32,7 @@
 
 #include "core/io/config_file.h"
 #include "core/io/dir_access.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/editor_node.h"
 #include "editor/file_system/editor_file_system.h"
diff --git a/editor/project_manager/engine_update_label.cpp b/editor/project_manager/engine_update_label.cpp
index 035535e971..5f033156e2 100644
--- a/editor/project_manager/engine_update_label.cpp
+++ b/editor/project_manager/engine_update_label.cpp
@@ -31,6 +31,7 @@
 #include "engine_update_label.h"
 
 #include "core/io/json.h"
+#include "core/object/class_db.h"
 #include "core/version.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
diff --git a/editor/project_manager/project_dialog.cpp b/editor/project_manager/project_dialog.cpp
index 1bdda52c96..14efb9fead 100644
--- a/editor/project_manager/project_dialog.cpp
+++ b/editor/project_manager/project_dialog.cpp
@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/zip_io.h"
+#include "core/object/class_db.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/project_manager/project_list.cpp b/editor/project_manager/project_list.cpp
index c2b9f92fc0..47d8ab7d30 100644
--- a/editor/project_manager/project_list.cpp
+++ b/editor/project_manager/project_list.cpp
@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/io/dir_access.h"
+#include "core/object/class_db.h"
 #include "core/os/time.h"
 #include "core/version.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/project_manager/quick_settings_dialog.cpp b/editor/project_manager/quick_settings_dialog.cpp
index 53e186cc53..84cedb51b3 100644
--- a/editor/project_manager/quick_settings_dialog.cpp
+++ b/editor/project_manager/quick_settings_dialog.cpp
@@ -30,6 +30,7 @@
 
 #include "quick_settings_dialog.h"
 
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/doc/editor_help.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/project_upgrade/project_upgrade_tool.cpp b/editor/project_upgrade/project_upgrade_tool.cpp
index 61a94c8511..79ba9afe00 100644
--- a/editor/project_upgrade/project_upgrade_tool.cpp
+++ b/editor/project_upgrade/project_upgrade_tool.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/file_system/editor_file_system.h"
 #include "editor/scene/editor_scene_tabs.h"
diff --git a/editor/run/editor_run_bar.cpp b/editor/run/editor_run_bar.cpp
index 98fdc138b9..ca874620c7 100644
--- a/editor/run/editor_run_bar.cpp
+++ b/editor/run/editor_run_bar.cpp
@@ -31,6 +31,7 @@
 #include "editor_run_bar.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
 #include "editor/editor_node.h"
diff --git a/editor/run/editor_run_native.cpp b/editor/run/editor_run_native.cpp
index d4af422163..2c99d66ce0 100644
--- a/editor/run/editor_run_native.cpp
+++ b/editor/run/editor_run_native.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_run_native.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/export/editor_export.h"
 #include "editor/export/editor_export_platform.h"
diff --git a/editor/run/embedded_process.cpp b/editor/run/embedded_process.cpp
index c0961f746f..ff6def0021 100644
--- a/editor/run/embedded_process.cpp
+++ b/editor/run/embedded_process.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "scene/main/timer.h"
 #include "scene/main/window.h"
diff --git a/editor/run/game_view_plugin.cpp b/editor/run/game_view_plugin.cpp
index 8d8c8bb92f..99df061e7a 100644
--- a/editor/run/game_view_plugin.cpp
+++ b/editor/run/game_view_plugin.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/debugger/debugger_marshalls.h"
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
diff --git a/editor/scene/2d/camera_2d_editor_plugin.cpp b/editor/scene/2d/camera_2d_editor_plugin.cpp
index 55158c44ca..7aae3fb142 100644
--- a/editor/scene/2d/camera_2d_editor_plugin.cpp
+++ b/editor/scene/2d/camera_2d_editor_plugin.cpp
@@ -31,6 +31,7 @@
 #include "camera_2d_editor_plugin.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
diff --git a/editor/scene/2d/path_2d_editor_plugin.cpp b/editor/scene/2d/path_2d_editor_plugin.cpp
index 82be464249..53db1b7b1d 100644
--- a/editor/scene/2d/path_2d_editor_plugin.cpp
+++ b/editor/scene/2d/path_2d_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "path_2d_editor_plugin.h"
 
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/editor/scene/2d/polygon_2d_editor_plugin.cpp b/editor/scene/2d/polygon_2d_editor_plugin.cpp
index cdbd08a033..773a9dea26 100644
--- a/editor/scene/2d/polygon_2d_editor_plugin.cpp
+++ b/editor/scene/2d/polygon_2d_editor_plugin.cpp
@@ -32,6 +32,7 @@
 
 #include "core/input/input_event.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_node.h"
diff --git a/editor/scene/2d/sprite_2d_editor_plugin.cpp b/editor/scene/2d/sprite_2d_editor_plugin.cpp
index 3c77d83d61..5bfb610ade 100644
--- a/editor/scene/2d/sprite_2d_editor_plugin.cpp
+++ b/editor/scene/2d/sprite_2d_editor_plugin.cpp
@@ -31,6 +31,7 @@
 #include "sprite_2d_editor_plugin.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/editor/scene/2d/tiles/tile_atlas_view.cpp b/editor/scene/2d/tiles/tile_atlas_view.cpp
index 453b9b15f7..9fdac2ec3f 100644
--- a/editor/scene/2d/tiles/tile_atlas_view.cpp
+++ b/editor/scene/2d/tiles/tile_atlas_view.cpp
@@ -30,6 +30,7 @@
 
 #include "tile_atlas_view.h"
 
+#include "core/object/class_db.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/2d/tile_map_layer.h"
diff --git a/editor/scene/2d/tiles/tile_data_editors.cpp b/editor/scene/2d/tiles/tile_data_editors.cpp
index ee767e73b4..50a55c71d6 100644
--- a/editor/scene/2d/tiles/tile_data_editors.cpp
+++ b/editor/scene/2d/tiles/tile_data_editors.cpp
@@ -34,6 +34,7 @@
 
 #include "core/math/geometry_2d.h"
 #include "core/math/random_pcg.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 
 #include "editor/editor_node.h"
diff --git a/editor/scene/2d/tiles/tile_map_layer_editor.cpp b/editor/scene/2d/tiles/tile_map_layer_editor.cpp
index 53c3801bda..f8e19534c8 100644
--- a/editor/scene/2d/tiles/tile_map_layer_editor.cpp
+++ b/editor/scene/2d/tiles/tile_map_layer_editor.cpp
@@ -30,6 +30,7 @@
 
 #include "tile_map_layer_editor.h"
 
+#include "core/object/class_db.h"
 #include "tiles_editor_plugin.h"
 
 #include "editor/editor_node.h"
diff --git a/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp b/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp
index bc221f0767..68679ee556 100644
--- a/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp
+++ b/editor/scene/2d/tiles/tile_proxies_manager_dialog.cpp
@@ -30,6 +30,7 @@
 
 #include "tile_proxies_manager_dialog.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/inspector/editor_properties_vector.h"
 #include "editor/settings/editor_settings.h"
diff --git a/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp
index cbeebb4c3b..3ddf833596 100644
--- a/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp
+++ b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp
@@ -32,6 +32,7 @@
 
 #include "tiles_editor_plugin.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp b/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp
index 4ec8947fef..cc7f1bb224 100644
--- a/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp
+++ b/editor/scene/2d/tiles/tile_set_scenes_collection_source_editor.cpp
@@ -30,6 +30,7 @@
 
 #include "tile_set_scenes_collection_source_editor.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/scene/3d/bone_map_editor_plugin.cpp b/editor/scene/3d/bone_map_editor_plugin.cpp
index 2fe61bace2..5d4ab4d99d 100644
--- a/editor/scene/3d/bone_map_editor_plugin.cpp
+++ b/editor/scene/3d/bone_map_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "bone_map_editor_plugin.h"
 
+#include "core/object/class_db.h"
 #include "editor/import/3d/post_import_plugin_skeleton_renamer.h"
 #include "editor/import/3d/post_import_plugin_skeleton_rest_fixer.h"
 #include "editor/import/3d/post_import_plugin_skeleton_track_organizer.h"
diff --git a/editor/scene/3d/lightmap_gi_editor_plugin.cpp b/editor/scene/3d/lightmap_gi_editor_plugin.cpp
index ac28526127..c74539b77f 100644
--- a/editor/scene/3d/lightmap_gi_editor_plugin.cpp
+++ b/editor/scene/3d/lightmap_gi_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "lightmap_gi_editor_plugin.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
diff --git a/editor/scene/3d/node_3d_editor_gizmos.cpp b/editor/scene/3d/node_3d_editor_gizmos.cpp
index 0b4705792f..b7caf8a658 100644
--- a/editor/scene/3d/node_3d_editor_gizmos.cpp
+++ b/editor/scene/3d/node_3d_editor_gizmos.cpp
@@ -32,6 +32,7 @@
 
 #include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
diff --git a/editor/scene/3d/node_3d_editor_plugin.cpp b/editor/scene/3d/node_3d_editor_plugin.cpp
index dd61b01dcb..e73e406f54 100644
--- a/editor/scene/3d/node_3d_editor_plugin.cpp
+++ b/editor/scene/3d/node_3d_editor_plugin.cpp
@@ -36,6 +36,7 @@
 #include "core/math/geometry_3d.h"
 #include "core/math/math_funcs.h"
 #include "core/math/projection.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/translation_server.h"
 #include "editor/animation/animation_player_editor_plugin.h"
diff --git a/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp b/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp
index 912ad92296..c444d62c17 100644
--- a/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp
+++ b/editor/scene/3d/occluder_instance_3d_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "occluder_instance_3d_editor_plugin.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
diff --git a/editor/scene/3d/path_3d_editor_plugin.cpp b/editor/scene/3d/path_3d_editor_plugin.cpp
index 29c10bacfe..7d437c08fa 100644
--- a/editor/scene/3d/path_3d_editor_plugin.cpp
+++ b/editor/scene/3d/path_3d_editor_plugin.cpp
@@ -32,6 +32,7 @@
 
 #include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/scene/3d/polygon_3d_editor_plugin.cpp b/editor/scene/3d/polygon_3d_editor_plugin.cpp
index 6ef45384f7..4a5d357b1a 100644
--- a/editor/scene/3d/polygon_3d_editor_plugin.cpp
+++ b/editor/scene/3d/polygon_3d_editor_plugin.cpp
@@ -32,6 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/scene/3d/skeleton_3d_editor_plugin.cpp b/editor/scene/3d/skeleton_3d_editor_plugin.cpp
index 035434b324..6c9635bccd 100644
--- a/editor/scene/3d/skeleton_3d_editor_plugin.cpp
+++ b/editor/scene/3d/skeleton_3d_editor_plugin.cpp
@@ -31,6 +31,7 @@
 #include "skeleton_3d_editor_plugin.h"
 
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 #include "editor/animation/animation_player_editor_plugin.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/scene/canvas_item_editor_plugin.cpp b/editor/scene/canvas_item_editor_plugin.cpp
index 04588ef2c4..e7a347fda3 100644
--- a/editor/scene/canvas_item_editor_plugin.cpp
+++ b/editor/scene/canvas_item_editor_plugin.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/translation_server.h"
 #include "editor/animation/animation_player_editor_plugin.h"
diff --git a/editor/scene/connections_dialog.cpp b/editor/scene/connections_dialog.cpp
index 63747304ec..b3ddc65159 100644
--- a/editor/scene/connections_dialog.cpp
+++ b/editor/scene/connections_dialog.cpp
@@ -31,6 +31,7 @@
 #include "connections_dialog.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/templates/hash_set.h"
 #include "editor/doc/editor_help.h"
 #include "editor/docks/scene_tree_dock.h"
diff --git a/editor/scene/curve_editor_plugin.cpp b/editor/scene/curve_editor_plugin.cpp
index a511b6f277..4ab84b87e2 100644
--- a/editor/scene/curve_editor_plugin.cpp
+++ b/editor/scene/curve_editor_plugin.cpp
@@ -33,6 +33,7 @@
 #include "canvas_item_editor_plugin.h"
 #include "core/input/input.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
diff --git a/editor/scene/editor_scene_tabs.cpp b/editor/scene/editor_scene_tabs.cpp
index bef5572aed..721edbe45c 100644
--- a/editor/scene/editor_scene_tabs.cpp
+++ b/editor/scene/editor_scene_tabs.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
diff --git a/editor/scene/gradient_editor_plugin.cpp b/editor/scene/gradient_editor_plugin.cpp
index b6f929660f..23ffb621c1 100644
--- a/editor/scene/gradient_editor_plugin.cpp
+++ b/editor/scene/gradient_editor_plugin.cpp
@@ -31,6 +31,7 @@
 #include "gradient_editor_plugin.h"
 
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/scene/group_settings_editor.cpp b/editor/scene/group_settings_editor.cpp
index 5dbceded1f..845977636e 100644
--- a/editor/scene/group_settings_editor.cpp
+++ b/editor/scene/group_settings_editor.cpp
@@ -31,6 +31,7 @@
 #include "group_settings_editor.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/docks/scene_tree_dock.h"
 #include "editor/editor_node.h"
diff --git a/editor/scene/gui/control_editor_plugin.cpp b/editor/scene/gui/control_editor_plugin.cpp
index 93bd6194c6..6c871418a7 100644
--- a/editor/scene/gui/control_editor_plugin.cpp
+++ b/editor/scene/gui/control_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "control_editor_plugin.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
diff --git a/editor/scene/gui/font_config_plugin.cpp b/editor/scene/gui/font_config_plugin.cpp
index 20821d3fee..db5add84e2 100644
--- a/editor/scene/gui/font_config_plugin.cpp
+++ b/editor/scene/gui/font_config_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "font_config_plugin.h"
 
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/import/dynamic_font_import_settings.h"
 #include "editor/settings/editor_settings.h"
diff --git a/editor/scene/gui/theme_editor_plugin.cpp b/editor/scene/gui/theme_editor_plugin.cpp
index 5f7916d4b9..10dcfc4dd3 100644
--- a/editor/scene/gui/theme_editor_plugin.cpp
+++ b/editor/scene/gui/theme_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "theme_editor_plugin.h"
 
+#include "core/object/class_db.h"
 #include "editor/doc/editor_help.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/docks/filesystem_dock.h"
diff --git a/editor/scene/gui/theme_editor_preview.cpp b/editor/scene/gui/theme_editor_preview.cpp
index fabebc269d..152eda8b25 100644
--- a/editor/scene/gui/theme_editor_preview.cpp
+++ b/editor/scene/gui/theme_editor_preview.cpp
@@ -31,6 +31,7 @@
 #include "theme_editor_preview.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
diff --git a/editor/scene/rename_dialog.cpp b/editor/scene/rename_dialog.cpp
index bc10fb2287..e90d98e08e 100644
--- a/editor/scene/rename_dialog.cpp
+++ b/editor/scene/rename_dialog.cpp
@@ -30,6 +30,7 @@
 
 #include "rename_dialog.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/editor/scene/reparent_dialog.cpp b/editor/scene/reparent_dialog.cpp
index fae52a27e2..06ddd15038 100644
--- a/editor/scene/reparent_dialog.cpp
+++ b/editor/scene/reparent_dialog.cpp
@@ -30,6 +30,7 @@
 
 #include "reparent_dialog.h"
 
+#include "core/object/class_db.h"
 #include "editor/scene/scene_tree_editor.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
diff --git a/editor/scene/resource_preloader_editor_plugin.cpp b/editor/scene/resource_preloader_editor_plugin.cpp
index 944c05a749..5f5b71849a 100644
--- a/editor/scene/resource_preloader_editor_plugin.cpp
+++ b/editor/scene/resource_preloader_editor_plugin.cpp
@@ -31,6 +31,7 @@
 #include "resource_preloader_editor_plugin.h"
 
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
diff --git a/editor/scene/scene_tree_editor.cpp b/editor/scene/scene_tree_editor.cpp
index 3281e38f58..ce8589251d 100644
--- a/editor/scene/scene_tree_editor.cpp
+++ b/editor/scene/scene_tree_editor.cpp
@@ -31,6 +31,7 @@
 #include "scene_tree_editor.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/animation/animation_player_editor_plugin.h"
 #include "editor/docks/editor_dock_manager.h"
diff --git a/editor/scene/sprite_frames_editor_plugin.cpp b/editor/scene/sprite_frames_editor_plugin.cpp
index 89a9ccb9a8..7e3409d9f6 100644
--- a/editor/scene/sprite_frames_editor_plugin.cpp
+++ b/editor/scene/sprite_frames_editor_plugin.cpp
@@ -32,6 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/translation_server.h"
 #include "editor/docks/editor_dock_manager.h"
diff --git a/editor/scene/texture/color_channel_selector.cpp b/editor/scene/texture/color_channel_selector.cpp
index 32325b4a03..c9b2175a8e 100644
--- a/editor/scene/texture/color_channel_selector.cpp
+++ b/editor/scene/texture/color_channel_selector.cpp
@@ -30,6 +30,7 @@
 
 #include "color_channel_selector.h"
 
+#include "core/object/class_db.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
diff --git a/editor/scene/texture/texture_region_editor_plugin.cpp b/editor/scene/texture/texture_region_editor_plugin.cpp
index 0646483ed2..265d0b5de5 100644
--- a/editor/scene/texture/texture_region_editor_plugin.cpp
+++ b/editor/scene/texture/texture_region_editor_plugin.cpp
@@ -31,6 +31,7 @@
 #include "texture_region_editor_plugin.h"
 
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/script/editor_script.cpp b/editor/script/editor_script.cpp
index 2dff5ba99a..2cac3fa338 100644
--- a/editor/script/editor_script.cpp
+++ b/editor/script/editor_script.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_script.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/editor/script/find_in_files.cpp b/editor/script/find_in_files.cpp
index d4aec5fcd2..6b9af88bc0 100644
--- a/editor/script/find_in_files.cpp
+++ b/editor/script/find_in_files.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/script/script_create_dialog.cpp b/editor/script/script_create_dialog.cpp
index 55c2e37ad1..e69fd72896 100644
--- a/editor/script/script_create_dialog.cpp
+++ b/editor/script/script_create_dialog.cpp
@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_saver.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/script/script_editor_base.cpp b/editor/script/script_editor_base.cpp
index 20a2e25ba3..ba6d7b1ad3 100644
--- a/editor/script/script_editor_base.cpp
+++ b/editor/script/script_editor_base.cpp
@@ -31,6 +31,7 @@
 #include "script_editor_base.h"
 
 #include "core/io/json.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/script/script_editor_plugin.h"
 #include "editor/script/syntax_highlighters.h"
diff --git a/editor/script/script_editor_plugin.cpp b/editor/script/script_editor_plugin.cpp
index 67eab520da..b19eb77fce 100644
--- a/editor/script/script_editor_plugin.cpp
+++ b/editor/script/script_editor_plugin.cpp
@@ -36,6 +36,7 @@
 #include "core/io/file_access.h"
 #include "core/io/json.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/string/fuzzy_search.h"
diff --git a/editor/script/syntax_highlighters.cpp b/editor/script/syntax_highlighters.cpp
index de1acb3ac3..6de912ce1e 100644
--- a/editor/script/syntax_highlighters.cpp
+++ b/editor/script/syntax_highlighters.cpp
@@ -31,6 +31,7 @@
 #include "syntax_highlighters.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/settings/editor_settings.h"
 
diff --git a/editor/settings/action_map_editor.cpp b/editor/settings/action_map_editor.cpp
index 6e646566df..414d4bac1d 100644
--- a/editor/settings/action_map_editor.cpp
+++ b/editor/settings/action_map_editor.cpp
@@ -30,6 +30,7 @@
 
 #include "action_map_editor.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_event_search_bar.h"
 #include "editor/settings/editor_settings.h"
diff --git a/editor/settings/editor_autoload_settings.cpp b/editor/settings/editor_autoload_settings.cpp
index 4d708e587f..72e1952cee 100644
--- a/editor/settings/editor_autoload_settings.cpp
+++ b/editor/settings/editor_autoload_settings.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/core_constants.h"
+#include "core/object/class_db.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/settings/editor_build_profile.cpp b/editor/settings/editor_build_profile.cpp
index 9663d26285..9e411bf48e 100644
--- a/editor/settings/editor_build_profile.cpp
+++ b/editor/settings/editor_build_profile.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/json.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/settings/editor_command_palette.cpp b/editor/settings/editor_command_palette.cpp
index f7a5949aad..6f4f3d0097 100644
--- a/editor/settings/editor_command_palette.cpp
+++ b/editor/settings/editor_command_palette.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_command_palette.h"
 
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/settings/editor_event_search_bar.cpp b/editor/settings/editor_event_search_bar.cpp
index e65e7d5feb..4cc11bf66c 100644
--- a/editor/settings/editor_event_search_bar.cpp
+++ b/editor/settings/editor_event_search_bar.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_event_search_bar.h"
 
+#include "core/object/class_db.h"
 #include "editor/settings/event_listener_line_edit.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
diff --git a/editor/settings/editor_feature_profile.cpp b/editor/settings/editor_feature_profile.cpp
index 0e929c3c4d..2476eef46d 100644
--- a/editor/settings/editor_feature_profile.cpp
+++ b/editor/settings/editor_feature_profile.cpp
@@ -32,6 +32,7 @@
 
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_paths.h"
diff --git a/editor/settings/editor_layouts_dialog.cpp b/editor/settings/editor_layouts_dialog.cpp
index 69fa5a4a36..018ec4236f 100644
--- a/editor/settings/editor_layouts_dialog.cpp
+++ b/editor/settings/editor_layouts_dialog.cpp
@@ -31,6 +31,7 @@
 #include "editor_layouts_dialog.h"
 
 #include "core/io/config_file.h"
+#include "core/object/class_db.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/item_list.h"
diff --git a/editor/settings/editor_settings_dialog.cpp b/editor/settings/editor_settings_dialog.cpp
index 285c8d5a2e..0f9624b5f8 100644
--- a/editor/settings/editor_settings_dialog.cpp
+++ b/editor/settings/editor_settings_dialog.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input_map.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/editor_log.h"
diff --git a/editor/settings/event_listener_line_edit.cpp b/editor/settings/event_listener_line_edit.cpp
index b471e44994..14b0381d39 100644
--- a/editor/settings/event_listener_line_edit.cpp
+++ b/editor/settings/event_listener_line_edit.cpp
@@ -31,6 +31,7 @@
 #include "event_listener_line_edit.h"
 
 #include "core/input/input_map.h"
+#include "core/object/class_db.h"
 #include "scene/gui/dialogs.h"
 
 // Maps to 2*axis if value is neg, or 2*axis+1 if value is pos.
diff --git a/editor/settings/project_settings_editor.cpp b/editor/settings/project_settings_editor.cpp
index 2916f7d20f..b480b71a76 100644
--- a/editor/settings/project_settings_editor.cpp
+++ b/editor/settings/project_settings_editor.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input_map.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/editor/shader/editor_native_shader_source_visualizer.cpp b/editor/shader/editor_native_shader_source_visualizer.cpp
index 8fc7f11e51..dbde23d071 100644
--- a/editor/shader/editor_native_shader_source_visualizer.cpp
+++ b/editor/shader/editor_native_shader_source_visualizer.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_native_shader_source_visualizer.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
diff --git a/editor/shader/shader_create_dialog.cpp b/editor/shader/shader_create_dialog.cpp
index f169552f67..54e6a3bfdc 100644
--- a/editor/shader/shader_create_dialog.cpp
+++ b/editor/shader/shader_create_dialog.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/gui/editor_validation_panel.h"
diff --git a/editor/shader/shader_globals_editor.cpp b/editor/shader/shader_globals_editor.cpp
index c854b56d82..5f4e669cf1 100644
--- a/editor/shader/shader_globals_editor.cpp
+++ b/editor/shader/shader_globals_editor.cpp
@@ -31,6 +31,7 @@
 #include "shader_globals_editor.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/inspector/editor_inspector.h"
diff --git a/editor/shader/text_shader_editor.cpp b/editor/shader/text_shader_editor.cpp
index ceee96e596..9661439393 100644
--- a/editor/shader/text_shader_editor.cpp
+++ b/editor/shader/text_shader_editor.cpp
@@ -31,6 +31,7 @@
 #include "text_shader_editor.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/version_generated.gen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
diff --git a/editor/shader/visual_shader_editor_plugin.cpp b/editor/shader/visual_shader_editor_plugin.cpp
index 0cc75f155e..285a0b51f6 100644
--- a/editor/shader/visual_shader_editor_plugin.cpp
+++ b/editor/shader/visual_shader_editor_plugin.cpp
@@ -34,6 +34,7 @@
 #include "core/input/input.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/version_generated.gen.h"
 #include "editor/docks/filesystem_dock.h"
diff --git a/editor/translations/editor_locale_dialog.cpp b/editor/translations/editor_locale_dialog.cpp
index d7e8aaf6ab..16e59c6bc6 100644
--- a/editor/translations/editor_locale_dialog.cpp
+++ b/editor/translations/editor_locale_dialog.cpp
@@ -31,6 +31,7 @@
 #include "editor_locale_dialog.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/themes/editor_scale.h"
diff --git a/editor/translations/editor_translation_parser.cpp b/editor/translations/editor_translation_parser.cpp
index 25f00f33b3..eb59d80ad7 100644
--- a/editor/translations/editor_translation_parser.cpp
+++ b/editor/translations/editor_translation_parser.cpp
@@ -31,6 +31,7 @@
 #include "editor_translation_parser.h"
 
 #include "core/error/error_macros.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/templates/hash_set.h"
 
diff --git a/editor/translations/localization_editor.cpp b/editor/translations/localization_editor.cpp
index 98cd80c2b3..f16380270d 100644
--- a/editor/translations/localization_editor.cpp
+++ b/editor/translations/localization_editor.cpp
@@ -31,6 +31,7 @@
 #include "localization_editor.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/editor/version_control/editor_vcs_interface.cpp b/editor/version_control/editor_vcs_interface.cpp
index 4c9eeb97c1..24ccc1254e 100644
--- a/editor/version_control/editor_vcs_interface.cpp
+++ b/editor/version_control/editor_vcs_interface.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_vcs_interface.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 
 EditorVCSInterface *EditorVCSInterface::singleton = nullptr;
diff --git a/editor/version_control/version_control_editor_plugin.cpp b/editor/version_control/version_control_editor_plugin.cpp
index 26173f017c..a65a448214 100644
--- a/editor/version_control/version_control_editor_plugin.cpp
+++ b/editor/version_control/version_control_editor_plugin.cpp
@@ -31,6 +31,7 @@
 #include "version_control_editor_plugin.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/time.h"
 #include "editor/docks/editor_dock.h"
diff --git a/main/performance.compat.inc b/main/performance.compat.inc
index 5046590e37..4d5436ef51 100644
--- a/main/performance.compat.inc
+++ b/main/performance.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "performance.h"
+
+#include "core/object/class_db.h"
+
 void Performance::_add_custom_monitor_bind_compat_110433(const StringName &p_id, const Callable &p_callable, const Vector<Variant> &p_args) {
 	add_custom_monitor(p_id, p_callable, p_args, MONITOR_TYPE_QUANTITY);
 }
@@ -38,4 +42,4 @@ void Performance::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("add_custom_monitor", "id", "callable", "arguments"), &Performance::_add_custom_monitor_bind_compat_110433, DEFVAL(Array()));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/main/performance.cpp b/main/performance.cpp
index 8d09e26738..77c1e9a8e0 100644
--- a/main/performance.cpp
+++ b/main/performance.cpp
@@ -31,6 +31,7 @@
 #include "performance.h"
 #include "performance.compat.inc"
 
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/variant/typed_array.h"
 #include "scene/main/node.h"
diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp
index a70a3a5172..1e173da6ff 100644
--- a/modules/csg/csg_shape.cpp
+++ b/modules/csg/csg_shape.cpp
@@ -31,6 +31,7 @@
 #include "csg_shape.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/modules/enet/enet_connection.cpp b/modules/enet/enet_connection.cpp
index 9b764b1ad9..a88ed5c43a 100644
--- a/modules/enet/enet_connection.cpp
+++ b/modules/enet/enet_connection.cpp
@@ -34,6 +34,7 @@
 
 #include "core/io/compression.h"
 #include "core/io/ip.h"
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void ENetConnection::broadcast(enet_uint8 p_channel, ENetPacket *p_packet) {
diff --git a/modules/enet/enet_multiplayer_peer.cpp b/modules/enet/enet_multiplayer_peer.cpp
index 9f187c5780..837a2cdb4e 100644
--- a/modules/enet/enet_multiplayer_peer.cpp
+++ b/modules/enet/enet_multiplayer_peer.cpp
@@ -30,6 +30,8 @@
 
 #include "enet_multiplayer_peer.h"
 
+#include "core/object/class_db.h"
+
 void ENetMultiplayerPeer::set_target_peer(int p_peer) {
 	target_peer = p_peer;
 }
diff --git a/modules/enet/enet_packet_peer.cpp b/modules/enet/enet_packet_peer.cpp
index d4fb390e82..36a00d512e 100644
--- a/modules/enet/enet_packet_peer.cpp
+++ b/modules/enet/enet_packet_peer.cpp
@@ -30,6 +30,8 @@
 
 #include "enet_packet_peer.h"
 
+#include "core/object/class_db.h"
+
 void ENetPacketPeer::peer_disconnect(int p_data) {
 	ERR_FAIL_NULL(peer);
 	enet_peer_disconnect(peer, p_data);
diff --git a/modules/fbx/fbx_state.cpp b/modules/fbx/fbx_state.cpp
index 0b42a86533..37e2b23e10 100644
--- a/modules/fbx/fbx_state.cpp
+++ b/modules/fbx/fbx_state.cpp
@@ -30,6 +30,8 @@
 
 #include "fbx_state.h"
 
+#include "core/object/class_db.h"
+
 void FBXState::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_allow_geometry_helper_nodes"), &FBXState::get_allow_geometry_helper_nodes);
 	ClassDB::bind_method(D_METHOD("set_allow_geometry_helper_nodes", "allow"), &FBXState::set_allow_geometry_helper_nodes);
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
index ad4099a7f3..4ea1ea207e 100644
--- a/modules/gdscript/gdscript.cpp
+++ b/modules/gdscript/gdscript.cpp
@@ -30,6 +30,7 @@
 
 #include "gdscript.h"
 
+#include "core/object/class_db.h"
 #include "gdscript_analyzer.h"
 #include "gdscript_cache.h"
 #include "gdscript_compiler.h"
diff --git a/modules/gdscript/gdscript_function.cpp b/modules/gdscript/gdscript_function.cpp
index 307976d2b5..dfcc428da6 100644
--- a/modules/gdscript/gdscript_function.cpp
+++ b/modules/gdscript/gdscript_function.cpp
@@ -32,6 +32,8 @@
 
 #include "gdscript.h"
 
+#include "core/object/class_db.h"
+
 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/language_server/gdscript_language_protocol.cpp b/modules/gdscript/language_server/gdscript_language_protocol.cpp
index 406b533353..5181d2ed3c 100644
--- a/modules/gdscript/language_server/gdscript_language_protocol.cpp
+++ b/modules/gdscript/language_server/gdscript_language_protocol.cpp
@@ -31,6 +31,7 @@
 #include "gdscript_language_protocol.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "editor/doc/doc_tools.h"
 #include "editor/doc/editor_help.h"
 #include "editor/editor_log.h"
diff --git a/modules/gdscript/language_server/gdscript_text_document.cpp b/modules/gdscript/language_server/gdscript_text_document.cpp
index e5e6367e52..14e40c21ea 100644
--- a/modules/gdscript/language_server/gdscript_text_document.cpp
+++ b/modules/gdscript/language_server/gdscript_text_document.cpp
@@ -34,6 +34,7 @@
 #include "gdscript_extend_parser.h"
 #include "gdscript_language_protocol.h"
 
+#include "core/object/class_db.h"
 #include "editor/script/script_text_editor.h"
 #include "editor/settings/editor_settings.h"
 #include "servers/display/display_server.h"
diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp
index abebe3b01e..236f3295a6 100644
--- a/modules/gdscript/language_server/gdscript_workspace.cpp
+++ b/modules/gdscript/language_server/gdscript_workspace.cpp
@@ -35,6 +35,7 @@
 #include "gdscript_language_protocol.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "editor/doc/doc_tools.h"
 #include "editor/doc/editor_help.h"
diff --git a/modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp b/modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp
index 187828a646..bd8abedadf 100644
--- a/modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp
+++ b/modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp
@@ -30,6 +30,8 @@
 
 #include "editor_scene_exporter_gltf_settings.h"
 
+#include "core/object/class_db.h"
+
 const uint32_t PROP_EDITOR_SCRIPT_VAR = PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_SCRIPT_VARIABLE;
 
 bool EditorSceneExporterGLTFSettings::_set(const StringName &p_name, const Variant &p_value) {
diff --git a/modules/gltf/extensions/gltf_document_extension.cpp b/modules/gltf/extensions/gltf_document_extension.cpp
index 1e912047a3..d6eadecec7 100644
--- a/modules/gltf/extensions/gltf_document_extension.cpp
+++ b/modules/gltf/extensions/gltf_document_extension.cpp
@@ -30,6 +30,8 @@
 
 #include "gltf_document_extension.h"
 
+#include "core/object/class_db.h"
+
 void GLTFDocumentExtension::_bind_methods() {
 	// Import process.
 	GDVIRTUAL_BIND(_import_preflight, "state", "extensions");
diff --git a/modules/gltf/extensions/gltf_light.cpp b/modules/gltf/extensions/gltf_light.cpp
index 93cb358fa7..64aa7f2260 100644
--- a/modules/gltf/extensions/gltf_light.cpp
+++ b/modules/gltf/extensions/gltf_light.cpp
@@ -31,6 +31,8 @@
 #include "gltf_light.h"
 
 #include "../structures/gltf_object_model_property.h"
+
+#include "core/object/class_db.h"
 #include "scene/3d/light_3d.h"
 
 void GLTFLight::_bind_methods() {
diff --git a/modules/gltf/extensions/gltf_spec_gloss.cpp b/modules/gltf/extensions/gltf_spec_gloss.cpp
index 52a5f353fd..3c75cba2b2 100644
--- a/modules/gltf/extensions/gltf_spec_gloss.cpp
+++ b/modules/gltf/extensions/gltf_spec_gloss.cpp
@@ -31,6 +31,7 @@
 #include "gltf_spec_gloss.h"
 
 #include "core/io/image.h"
+#include "core/object/class_db.h"
 
 void GLTFSpecGloss::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_diffuse_img"), &GLTFSpecGloss::get_diffuse_img);
diff --git a/modules/gltf/extensions/physics/gltf_physics_body.cpp b/modules/gltf/extensions/physics/gltf_physics_body.cpp
index 3a12a15761..24fea604a3 100644
--- a/modules/gltf/extensions/physics/gltf_physics_body.cpp
+++ b/modules/gltf/extensions/physics/gltf_physics_body.cpp
@@ -30,6 +30,7 @@
 
 #include "gltf_physics_body.h"
 
+#include "core/object/class_db.h"
 #include "scene/3d/physics/animatable_body_3d.h"
 #include "scene/3d/physics/area_3d.h"
 #include "scene/3d/physics/character_body_3d.h"
diff --git a/modules/gltf/extensions/physics/gltf_physics_shape.cpp b/modules/gltf/extensions/physics/gltf_physics_shape.cpp
index db5f6cd540..a084ddc524 100644
--- a/modules/gltf/extensions/physics/gltf_physics_shape.cpp
+++ b/modules/gltf/extensions/physics/gltf_physics_shape.cpp
@@ -33,6 +33,7 @@
 #include "../../gltf_state.h"
 
 #include "core/math/convex_hull.h"
+#include "core/object/class_db.h"
 #include "scene/3d/physics/area_3d.h"
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
index b812f04304..401aa486b5 100644
--- a/modules/gltf/gltf_document.cpp
+++ b/modules/gltf/gltf_document.cpp
@@ -30,6 +30,7 @@
 
 #include "gltf_document.h"
 
+#include "core/object/class_db.h"
 #include "extensions/gltf_document_extension_convert_importer_mesh.h"
 #include "extensions/gltf_spec_gloss.h"
 #include "gltf_state.h"
diff --git a/modules/gltf/gltf_state.compat.inc b/modules/gltf/gltf_state.compat.inc
index 31892797ff..e26916e72d 100644
--- a/modules/gltf/gltf_state.compat.inc
+++ b/modules/gltf/gltf_state.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "gltf_state.h"
+
+#include "core/object/class_db.h"
+
 // Non-const getters for compatibility.
 int32_t GLTFState::_get_handle_binary_image_bind_compat_113172() {
 	return get_handle_binary_image();
diff --git a/modules/gltf/gltf_state.cpp b/modules/gltf/gltf_state.cpp
index 2ef874412b..0595fc5a88 100644
--- a/modules/gltf/gltf_state.cpp
+++ b/modules/gltf/gltf_state.cpp
@@ -33,6 +33,8 @@
 
 #include "gltf_template_convert.h"
 
+#include "core/object/class_db.h"
+
 void GLTFState::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("add_used_extension", "extension_name", "required"), &GLTFState::add_used_extension);
 	ClassDB::bind_method(D_METHOD("append_data_to_buffers", "data", "deduplication"), &GLTFState::append_data_to_buffers);
diff --git a/modules/gltf/structures/gltf_accessor.compat.inc b/modules/gltf/structures/gltf_accessor.compat.inc
index 3155b7d792..cdc6304572 100644
--- a/modules/gltf/structures/gltf_accessor.compat.inc
+++ b/modules/gltf/structures/gltf_accessor.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "gltf_accessor.h"
+
+#include "core/object/class_db.h"
+
 // 32-bit versions for compatibility.
 
 GLTFBufferViewIndex GLTFAccessor::_get_buffer_view_bind_compat_106220() {
diff --git a/modules/gltf/structures/gltf_accessor.cpp b/modules/gltf/structures/gltf_accessor.cpp
index ff9aee0966..b693103548 100644
--- a/modules/gltf/structures/gltf_accessor.cpp
+++ b/modules/gltf/structures/gltf_accessor.cpp
@@ -33,6 +33,8 @@
 
 #include "../gltf_state.h"
 
+#include "core/object/class_db.h"
+
 void GLTFAccessor::_bind_methods() {
 	BIND_ENUM_CONSTANT(TYPE_SCALAR);
 	BIND_ENUM_CONSTANT(TYPE_VEC2);
diff --git a/modules/gltf/structures/gltf_animation.cpp b/modules/gltf/structures/gltf_animation.cpp
index 3d0ac602ff..fbdaaff4eb 100644
--- a/modules/gltf/structures/gltf_animation.cpp
+++ b/modules/gltf/structures/gltf_animation.cpp
@@ -30,6 +30,8 @@
 
 #include "gltf_animation.h"
 
+#include "core/object/class_db.h"
+
 void GLTFAnimation::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_original_name"), &GLTFAnimation::get_original_name);
 	ClassDB::bind_method(D_METHOD("set_original_name", "original_name"), &GLTFAnimation::set_original_name);
diff --git a/modules/gltf/structures/gltf_buffer_view.compat.inc b/modules/gltf/structures/gltf_buffer_view.compat.inc
index 93624947ac..817c8fccfe 100644
--- a/modules/gltf/structures/gltf_buffer_view.compat.inc
+++ b/modules/gltf/structures/gltf_buffer_view.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "gltf_buffer_view.h"
+
+#include "core/object/class_db.h"
+
 GLTFBufferIndex GLTFBufferView::_get_buffer_bind_compat_86907() {
 	return get_buffer();
 }
diff --git a/modules/gltf/structures/gltf_buffer_view.cpp b/modules/gltf/structures/gltf_buffer_view.cpp
index 2758309a11..443d534ec9 100644
--- a/modules/gltf/structures/gltf_buffer_view.cpp
+++ b/modules/gltf/structures/gltf_buffer_view.cpp
@@ -33,6 +33,8 @@
 
 #include "../gltf_state.h"
 
+#include "core/object/class_db.h"
+
 void GLTFBufferView::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("load_buffer_view_data", "state"), &GLTFBufferView::load_buffer_view_data);
 
diff --git a/modules/gltf/structures/gltf_camera.cpp b/modules/gltf/structures/gltf_camera.cpp
index 33cef291e1..3d8462f66a 100644
--- a/modules/gltf/structures/gltf_camera.cpp
+++ b/modules/gltf/structures/gltf_camera.cpp
@@ -31,6 +31,8 @@
 #include "gltf_camera.h"
 
 #include "gltf_object_model_property.h"
+
+#include "core/object/class_db.h"
 #include "scene/3d/camera_3d.h"
 
 void GLTFCamera::_bind_methods() {
diff --git a/modules/gltf/structures/gltf_mesh.cpp b/modules/gltf/structures/gltf_mesh.cpp
index 615193fce4..e74193d41d 100644
--- a/modules/gltf/structures/gltf_mesh.cpp
+++ b/modules/gltf/structures/gltf_mesh.cpp
@@ -30,6 +30,7 @@
 
 #include "gltf_mesh.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/3d/importer_mesh.h"
 
 void GLTFMesh::_bind_methods() {
diff --git a/modules/gltf/structures/gltf_node.cpp b/modules/gltf/structures/gltf_node.cpp
index c260e9583d..75fc309ef9 100644
--- a/modules/gltf/structures/gltf_node.cpp
+++ b/modules/gltf/structures/gltf_node.cpp
@@ -32,6 +32,8 @@
 
 #include "../gltf_state.h"
 
+#include "core/object/class_db.h"
+
 void GLTFNode::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_original_name"), &GLTFNode::get_original_name);
 	ClassDB::bind_method(D_METHOD("set_original_name", "original_name"), &GLTFNode::set_original_name);
diff --git a/modules/gltf/structures/gltf_object_model_property.cpp b/modules/gltf/structures/gltf_object_model_property.cpp
index b34939536a..561401d2da 100644
--- a/modules/gltf/structures/gltf_object_model_property.cpp
+++ b/modules/gltf/structures/gltf_object_model_property.cpp
@@ -32,6 +32,8 @@
 
 #include "../gltf_template_convert.h"
 
+#include "core/object/class_db.h"
+
 void GLTFObjectModelProperty::_bind_methods() {
 	BIND_ENUM_CONSTANT(GLTF_OBJECT_MODEL_TYPE_UNKNOWN);
 	BIND_ENUM_CONSTANT(GLTF_OBJECT_MODEL_TYPE_BOOL);
diff --git a/modules/gltf/structures/gltf_skeleton.cpp b/modules/gltf/structures/gltf_skeleton.cpp
index 040f3ce96f..ba0609c119 100644
--- a/modules/gltf/structures/gltf_skeleton.cpp
+++ b/modules/gltf/structures/gltf_skeleton.cpp
@@ -32,6 +32,7 @@
 
 #include "../gltf_template_convert.h"
 
+#include "core/object/class_db.h"
 #include "scene/3d/bone_attachment_3d.h"
 
 void GLTFSkeleton::_bind_methods() {
diff --git a/modules/gltf/structures/gltf_skin.cpp b/modules/gltf/structures/gltf_skin.cpp
index 0e8c033d51..188ae57a90 100644
--- a/modules/gltf/structures/gltf_skin.cpp
+++ b/modules/gltf/structures/gltf_skin.cpp
@@ -32,6 +32,7 @@
 
 #include "../gltf_template_convert.h"
 
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 #include "scene/resources/3d/skin.h"
 
diff --git a/modules/gltf/structures/gltf_texture.cpp b/modules/gltf/structures/gltf_texture.cpp
index 67010f3b75..f8dc86f66c 100644
--- a/modules/gltf/structures/gltf_texture.cpp
+++ b/modules/gltf/structures/gltf_texture.cpp
@@ -30,6 +30,8 @@
 
 #include "gltf_texture.h"
 
+#include "core/object/class_db.h"
+
 void GLTFTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_src_image"), &GLTFTexture::get_src_image);
 	ClassDB::bind_method(D_METHOD("set_src_image", "src_image"), &GLTFTexture::set_src_image);
diff --git a/modules/gltf/structures/gltf_texture_sampler.cpp b/modules/gltf/structures/gltf_texture_sampler.cpp
index 8653bd83db..4a6b9a6d1b 100644
--- a/modules/gltf/structures/gltf_texture_sampler.cpp
+++ b/modules/gltf/structures/gltf_texture_sampler.cpp
@@ -30,6 +30,8 @@
 
 #include "gltf_texture_sampler.h"
 
+#include "core/object/class_db.h"
+
 void GLTFTextureSampler::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_mag_filter"), &GLTFTextureSampler::get_mag_filter);
 	ClassDB::bind_method(D_METHOD("set_mag_filter", "filter_mode"), &GLTFTextureSampler::set_mag_filter);
diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp
index fb26a3105c..5b938a3314 100644
--- a/modules/gridmap/editor/grid_map_editor_plugin.cpp
+++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp
@@ -32,6 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_main_screen.h"
diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp
index 226b1ff64a..14682f1ca7 100644
--- a/modules/gridmap/grid_map.cpp
+++ b/modules/gridmap/grid_map.cpp
@@ -31,6 +31,7 @@
 #include "grid_map.h"
 
 #include "core/io/marshalls.h"
+#include "core/object/class_db.h"
 #include "core/templates/a_hash_map.h"
 #include "scene/resources/3d/mesh_library.h"
 #include "scene/resources/3d/primitive_meshes.h"
diff --git a/modules/interactive_music/audio_stream_interactive.cpp b/modules/interactive_music/audio_stream_interactive.cpp
index da62d49b12..68565b39b1 100644
--- a/modules/interactive_music/audio_stream_interactive.cpp
+++ b/modules/interactive_music/audio_stream_interactive.cpp
@@ -31,6 +31,7 @@
 #include "audio_stream_interactive.h"
 
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 
 AudioStreamInteractive::AudioStreamInteractive() {
 }
diff --git a/modules/interactive_music/audio_stream_playlist.cpp b/modules/interactive_music/audio_stream_playlist.cpp
index 7b40a9152d..02e3a3d9db 100644
--- a/modules/interactive_music/audio_stream_playlist.cpp
+++ b/modules/interactive_music/audio_stream_playlist.cpp
@@ -31,6 +31,7 @@
 #include "audio_stream_playlist.h"
 
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 
 Ref<AudioStreamPlayback> AudioStreamPlaylist::instantiate_playback() {
 	Ref<AudioStreamPlaybackPlaylist> playback_playlist;
diff --git a/modules/interactive_music/audio_stream_synchronized.cpp b/modules/interactive_music/audio_stream_synchronized.cpp
index c4163d7ec8..e3c7d14a72 100644
--- a/modules/interactive_music/audio_stream_synchronized.cpp
+++ b/modules/interactive_music/audio_stream_synchronized.cpp
@@ -31,6 +31,7 @@
 #include "audio_stream_synchronized.h"
 
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 
 AudioStreamSynchronized::AudioStreamSynchronized() {
 }
diff --git a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
index a70ce41728..3a2f2e40fa 100644
--- a/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
+++ b/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
@@ -31,6 +31,8 @@
 #include "audio_stream_interactive_editor_plugin.h"
 
 #include "../audio_stream_interactive.h"
+
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/modules/jsonrpc/jsonrpc.compat.inc b/modules/jsonrpc/jsonrpc.compat.inc
index ad56dc61c0..16d40998d8 100644
--- a/modules/jsonrpc/jsonrpc.compat.inc
+++ b/modules/jsonrpc/jsonrpc.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "jsonrpc.h"
+
+#include "core/object/class_db.h"
+
 void JSONRPC::_set_scope_bind_compat_104890(const String &p_scope, Object *p_obj) {
 	ERR_PRINT("JSONRPC::set_scope is not supported anymore. Upgrade to JSONRPC::set_method.");
 }
@@ -38,4 +42,4 @@ void JSONRPC::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("set_scope", "scope", "target"), &JSONRPC::_set_scope_bind_compat_104890);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/modules/jsonrpc/jsonrpc.cpp b/modules/jsonrpc/jsonrpc.cpp
index ae4632877a..b94a2a1242 100644
--- a/modules/jsonrpc/jsonrpc.cpp
+++ b/modules/jsonrpc/jsonrpc.cpp
@@ -32,6 +32,7 @@
 #include "jsonrpc.compat.inc"
 
 #include "core/io/json.h"
+#include "core/object/class_db.h"
 
 JSONRPC::JSONRPC() {
 }
diff --git a/modules/mobile_vr/mobile_vr_interface.cpp b/modules/mobile_vr/mobile_vr_interface.cpp
index 842fa6f93a..39dfae306a 100644
--- a/modules/mobile_vr/mobile_vr_interface.cpp
+++ b/modules/mobile_vr/mobile_vr_interface.cpp
@@ -31,6 +31,7 @@
 #include "mobile_vr_interface.h"
 
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server_types.h"
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index 4a22306d42..b67884dd02 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -30,6 +30,7 @@
 
 #include "csharp_script.h"
 
+#include "core/object/class_db.h"
 #include "godotsharp_dirs.h"
 #include "managed_callable.h"
 #include "mono_gd/gd_mono_cache.h"
diff --git a/modules/mp3/audio_stream_mp3.cpp b/modules/mp3/audio_stream_mp3.cpp
index 4eb4942078..012372e305 100644
--- a/modules/mp3/audio_stream_mp3.cpp
+++ b/modules/mp3/audio_stream_mp3.cpp
@@ -33,7 +33,9 @@
 #define DR_MP3_NO_STDIO
 
 #include "audio_stream_mp3.h"
+
 #include "core/io/file_access.h"
+#include "core/object/class_db.h"
 
 #include "thirdparty/dr_libs/dr_bridge.h"
 
diff --git a/modules/multiplayer/editor/editor_network_profiler.cpp b/modules/multiplayer/editor/editor_network_profiler.cpp
index 9f54980d54..f4eab40e58 100644
--- a/modules/multiplayer/editor/editor_network_profiler.cpp
+++ b/modules/multiplayer/editor/editor_network_profiler.cpp
@@ -31,6 +31,7 @@
 #include "editor_network_profiler.h"
 
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/run/editor_run_bar.h"
 #include "editor/settings/editor_settings.h"
diff --git a/modules/multiplayer/editor/multiplayer_editor_plugin.cpp b/modules/multiplayer/editor/multiplayer_editor_plugin.cpp
index c8f61c1de4..e18ce3df16 100644
--- a/modules/multiplayer/editor/multiplayer_editor_plugin.cpp
+++ b/modules/multiplayer/editor/multiplayer_editor_plugin.cpp
@@ -34,6 +34,7 @@
 #include "editor_network_profiler.h"
 #include "replication_editor.h"
 
+#include "core/object/class_db.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
diff --git a/modules/multiplayer/editor/replication_editor.cpp b/modules/multiplayer/editor/replication_editor.cpp
index fc8b30ee31..dfccbd36b1 100644
--- a/modules/multiplayer/editor/replication_editor.cpp
+++ b/modules/multiplayer/editor/replication_editor.cpp
@@ -32,6 +32,7 @@
 
 #include "../multiplayer_synchronizer.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
diff --git a/modules/multiplayer/multiplayer_spawner.cpp b/modules/multiplayer/multiplayer_spawner.cpp
index 0121011a98..4818b9a907 100644
--- a/modules/multiplayer/multiplayer_spawner.cpp
+++ b/modules/multiplayer/multiplayer_spawner.cpp
@@ -31,6 +31,7 @@
 #include "multiplayer_spawner.h"
 
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "scene/main/multiplayer_api.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/modules/multiplayer/multiplayer_synchronizer.cpp b/modules/multiplayer/multiplayer_synchronizer.cpp
index 1f6cfd89c2..295bcca82e 100644
--- a/modules/multiplayer/multiplayer_synchronizer.cpp
+++ b/modules/multiplayer/multiplayer_synchronizer.cpp
@@ -31,6 +31,7 @@
 #include "multiplayer_synchronizer.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/main/multiplayer_api.h"
 
 Object *MultiplayerSynchronizer::_get_prop_target(Object *p_obj, const NodePath &p_path) {
diff --git a/modules/multiplayer/scene_multiplayer.cpp b/modules/multiplayer/scene_multiplayer.cpp
index 24b3ad4717..5fca05fc80 100644
--- a/modules/multiplayer/scene_multiplayer.cpp
+++ b/modules/multiplayer/scene_multiplayer.cpp
@@ -32,6 +32,7 @@
 
 #include "core/debugger/engine_debugger.h"
 #include "core/io/marshalls.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 #ifdef DEBUG_ENABLED
diff --git a/modules/multiplayer/scene_replication_config.cpp b/modules/multiplayer/scene_replication_config.cpp
index de4337de4a..cd8a565c6f 100644
--- a/modules/multiplayer/scene_replication_config.cpp
+++ b/modules/multiplayer/scene_replication_config.cpp
@@ -30,6 +30,8 @@
 
 #include "scene_replication_config.h"
 
+#include "core/object/class_db.h"
+
 bool SceneReplicationConfig::_set(const StringName &p_name, const Variant &p_value) {
 	String prop_name = p_name;
 
diff --git a/modules/navigation_3d/3d/navigation_mesh_generator.cpp b/modules/navigation_3d/3d/navigation_mesh_generator.cpp
index 23d5e65422..424d2cc7a1 100644
--- a/modules/navigation_3d/3d/navigation_mesh_generator.cpp
+++ b/modules/navigation_3d/3d/navigation_mesh_generator.cpp
@@ -30,6 +30,7 @@
 
 #include "navigation_mesh_generator.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
diff --git a/modules/noise/fastnoise_lite.cpp b/modules/noise/fastnoise_lite.cpp
index 57c2c272cb..42f00ce812 100644
--- a/modules/noise/fastnoise_lite.cpp
+++ b/modules/noise/fastnoise_lite.cpp
@@ -31,6 +31,7 @@
 #include "fastnoise_lite.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 _FastNoiseLite::FractalType FastNoiseLite::_convert_domain_warp_fractal_type_enum(DomainWarpFractalType p_domain_warp_fractal_type) {
 	_FastNoiseLite::FractalType type;
diff --git a/modules/noise/noise.cpp b/modules/noise/noise.cpp
index c8d6d78a43..55d936159e 100644
--- a/modules/noise/noise.cpp
+++ b/modules/noise/noise.cpp
@@ -30,6 +30,8 @@
 
 #include "noise.h"
 
+#include "core/object/class_db.h"
+
 Vector<Ref<Image>> Noise::_get_seamless_image(int p_width, int p_height, int p_depth, bool p_invert, bool p_in_3d_space, real_t p_blend_skirt, bool p_normalize) const {
 	ERR_FAIL_COND_V(p_width <= 0 || p_height <= 0 || p_depth <= 0, Vector<Ref<Image>>());
 
diff --git a/modules/noise/noise_texture_2d.cpp b/modules/noise/noise_texture_2d.cpp
index a2ed1bd81c..7b2be2c266 100644
--- a/modules/noise/noise_texture_2d.cpp
+++ b/modules/noise/noise_texture_2d.cpp
@@ -32,6 +32,7 @@
 
 #include "noise.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 NoiseTexture2D::NoiseTexture2D() {
diff --git a/modules/noise/noise_texture_3d.cpp b/modules/noise/noise_texture_3d.cpp
index 6714e8e7f7..8850f33b40 100644
--- a/modules/noise/noise_texture_3d.cpp
+++ b/modules/noise/noise_texture_3d.cpp
@@ -32,6 +32,7 @@
 
 #include "noise.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 NoiseTexture3D::NoiseTexture3D() {
diff --git a/modules/objectdb_profiler/editor/snapshot_data.cpp b/modules/objectdb_profiler/editor/snapshot_data.cpp
index d3154b5fd8..f229394ca3 100644
--- a/modules/objectdb_profiler/editor/snapshot_data.cpp
+++ b/modules/objectdb_profiler/editor/snapshot_data.cpp
@@ -32,6 +32,7 @@
 
 #include "core/core_bind.h"
 #include "core/io/compression.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "scene/debugger/scene_debugger_object.h"
 
diff --git a/modules/ogg/ogg_packet_sequence.cpp b/modules/ogg/ogg_packet_sequence.cpp
index 1e6a9bbb6a..538fa4c313 100644
--- a/modules/ogg/ogg_packet_sequence.cpp
+++ b/modules/ogg/ogg_packet_sequence.cpp
@@ -30,6 +30,7 @@
 
 #include "ogg_packet_sequence.h"
 
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void OggPacketSequence::push_page(int64_t p_granule_pos, const Vector<PackedByteArray> &p_data) {
diff --git a/modules/openxr/action_map/openxr_action.cpp b/modules/openxr/action_map/openxr_action.cpp
index 6b62f5dccc..313113ec33 100644
--- a/modules/openxr/action_map/openxr_action.cpp
+++ b/modules/openxr/action_map/openxr_action.cpp
@@ -30,6 +30,7 @@
 
 #include "openxr_action.h"
 
+#include "core/object/class_db.h"
 #include "openxr_action_set.h"
 
 void OpenXRAction::_bind_methods() {
diff --git a/modules/openxr/action_map/openxr_action_map.cpp b/modules/openxr/action_map/openxr_action_map.cpp
index 9a22a33e02..6aab0d472f 100644
--- a/modules/openxr/action_map/openxr_action_map.cpp
+++ b/modules/openxr/action_map/openxr_action_map.cpp
@@ -30,6 +30,8 @@
 
 #include "openxr_action_map.h"
 
+#include "core/object/class_db.h"
+
 void OpenXRActionMap::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_action_sets", "action_sets"), &OpenXRActionMap::set_action_sets);
 	ClassDB::bind_method(D_METHOD("get_action_sets"), &OpenXRActionMap::get_action_sets);
diff --git a/modules/openxr/action_map/openxr_action_set.cpp b/modules/openxr/action_map/openxr_action_set.cpp
index cba94a0345..14f14a959c 100644
--- a/modules/openxr/action_map/openxr_action_set.cpp
+++ b/modules/openxr/action_map/openxr_action_set.cpp
@@ -30,6 +30,8 @@
 
 #include "openxr_action_set.h"
 
+#include "core/object/class_db.h"
+
 void OpenXRActionSet::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_localized_name", "localized_name"), &OpenXRActionSet::set_localized_name);
 	ClassDB::bind_method(D_METHOD("get_localized_name"), &OpenXRActionSet::get_localized_name);
diff --git a/modules/openxr/action_map/openxr_binding_modifier.cpp b/modules/openxr/action_map/openxr_binding_modifier.cpp
index 3a1c577615..41d2ee9860 100644
--- a/modules/openxr/action_map/openxr_binding_modifier.cpp
+++ b/modules/openxr/action_map/openxr_binding_modifier.cpp
@@ -30,6 +30,8 @@
 
 #include "openxr_binding_modifier.h"
 
+#include "core/object/class_db.h"
+
 void OpenXRBindingModifier::_bind_methods() {
 	GDVIRTUAL_BIND(_get_description);
 	GDVIRTUAL_BIND(_get_ip_modification);
diff --git a/modules/openxr/action_map/openxr_haptic_feedback.cpp b/modules/openxr/action_map/openxr_haptic_feedback.cpp
index 583e4d4fe3..abb4730985 100644
--- a/modules/openxr/action_map/openxr_haptic_feedback.cpp
+++ b/modules/openxr/action_map/openxr_haptic_feedback.cpp
@@ -30,6 +30,8 @@
 
 #include "openxr_haptic_feedback.h"
 
+#include "core/object/class_db.h"
+
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRHapticBase
 
diff --git a/modules/openxr/action_map/openxr_interaction_profile.cpp b/modules/openxr/action_map/openxr_interaction_profile.cpp
index 0169ba7b6b..e6ffde40de 100644
--- a/modules/openxr/action_map/openxr_interaction_profile.cpp
+++ b/modules/openxr/action_map/openxr_interaction_profile.cpp
@@ -30,6 +30,8 @@
 
 #include "openxr_interaction_profile.h"
 
+#include "core/object/class_db.h"
+
 void OpenXRIPBinding::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_action", "action"), &OpenXRIPBinding::set_action);
 	ClassDB::bind_method(D_METHOD("get_action"), &OpenXRIPBinding::get_action);
diff --git a/modules/openxr/action_map/openxr_interaction_profile_metadata.cpp b/modules/openxr/action_map/openxr_interaction_profile_metadata.cpp
index e3d2859423..f5ea16289f 100644
--- a/modules/openxr/action_map/openxr_interaction_profile_metadata.cpp
+++ b/modules/openxr/action_map/openxr_interaction_profile_metadata.cpp
@@ -32,6 +32,8 @@
 
 #include "../openxr_api.h"
 
+#include "core/object/class_db.h"
+
 OpenXRInteractionProfileMetadata *OpenXRInteractionProfileMetadata::singleton = nullptr;
 
 OpenXRInteractionProfileMetadata::OpenXRInteractionProfileMetadata() {
diff --git a/modules/openxr/editor/openxr_action_editor.cpp b/modules/openxr/editor/openxr_action_editor.cpp
index eb45584399..28143dbb97 100644
--- a/modules/openxr/editor/openxr_action_editor.cpp
+++ b/modules/openxr/editor/openxr_action_editor.cpp
@@ -30,6 +30,7 @@
 
 #include "openxr_action_editor.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
 
diff --git a/modules/openxr/editor/openxr_action_map_editor.cpp b/modules/openxr/editor/openxr_action_map_editor.cpp
index f3ac1cd532..bcc25eb17f 100644
--- a/modules/openxr/editor/openxr_action_map_editor.cpp
+++ b/modules/openxr/editor/openxr_action_map_editor.cpp
@@ -34,6 +34,7 @@
 #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 "editor/editor_node.h"
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/settings/editor_command_palette.h"
diff --git a/modules/openxr/editor/openxr_action_set_editor.cpp b/modules/openxr/editor/openxr_action_set_editor.cpp
index ac96718f91..b8ea7fb64e 100644
--- a/modules/openxr/editor/openxr_action_set_editor.cpp
+++ b/modules/openxr/editor/openxr_action_set_editor.cpp
@@ -30,6 +30,7 @@
 
 #include "openxr_action_set_editor.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_spin_slider.h"
 #include "editor/themes/editor_scale.h"
diff --git a/modules/openxr/editor/openxr_binding_modifier_editor.cpp b/modules/openxr/editor/openxr_binding_modifier_editor.cpp
index 7befdbefbb..a184f0dd93 100644
--- a/modules/openxr/editor/openxr_binding_modifier_editor.cpp
+++ b/modules/openxr/editor/openxr_binding_modifier_editor.cpp
@@ -30,6 +30,7 @@
 
 #include "openxr_binding_modifier_editor.h"
 
+#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 #include "scene/gui/option_button.h"
 
diff --git a/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp b/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp
index e38b7b6468..6eecaee7c6 100644
--- a/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp
+++ b/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp
@@ -32,6 +32,7 @@
 #include "../action_map/openxr_interaction_profile_metadata.h"
 #include "openxr_action_map_editor.h"
 
+#include "core/object/class_db.h"
 #include "editor/themes/editor_scale.h"
 
 void OpenXRBindingModifiersDialog::_bind_methods() {
diff --git a/modules/openxr/editor/openxr_interaction_profile_editor.cpp b/modules/openxr/editor/openxr_interaction_profile_editor.cpp
index a48d1751c6..9a6af7f786 100644
--- a/modules/openxr/editor/openxr_interaction_profile_editor.cpp
+++ b/modules/openxr/editor/openxr_interaction_profile_editor.cpp
@@ -29,7 +29,10 @@
 /**************************************************************************/
 
 #include "openxr_interaction_profile_editor.h"
+
 #include "../openxr_api.h"
+
+#include "core/object/class_db.h"
 #include "editor/editor_string_names.h"
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/modules/openxr/editor/openxr_select_action_dialog.cpp b/modules/openxr/editor/openxr_select_action_dialog.cpp
index 314ec8e3b1..58222e6a92 100644
--- a/modules/openxr/editor/openxr_select_action_dialog.cpp
+++ b/modules/openxr/editor/openxr_select_action_dialog.cpp
@@ -30,6 +30,7 @@
 
 #include "openxr_select_action_dialog.h"
 
+#include "core/object/class_db.h"
 #include "editor/themes/editor_scale.h"
 
 void OpenXRSelectActionDialog::_bind_methods() {
diff --git a/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp b/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp
index cda0cec284..c3513524c5 100644
--- a/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp
+++ b/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp
@@ -33,6 +33,7 @@
 #include "../action_map/openxr_interaction_profile_metadata.h"
 #include "../openxr_api.h"
 
+#include "core/object/class_db.h"
 #include "editor/themes/editor_scale.h"
 
 void OpenXRSelectInteractionProfileDialog::_bind_methods() {
diff --git a/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp b/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp
index 2ddc03e9b2..a3702b0dcf 100644
--- a/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp
+++ b/modules/openxr/extensions/openxr_android_thread_settings_extension.cpp
@@ -31,6 +31,7 @@
 #include "openxr_android_thread_settings_extension.h"
 
 #include "core/object/callable_method_pointer.h"
+#include "core/object/class_db.h"
 #include "core/string/print_string.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/modules/openxr/extensions/openxr_dpad_binding_extension.cpp b/modules/openxr/extensions/openxr_dpad_binding_extension.cpp
index 16b91f6ad1..181ea6c3ce 100644
--- a/modules/openxr/extensions/openxr_dpad_binding_extension.cpp
+++ b/modules/openxr/extensions/openxr_dpad_binding_extension.cpp
@@ -29,8 +29,11 @@
 /**************************************************************************/
 
 #include "openxr_dpad_binding_extension.h"
+
 #include "../openxr_api.h"
+
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 
 // Implementation for:
 // https://registry.khronos.org/OpenXR/specs/1.1/html/xrspec.html#XR_EXT_dpad_binding
diff --git a/modules/openxr/extensions/openxr_extension_wrapper.cpp b/modules/openxr/extensions/openxr_extension_wrapper.cpp
index 8ff23692f2..11c338b6fd 100644
--- a/modules/openxr/extensions/openxr_extension_wrapper.cpp
+++ b/modules/openxr/extensions/openxr_extension_wrapper.cpp
@@ -33,6 +33,8 @@
 #include "../openxr_api.h"
 #include "../openxr_api_extension.h"
 
+#include "core/object/class_db.h"
+
 void OpenXRExtensionWrapper::_bind_methods() {
 	GDVIRTUAL_BIND(_get_requested_extensions, "xr_version");
 	GDVIRTUAL_BIND(_set_system_properties_and_get_next_pointer, "next_pointer");
diff --git a/modules/openxr/extensions/openxr_frame_synthesis_extension.cpp b/modules/openxr/extensions/openxr_frame_synthesis_extension.cpp
index f1ec2d0910..3af1041955 100644
--- a/modules/openxr/extensions/openxr_frame_synthesis_extension.cpp
+++ b/modules/openxr/extensions/openxr_frame_synthesis_extension.cpp
@@ -31,6 +31,7 @@
 #include "openxr_frame_synthesis_extension.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/xr/xr_server.h"
 
diff --git a/modules/openxr/extensions/openxr_future_extension.cpp b/modules/openxr/extensions/openxr_future_extension.cpp
index 8863a82267..1e79dc049f 100644
--- a/modules/openxr/extensions/openxr_future_extension.cpp
+++ b/modules/openxr/extensions/openxr_future_extension.cpp
@@ -32,6 +32,8 @@
 
 #include "../openxr_api.h"
 
+#include "core/object/class_db.h"
+
 ////////////////////////////////////////////////////////////////////////////
 // OpenXRFutureResult
 
diff --git a/modules/openxr/extensions/openxr_render_model_extension.cpp b/modules/openxr/extensions/openxr_render_model_extension.cpp
index c5d8089ff7..0420b5b814 100644
--- a/modules/openxr/extensions/openxr_render_model_extension.cpp
+++ b/modules/openxr/extensions/openxr_render_model_extension.cpp
@@ -35,6 +35,7 @@
 #include "../openxr_interface.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/string/print_string.h"
 #include "servers/xr/xr_server.h"
 
diff --git a/modules/openxr/extensions/openxr_valve_analog_threshold_extension.cpp b/modules/openxr/extensions/openxr_valve_analog_threshold_extension.cpp
index 77d48df345..4f404603be 100644
--- a/modules/openxr/extensions/openxr_valve_analog_threshold_extension.cpp
+++ b/modules/openxr/extensions/openxr_valve_analog_threshold_extension.cpp
@@ -29,10 +29,13 @@
 /**************************************************************************/
 
 #include "openxr_valve_analog_threshold_extension.h"
+
 #include "../action_map/openxr_action_set.h"
 #include "../action_map/openxr_interaction_profile.h"
 #include "../openxr_api.h"
 
+#include "core/object/class_db.h"
+
 // Implementation for:
 // https://registry.khronos.org/OpenXR/specs/1.1/html/xrspec.html#XR_VALVE_analog_threshold
 
diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp
index ff28662df9..253b3b3c2b 100644
--- a/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp
+++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_anchor.cpp
@@ -33,7 +33,9 @@
 #include "../../openxr_api.h"
 #include "../../openxr_util.h"
 #include "../openxr_future_extension.h"
+
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.cpp
index a15c8c2f0b..379bdfd846 100644
--- a/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.cpp
+++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_entities.cpp
@@ -31,6 +31,8 @@
 #include "openxr_spatial_entities.h"
 
 #include "../../openxr_api.h"
+
+#include "core/object/class_db.h"
 #include "core/variant/native_ptr.h"
 #include "openxr_spatial_entity_extension.h"
 
diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp
index e77d2a7555..b9e98c409e 100644
--- a/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp
+++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_entity_extension.cpp
@@ -31,7 +31,9 @@
 #include "openxr_spatial_entity_extension.h"
 
 #include "../../openxr_api.h"
+
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "servers/xr/xr_server.h"
 
 ////////////////////////////////////////////////////////////////////////////
diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp
index b387ba9453..1f771eeaeb 100644
--- a/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp
+++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_marker_tracking.cpp
@@ -31,7 +31,9 @@
 #include "openxr_spatial_marker_tracking.h"
 
 #include "../../openxr_api.h"
+
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "openxr_spatial_entity_extension.h"
 #include "servers/xr/xr_server.h"
 
diff --git a/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp b/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp
index b006a8c5e5..ad83bf1062 100644
--- a/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp
+++ b/modules/openxr/extensions/spatial_entities/openxr_spatial_plane_tracking.cpp
@@ -31,7 +31,9 @@
 #include "openxr_spatial_plane_tracking.h"
 
 #include "../../openxr_api.h"
+
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/primitive_meshes.h"
diff --git a/modules/openxr/openxr_api_extension.compat.inc b/modules/openxr/openxr_api_extension.compat.inc
index 2373979941..129f53a9c6 100644
--- a/modules/openxr/openxr_api_extension.compat.inc
+++ b/modules/openxr/openxr_api_extension.compat.inc
@@ -30,6 +30,9 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "openxr_api_extension.h"
+
+#include "core/object/class_db.h"
 #include "extensions/openxr_extension_wrapper_extension.h"
 
 void OpenXRAPIExtension::_register_composition_layer_provider_bind_compat_104087(OpenXRExtensionWrapperExtension *p_extension) {
diff --git a/modules/openxr/openxr_api_extension.cpp b/modules/openxr/openxr_api_extension.cpp
index cbe7293d80..c057af7757 100644
--- a/modules/openxr/openxr_api_extension.cpp
+++ b/modules/openxr/openxr_api_extension.cpp
@@ -29,10 +29,11 @@
 /**************************************************************************/
 
 #include "openxr_api_extension.h"
-
-#include "extensions/openxr_extension_wrapper.h"
 #include "openxr_api_extension.compat.inc"
 
+#include "core/object/class_db.h"
+#include "extensions/openxr_extension_wrapper.h"
+
 #include "servers/rendering/rendering_server.h" // ERR_NOT_ON_RENDER_THREAD_V
 
 void OpenXRAPIExtension::_bind_methods() {
diff --git a/modules/openxr/openxr_interface.cpp b/modules/openxr/openxr_interface.cpp
index ade34120a7..6ddfad28fa 100644
--- a/modules/openxr/openxr_interface.cpp
+++ b/modules/openxr/openxr_interface.cpp
@@ -37,6 +37,7 @@
 
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 #include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server_types.h"
 
diff --git a/modules/openxr/openxr_structure.cpp b/modules/openxr/openxr_structure.cpp
index d3b5ecabbf..390b732cd7 100644
--- a/modules/openxr/openxr_structure.cpp
+++ b/modules/openxr/openxr_structure.cpp
@@ -30,6 +30,8 @@
 
 #include "openxr_structure.h"
 
+#include "core/object/class_db.h"
+
 void OpenXRStructureBase::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_structure_type"), &OpenXRStructureBase::_get_structure_type);
 
diff --git a/modules/openxr/scene/openxr_composition_layer.cpp b/modules/openxr/scene/openxr_composition_layer.cpp
index 1c5266c493..a4c34c5511 100644
--- a/modules/openxr/scene/openxr_composition_layer.cpp
+++ b/modules/openxr/scene/openxr_composition_layer.cpp
@@ -34,6 +34,7 @@
 #include "../openxr_api.h"
 #include "../openxr_interface.h"
 
+#include "core/object/class_db.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/xr/xr_nodes.h"
 #include "scene/main/viewport.h"
diff --git a/modules/openxr/scene/openxr_composition_layer_cylinder.cpp b/modules/openxr/scene/openxr_composition_layer_cylinder.cpp
index fc38e6a6b0..541640cb0f 100644
--- a/modules/openxr/scene/openxr_composition_layer_cylinder.cpp
+++ b/modules/openxr/scene/openxr_composition_layer_cylinder.cpp
@@ -33,6 +33,7 @@
 #include "../extensions/openxr_composition_layer_extension.h"
 #include "../openxr_interface.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 
 OpenXRCompositionLayerCylinder::OpenXRCompositionLayerCylinder() {
diff --git a/modules/openxr/scene/openxr_composition_layer_equirect.cpp b/modules/openxr/scene/openxr_composition_layer_equirect.cpp
index 2cd15c56ff..f62289c7be 100644
--- a/modules/openxr/scene/openxr_composition_layer_equirect.cpp
+++ b/modules/openxr/scene/openxr_composition_layer_equirect.cpp
@@ -33,6 +33,7 @@
 #include "../extensions/openxr_composition_layer_extension.h"
 #include "../openxr_interface.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 
 OpenXRCompositionLayerEquirect::OpenXRCompositionLayerEquirect() {
diff --git a/modules/openxr/scene/openxr_composition_layer_quad.cpp b/modules/openxr/scene/openxr_composition_layer_quad.cpp
index 4017bc2a2a..75182468d1 100644
--- a/modules/openxr/scene/openxr_composition_layer_quad.cpp
+++ b/modules/openxr/scene/openxr_composition_layer_quad.cpp
@@ -33,6 +33,7 @@
 #include "../extensions/openxr_composition_layer_extension.h"
 #include "../openxr_interface.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/3d/primitive_meshes.h"
 
 OpenXRCompositionLayerQuad::OpenXRCompositionLayerQuad() {
diff --git a/modules/openxr/scene/openxr_hand.cpp b/modules/openxr/scene/openxr_hand.cpp
index 76775899da..4825ff0558 100644
--- a/modules/openxr/scene/openxr_hand.cpp
+++ b/modules/openxr/scene/openxr_hand.cpp
@@ -33,6 +33,7 @@
 #include "../extensions/openxr_hand_tracking_extension.h"
 #include "../openxr_api.h"
 
+#include "core/object/class_db.h"
 #include "scene/3d/skeleton_3d.h"
 #include "servers/xr/xr_server.h"
 
diff --git a/modules/openxr/scene/openxr_render_model.cpp b/modules/openxr/scene/openxr_render_model.cpp
index 14a977ada7..5777fbf2e3 100644
--- a/modules/openxr/scene/openxr_render_model.cpp
+++ b/modules/openxr/scene/openxr_render_model.cpp
@@ -33,7 +33,9 @@
 #ifdef MODULE_GLTF_ENABLED
 
 #include "../extensions/openxr_render_model_extension.h"
+
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/xr/xr_nodes.h"
 #include "scene/resources/3d/primitive_meshes.h"
diff --git a/modules/openxr/scene/openxr_render_model_manager.cpp b/modules/openxr/scene/openxr_render_model_manager.cpp
index ffd6df701d..ee1745e51a 100644
--- a/modules/openxr/scene/openxr_render_model_manager.cpp
+++ b/modules/openxr/scene/openxr_render_model_manager.cpp
@@ -32,9 +32,10 @@
 
 #ifdef MODULE_GLTF_ENABLED
 #include "../extensions/openxr_render_model_extension.h"
-
 #include "../openxr_api.h"
+
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/3d/xr/xr_nodes.h"
 #include "servers/xr/xr_server.h"
 
diff --git a/modules/openxr/scene/openxr_visibility_mask.cpp b/modules/openxr/scene/openxr_visibility_mask.cpp
index c90be93145..f8daf12a54 100644
--- a/modules/openxr/scene/openxr_visibility_mask.cpp
+++ b/modules/openxr/scene/openxr_visibility_mask.cpp
@@ -32,6 +32,8 @@
 
 #include "../extensions/openxr_visibility_mask_extension.h"
 #include "../openxr_interface.h"
+
+#include "core/object/class_db.h"
 #include "scene/3d/xr/xr_nodes.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/modules/regex/regex.compat.inc b/modules/regex/regex.compat.inc
index 0c380655a4..321f27b1a0 100644
--- a/modules/regex/regex.compat.inc
+++ b/modules/regex/regex.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "regex.h"
+
+#include "core/object/class_db.h"
+
 Ref<RegEx> RegEx::_create_from_string_bind_compat_95212(const String &p_pattern) {
 	return create_from_string(p_pattern, true);
 }
@@ -43,4 +47,4 @@ void RegEx::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("compile", "pattern"), &RegEx::_compile_bind_compat_95212);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/modules/regex/regex.cpp b/modules/regex/regex.cpp
index 3c6acfbc5b..4d199515f5 100644
--- a/modules/regex/regex.cpp
+++ b/modules/regex/regex.cpp
@@ -31,6 +31,7 @@
 #include "regex.h"
 #include "regex.compat.inc"
 
+#include "core/object/class_db.h"
 #include "core/os/memory.h"
 
 extern "C" {
diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp
index b610384496..f674282ebb 100644
--- a/modules/theora/video_stream_theora.cpp
+++ b/modules/theora/video_stream_theora.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/image.h"
+#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 
 #include "thirdparty/misc/yuv2rgb.h"
diff --git a/modules/upnp/upnp.cpp b/modules/upnp/upnp.cpp
index 5ec0b984fc..f32b16d4c5 100644
--- a/modules/upnp/upnp.cpp
+++ b/modules/upnp/upnp.cpp
@@ -30,6 +30,8 @@
 
 #include "upnp.h"
 
+#include "core/object/class_db.h"
+
 UPNP *(*UPNP::_create)(bool p_notify_postinitialize) = nullptr;
 
 void UPNP::_bind_methods() {
diff --git a/modules/upnp/upnp_device.cpp b/modules/upnp/upnp_device.cpp
index 45766281f1..876f48278c 100644
--- a/modules/upnp/upnp_device.cpp
+++ b/modules/upnp/upnp_device.cpp
@@ -30,6 +30,8 @@
 
 #include "upnp_device.h"
 
+#include "core/object/class_db.h"
+
 UPNPDevice *(*UPNPDevice::_create)(bool p_notify_postinitialize) = nullptr;
 
 void UPNPDevice::_bind_methods() {
diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp
index 62c7e73956..c85f89f2a1 100644
--- a/modules/vorbis/audio_stream_ogg_vorbis.cpp
+++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp
@@ -31,6 +31,7 @@
 #include "audio_stream_ogg_vorbis.h"
 #include "core/io/file_access.h"
 
+#include "core/object/class_db.h"
 #include "core/templates/rb_map.h"
 
 #include <ogg/ogg.h>
diff --git a/modules/vorbis/resource_importer_ogg_vorbis.cpp b/modules/vorbis/resource_importer_ogg_vorbis.cpp
index a30c8490ac..f0f6c73c9d 100644
--- a/modules/vorbis/resource_importer_ogg_vorbis.cpp
+++ b/modules/vorbis/resource_importer_ogg_vorbis.cpp
@@ -32,6 +32,7 @@
 
 #include "core/io/file_access.h"
 #include "core/io/resource_saver.h"
+#include "core/object/class_db.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/import/audio_stream_import_settings.h"
diff --git a/modules/webrtc/webrtc_data_channel.cpp b/modules/webrtc/webrtc_data_channel.cpp
index ac1c4a4997..1ef3b51fba 100644
--- a/modules/webrtc/webrtc_data_channel.cpp
+++ b/modules/webrtc/webrtc_data_channel.cpp
@@ -31,6 +31,7 @@
 #include "webrtc_data_channel.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 
 void WebRTCDataChannel::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("poll"), &WebRTCDataChannel::poll);
diff --git a/modules/webrtc/webrtc_data_channel_extension.cpp b/modules/webrtc/webrtc_data_channel_extension.cpp
index b09997e445..368caba672 100644
--- a/modules/webrtc/webrtc_data_channel_extension.cpp
+++ b/modules/webrtc/webrtc_data_channel_extension.cpp
@@ -30,6 +30,8 @@
 
 #include "webrtc_data_channel_extension.h"
 
+#include "core/object/class_db.h"
+
 void WebRTCDataChannelExtension::_bind_methods() {
 	ADD_PROPERTY_DEFAULT("write_mode", WRITE_MODE_BINARY);
 
diff --git a/modules/webrtc/webrtc_multiplayer_peer.cpp b/modules/webrtc/webrtc_multiplayer_peer.cpp
index 2bf9e086e8..f6e890d761 100644
--- a/modules/webrtc/webrtc_multiplayer_peer.cpp
+++ b/modules/webrtc/webrtc_multiplayer_peer.cpp
@@ -30,6 +30,8 @@
 
 #include "webrtc_multiplayer_peer.h"
 
+#include "core/object/class_db.h"
+
 void WebRTCMultiplayerPeer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("create_server", "channels_config"), &WebRTCMultiplayerPeer::create_server, DEFVAL(Array()));
 	ClassDB::bind_method(D_METHOD("create_client", "peer_id", "channels_config"), &WebRTCMultiplayerPeer::create_client, DEFVAL(Array()));
diff --git a/modules/webrtc/webrtc_peer_connection.cpp b/modules/webrtc/webrtc_peer_connection.cpp
index 1d72d48e6a..9b857d305f 100644
--- a/modules/webrtc/webrtc_peer_connection.cpp
+++ b/modules/webrtc/webrtc_peer_connection.cpp
@@ -36,6 +36,8 @@
 
 #include "webrtc_peer_connection_extension.h"
 
+#include "core/object/class_db.h"
+
 StringName WebRTCPeerConnection::default_extension;
 
 void WebRTCPeerConnection::set_default_extension(const StringName &p_extension) {
diff --git a/modules/webrtc/webrtc_peer_connection_extension.cpp b/modules/webrtc/webrtc_peer_connection_extension.cpp
index 248b0cf610..815b869c34 100644
--- a/modules/webrtc/webrtc_peer_connection_extension.cpp
+++ b/modules/webrtc/webrtc_peer_connection_extension.cpp
@@ -30,6 +30,8 @@
 
 #include "webrtc_peer_connection_extension.h"
 
+#include "core/object/class_db.h"
+
 void WebRTCPeerConnectionExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_get_connection_state);
 	GDVIRTUAL_BIND(_get_gathering_state);
diff --git a/modules/websocket/websocket_multiplayer_peer.cpp b/modules/websocket/websocket_multiplayer_peer.cpp
index 47c9af2839..f6bf1de9bd 100644
--- a/modules/websocket/websocket_multiplayer_peer.cpp
+++ b/modules/websocket/websocket_multiplayer_peer.cpp
@@ -31,6 +31,7 @@
 #include "websocket_multiplayer_peer.h"
 
 #include "core/io/stream_peer_tls.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 WebSocketMultiplayerPeer::WebSocketMultiplayerPeer() {
diff --git a/modules/websocket/websocket_peer.cpp b/modules/websocket/websocket_peer.cpp
index 5c24b5d082..53bc566cc4 100644
--- a/modules/websocket/websocket_peer.cpp
+++ b/modules/websocket/websocket_peer.cpp
@@ -30,6 +30,8 @@
 
 #include "websocket_peer.h"
 
+#include "core/object/class_db.h"
+
 WebSocketPeer *(*WebSocketPeer::_create)(bool p_notify_postinitialize) = nullptr;
 
 WebSocketPeer::WebSocketPeer() {
diff --git a/modules/webxr/webxr_interface.compat.inc b/modules/webxr/webxr_interface.compat.inc
index 97a9d44ca9..681c3ddcfa 100644
--- a/modules/webxr/webxr_interface.compat.inc
+++ b/modules/webxr/webxr_interface.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "webxr_interface.h"
+
+#include "core/object/class_db.h"
+
 Ref<XRPositionalTracker> WebXRInterface::_get_input_source_tracker_bind_compat_90645(int p_input_source_id) const {
 	return get_input_source_tracker(p_input_source_id);
 }
diff --git a/modules/webxr/webxr_interface.cpp b/modules/webxr/webxr_interface.cpp
index a33a28a77a..63213196f2 100644
--- a/modules/webxr/webxr_interface.cpp
+++ b/modules/webxr/webxr_interface.cpp
@@ -31,6 +31,8 @@
 #include "webxr_interface.h"
 #include "webxr_interface.compat.inc"
 
+#include "core/object/class_db.h"
+
 void WebXRInterface::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_session_supported", "session_mode"), &WebXRInterface::is_session_supported);
 	ClassDB::bind_method(D_METHOD("set_session_mode", "session_mode"), &WebXRInterface::set_session_mode);
diff --git a/modules/zip/zip_packer.compat.inc b/modules/zip/zip_packer.compat.inc
index d752a2d661..6787065b7c 100644
--- a/modules/zip/zip_packer.compat.inc
+++ b/modules/zip/zip_packer.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "zip_packer.h"
+
+#include "core/object/class_db.h"
+
 Error ZIPPacker::_start_file_bind_compat_115946(const String &p_path) {
 	return start_file(p_path, 0644, 0);
 }
diff --git a/modules/zip/zip_packer.cpp b/modules/zip/zip_packer.cpp
index 2b6164f2cd..8bc13ba7c9 100644
--- a/modules/zip/zip_packer.cpp
+++ b/modules/zip/zip_packer.cpp
@@ -32,6 +32,7 @@
 #include "zip_packer.compat.inc"
 
 #include "core/io/zip_io.h"
+#include "core/object/class_db.h"
 #include "core/os/time.h"
 
 Error ZIPPacker::open(const String &p_path, ZipAppend p_append) {
diff --git a/modules/zip/zip_reader.cpp b/modules/zip/zip_reader.cpp
index 5817c1c2e7..bf91748107 100644
--- a/modules/zip/zip_reader.cpp
+++ b/modules/zip/zip_reader.cpp
@@ -32,6 +32,7 @@
 
 #include "core/error/error_macros.h"
 #include "core/io/zip_io.h"
+#include "core/object/class_db.h"
 
 Error ZIPReader::open(const String &p_path) {
 	if (fa.is_valid()) {
diff --git a/platform/android/api/api.cpp b/platform/android/api/api.cpp
index 8c4a077995..aa17f78ca2 100644
--- a/platform/android/api/api.cpp
+++ b/platform/android/api/api.cpp
@@ -30,6 +30,7 @@
 
 #include "api.h"
 
+#include "core/object/class_db.h"
 #include "java_class_wrapper.h"
 #include "jni_singleton.h"
 
diff --git a/platform/web/api/api.cpp b/platform/web/api/api.cpp
index c8d9435770..deb7847183 100644
--- a/platform/web/api/api.cpp
+++ b/platform/web/api/api.cpp
@@ -33,6 +33,7 @@
 #include "javascript_bridge_singleton.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 static JavaScriptBridge *javascript_bridge_singleton;
 
diff --git a/scene/2d/animated_sprite_2d.cpp b/scene/2d/animated_sprite_2d.cpp
index 57a097d6ca..e304f2bd48 100644
--- a/scene/2d/animated_sprite_2d.cpp
+++ b/scene/2d/animated_sprite_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "animated_sprite_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/scene/2d/audio_listener_2d.cpp b/scene/2d/audio_listener_2d.cpp
index 2d6ef2039e..bc36464e10 100644
--- a/scene/2d/audio_listener_2d.cpp
+++ b/scene/2d/audio_listener_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "audio_listener_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 
 bool AudioListener2D::_set(const StringName &p_name, const Variant &p_value) {
diff --git a/scene/2d/audio_stream_player_2d.compat.inc b/scene/2d/audio_stream_player_2d.compat.inc
index 6f541087a6..f2911fc34e 100644
--- a/scene/2d/audio_stream_player_2d.compat.inc
+++ b/scene/2d/audio_stream_player_2d.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "audio_stream_player_2d.h"
+
+#include "core/object/class_db.h"
+
 bool AudioStreamPlayer2D::_is_autoplay_enabled_bind_compat_86907() {
 	return is_autoplay_enabled();
 }
diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp
index 63e44aecbd..84db948d84 100644
--- a/scene/2d/audio_stream_player_2d.cpp
+++ b/scene/2d/audio_stream_player_2d.cpp
@@ -32,6 +32,7 @@
 #include "audio_stream_player_2d.compat.inc"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/2d/audio_listener_2d.h"
 #include "scene/audio/audio_stream_player_internal.h"
 #include "scene/main/viewport.h"
diff --git a/scene/2d/back_buffer_copy.cpp b/scene/2d/back_buffer_copy.cpp
index 91cd1e103c..1e76826825 100644
--- a/scene/2d/back_buffer_copy.cpp
+++ b/scene/2d/back_buffer_copy.cpp
@@ -30,6 +30,7 @@
 
 #include "back_buffer_copy.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void BackBufferCopy::_update_copy_mode() {
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp
index f66b113993..bffcc802e0 100644
--- a/scene/2d/camera_2d.cpp
+++ b/scene/2d/camera_2d.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 
 void Camera2D::_update_scroll() {
diff --git a/scene/2d/canvas_group.cpp b/scene/2d/canvas_group.cpp
index a5e18cc131..9ceae2053d 100644
--- a/scene/2d/canvas_group.cpp
+++ b/scene/2d/canvas_group.cpp
@@ -30,6 +30,7 @@
 
 #include "canvas_group.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void CanvasGroup::set_fit_margin(real_t p_fit_margin) {
diff --git a/scene/2d/canvas_modulate.cpp b/scene/2d/canvas_modulate.cpp
index f0c6a65068..6e1e52efbd 100644
--- a/scene/2d/canvas_modulate.cpp
+++ b/scene/2d/canvas_modulate.cpp
@@ -30,6 +30,7 @@
 
 #include "canvas_modulate.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void CanvasModulate::_on_in_canvas_visibility_changed(bool p_new_visibility) {
diff --git a/scene/2d/cpu_particles_2d.compat.inc b/scene/2d/cpu_particles_2d.compat.inc
index 38a801eccb..7df8da283e 100644
--- a/scene/2d/cpu_particles_2d.compat.inc
+++ b/scene/2d/cpu_particles_2d.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "cpu_particles_2d.h"
+
+#include "core/object/class_db.h"
+
 void CPUParticles2D::_restart_bind_compat_92089() {
 	restart(false);
 }
diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp
index dd275d4f51..d1d094da81 100644
--- a/scene/2d/cpu_particles_2d.cpp
+++ b/scene/2d/cpu_particles_2d.cpp
@@ -33,6 +33,7 @@
 
 #include "core/math/random_number_generator.h"
 #include "core/math/transform_interpolator.h"
+#include "core/object/class_db.h"
 #include "scene/2d/gpu_particles_2d.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/canvas_item_material.h"
diff --git a/scene/2d/gpu_particles_2d.compat.inc b/scene/2d/gpu_particles_2d.compat.inc
index 5ff6442e99..9dfed63d5d 100644
--- a/scene/2d/gpu_particles_2d.compat.inc
+++ b/scene/2d/gpu_particles_2d.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "gpu_particles_2d.h"
+
+#include "core/object/class_db.h"
+
 void GPUParticles2D::_restart_bind_compat_92089() {
 	restart(false);
 }
diff --git a/scene/2d/gpu_particles_2d.cpp b/scene/2d/gpu_particles_2d.cpp
index 0e13c1dfbe..e5b6631ed5 100644
--- a/scene/2d/gpu_particles_2d.cpp
+++ b/scene/2d/gpu_particles_2d.cpp
@@ -31,6 +31,7 @@
 #include "gpu_particles_2d.h"
 #include "gpu_particles_2d.compat.inc"
 
+#include "core/object/class_db.h"
 #include "scene/2d/cpu_particles_2d.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/canvas_item_material.h"
diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp
index a89145cfb5..91f83fd521 100644
--- a/scene/2d/light_2d.cpp
+++ b/scene/2d/light_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "light_2d.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void Light2D::owner_changed_notify() {
diff --git a/scene/2d/light_occluder_2d.cpp b/scene/2d/light_occluder_2d.cpp
index bc405f0308..965c54d669 100644
--- a/scene/2d/light_occluder_2d.cpp
+++ b/scene/2d/light_occluder_2d.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/engine.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 #define LINE_GRAB_WIDTH 8
diff --git a/scene/2d/line_2d.cpp b/scene/2d/line_2d.cpp
index 04eadd91aa..82b459a152 100644
--- a/scene/2d/line_2d.cpp
+++ b/scene/2d/line_2d.cpp
@@ -31,6 +31,7 @@
 #include "line_2d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "line_builder.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/2d/marker_2d.cpp b/scene/2d/marker_2d.cpp
index fc19f829d7..57939e7900 100644
--- a/scene/2d/marker_2d.cpp
+++ b/scene/2d/marker_2d.cpp
@@ -31,6 +31,7 @@
 #include "marker_2d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 void Marker2D::_draw_cross() {
 	const real_t extents = get_gizmo_extents();
diff --git a/scene/2d/mesh_instance_2d.cpp b/scene/2d/mesh_instance_2d.cpp
index f12aaab132..bc0b096c80 100644
--- a/scene/2d/mesh_instance_2d.cpp
+++ b/scene/2d/mesh_instance_2d.cpp
@@ -30,6 +30,8 @@
 
 #include "mesh_instance_2d.h"
 
+#include "core/object/class_db.h"
+
 #ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
diff --git a/scene/2d/multimesh_instance_2d.cpp b/scene/2d/multimesh_instance_2d.cpp
index 8ee488c0cd..1c864b5414 100644
--- a/scene/2d/multimesh_instance_2d.cpp
+++ b/scene/2d/multimesh_instance_2d.cpp
@@ -30,6 +30,8 @@
 
 #include "multimesh_instance_2d.h"
 
+#include "core/object/class_db.h"
+
 #ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
diff --git a/scene/2d/navigation/navigation_agent_2d.cpp b/scene/2d/navigation/navigation_agent_2d.cpp
index e74822b89c..56b38b50a3 100644
--- a/scene/2d/navigation/navigation_agent_2d.cpp
+++ b/scene/2d/navigation/navigation_agent_2d.cpp
@@ -31,6 +31,7 @@
 #include "navigation_agent_2d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "scene/2d/navigation/navigation_link_2d.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
diff --git a/scene/2d/navigation/navigation_link_2d.cpp b/scene/2d/navigation/navigation_link_2d.cpp
index afe4dd1b37..8ddf402070 100644
--- a/scene/2d/navigation/navigation_link_2d.cpp
+++ b/scene/2d/navigation/navigation_link_2d.cpp
@@ -31,6 +31,7 @@
 #include "navigation_link_2d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 
diff --git a/scene/2d/navigation/navigation_obstacle_2d.cpp b/scene/2d/navigation/navigation_obstacle_2d.cpp
index fb94a7a126..761c4437e5 100644
--- a/scene/2d/navigation/navigation_obstacle_2d.cpp
+++ b/scene/2d/navigation/navigation_obstacle_2d.cpp
@@ -31,6 +31,7 @@
 #include "navigation_obstacle_2d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
 #include "scene/resources/world_2d.h"
diff --git a/scene/2d/navigation/navigation_region_2d.cpp b/scene/2d/navigation/navigation_region_2d.cpp
index 72b264d208..fe48b478b6 100644
--- a/scene/2d/navigation/navigation_region_2d.cpp
+++ b/scene/2d/navigation/navigation_region_2d.cpp
@@ -31,6 +31,7 @@
 #include "navigation_region_2d.h"
 
 #include "core/math/random_pcg.h"
+#include "core/object/class_db.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp
index 7f60d68d35..01a8fcdff8 100644
--- a/scene/2d/node_2d.cpp
+++ b/scene/2d/node_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "node_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/2d/parallax_2d.cpp b/scene/2d/parallax_2d.cpp
index aea3a5387c..6f99f7c3c3 100644
--- a/scene/2d/parallax_2d.cpp
+++ b/scene/2d/parallax_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "parallax_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/2d/parallax_background.cpp b/scene/2d/parallax_background.cpp
index 777a525135..bb3562ecbf 100644
--- a/scene/2d/parallax_background.cpp
+++ b/scene/2d/parallax_background.cpp
@@ -32,6 +32,8 @@
 
 #include "parallax_layer.h"
 
+#include "core/object/class_db.h"
+
 void ParallaxBackground::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp
index 45bb829d30..d1186e3245 100644
--- a/scene/2d/parallax_layer.cpp
+++ b/scene/2d/parallax_layer.cpp
@@ -31,6 +31,8 @@
 #include "parallax_layer.h"
 
 #include "parallax_background.h"
+
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void ParallaxLayer::set_motion_scale(const Size2 &p_scale) {
diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp
index 7659c919e0..3a29e5c08b 100644
--- a/scene/2d/path_2d.cpp
+++ b/scene/2d/path_2d.cpp
@@ -31,6 +31,7 @@
 #include "path_2d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "scene/main/timer.h"
 #include "scene/resources/mesh.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/2d/physics/animatable_body_2d.cpp b/scene/2d/physics/animatable_body_2d.cpp
index 10e90e708b..d36e2a59b4 100644
--- a/scene/2d/physics/animatable_body_2d.cpp
+++ b/scene/2d/physics/animatable_body_2d.cpp
@@ -30,6 +30,8 @@
 
 #include "animatable_body_2d.h"
 
+#include "core/object/class_db.h"
+
 void AnimatableBody2D::set_sync_to_physics(bool p_enable) {
 	if (sync_to_physics == p_enable) {
 		return;
diff --git a/scene/2d/physics/area_2d.cpp b/scene/2d/physics/area_2d.cpp
index 8094f52616..8c820ccf01 100644
--- a/scene/2d/physics/area_2d.cpp
+++ b/scene/2d/physics/area_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "area_2d.h"
 
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void Area2D::set_gravity_space_override_mode(SpaceOverride p_mode) {
diff --git a/scene/2d/physics/character_body_2d.cpp b/scene/2d/physics/character_body_2d.cpp
index 2138a1aec5..a7174abfb2 100644
--- a/scene/2d/physics/character_body_2d.cpp
+++ b/scene/2d/physics/character_body_2d.cpp
@@ -30,6 +30,8 @@
 
 #include "character_body_2d.h"
 
+#include "core/object/class_db.h"
+
 #ifndef DISABLE_DEPRECATED
 #include "servers/physics_2d/physics_server_2d_extension.h"
 #endif
diff --git a/scene/2d/physics/collision_object_2d.cpp b/scene/2d/physics/collision_object_2d.cpp
index 6db7449147..7f4833675e 100644
--- a/scene/2d/physics/collision_object_2d.cpp
+++ b/scene/2d/physics/collision_object_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "collision_object_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/world_2d.h"
 
 void CollisionObject2D::_notification(int p_what) {
diff --git a/scene/2d/physics/collision_polygon_2d.cpp b/scene/2d/physics/collision_polygon_2d.cpp
index f40c460d51..c88fb5ac9c 100644
--- a/scene/2d/physics/collision_polygon_2d.cpp
+++ b/scene/2d/physics/collision_polygon_2d.cpp
@@ -31,6 +31,7 @@
 #include "collision_polygon_2d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "scene/2d/physics/area_2d.h"
 #include "scene/2d/physics/collision_object_2d.h"
 #include "scene/resources/2d/concave_polygon_shape_2d.h"
diff --git a/scene/2d/physics/collision_shape_2d.cpp b/scene/2d/physics/collision_shape_2d.cpp
index 54ed91fed9..f3fce65c4f 100644
--- a/scene/2d/physics/collision_shape_2d.cpp
+++ b/scene/2d/physics/collision_shape_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "collision_shape_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/2d/physics/area_2d.h"
 #include "scene/2d/physics/collision_object_2d.h"
 #include "scene/resources/2d/concave_polygon_shape_2d.h"
diff --git a/scene/2d/physics/joints/damped_spring_joint_2d.cpp b/scene/2d/physics/joints/damped_spring_joint_2d.cpp
index 4b210ec0c7..602a1f20c5 100644
--- a/scene/2d/physics/joints/damped_spring_joint_2d.cpp
+++ b/scene/2d/physics/joints/damped_spring_joint_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "damped_spring_joint_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
 
 void DampedSpringJoint2D::_notification(int p_what) {
diff --git a/scene/2d/physics/joints/groove_joint_2d.cpp b/scene/2d/physics/joints/groove_joint_2d.cpp
index 415a49d8bd..4e8ff28116 100644
--- a/scene/2d/physics/joints/groove_joint_2d.cpp
+++ b/scene/2d/physics/joints/groove_joint_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "groove_joint_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
 
 void GrooveJoint2D::_notification(int p_what) {
diff --git a/scene/2d/physics/joints/joint_2d.cpp b/scene/2d/physics/joints/joint_2d.cpp
index 382a3cc7ee..f63503f14f 100644
--- a/scene/2d/physics/joints/joint_2d.cpp
+++ b/scene/2d/physics/joints/joint_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "joint_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
 
 void Joint2D::_disconnect_signals() {
diff --git a/scene/2d/physics/joints/pin_joint_2d.cpp b/scene/2d/physics/joints/pin_joint_2d.cpp
index b28a77ee04..7e86ac3e00 100644
--- a/scene/2d/physics/joints/pin_joint_2d.cpp
+++ b/scene/2d/physics/joints/pin_joint_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "pin_joint_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
 
 void PinJoint2D::_notification(int p_what) {
diff --git a/scene/2d/physics/kinematic_collision_2d.cpp b/scene/2d/physics/kinematic_collision_2d.cpp
index 28e8f39264..b1e98b5aac 100644
--- a/scene/2d/physics/kinematic_collision_2d.cpp
+++ b/scene/2d/physics/kinematic_collision_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "kinematic_collision_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
 
 Vector2 KinematicCollision2D::get_position() const {
diff --git a/scene/2d/physics/physical_bone_2d.cpp b/scene/2d/physics/physical_bone_2d.cpp
index 19274c8084..5102937d71 100644
--- a/scene/2d/physics/physical_bone_2d.cpp
+++ b/scene/2d/physics/physical_bone_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "physical_bone_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/2d/physics/joints/joint_2d.h"
 
 void PhysicalBone2D::_notification(int p_what) {
diff --git a/scene/2d/physics/physics_body_2d.cpp b/scene/2d/physics/physics_body_2d.cpp
index f8313360ae..5d93117d8d 100644
--- a/scene/2d/physics/physics_body_2d.cpp
+++ b/scene/2d/physics/physics_body_2d.cpp
@@ -30,6 +30,8 @@
 
 #include "physics_body_2d.h"
 
+#include "core/object/class_db.h"
+
 void PhysicsBody2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("move_and_collide", "motion", "test_only", "safe_margin", "recovery_as_collision"), &PhysicsBody2D::_move, DEFVAL(false), DEFVAL(0.08), DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("test_move", "from", "motion", "collision", "safe_margin", "recovery_as_collision"), &PhysicsBody2D::test_move, DEFVAL(Variant()), DEFVAL(0.08), DEFVAL(false));
diff --git a/scene/2d/physics/ray_cast_2d.cpp b/scene/2d/physics/ray_cast_2d.cpp
index af5268d958..b4a3be2cbf 100644
--- a/scene/2d/physics/ray_cast_2d.cpp
+++ b/scene/2d/physics/ray_cast_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "ray_cast_2d.h"
 
+#include "core/object/class_db.h"
 #include "scene/2d/physics/collision_object_2d.h"
 #include "scene/resources/world_2d.h"
 
diff --git a/scene/2d/physics/rigid_body_2d.cpp b/scene/2d/physics/rigid_body_2d.cpp
index f1eb54020c..a7305559d8 100644
--- a/scene/2d/physics/rigid_body_2d.cpp
+++ b/scene/2d/physics/rigid_body_2d.cpp
@@ -30,6 +30,8 @@
 
 #include "rigid_body_2d.h"
 
+#include "core/object/class_db.h"
+
 void RigidBody2D::_body_enter_tree(ObjectID p_id) {
 	Object *obj = ObjectDB::get_instance(p_id);
 	Node *node = Object::cast_to<Node>(obj);
diff --git a/scene/2d/physics/shape_cast_2d.cpp b/scene/2d/physics/shape_cast_2d.cpp
index cfe877631e..72a6828c2d 100644
--- a/scene/2d/physics/shape_cast_2d.cpp
+++ b/scene/2d/physics/shape_cast_2d.cpp
@@ -31,6 +31,7 @@
 #include "shape_cast_2d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/2d/physics/collision_object_2d.h"
 #include "scene/resources/world_2d.h"
 #include "servers/physics_2d/physics_server_2d.h"
diff --git a/scene/2d/physics/static_body_2d.cpp b/scene/2d/physics/static_body_2d.cpp
index dde868efb2..ec3735f3c9 100644
--- a/scene/2d/physics/static_body_2d.cpp
+++ b/scene/2d/physics/static_body_2d.cpp
@@ -30,6 +30,8 @@
 
 #include "static_body_2d.h"
 
+#include "core/object/class_db.h"
+
 #ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/capsule_shape_2d.h"
 #include "scene/resources/2d/circle_shape_2d.h"
diff --git a/scene/2d/physics/touch_screen_button.cpp b/scene/2d/physics/touch_screen_button.cpp
index f156a14fc4..096de73643 100644
--- a/scene/2d/physics/touch_screen_button.cpp
+++ b/scene/2d/physics/touch_screen_button.cpp
@@ -31,6 +31,7 @@
 #include "touch_screen_button.h"
 
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 
 void TouchScreenButton::set_texture_normal(const Ref<Texture2D> &p_texture) {
diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp
index 97d548f0fd..94ccd392e1 100644
--- a/scene/2d/polygon_2d.cpp
+++ b/scene/2d/polygon_2d.cpp
@@ -31,6 +31,7 @@
 #include "polygon_2d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/2d/remote_transform_2d.cpp b/scene/2d/remote_transform_2d.cpp
index a24dd55385..31de1bf776 100644
--- a/scene/2d/remote_transform_2d.cpp
+++ b/scene/2d/remote_transform_2d.cpp
@@ -30,6 +30,8 @@
 
 #include "remote_transform_2d.h"
 
+#include "core/object/class_db.h"
+
 void RemoteTransform2D::_update_cache() {
 	cache = ObjectID();
 	if (has_node(remote_node)) {
diff --git a/scene/2d/skeleton_2d.cpp b/scene/2d/skeleton_2d.cpp
index 3cff096196..7a513d72ac 100644
--- a/scene/2d/skeleton_2d.cpp
+++ b/scene/2d/skeleton_2d.cpp
@@ -31,6 +31,7 @@
 #include "skeleton_2d.h"
 
 #include "core/math/transform_interpolator.h"
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/scene/2d/sprite_2d.cpp b/scene/2d/sprite_2d.cpp
index 421033d4ad..9f88b3c0a9 100644
--- a/scene/2d/sprite_2d.cpp
+++ b/scene/2d/sprite_2d.cpp
@@ -31,6 +31,7 @@
 #include "sprite_2d.h"
 
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/scene/2d/tile_map.compat.inc b/scene/2d/tile_map.compat.inc
index e0f99e7015..3fef663da8 100644
--- a/scene/2d/tile_map.compat.inc
+++ b/scene/2d/tile_map.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "tile_map.h"
+
+#include "core/object/class_db.h"
+
 Rect2i TileMap::_get_used_rect_bind_compat_78328() {
 	return get_used_rect();
 }
@@ -62,4 +66,4 @@ void TileMap::_bind_compatibility_methods() {
 #endif // NAVIGATION_2D_DISABLED
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index ae64b91f10..730a399a9f 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -32,6 +32,8 @@
 #include "tile_map.compat.inc"
 
 #include "core/io/marshalls.h"
+#include "core/object/class_db.h"
+
 #ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
diff --git a/scene/2d/tile_map_layer.cpp b/scene/2d/tile_map_layer.cpp
index 4647d4a929..53b87a01a9 100644
--- a/scene/2d/tile_map_layer.cpp
+++ b/scene/2d/tile_map_layer.cpp
@@ -33,6 +33,7 @@
 #include "core/io/marshalls.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/random_pcg.h"
+#include "core/object/class_db.h"
 #include "core/templates/a_hash_map.h"
 #include "scene/2d/tile_map.h"
 #include "scene/gui/control.h"
diff --git a/scene/2d/visible_on_screen_notifier_2d.cpp b/scene/2d/visible_on_screen_notifier_2d.cpp
index d431082045..a387dca702 100644
--- a/scene/2d/visible_on_screen_notifier_2d.cpp
+++ b/scene/2d/visible_on_screen_notifier_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "visible_on_screen_notifier_2d.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/scene/3d/aim_modifier_3d.cpp b/scene/3d/aim_modifier_3d.cpp
index fc7dfe7303..568112c1b8 100644
--- a/scene/3d/aim_modifier_3d.cpp
+++ b/scene/3d/aim_modifier_3d.cpp
@@ -31,6 +31,8 @@
 #include "aim_modifier_3d.h"
 #include "scene/3d/look_at_modifier_3d.h"
 
+#include "core/object/class_db.h"
+
 bool AimModifier3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
diff --git a/scene/3d/audio_listener_3d.cpp b/scene/3d/audio_listener_3d.cpp
index ad6f13c85c..ae109ab89d 100644
--- a/scene/3d/audio_listener_3d.cpp
+++ b/scene/3d/audio_listener_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "audio_listener_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 
 void AudioListener3D::_update_audio_listener_state() {
diff --git a/scene/3d/audio_stream_player_3d.compat.inc b/scene/3d/audio_stream_player_3d.compat.inc
index 11f82b51f7..aa5dbdfb99 100644
--- a/scene/3d/audio_stream_player_3d.compat.inc
+++ b/scene/3d/audio_stream_player_3d.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "audio_stream_player_3d.h"
+
+#include "core/object/class_db.h"
+
 bool AudioStreamPlayer3D::_is_autoplay_enabled_bind_compat_86907() {
 	return is_autoplay_enabled();
 }
diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp
index db53082810..3706ac7412 100644
--- a/scene/3d/audio_stream_player_3d.cpp
+++ b/scene/3d/audio_stream_player_3d.cpp
@@ -32,6 +32,7 @@
 #include "audio_stream_player_3d.compat.inc"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/3d/audio_listener_3d.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/velocity_tracker_3d.h"
diff --git a/scene/3d/bone_attachment_3d.compat.inc b/scene/3d/bone_attachment_3d.compat.inc
index 1b21612d5f..acde7931e2 100644
--- a/scene/3d/bone_attachment_3d.compat.inc
+++ b/scene/3d/bone_attachment_3d.compat.inc
@@ -32,6 +32,8 @@
 
 #include "bone_attachment_3d.h"
 
+#include "core/object/class_db.h"
+
 void BoneAttachment3D::_on_bone_pose_update_bind_compat_90575(int p_bone_index) {
 	return on_skeleton_update();
 }
diff --git a/scene/3d/bone_attachment_3d.cpp b/scene/3d/bone_attachment_3d.cpp
index 61eec8eabd..e40af113a7 100644
--- a/scene/3d/bone_attachment_3d.cpp
+++ b/scene/3d/bone_attachment_3d.cpp
@@ -32,6 +32,7 @@
 #include "bone_attachment_3d.compat.inc"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 void BoneAttachment3D::_validate_property(PropertyInfo &p_property) const {
 	if (Engine::get_singleton()->is_editor_hint() && p_property.name == "bone_name") {
diff --git a/scene/3d/bone_constraint_3d.cpp b/scene/3d/bone_constraint_3d.cpp
index cc34052f62..d21ed87aeb 100644
--- a/scene/3d/bone_constraint_3d.cpp
+++ b/scene/3d/bone_constraint_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "bone_constraint_3d.h"
 
+#include "core/object/class_db.h"
+
 bool BoneConstraint3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
diff --git a/scene/3d/bone_twist_disperser_3d.cpp b/scene/3d/bone_twist_disperser_3d.cpp
index 3f6314862e..e268f8ff8b 100644
--- a/scene/3d/bone_twist_disperser_3d.cpp
+++ b/scene/3d/bone_twist_disperser_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "bone_twist_disperser_3d.h"
 
+#include "core/object/class_db.h"
+
 bool BoneTwistDisperser3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
diff --git a/scene/3d/camera_3d.cpp b/scene/3d/camera_3d.cpp
index c74b66bf93..6fef554ec8 100644
--- a/scene/3d/camera_3d.cpp
+++ b/scene/3d/camera_3d.cpp
@@ -32,6 +32,7 @@
 
 #include "core/math/projection.h"
 #include "core/math/transform_interpolator.h"
+#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/3d/chain_ik_3d.cpp b/scene/3d/chain_ik_3d.cpp
index bb0a616e0c..ce96d17d93 100644
--- a/scene/3d/chain_ik_3d.cpp
+++ b/scene/3d/chain_ik_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "chain_ik_3d.h"
 
+#include "core/object/class_db.h"
+
 bool ChainIK3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
diff --git a/scene/3d/convert_transform_modifier_3d.cpp b/scene/3d/convert_transform_modifier_3d.cpp
index 55c9f56533..179ef18a14 100644
--- a/scene/3d/convert_transform_modifier_3d.cpp
+++ b/scene/3d/convert_transform_modifier_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "convert_transform_modifier_3d.h"
 
+#include "core/object/class_db.h"
+
 constexpr const char *HINT_POSITION = "-10,10,0.01,or_greater,or_less,suffix:m";
 constexpr const char *HINT_ROTATION = "-180,180,0.01,radians_as_degrees";
 constexpr const char *HINT_SCALE = "0,10,0.01,or_greater";
diff --git a/scene/3d/copy_transform_modifier_3d.cpp b/scene/3d/copy_transform_modifier_3d.cpp
index 067bfe68d8..6e1b3b2a86 100644
--- a/scene/3d/copy_transform_modifier_3d.cpp
+++ b/scene/3d/copy_transform_modifier_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "copy_transform_modifier_3d.h"
 
+#include "core/object/class_db.h"
+
 bool CopyTransformModifier3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
diff --git a/scene/3d/cpu_particles_3d.compat.inc b/scene/3d/cpu_particles_3d.compat.inc
index 33e7f5463d..c39e3a89b7 100644
--- a/scene/3d/cpu_particles_3d.compat.inc
+++ b/scene/3d/cpu_particles_3d.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "cpu_particles_3d.h"
+
+#include "core/object/class_db.h"
+
 void CPUParticles3D::_restart_bind_compat_92089() {
 	restart(false);
 }
diff --git a/scene/3d/cpu_particles_3d.cpp b/scene/3d/cpu_particles_3d.cpp
index 34cd209323..5343ce6f6d 100644
--- a/scene/3d/cpu_particles_3d.cpp
+++ b/scene/3d/cpu_particles_3d.cpp
@@ -32,6 +32,7 @@
 #include "cpu_particles_3d.compat.inc"
 
 #include "core/math/random_number_generator.h"
+#include "core/object/class_db.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/gpu_particles_3d.h"
 #include "scene/main/viewport.h"
diff --git a/scene/3d/decal.cpp b/scene/3d/decal.cpp
index e0d13ce7b5..6da75ab165 100644
--- a/scene/3d/decal.cpp
+++ b/scene/3d/decal.cpp
@@ -30,6 +30,7 @@
 
 #include "decal.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void Decal::set_size(const Vector3 &p_size) {
diff --git a/scene/3d/fog_volume.cpp b/scene/3d/fog_volume.cpp
index 111d2455c1..b0b8c8e93e 100644
--- a/scene/3d/fog_volume.cpp
+++ b/scene/3d/fog_volume.cpp
@@ -30,6 +30,7 @@
 
 #include "fog_volume.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/environment.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/3d/gpu_particles_3d.compat.inc b/scene/3d/gpu_particles_3d.compat.inc
index 44e6fbb135..6509b2e415 100644
--- a/scene/3d/gpu_particles_3d.compat.inc
+++ b/scene/3d/gpu_particles_3d.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "gpu_particles_3d.h"
+
+#include "core/object/class_db.h"
+
 void GPUParticles3D::_restart_bind_compat_92089() {
 	restart(false);
 }
diff --git a/scene/3d/gpu_particles_3d.cpp b/scene/3d/gpu_particles_3d.cpp
index d4e6a32ebb..a2b134f6c0 100644
--- a/scene/3d/gpu_particles_3d.cpp
+++ b/scene/3d/gpu_particles_3d.cpp
@@ -31,6 +31,7 @@
 #include "gpu_particles_3d.h"
 #include "gpu_particles_3d.compat.inc"
 
+#include "core/object/class_db.h"
 #include "scene/3d/cpu_particles_3d.h"
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/gradient_texture.h"
diff --git a/scene/3d/gpu_particles_collision_3d.cpp b/scene/3d/gpu_particles_collision_3d.cpp
index 9ba06b1951..649d0b8857 100644
--- a/scene/3d/gpu_particles_collision_3d.cpp
+++ b/scene/3d/gpu_particles_collision_3d.cpp
@@ -31,6 +31,7 @@
 #include "gpu_particles_collision_3d.h"
 
 #include "core/math/geometry_3d.h"
+#include "core/object/class_db.h"
 #include "core/object/worker_thread_pool.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
diff --git a/scene/3d/ik_modifier_3d.cpp b/scene/3d/ik_modifier_3d.cpp
index ee485b9d9d..4e768ef649 100644
--- a/scene/3d/ik_modifier_3d.cpp
+++ b/scene/3d/ik_modifier_3d.cpp
@@ -31,6 +31,7 @@
 #include "ik_modifier_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 void IKModifier3D::_notification(int p_what) {
 	switch (p_what) {
diff --git a/scene/3d/importer_mesh_instance_3d.cpp b/scene/3d/importer_mesh_instance_3d.cpp
index 72544293a6..85ee613305 100644
--- a/scene/3d/importer_mesh_instance_3d.cpp
+++ b/scene/3d/importer_mesh_instance_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "importer_mesh_instance_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/3d/importer_mesh.h"
 
 void ImporterMeshInstance3D::set_mesh(const Ref<ImporterMesh> &p_mesh) {
diff --git a/scene/3d/iterate_ik_3d.cpp b/scene/3d/iterate_ik_3d.cpp
index 3763b2c4ed..f8da9a57e6 100644
--- a/scene/3d/iterate_ik_3d.cpp
+++ b/scene/3d/iterate_ik_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "iterate_ik_3d.h"
 
+#include "core/object/class_db.h"
+
 bool IterateIK3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
diff --git a/scene/3d/label_3d.cpp b/scene/3d/label_3d.cpp
index 2c2d8c97fc..9800ba5b30 100644
--- a/scene/3d/label_3d.cpp
+++ b/scene/3d/label_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "label_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/window.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/theme.h"
diff --git a/scene/3d/light_3d.cpp b/scene/3d/light_3d.cpp
index 4c57dd1dba..b0705d276f 100644
--- a/scene/3d/light_3d.cpp
+++ b/scene/3d/light_3d.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void Light3D::set_param(Param p_param, real_t p_value) {
diff --git a/scene/3d/lightmap_gi.cpp b/scene/3d/lightmap_gi.cpp
index 1904499d50..8afeb44197 100644
--- a/scene/3d/lightmap_gi.cpp
+++ b/scene/3d/lightmap_gi.cpp
@@ -34,6 +34,7 @@
 #include "core/io/config_file.h"
 #include "core/math/delaunay_3d.h"
 #include "core/math/geometry_3d.h"
+#include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "scene/3d/light_3d.h"
 #include "scene/3d/lightmap_probe.h"
diff --git a/scene/3d/limit_angular_velocity_modifier_3d.cpp b/scene/3d/limit_angular_velocity_modifier_3d.cpp
index e0dc3e94ca..b4b414ea8c 100644
--- a/scene/3d/limit_angular_velocity_modifier_3d.cpp
+++ b/scene/3d/limit_angular_velocity_modifier_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "limit_angular_velocity_modifier_3d.h"
 
+#include "core/object/class_db.h"
+
 bool LimitAngularVelocityModifier3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
diff --git a/scene/3d/look_at_modifier_3d.cpp b/scene/3d/look_at_modifier_3d.cpp
index e03ef428d5..6ac5462c59 100644
--- a/scene/3d/look_at_modifier_3d.cpp
+++ b/scene/3d/look_at_modifier_3d.cpp
@@ -31,6 +31,7 @@
 #include "look_at_modifier_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/resources/animation.h"
 
 void LookAtModifier3D::_validate_property(PropertyInfo &p_property) const {
diff --git a/scene/3d/marker_3d.cpp b/scene/3d/marker_3d.cpp
index 565f383e9a..a76f2991ac 100644
--- a/scene/3d/marker_3d.cpp
+++ b/scene/3d/marker_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "marker_3d.h"
 
+#include "core/object/class_db.h"
+
 void Marker3D::set_gizmo_extents(real_t p_extents) {
 	if (Math::is_equal_approx(gizmo_extents, p_extents)) {
 		return;
diff --git a/scene/3d/mesh_instance_3d.cpp b/scene/3d/mesh_instance_3d.cpp
index 51b1f1fa09..e7df431475 100644
--- a/scene/3d/mesh_instance_3d.cpp
+++ b/scene/3d/mesh_instance_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "mesh_instance_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/3d/skeleton_3d.h"
 
 #ifndef PHYSICS_3D_DISABLED
diff --git a/scene/3d/modifier_bone_target_3d.cpp b/scene/3d/modifier_bone_target_3d.cpp
index 1bafa8489c..9028ee487b 100644
--- a/scene/3d/modifier_bone_target_3d.cpp
+++ b/scene/3d/modifier_bone_target_3d.cpp
@@ -31,6 +31,7 @@
 #include "modifier_bone_target_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 void ModifierBoneTarget3D::_validate_bone_names() {
 	// Prior bone name.
diff --git a/scene/3d/multimesh_instance_3d.cpp b/scene/3d/multimesh_instance_3d.cpp
index b2bfe548c7..52efeb1e26 100644
--- a/scene/3d/multimesh_instance_3d.cpp
+++ b/scene/3d/multimesh_instance_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "multimesh_instance_3d.h"
 
+#include "core/object/class_db.h"
+
 #ifndef NAVIGATION_3D_DISABLED
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
diff --git a/scene/3d/navigation/navigation_agent_3d.cpp b/scene/3d/navigation/navigation_agent_3d.cpp
index 92102695e5..172afce60c 100644
--- a/scene/3d/navigation/navigation_agent_3d.cpp
+++ b/scene/3d/navigation/navigation_agent_3d.cpp
@@ -31,6 +31,7 @@
 #include "navigation_agent_3d.h"
 
 #include "core/math/geometry_3d.h"
+#include "core/object/class_db.h"
 #include "scene/3d/navigation/navigation_link_3d.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/3d/navigation/navigation_link_3d.cpp b/scene/3d/navigation/navigation_link_3d.cpp
index bca6889929..291a145ce0 100644
--- a/scene/3d/navigation/navigation_link_3d.cpp
+++ b/scene/3d/navigation/navigation_link_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "navigation_link_3d.h"
 
+#include "core/object/class_db.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/3d/navigation/navigation_obstacle_3d.cpp b/scene/3d/navigation/navigation_obstacle_3d.cpp
index 227e5fdd00..eb423c8fba 100644
--- a/scene/3d/navigation/navigation_obstacle_3d.cpp
+++ b/scene/3d/navigation/navigation_obstacle_3d.cpp
@@ -31,6 +31,7 @@
 #include "navigation_obstacle_3d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
diff --git a/scene/3d/navigation/navigation_region_3d.cpp b/scene/3d/navigation/navigation_region_3d.cpp
index f19bf01043..e0994df9b3 100644
--- a/scene/3d/navigation/navigation_region_3d.cpp
+++ b/scene/3d/navigation/navigation_region_3d.cpp
@@ -31,6 +31,7 @@
 #include "navigation_region_3d.h"
 
 #include "core/math/random_pcg.h"
+#include "core/object/class_db.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/3d/node_3d.cpp b/scene/3d/node_3d.cpp
index 01ff9ac339..b494b9a4db 100644
--- a/scene/3d/node_3d.cpp
+++ b/scene/3d/node_3d.cpp
@@ -31,6 +31,7 @@
 #include "node_3d.h"
 
 #include "core/math/transform_interpolator.h"
+#include "core/object/class_db.h"
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/main/viewport.h"
 #include "scene/property_utils.h"
diff --git a/scene/3d/occluder_instance_3d.cpp b/scene/3d/occluder_instance_3d.cpp
index 9a31111b97..d742eec42f 100644
--- a/scene/3d/occluder_instance_3d.cpp
+++ b/scene/3d/occluder_instance_3d.cpp
@@ -34,6 +34,7 @@
 #include "core/io/marshalls.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/triangulate.h"
+#include "core/object/class_db.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/resources/3d/importer_mesh.h"
diff --git a/scene/3d/path_3d.cpp b/scene/3d/path_3d.cpp
index 765ad4d610..778fcb889e 100644
--- a/scene/3d/path_3d.cpp
+++ b/scene/3d/path_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "path_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/3d/physics/animatable_body_3d.cpp b/scene/3d/physics/animatable_body_3d.cpp
index 9bfdb58acd..e09092470f 100644
--- a/scene/3d/physics/animatable_body_3d.cpp
+++ b/scene/3d/physics/animatable_body_3d.cpp
@@ -31,6 +31,7 @@
 #include "animatable_body_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 Vector3 AnimatableBody3D::get_linear_velocity() const {
 	return linear_velocity;
diff --git a/scene/3d/physics/area_3d.cpp b/scene/3d/physics/area_3d.cpp
index 8ee0ad451b..4fd4048fe8 100644
--- a/scene/3d/physics/area_3d.cpp
+++ b/scene/3d/physics/area_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "area_3d.h"
 
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void Area3D::set_gravity_space_override_mode(SpaceOverride p_mode) {
diff --git a/scene/3d/physics/character_body_3d.cpp b/scene/3d/physics/character_body_3d.cpp
index 7a58327eb3..19bebc581b 100644
--- a/scene/3d/physics/character_body_3d.cpp
+++ b/scene/3d/physics/character_body_3d.cpp
@@ -31,6 +31,7 @@
 #include "character_body_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 #ifndef DISABLE_DEPRECATED
 #include "servers/physics_3d/physics_server_3d_extension.h"
diff --git a/scene/3d/physics/collision_object_3d.cpp b/scene/3d/physics/collision_object_3d.cpp
index 96cd8910af..2b6cbff418 100644
--- a/scene/3d/physics/collision_object_3d.cpp
+++ b/scene/3d/physics/collision_object_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "collision_object_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/3d/shape_3d.h"
 #include "scene/resources/mesh.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/3d/physics/collision_polygon_3d.cpp b/scene/3d/physics/collision_polygon_3d.cpp
index 10281b0818..8ef1701828 100644
--- a/scene/3d/physics/collision_polygon_3d.cpp
+++ b/scene/3d/physics/collision_polygon_3d.cpp
@@ -31,6 +31,7 @@
 #include "collision_polygon_3d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "scene/3d/physics/collision_object_3d.h"
 #include "scene/resources/3d/convex_polygon_shape_3d.h"
 
diff --git a/scene/3d/physics/collision_shape_3d.cpp b/scene/3d/physics/collision_shape_3d.cpp
index 4f2e27961c..c0485cbe11 100644
--- a/scene/3d/physics/collision_shape_3d.cpp
+++ b/scene/3d/physics/collision_shape_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "collision_shape_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/physics/character_body_3d.h"
 #include "scene/3d/physics/vehicle_body_3d.h"
diff --git a/scene/3d/physics/joints/cone_twist_joint_3d.cpp b/scene/3d/physics/joints/cone_twist_joint_3d.cpp
index f4e58adce6..fe2bdd5221 100644
--- a/scene/3d/physics/joints/cone_twist_joint_3d.cpp
+++ b/scene/3d/physics/joints/cone_twist_joint_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "cone_twist_joint_3d.h"
 
+#include "core/object/class_db.h"
+
 void ConeTwistJoint3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_param", "param", "value"), &ConeTwistJoint3D::set_param);
 	ClassDB::bind_method(D_METHOD("get_param", "param"), &ConeTwistJoint3D::get_param);
diff --git a/scene/3d/physics/joints/generic_6dof_joint_3d.cpp b/scene/3d/physics/joints/generic_6dof_joint_3d.cpp
index 9f440b65cc..87774956e9 100644
--- a/scene/3d/physics/joints/generic_6dof_joint_3d.cpp
+++ b/scene/3d/physics/joints/generic_6dof_joint_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "generic_6dof_joint_3d.h"
 
+#include "core/object/class_db.h"
+
 void Generic6DOFJoint3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_param_x", "param", "value"), &Generic6DOFJoint3D::set_param_x);
 	ClassDB::bind_method(D_METHOD("get_param_x", "param"), &Generic6DOFJoint3D::get_param_x);
diff --git a/scene/3d/physics/joints/hinge_joint_3d.cpp b/scene/3d/physics/joints/hinge_joint_3d.cpp
index cf38357d7c..d66cfc8026 100644
--- a/scene/3d/physics/joints/hinge_joint_3d.cpp
+++ b/scene/3d/physics/joints/hinge_joint_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "hinge_joint_3d.h"
 
+#include "core/object/class_db.h"
+
 void HingeJoint3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_param", "param", "value"), &HingeJoint3D::set_param);
 	ClassDB::bind_method(D_METHOD("get_param", "param"), &HingeJoint3D::get_param);
diff --git a/scene/3d/physics/joints/joint_3d.cpp b/scene/3d/physics/joints/joint_3d.cpp
index b6760dbc23..e5ebf5f1d1 100644
--- a/scene/3d/physics/joints/joint_3d.cpp
+++ b/scene/3d/physics/joints/joint_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "joint_3d.h"
 
+#include "core/object/class_db.h"
+
 void Joint3D::_disconnect_signals() {
 	Node *node_a = get_node_or_null(a);
 	PhysicsBody3D *body_a = Object::cast_to<PhysicsBody3D>(node_a);
diff --git a/scene/3d/physics/joints/pin_joint_3d.cpp b/scene/3d/physics/joints/pin_joint_3d.cpp
index 8e367c5ef6..c9311cfabf 100644
--- a/scene/3d/physics/joints/pin_joint_3d.cpp
+++ b/scene/3d/physics/joints/pin_joint_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "pin_joint_3d.h"
 
+#include "core/object/class_db.h"
+
 void PinJoint3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_param", "param", "value"), &PinJoint3D::set_param);
 	ClassDB::bind_method(D_METHOD("get_param", "param"), &PinJoint3D::get_param);
diff --git a/scene/3d/physics/joints/slider_joint_3d.cpp b/scene/3d/physics/joints/slider_joint_3d.cpp
index df6b1cc045..450776522a 100644
--- a/scene/3d/physics/joints/slider_joint_3d.cpp
+++ b/scene/3d/physics/joints/slider_joint_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "slider_joint_3d.h"
 
+#include "core/object/class_db.h"
+
 void SliderJoint3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_param", "param", "value"), &SliderJoint3D::set_param);
 	ClassDB::bind_method(D_METHOD("get_param", "param"), &SliderJoint3D::get_param);
diff --git a/scene/3d/physics/kinematic_collision_3d.cpp b/scene/3d/physics/kinematic_collision_3d.cpp
index 15111258dc..8b891c64a4 100644
--- a/scene/3d/physics/kinematic_collision_3d.cpp
+++ b/scene/3d/physics/kinematic_collision_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "kinematic_collision_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/3d/physics/physics_body_3d.h"
 
 Vector3 KinematicCollision3D::get_travel() const {
diff --git a/scene/3d/physics/physical_bone_3d.cpp b/scene/3d/physics/physical_bone_3d.cpp
index 810a051376..cea0441094 100644
--- a/scene/3d/physics/physical_bone_3d.cpp
+++ b/scene/3d/physics/physical_bone_3d.cpp
@@ -31,6 +31,7 @@
 #include "physical_bone_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/3d/physics/physical_bone_simulator_3d.h"
 
 #ifndef DISABLE_DEPRECATED
diff --git a/scene/3d/physics/physical_bone_simulator_3d.cpp b/scene/3d/physics/physical_bone_simulator_3d.cpp
index 9774a73d1f..97e1c6b37b 100644
--- a/scene/3d/physics/physical_bone_simulator_3d.cpp
+++ b/scene/3d/physics/physical_bone_simulator_3d.cpp
@@ -31,6 +31,7 @@
 #include "physical_bone_simulator_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/3d/physics/physical_bone_3d.h"
 
 void PhysicalBoneSimulator3D::_skeleton_changed(Skeleton3D *p_old, Skeleton3D *p_new) {
diff --git a/scene/3d/physics/physics_body_3d.cpp b/scene/3d/physics/physics_body_3d.cpp
index a3f72a6003..3d9225f421 100644
--- a/scene/3d/physics/physics_body_3d.cpp
+++ b/scene/3d/physics/physics_body_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "physics_body_3d.h"
 
+#include "core/object/class_db.h"
+
 void PhysicsBody3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("move_and_collide", "motion", "test_only", "safe_margin", "recovery_as_collision", "max_collisions"), &PhysicsBody3D::_move, DEFVAL(false), DEFVAL(0.001), DEFVAL(false), DEFVAL(1));
 	ClassDB::bind_method(D_METHOD("test_move", "from", "motion", "collision", "safe_margin", "recovery_as_collision", "max_collisions"), &PhysicsBody3D::test_move, DEFVAL(Variant()), DEFVAL(0.001), DEFVAL(false), DEFVAL(1));
diff --git a/scene/3d/physics/ray_cast_3d.cpp b/scene/3d/physics/ray_cast_3d.cpp
index 326192a74d..38db9887bd 100644
--- a/scene/3d/physics/ray_cast_3d.cpp
+++ b/scene/3d/physics/ray_cast_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "ray_cast_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/3d/physics/collision_object_3d.h"
 #include "scene/resources/mesh.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/3d/physics/rigid_body_3d.cpp b/scene/3d/physics/rigid_body_3d.cpp
index 2a638618ac..745f16bf5a 100644
--- a/scene/3d/physics/rigid_body_3d.cpp
+++ b/scene/3d/physics/rigid_body_3d.cpp
@@ -31,6 +31,7 @@
 #include "rigid_body_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 void RigidBody3D::_body_enter_tree(ObjectID p_id) {
 	Object *obj = ObjectDB::get_instance(p_id);
diff --git a/scene/3d/physics/shape_cast_3d.cpp b/scene/3d/physics/shape_cast_3d.cpp
index 29691cf8c0..c15a18b781 100644
--- a/scene/3d/physics/shape_cast_3d.cpp
+++ b/scene/3d/physics/shape_cast_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "shape_cast_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/3d/physics/collision_object_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/mesh.h"
diff --git a/scene/3d/physics/soft_body_3d.compat.inc b/scene/3d/physics/soft_body_3d.compat.inc
index 0b01bfeb1f..1b56ce0199 100644
--- a/scene/3d/physics/soft_body_3d.compat.inc
+++ b/scene/3d/physics/soft_body_3d.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "soft_body_3d.h"
+
+#include "core/object/class_db.h"
+
 void SoftBody3D::_pin_point_bind_compat_94684(int p_point_index, bool pin, const NodePath &p_spatial_attachment_path) {
 	pin_point(p_point_index, pin, p_spatial_attachment_path, -1);
 }
diff --git a/scene/3d/physics/soft_body_3d.cpp b/scene/3d/physics/soft_body_3d.cpp
index e95fdd7341..7c6d41594f 100644
--- a/scene/3d/physics/soft_body_3d.cpp
+++ b/scene/3d/physics/soft_body_3d.cpp
@@ -31,6 +31,7 @@
 #include "soft_body_3d.h"
 #include "soft_body_3d.compat.inc"
 
+#include "core/object/class_db.h"
 #include "scene/3d/physics/physics_body_3d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/3d/physics/spring_arm_3d.cpp b/scene/3d/physics/spring_arm_3d.cpp
index 222abccf4d..bad2f59623 100644
--- a/scene/3d/physics/spring_arm_3d.cpp
+++ b/scene/3d/physics/spring_arm_3d.cpp
@@ -31,6 +31,7 @@
 #include "spring_arm_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/resources/3d/shape_3d.h"
 
diff --git a/scene/3d/physics/static_body_3d.cpp b/scene/3d/physics/static_body_3d.cpp
index 5c9e577082..f34235bb6c 100644
--- a/scene/3d/physics/static_body_3d.cpp
+++ b/scene/3d/physics/static_body_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "static_body_3d.h"
 
+#include "core/object/class_db.h"
+
 #ifndef NAVIGATION_3D_DISABLED
 #include "core/math/convex_hull.h"
 #include "scene/resources/3d/box_shape_3d.h"
diff --git a/scene/3d/physics/vehicle_body_3d.cpp b/scene/3d/physics/vehicle_body_3d.cpp
index 5efa207f24..1e5083a90c 100644
--- a/scene/3d/physics/vehicle_body_3d.cpp
+++ b/scene/3d/physics/vehicle_body_3d.cpp
@@ -31,6 +31,7 @@
 #include "vehicle_body_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 #define ROLLING_INFLUENCE_FIX
 
diff --git a/scene/3d/reflection_probe.cpp b/scene/3d/reflection_probe.cpp
index 9866ef8196..cfa216eeee 100644
--- a/scene/3d/reflection_probe.cpp
+++ b/scene/3d/reflection_probe.cpp
@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "reflection_probe.h"
+
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void ReflectionProbe::set_intensity(float p_intensity) {
diff --git a/scene/3d/remote_transform_3d.cpp b/scene/3d/remote_transform_3d.cpp
index 2a69ded063..325d814858 100644
--- a/scene/3d/remote_transform_3d.cpp
+++ b/scene/3d/remote_transform_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "remote_transform_3d.h"
 
+#include "core/object/class_db.h"
+
 void RemoteTransform3D::_update_cache() {
 	cache = ObjectID();
 	if (has_node(remote_node)) {
diff --git a/scene/3d/retarget_modifier_3d.cpp b/scene/3d/retarget_modifier_3d.cpp
index df00cbdcae..abafe17533 100644
--- a/scene/3d/retarget_modifier_3d.cpp
+++ b/scene/3d/retarget_modifier_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "retarget_modifier_3d.h"
 
+#include "core/object/class_db.h"
+
 PackedStringArray RetargetModifier3D::get_configuration_warnings() const {
 	PackedStringArray warnings = SkeletonModifier3D::get_configuration_warnings();
 	if (child_skeletons.is_empty()) {
diff --git a/scene/3d/skeleton_3d.compat.inc b/scene/3d/skeleton_3d.compat.inc
index 6410ab335a..f0291d3c5f 100644
--- a/scene/3d/skeleton_3d.compat.inc
+++ b/scene/3d/skeleton_3d.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "skeleton_3d.h"
+
+#include "core/object/class_db.h"
+
 void Skeleton3D::_add_bone_bind_compat_88791(const String &p_name) {
 	add_bone(p_name);
 }
diff --git a/scene/3d/skeleton_3d.cpp b/scene/3d/skeleton_3d.cpp
index d2cb12c3b7..668f13d849 100644
--- a/scene/3d/skeleton_3d.cpp
+++ b/scene/3d/skeleton_3d.cpp
@@ -31,6 +31,7 @@
 #include "skeleton_3d.h"
 #include "skeleton_3d.compat.inc"
 
+#include "core/object/class_db.h"
 #include "scene/3d/skeleton_modifier_3d.h"
 #if !defined(DISABLE_DEPRECATED) && !defined(PHYSICS_3D_DISABLED)
 #include "scene/3d/physics/physical_bone_simulator_3d.h"
diff --git a/scene/3d/skeleton_ik_3d.cpp b/scene/3d/skeleton_ik_3d.cpp
index a5e7b82bae..4f500cdd4d 100644
--- a/scene/3d/skeleton_ik_3d.cpp
+++ b/scene/3d/skeleton_ik_3d.cpp
@@ -31,6 +31,7 @@
 #include "skeleton_ik_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 FabrikInverseKinematic::ChainItem *FabrikInverseKinematic::ChainItem::find_child(const BoneId p_bone_id) {
 	for (int i = children.size() - 1; 0 <= i; --i) {
diff --git a/scene/3d/skeleton_modifier_3d.cpp b/scene/3d/skeleton_modifier_3d.cpp
index 3c34c875f1..339dbc28e0 100644
--- a/scene/3d/skeleton_modifier_3d.cpp
+++ b/scene/3d/skeleton_modifier_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "skeleton_modifier_3d.h"
 
+#include "core/object/class_db.h"
+
 PackedStringArray SkeletonModifier3D::get_configuration_warnings() const {
 	PackedStringArray warnings = Node3D::get_configuration_warnings();
 	if (skeleton_id.is_null()) {
diff --git a/scene/3d/spline_ik_3d.cpp b/scene/3d/spline_ik_3d.cpp
index 0e3119c448..7a6bc8859d 100644
--- a/scene/3d/spline_ik_3d.cpp
+++ b/scene/3d/spline_ik_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "spline_ik_3d.h"
 
+#include "core/object/class_db.h"
+
 bool SplineIK3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
diff --git a/scene/3d/spring_bone_collision_3d.cpp b/scene/3d/spring_bone_collision_3d.cpp
index 17cdcc168e..ff863f6d41 100644
--- a/scene/3d/spring_bone_collision_3d.cpp
+++ b/scene/3d/spring_bone_collision_3d.cpp
@@ -31,6 +31,7 @@
 #include "spring_bone_collision_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/3d/spring_bone_simulator_3d.h"
 
 PackedStringArray SpringBoneCollision3D::get_configuration_warnings() const {
diff --git a/scene/3d/spring_bone_collision_capsule_3d.cpp b/scene/3d/spring_bone_collision_capsule_3d.cpp
index 2867c2c463..fec5b4efaa 100644
--- a/scene/3d/spring_bone_collision_capsule_3d.cpp
+++ b/scene/3d/spring_bone_collision_capsule_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "spring_bone_collision_capsule_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/3d/spring_bone_collision_sphere_3d.h"
 
 void SpringBoneCollisionCapsule3D::set_radius(float p_radius) {
diff --git a/scene/3d/spring_bone_collision_sphere_3d.cpp b/scene/3d/spring_bone_collision_sphere_3d.cpp
index 3560932bc9..c49657d66f 100644
--- a/scene/3d/spring_bone_collision_sphere_3d.cpp
+++ b/scene/3d/spring_bone_collision_sphere_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "spring_bone_collision_sphere_3d.h"
 
+#include "core/object/class_db.h"
+
 void SpringBoneCollisionSphere3D::set_radius(float p_radius) {
 	radius = p_radius;
 #ifdef TOOLS_ENABLED
diff --git a/scene/3d/spring_bone_simulator_3d.compat.inc b/scene/3d/spring_bone_simulator_3d.compat.inc
index 4fa1e94caf..99f4970781 100644
--- a/scene/3d/spring_bone_simulator_3d.compat.inc
+++ b/scene/3d/spring_bone_simulator_3d.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "spring_bone_simulator_3d.h"
+
+#include "core/object/class_db.h"
+
 namespace compat::SpringBoneSimulator3D {
 enum BoneDirection : int {
 	BONE_DIRECTION_PLUS_X = SkeletonModifier3D::BONE_DIRECTION_PLUS_X,
diff --git a/scene/3d/spring_bone_simulator_3d.cpp b/scene/3d/spring_bone_simulator_3d.cpp
index 707cbd6778..3c87e6e872 100644
--- a/scene/3d/spring_bone_simulator_3d.cpp
+++ b/scene/3d/spring_bone_simulator_3d.cpp
@@ -32,6 +32,7 @@
 #include "spring_bone_simulator_3d.compat.inc"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/3d/spring_bone_collision_3d.h"
 
 // Original VRM Spring Bone movement logic was distributed by (c) VRM Consortium. Licensed under the MIT license.
diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp
index 737b683b13..d1961bbfa3 100644
--- a/scene/3d/sprite_3d.cpp
+++ b/scene/3d/sprite_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "sprite_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/mesh.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/3d/two_bone_ik_3d.cpp b/scene/3d/two_bone_ik_3d.cpp
index bcd4c13f9e..0635e0d0ad 100644
--- a/scene/3d/two_bone_ik_3d.cpp
+++ b/scene/3d/two_bone_ik_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "two_bone_ik_3d.h"
 
+#include "core/object/class_db.h"
+
 bool TwoBoneIK3D::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
diff --git a/scene/3d/velocity_tracker_3d.cpp b/scene/3d/velocity_tracker_3d.cpp
index 2b92f72f88..cb8734afd1 100644
--- a/scene/3d/velocity_tracker_3d.cpp
+++ b/scene/3d/velocity_tracker_3d.cpp
@@ -31,6 +31,7 @@
 #include "velocity_tracker_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 void VelocityTracker3D::set_track_physics_step(bool p_track_physics_step) {
 	physics_step = p_track_physics_step;
diff --git a/scene/3d/visible_on_screen_notifier_3d.cpp b/scene/3d/visible_on_screen_notifier_3d.cpp
index 252a1a6d0f..efd9ead4ae 100644
--- a/scene/3d/visible_on_screen_notifier_3d.cpp
+++ b/scene/3d/visible_on_screen_notifier_3d.cpp
@@ -31,6 +31,7 @@
 #include "visible_on_screen_notifier_3d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void VisibleOnScreenNotifier3D::_visibility_enter() {
diff --git a/scene/3d/visual_instance_3d.cpp b/scene/3d/visual_instance_3d.cpp
index 2e5b465884..67ba343876 100644
--- a/scene/3d/visual_instance_3d.cpp
+++ b/scene/3d/visual_instance_3d.cpp
@@ -33,6 +33,7 @@
 STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/resources/material.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/3d/voxel_gi.cpp b/scene/3d/voxel_gi.cpp
index 547161601e..9a9b4a50c7 100644
--- a/scene/3d/voxel_gi.cpp
+++ b/scene/3d/voxel_gi.cpp
@@ -31,6 +31,7 @@
 #include "voxel_gi.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/multimesh_instance_3d.h"
 #include "scene/3d/voxelizer.h"
diff --git a/scene/3d/world_environment.cpp b/scene/3d/world_environment.cpp
index 1b53c4c26a..243c3c48fe 100644
--- a/scene/3d/world_environment.cpp
+++ b/scene/3d/world_environment.cpp
@@ -30,6 +30,7 @@
 
 #include "world_environment.h"
 
+#include "core/object/class_db.h"
 #include "scene/3d/node_3d.h"
 #include "scene/main/viewport.h"
 
diff --git a/scene/3d/xr/xr_body_modifier_3d.cpp b/scene/3d/xr/xr_body_modifier_3d.cpp
index 4d05f40a9d..fb79ceb712 100644
--- a/scene/3d/xr/xr_body_modifier_3d.cpp
+++ b/scene/3d/xr/xr_body_modifier_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "xr_body_modifier_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/3d/skeleton_3d.h"
 #include "servers/xr/xr_server.h"
 
diff --git a/scene/3d/xr/xr_face_modifier_3d.cpp b/scene/3d/xr/xr_face_modifier_3d.cpp
index df7c6b530d..aa4c2ff745 100644
--- a/scene/3d/xr/xr_face_modifier_3d.cpp
+++ b/scene/3d/xr/xr_face_modifier_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "xr_face_modifier_3d.h"
 
+#include "core/object/class_db.h"
 #include "servers/xr/xr_face_tracker.h"
 #include "servers/xr/xr_server.h"
 
diff --git a/scene/3d/xr/xr_hand_modifier_3d.cpp b/scene/3d/xr/xr_hand_modifier_3d.cpp
index ac106373f5..545602b1c2 100644
--- a/scene/3d/xr/xr_hand_modifier_3d.cpp
+++ b/scene/3d/xr/xr_hand_modifier_3d.cpp
@@ -31,6 +31,7 @@
 #include "xr_hand_modifier_3d.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "servers/xr/xr_server.h"
 
 void XRHandModifier3D::_bind_methods() {
diff --git a/scene/3d/xr/xr_nodes.cpp b/scene/3d/xr/xr_nodes.cpp
index d0da5c9287..7f84040694 100644
--- a/scene/3d/xr/xr_nodes.cpp
+++ b/scene/3d/xr/xr_nodes.cpp
@@ -31,6 +31,7 @@
 #include "xr_nodes.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 #include "servers/xr/xr_interface.h"
 
diff --git a/scene/animation/animation_blend_space_1d.cpp b/scene/animation/animation_blend_space_1d.cpp
index 9c95b3156b..691e6a1b31 100644
--- a/scene/animation/animation_blend_space_1d.cpp
+++ b/scene/animation/animation_blend_space_1d.cpp
@@ -32,6 +32,8 @@
 
 #include "animation_blend_tree.h"
 
+#include "core/object/class_db.h"
+
 void AnimationNodeBlendSpace1D::get_parameter_list(List<PropertyInfo> *r_list) const {
 	AnimationNode::get_parameter_list(r_list);
 	r_list->push_back(PropertyInfo(Variant::FLOAT, blend_position));
diff --git a/scene/animation/animation_blend_space_2d.cpp b/scene/animation/animation_blend_space_2d.cpp
index 6cfa6f8098..d3a23f8fcc 100644
--- a/scene/animation/animation_blend_space_2d.cpp
+++ b/scene/animation/animation_blend_space_2d.cpp
@@ -31,7 +31,9 @@
 #include "animation_blend_space_2d.h"
 
 #include "animation_blend_tree.h"
+
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "scene/resources/material.h"
 
 void AnimationNodeBlendSpace2D::get_parameter_list(List<PropertyInfo> *r_list) const {
diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp
index 5bcc77d204..4ea9d11d00 100644
--- a/scene/animation/animation_blend_tree.cpp
+++ b/scene/animation/animation_blend_tree.cpp
@@ -30,6 +30,7 @@
 
 #include "animation_blend_tree.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/animation.h"
 
 void AnimationNodeAnimation::set_animation(const StringName &p_name) {
diff --git a/scene/animation/animation_mixer.compat.inc b/scene/animation/animation_mixer.compat.inc
index f46e34bf98..39716c29b1 100644
--- a/scene/animation/animation_mixer.compat.inc
+++ b/scene/animation/animation_mixer.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "animation_mixer.h"
+
+#include "core/object/class_db.h"
+
 Variant AnimationMixer::_post_process_key_value_bind_compat_86687(const Ref<Animation> &p_anim, int p_track, Variant p_value, Object *p_object, int p_object_idx) {
 	if (!p_object) {
 		return Variant();
diff --git a/scene/animation/animation_mixer.cpp b/scene/animation/animation_mixer.cpp
index 6d1054607b..aad583a060 100644
--- a/scene/animation/animation_mixer.cpp
+++ b/scene/animation/animation_mixer.cpp
@@ -33,6 +33,7 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/string/string_name.h"
 #include "scene/2d/audio_stream_player_2d.h"
 #include "scene/animation/animation_player.h"
diff --git a/scene/animation/animation_node_extension.cpp b/scene/animation/animation_node_extension.cpp
index 3d5a636787..b4c9b038c4 100644
--- a/scene/animation/animation_node_extension.cpp
+++ b/scene/animation/animation_node_extension.cpp
@@ -30,6 +30,8 @@
 
 #include "animation_node_extension.h"
 
+#include "core/object/class_db.h"
+
 AnimationNode::NodeTimeInfo AnimationNodeExtension::_process(const AnimationMixer::PlaybackInfo p_playback_info, bool p_test_only) {
 	PackedFloat32Array r_ret;
 
diff --git a/scene/animation/animation_node_state_machine.cpp b/scene/animation/animation_node_state_machine.cpp
index 338182662b..e564e2d2f7 100644
--- a/scene/animation/animation_node_state_machine.cpp
+++ b/scene/animation/animation_node_state_machine.cpp
@@ -30,6 +30,8 @@
 
 #include "animation_node_state_machine.h"
 
+#include "core/object/class_db.h"
+
 /////////////////////////////////////////////////
 
 void AnimationNodeStateMachineTransition::set_switch_mode(SwitchMode p_mode) {
diff --git a/scene/animation/animation_player.compat.inc b/scene/animation/animation_player.compat.inc
index 19df42fef7..dd390769a1 100644
--- a/scene/animation/animation_player.compat.inc
+++ b/scene/animation/animation_player.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "animation_player.h"
+
+#include "core/object/class_db.h"
+
 void AnimationPlayer::_set_process_callback_bind_compat_80813(AnimationPlayer::AnimationProcessCallback p_mode) {
 	set_callback_mode_process(static_cast<AnimationMixer::AnimationCallbackModeProcess>(static_cast<int>(p_mode)));
 }
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index b101554612..e56276e281 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -32,6 +32,7 @@
 #include "animation_player.compat.inc"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 bool AnimationPlayer::_set(const StringName &p_name, const Variant &p_value) {
 	String name = p_name;
diff --git a/scene/animation/animation_tree.compat.inc b/scene/animation/animation_tree.compat.inc
index 29635f5b52..b98e79ede2 100644
--- a/scene/animation/animation_tree.compat.inc
+++ b/scene/animation/animation_tree.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "animation_tree.h"
+
+#include "core/object/class_db.h"
+
 void AnimationTree::_set_process_callback_bind_compat_80813(AnimationTree::AnimationProcessCallback p_mode) {
 	set_callback_mode_process(static_cast<AnimationMixer::AnimationCallbackModeProcess>(static_cast<int>(p_mode)));
 }
diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp
index ea55a14c11..6585456cc9 100644
--- a/scene/animation/animation_tree.cpp
+++ b/scene/animation/animation_tree.cpp
@@ -32,6 +32,7 @@
 #include "animation_tree.compat.inc"
 
 #include "animation_blend_tree.h"
+#include "core/object/class_db.h"
 #include "scene/animation/animation_player.h"
 
 void AnimationNode::get_parameter_list(List<PropertyInfo> *r_list) const {
diff --git a/scene/animation/root_motion_view.cpp b/scene/animation/root_motion_view.cpp
index 5c4a71f4d6..e8042f6eca 100644
--- a/scene/animation/root_motion_view.cpp
+++ b/scene/animation/root_motion_view.cpp
@@ -32,6 +32,7 @@
 
 #include "root_motion_view.h"
 
+#include "core/object/class_db.h"
 #include "scene/animation/animation_mixer.h"
 #include "scene/resources/material.h"
 
diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp
index 35146edb87..86abba1a4e 100644
--- a/scene/animation/tween.cpp
+++ b/scene/animation/tween.cpp
@@ -30,6 +30,7 @@
 
 #include "tween.h"
 
+#include "core/object/class_db.h"
 #include "scene/animation/easing_equations.h"
 #include "scene/main/node.h"
 #include "scene/resources/animation.h"
diff --git a/scene/audio/audio_stream_player.compat.inc b/scene/audio/audio_stream_player.compat.inc
index b0f091ec08..e16cd1a497 100644
--- a/scene/audio/audio_stream_player.compat.inc
+++ b/scene/audio/audio_stream_player.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "audio_stream_player.h"
+
+#include "core/object/class_db.h"
+
 bool AudioStreamPlayer::_is_autoplay_enabled_bind_compat_86907() {
 	return is_autoplay_enabled();
 }
diff --git a/scene/audio/audio_stream_player.cpp b/scene/audio/audio_stream_player.cpp
index 954dffefb7..8501c5f774 100644
--- a/scene/audio/audio_stream_player.cpp
+++ b/scene/audio/audio_stream_player.cpp
@@ -31,6 +31,7 @@
 #include "audio_stream_player.h"
 #include "audio_stream_player.compat.inc"
 
+#include "core/object/class_db.h"
 #include "scene/audio/audio_stream_player_internal.h"
 #include "servers/audio/audio_stream.h"
 #include "servers/display/display_server.h"
diff --git a/scene/gui/aspect_ratio_container.cpp b/scene/gui/aspect_ratio_container.cpp
index d012268e41..96064094c8 100644
--- a/scene/gui/aspect_ratio_container.cpp
+++ b/scene/gui/aspect_ratio_container.cpp
@@ -30,6 +30,7 @@
 
 #include "aspect_ratio_container.h"
 
+#include "core/object/class_db.h"
 #include "scene/gui/texture_rect.h"
 
 Size2 AspectRatioContainer::get_minimum_size() const {
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index 9f00d9e9fb..a6b2c5c9fc 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -31,6 +31,7 @@
 #include "base_button.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/gui/label.h"
 #include "scene/main/timer.h"
 #include "scene/main/window.h"
diff --git a/scene/gui/box_container.cpp b/scene/gui/box_container.cpp
index e5d73769a7..f4ee345977 100644
--- a/scene/gui/box_container.cpp
+++ b/scene/gui/box_container.cpp
@@ -30,6 +30,7 @@
 
 #include "box_container.h"
 
+#include "core/object/class_db.h"
 #include "scene/gui/label.h"
 #include "scene/gui/margin_container.h"
 #include "scene/theme/theme_db.h"
diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp
index d99b2269b6..0b49e93a5b 100644
--- a/scene/gui/button.cpp
+++ b/scene/gui/button.cpp
@@ -30,8 +30,8 @@
 
 #include "button.h"
 
+#include "core/object/class_db.h"
 #include "scene/gui/dialogs.h"
-
 #include "scene/theme/theme_db.h"
 
 Size2 Button::get_minimum_size() const {
diff --git a/scene/gui/center_container.cpp b/scene/gui/center_container.cpp
index 98fc1116ba..520bd8817f 100644
--- a/scene/gui/center_container.cpp
+++ b/scene/gui/center_container.cpp
@@ -30,6 +30,8 @@
 
 #include "center_container.h"
 
+#include "core/object/class_db.h"
+
 Size2 CenterContainer::get_minimum_size() const {
 	if (use_top_left) {
 		return Size2();
diff --git a/scene/gui/check_box.cpp b/scene/gui/check_box.cpp
index 03dab7448b..bd00406c85 100644
--- a/scene/gui/check_box.cpp
+++ b/scene/gui/check_box.cpp
@@ -30,6 +30,7 @@
 
 #include "check_box.h"
 
+#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
 
 Size2 CheckBox::get_icon_size() const {
diff --git a/scene/gui/check_button.cpp b/scene/gui/check_button.cpp
index d90f12e48e..14a690adb4 100644
--- a/scene/gui/check_button.cpp
+++ b/scene/gui/check_button.cpp
@@ -30,6 +30,7 @@
 
 #include "check_button.h"
 
+#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
 
 Size2 CheckButton::get_icon_size() const {
diff --git a/scene/gui/code_edit.compat.inc b/scene/gui/code_edit.compat.inc
index 8dd7c00aa4..3461b6f2ed 100644
--- a/scene/gui/code_edit.compat.inc
+++ b/scene/gui/code_edit.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "code_edit.h"
+
+#include "core/object/class_db.h"
+
 String CodeEdit::_get_text_for_symbol_lookup_bind_compat_73196() {
 	return get_text_for_symbol_lookup();
 }
@@ -43,4 +47,4 @@ void CodeEdit::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("add_code_completion_option", "type", "display_text", "insert_text", "text_color", "icon", "value", "location"), &CodeEdit::_add_code_completion_option_compat_84906, DEFVAL(Color(1, 1, 1)), DEFVAL(Ref<Resource>()), DEFVAL(Variant::NIL), DEFVAL(LOCATION_OTHER));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/gui/code_edit.cpp b/scene/gui/code_edit.cpp
index 0fcab013a6..beafabed65 100644
--- a/scene/gui/code_edit.cpp
+++ b/scene/gui/code_edit.cpp
@@ -33,6 +33,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/string/string_builder.h"
 #include "core/string/translation_server.h"
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index e8401d9afa..7d69356bcf 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -33,6 +33,7 @@
 #include "core/input/input.h"
 #include "core/io/image.h"
 #include "core/math/expression.h"
+#include "core/object/class_db.h"
 #include "scene/gui/color_mode.h"
 #include "scene/gui/color_picker_shape.h"
 #include "scene/gui/file_dialog.h"
diff --git a/scene/gui/color_rect.cpp b/scene/gui/color_rect.cpp
index 141581c22d..45f430deca 100644
--- a/scene/gui/color_rect.cpp
+++ b/scene/gui/color_rect.cpp
@@ -30,6 +30,8 @@
 
 #include "color_rect.h"
 
+#include "core/object/class_db.h"
+
 void ColorRect::set_color(const Color &p_color) {
 	if (color == p_color) {
 		return;
diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp
index b96a0ca346..c7189b5892 100644
--- a/scene/gui/container.cpp
+++ b/scene/gui/container.cpp
@@ -30,6 +30,8 @@
 
 #include "container.h"
 
+#include "core/object/class_db.h"
+
 void Container::_child_minsize_changed() {
 	update_minimum_size();
 	queue_sort();
diff --git a/scene/gui/control.compat.inc b/scene/gui/control.compat.inc
index 4e854fc98a..6da7e06d09 100644
--- a/scene/gui/control.compat.inc
+++ b/scene/gui/control.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "control.h"
+
+#include "core/object/class_db.h"
+
 bool Control::_has_focus_bind_compat_110250() const {
 	return has_focus(false);
 }
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index dea37e85a1..8a3c9cd64c 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -36,6 +36,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 #include "container.h"
 #include "core/config/project_settings.h"
 #include "core/input/input_map.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/string/string_builder.h"
 #include "scene/gui/scroll_container.h"
diff --git a/scene/gui/dialogs.compat.inc b/scene/gui/dialogs.compat.inc
index acfc9f0a18..90691bcdb9 100644
--- a/scene/gui/dialogs.compat.inc
+++ b/scene/gui/dialogs.compat.inc
@@ -30,6 +30,9 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "dialogs.h"
+
+#include "core/object/class_db.h"
 #include "scene/gui/line_edit.h"
 
 void AcceptDialog::_register_text_enter_bind_compat_89419(Control *p_line_edit) {
@@ -45,4 +48,4 @@ void AcceptDialog::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("remove_button", "quadrant_size"), &AcceptDialog::_remove_button_bind_compat_89419);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index 69993a4153..44e8b8c732 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -31,6 +31,7 @@
 #include "dialogs.h"
 #include "dialogs.compat.inc"
 
+#include "core/object/class_db.h"
 #include "scene/gui/line_edit.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/file_dialog.compat.inc b/scene/gui/file_dialog.compat.inc
index c8da18f7a1..b0ce5b70b9 100644
--- a/scene/gui/file_dialog.compat.inc
+++ b/scene/gui/file_dialog.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "file_dialog.h"
+
+#include "core/object/class_db.h"
+
 void FileDialog::_add_filter_bind_compat_111439(const String &p_filter, const String &p_description) {
 	add_filter(p_filter, p_description, "");
 }
@@ -38,4 +42,4 @@ void FileDialog::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("add_filter", "filter", "description"), &FileDialog::_add_filter_bind_compat_111439, DEFVAL(""));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp
index 2c42e05e64..be7a478a24 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/file_dialog.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/class_db.h"
 #include "core/os/keyboard.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
diff --git a/scene/gui/flow_container.cpp b/scene/gui/flow_container.cpp
index 659a8ad7da..3e4f32acde 100644
--- a/scene/gui/flow_container.cpp
+++ b/scene/gui/flow_container.cpp
@@ -30,6 +30,7 @@
 
 #include "flow_container.h"
 
+#include "core/object/class_db.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/foldable_container.cpp b/scene/gui/foldable_container.cpp
index ff0e424c24..415a57193c 100644
--- a/scene/gui/foldable_container.cpp
+++ b/scene/gui/foldable_container.cpp
@@ -30,6 +30,7 @@
 
 #include "foldable_container.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/text_line.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/graph_edit.compat.inc b/scene/gui/graph_edit.compat.inc
index 5b8cc2b048..4f374819a6 100644
--- a/scene/gui/graph_edit.compat.inc
+++ b/scene/gui/graph_edit.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "graph_edit.h"
+
+#include "core/object/class_db.h"
+
 bool GraphEdit::_is_arrange_nodes_button_hidden_bind_compat_81582() const {
 	return !is_showing_arrange_button();
 }
@@ -53,4 +57,4 @@ void GraphEdit::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("connect_node", "from_node", "from_port", "to_node", "to_port"), &GraphEdit::_connect_node_bind_compat_97449);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index 2468181856..caa51026b6 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/graph_edit.cpp
@@ -34,6 +34,7 @@
 #include "core/input/input.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "scene/2d/line_2d.h"
 #include "scene/gui/box_container.h"
diff --git a/scene/gui/graph_element.cpp b/scene/gui/graph_element.cpp
index 0d69e3750d..db3c861343 100644
--- a/scene/gui/graph_element.cpp
+++ b/scene/gui/graph_element.cpp
@@ -30,6 +30,7 @@
 
 #include "graph_element.h"
 
+#include "core/object/class_db.h"
 #include "scene/gui/graph_edit.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/graph_frame.cpp b/scene/gui/graph_frame.cpp
index 9eed6d5696..2e1ccfb8e3 100644
--- a/scene/gui/graph_frame.cpp
+++ b/scene/gui/graph_frame.cpp
@@ -30,6 +30,7 @@
 
 #include "graph_frame.h"
 
+#include "core/object/class_db.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"
 #include "scene/resources/style_box_flat.h"
diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp
index c0f7eaca6d..335685977c 100644
--- a/scene/gui/graph_node.cpp
+++ b/scene/gui/graph_node.cpp
@@ -30,6 +30,7 @@
 
 #include "graph_node.h"
 
+#include "core/object/class_db.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/graph_edit.h"
 #include "scene/gui/label.h"
diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp
index 06627019e8..7b434f7d38 100644
--- a/scene/gui/grid_container.cpp
+++ b/scene/gui/grid_container.cpp
@@ -30,6 +30,7 @@
 
 #include "grid_container.h"
 
+#include "core/object/class_db.h"
 #include "core/templates/rb_map.h"
 #include "core/templates/rb_set.h"
 #include "scene/theme/theme_db.h"
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index a309c4e08f..052340e1e1 100644
--- a/scene/gui/item_list.cpp
+++ b/scene/gui/item_list.cpp
@@ -31,6 +31,7 @@
 #include "item_list.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "scene/theme/theme_db.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp
index da14acf103..1aab515b7a 100644
--- a/scene/gui/label.cpp
+++ b/scene/gui/label.cpp
@@ -30,6 +30,7 @@
 
 #include "label.h"
 
+#include "core/object/class_db.h"
 #include "scene/gui/container.h"
 #include "scene/theme/theme_db.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/gui/line_edit.compat.inc b/scene/gui/line_edit.compat.inc
index 9b2148e210..e9cbe962e7 100644
--- a/scene/gui/line_edit.compat.inc
+++ b/scene/gui/line_edit.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "line_edit.h"
+
+#include "core/object/class_db.h"
+
 void LineEdit::_edit_bind_compat_111117() {
 	edit(false);
 }
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index dd01243dd9..ab9876597b 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -34,6 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/input/input_map.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/string/alt_codes.h"
diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp
index a51dd1240a..b7c65ced86 100644
--- a/scene/gui/link_button.cpp
+++ b/scene/gui/link_button.cpp
@@ -30,6 +30,7 @@
 
 #include "link_button.h"
 
+#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
 
 void LinkButton::_shape() {
diff --git a/scene/gui/margin_container.cpp b/scene/gui/margin_container.cpp
index 535db650f0..9bb5685435 100644
--- a/scene/gui/margin_container.cpp
+++ b/scene/gui/margin_container.cpp
@@ -30,6 +30,7 @@
 
 #include "margin_container.h"
 
+#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
 
 Size2 MarginContainer::get_minimum_size() const {
diff --git a/scene/gui/menu_bar.cpp b/scene/gui/menu_bar.cpp
index 325ac40ce9..ed134bf2aa 100644
--- a/scene/gui/menu_bar.cpp
+++ b/scene/gui/menu_bar.cpp
@@ -30,6 +30,7 @@
 
 #include "menu_bar.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp
index 7c405d8d0f..cc3e9cde40 100644
--- a/scene/gui/menu_button.cpp
+++ b/scene/gui/menu_button.cpp
@@ -30,6 +30,7 @@
 
 #include "menu_button.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/window.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/gui/nine_patch_rect.cpp b/scene/gui/nine_patch_rect.cpp
index d99204be17..2c3cb64a61 100644
--- a/scene/gui/nine_patch_rect.cpp
+++ b/scene/gui/nine_patch_rect.cpp
@@ -30,6 +30,7 @@
 
 #include "nine_patch_rect.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void NinePatchRect::_notification(int p_what) {
diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp
index d0b376736a..3785f91cbc 100644
--- a/scene/gui/option_button.cpp
+++ b/scene/gui/option_button.cpp
@@ -30,6 +30,7 @@
 
 #include "option_button.h"
 
+#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
 
 static const int NONE_SELECTED = -1;
diff --git a/scene/gui/panel.cpp b/scene/gui/panel.cpp
index 9f175ea34f..58dbe6587d 100644
--- a/scene/gui/panel.cpp
+++ b/scene/gui/panel.cpp
@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "panel.h"
+
+#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
 
 void Panel::_notification(int p_what) {
diff --git a/scene/gui/panel_container.cpp b/scene/gui/panel_container.cpp
index 6196310b55..2da3a65be2 100644
--- a/scene/gui/panel_container.cpp
+++ b/scene/gui/panel_container.cpp
@@ -30,6 +30,7 @@
 
 #include "panel_container.h"
 
+#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
 
 Size2 PanelContainer::get_minimum_size() const {
diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
index 40e0948195..caba670394 100644
--- a/scene/gui/popup.cpp
+++ b/scene/gui/popup.cpp
@@ -33,6 +33,8 @@
 #ifdef TOOLS_ENABLED
 #include "core/config/project_settings.h"
 #endif
+
+#include "core/object/class_db.h"
 #include "scene/gui/panel.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/theme/theme_db.h"
diff --git a/scene/gui/popup_menu.compat.inc b/scene/gui/popup_menu.compat.inc
index 3d41c62634..fef7455271 100644
--- a/scene/gui/popup_menu.compat.inc
+++ b/scene/gui/popup_menu.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "popup_menu.h"
+
+#include "core/object/class_db.h"
+
 void PopupMenu::_add_shortcut_bind_compat_36493(const Ref<Shortcut> &p_shortcut, int p_id, bool p_global) {
 	add_shortcut(p_shortcut, p_id, p_global, false);
 }
@@ -78,4 +82,4 @@ void PopupMenu::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_system_menu_root"), &PopupMenu::_get_system_menu_root_compat_87452);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index 7c3592c588..d24ff8d414 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -33,6 +33,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "scene/gui/graph_edit.h"
diff --git a/scene/gui/progress_bar.cpp b/scene/gui/progress_bar.cpp
index 9d5588055a..8211f3e29a 100644
--- a/scene/gui/progress_bar.cpp
+++ b/scene/gui/progress_bar.cpp
@@ -30,6 +30,7 @@
 
 #include "progress_bar.h"
 
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "scene/resources/text_line.h"
 #include "scene/theme/theme_db.h"
diff --git a/scene/gui/range.cpp b/scene/gui/range.cpp
index 6f5abb4d3f..b6935a5156 100644
--- a/scene/gui/range.cpp
+++ b/scene/gui/range.cpp
@@ -30,6 +30,7 @@
 
 #include "range.h"
 
+#include "core/object/class_db.h"
 #include "thirdparty/misc/r128.h"
 
 double Range::_snapped_r128(double p_value, double p_step) {
diff --git a/scene/gui/reference_rect.cpp b/scene/gui/reference_rect.cpp
index 5a4b6c4431..00bbb34247 100644
--- a/scene/gui/reference_rect.cpp
+++ b/scene/gui/reference_rect.cpp
@@ -31,6 +31,7 @@
 #include "reference_rect.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 void ReferenceRect::_notification(int p_what) {
 	switch (p_what) {
diff --git a/scene/gui/rich_text_effect.cpp b/scene/gui/rich_text_effect.cpp
index e968321777..4a05477a37 100644
--- a/scene/gui/rich_text_effect.cpp
+++ b/scene/gui/rich_text_effect.cpp
@@ -30,6 +30,7 @@
 
 #include "rich_text_effect.h"
 
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 
 CharFXTransform::CharFXTransform() {
diff --git a/scene/gui/rich_text_label.compat.inc b/scene/gui/rich_text_label.compat.inc
index 661f589ba9..04ee6d4dde 100644
--- a/scene/gui/rich_text_label.compat.inc
+++ b/scene/gui/rich_text_label.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "rich_text_label.h"
+
+#include "core/object/class_db.h"
+
 void RichTextLabel::_push_font_bind_compat_79053(const Ref<Font> &p_font, int p_size) {
 	push_font(p_font, p_size);
 }
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 317803a0f6..b79c894fec 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -34,6 +34,7 @@
 #include "core/input/input_map.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "core/string/translation_server.h"
diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp
index 90bbd3180c..eb6bc7b332 100644
--- a/scene/gui/scroll_bar.cpp
+++ b/scene/gui/scroll_bar.cpp
@@ -30,6 +30,7 @@
 
 #include "scroll_bar.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp
index 29dc4b0c76..ae12b40e1e 100644
--- a/scene/gui/scroll_container.cpp
+++ b/scene/gui/scroll_container.cpp
@@ -31,6 +31,7 @@
 #include "scroll_container.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/main/window.h"
diff --git a/scene/gui/separator.cpp b/scene/gui/separator.cpp
index d0ca7c2e86..9a37d93de8 100644
--- a/scene/gui/separator.cpp
+++ b/scene/gui/separator.cpp
@@ -30,6 +30,7 @@
 
 #include "separator.h"
 
+#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
 
 Size2 Separator::get_minimum_size() const {
diff --git a/scene/gui/slider.cpp b/scene/gui/slider.cpp
index 17e89f4a7b..ab8ee85ea3 100644
--- a/scene/gui/slider.cpp
+++ b/scene/gui/slider.cpp
@@ -31,6 +31,7 @@
 #include "slider.h"
 
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
 
 Size2 Slider::get_minimum_size() const {
diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp
index d3b5f96b26..b70d16ecba 100644
--- a/scene/gui/spin_box.cpp
+++ b/scene/gui/spin_box.cpp
@@ -32,6 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/math/expression.h"
+#include "core/object/class_db.h"
 #include "core/string/translation_server.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/split_container.compat.inc b/scene/gui/split_container.compat.inc
index 1833290be3..11a101254b 100644
--- a/scene/gui/split_container.compat.inc
+++ b/scene/gui/split_container.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "split_container.h"
+
+#include "core/object/class_db.h"
+
 void SplitContainer::_clamp_split_offset_compat_90411() {
 	clamp_split_offset(0);
 }
@@ -38,4 +42,4 @@ void SplitContainer::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("clamp_split_offset"), &SplitContainer::_clamp_split_offset_compat_90411);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/gui/split_container.cpp b/scene/gui/split_container.cpp
index 7992b480b4..10094b36fd 100644
--- a/scene/gui/split_container.cpp
+++ b/scene/gui/split_container.cpp
@@ -31,6 +31,7 @@
 #include "split_container.h"
 #include "split_container.compat.inc"
 
+#include "core/object/class_db.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/main/viewport.h"
 #include "scene/theme/theme_db.h"
diff --git a/scene/gui/subviewport_container.cpp b/scene/gui/subviewport_container.cpp
index 9e885e9d62..4da07b13bc 100644
--- a/scene/gui/subviewport_container.cpp
+++ b/scene/gui/subviewport_container.cpp
@@ -31,6 +31,7 @@
 #include "subviewport_container.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 
 Size2 SubViewportContainer::get_minimum_size() const {
diff --git a/scene/gui/tab_bar.cpp b/scene/gui/tab_bar.cpp
index 8f041ede6e..5554e011cd 100644
--- a/scene/gui/tab_bar.cpp
+++ b/scene/gui/tab_bar.cpp
@@ -31,6 +31,7 @@
 #include "tab_bar.h"
 
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/texture_rect.h"
diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp
index 5d94610fba..b881d98d77 100644
--- a/scene/gui/tab_container.cpp
+++ b/scene/gui/tab_container.cpp
@@ -30,6 +30,7 @@
 
 #include "tab_container.h"
 
+#include "core/object/class_db.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/popup.h"
diff --git a/scene/gui/text_edit.compat.inc b/scene/gui/text_edit.compat.inc
index d15740390e..c405407841 100644
--- a/scene/gui/text_edit.compat.inc
+++ b/scene/gui/text_edit.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "text_edit.h"
+
+#include "core/object/class_db.h"
+
 void TextEdit::_set_selection_mode_compat_86978(SelectionMode p_mode, int p_line, int p_column, int p_caret) {
 	set_selection_mode(p_mode);
 }
@@ -43,4 +47,4 @@ void TextEdit::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_line_column_at_pos", "position", "allow_out_of_bounds"), &TextEdit::_get_line_column_at_pos_bind_compat_100913, DEFVAL(true));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 3681693dd6..4e8b83fc40 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -34,6 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/input/input_map.h"
+#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp
index df5212f6c7..14a35a8b3f 100644
--- a/scene/gui/texture_button.cpp
+++ b/scene/gui/texture_button.cpp
@@ -30,6 +30,7 @@
 
 #include "texture_button.h"
 
+#include "core/object/class_db.h"
 #include "core/typedefs.h"
 
 Size2 TextureButton::get_minimum_size() const {
diff --git a/scene/gui/texture_progress_bar.cpp b/scene/gui/texture_progress_bar.cpp
index 793f26d533..5f95aae2c7 100644
--- a/scene/gui/texture_progress_bar.cpp
+++ b/scene/gui/texture_progress_bar.cpp
@@ -30,6 +30,7 @@
 
 #include "texture_progress_bar.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void TextureProgressBar::set_under_texture(const Ref<Texture2D> &p_texture) {
diff --git a/scene/gui/texture_rect.cpp b/scene/gui/texture_rect.cpp
index 99855941f7..714e5b0446 100644
--- a/scene/gui/texture_rect.cpp
+++ b/scene/gui/texture_rect.cpp
@@ -30,6 +30,7 @@
 
 #include "texture_rect.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/atlas_texture.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/gui/tree.compat.inc b/scene/gui/tree.compat.inc
index f435576464..ec15106dd4 100644
--- a/scene/gui/tree.compat.inc
+++ b/scene/gui/tree.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "tree.h"
+
+#include "core/object/class_db.h"
+
 void TreeItem::_add_button_bind_compat_76829(int p_column, const Ref<Texture2D> &p_button, int p_id, bool p_disabled, const String &p_tooltip) {
 	add_button(p_column, p_button, p_id, p_disabled, p_tooltip, String());
 }
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index 2d53fc6528..a734118edd 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -34,6 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
 #include "scene/gui/box_container.h"
diff --git a/scene/gui/video_stream_player.cpp b/scene/gui/video_stream_player.cpp
index b15e1dbde7..0e0a7a128e 100644
--- a/scene/gui/video_stream_player.cpp
+++ b/scene/gui/video_stream_player.cpp
@@ -30,6 +30,7 @@
 
 #include "video_stream_player.h"
 
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "servers/audio/audio_server.h"
 
diff --git a/scene/gui/virtual_joystick.cpp b/scene/gui/virtual_joystick.cpp
index 4f4472416b..b18ba5b93d 100644
--- a/scene/gui/virtual_joystick.cpp
+++ b/scene/gui/virtual_joystick.cpp
@@ -32,6 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/input/input_map.h"
+#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
 
 void VirtualJoystick::gui_input(const Ref<InputEvent> &p_event) {
diff --git a/scene/main/canvas_item.compat.inc b/scene/main/canvas_item.compat.inc
index ceb85e77cb..399dfe258f 100644
--- a/scene/main/canvas_item.compat.inc
+++ b/scene/main/canvas_item.compat.inc
@@ -30,6 +30,9 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "canvas_item.h"
+
+#include "core/object/class_db.h"
 #include "scene/resources/font.h"
 
 void CanvasItem::_draw_string_bind_compat_104872(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment, float p_width, int p_font_size, const Color &p_modulate, BitField<TextServer::JustificationFlag> p_jst_flags, TextServer::Direction p_direction, TextServer::Orientation p_orientation) const {
@@ -90,4 +93,4 @@ void CanvasItem::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("draw_multiline_colors", "points", "colors", "width"), &CanvasItem::_draw_multiline_colors_bind_compat_84523, DEFVAL(-1.0));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp
index 901453ed89..6ccd83f6ff 100644
--- a/scene/main/canvas_item.cpp
+++ b/scene/main/canvas_item.cpp
@@ -33,6 +33,7 @@
 
 STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 
+#include "core/object/class_db.h"
 #include "scene/2d/canvas_group.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/window.h"
diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp
index fa9cc62fa9..c2624bb6f1 100644
--- a/scene/main/canvas_layer.cpp
+++ b/scene/main/canvas_layer.cpp
@@ -30,6 +30,7 @@
 
 #include "canvas_layer.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/canvas_item.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/world_2d.h"
diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp
index 20c2b84afa..2793facbad 100644
--- a/scene/main/http_request.cpp
+++ b/scene/main/http_request.cpp
@@ -32,6 +32,7 @@
 
 #include "core/io/file_access.h"
 #include "core/io/stream_peer_gzip.h"
+#include "core/object/class_db.h"
 #include "core/os/thread.h"
 #include "scene/main/timer.h"
 
diff --git a/scene/main/instance_placeholder.cpp b/scene/main/instance_placeholder.cpp
index 0a93eaaa2f..7aff0d784a 100644
--- a/scene/main/instance_placeholder.cpp
+++ b/scene/main/instance_placeholder.cpp
@@ -31,6 +31,7 @@
 #include "instance_placeholder.h"
 
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "scene/resources/packed_scene.h"
 
 bool InstancePlaceholder::_set(const StringName &p_name, const Variant &p_value) {
diff --git a/scene/main/missing_node.cpp b/scene/main/missing_node.cpp
index 10d426dd01..2cf90600ca 100644
--- a/scene/main/missing_node.cpp
+++ b/scene/main/missing_node.cpp
@@ -30,6 +30,8 @@
 
 #include "missing_node.h"
 
+#include "core/object/class_db.h"
+
 bool MissingNode::_set(const StringName &p_name, const Variant &p_value) {
 	if (is_recording_properties()) {
 		properties.insert(p_name, p_value);
diff --git a/scene/main/multiplayer_api.cpp b/scene/main/multiplayer_api.cpp
index 76978fb234..3e9a3e76f3 100644
--- a/scene/main/multiplayer_api.cpp
+++ b/scene/main/multiplayer_api.cpp
@@ -31,6 +31,7 @@
 #include "multiplayer_api.h"
 
 #include "core/io/marshalls.h"
+#include "core/object/class_db.h"
 
 StringName MultiplayerAPI::default_interface;
 
diff --git a/scene/main/multiplayer_peer.cpp b/scene/main/multiplayer_peer.cpp
index 407353ffb8..b01f390cde 100644
--- a/scene/main/multiplayer_peer.cpp
+++ b/scene/main/multiplayer_peer.cpp
@@ -30,6 +30,7 @@
 
 #include "multiplayer_peer.h"
 
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 
 uint32_t MultiplayerPeer::generate_unique_id() const {
diff --git a/scene/main/node.compat.inc b/scene/main/node.compat.inc
index 27685d2260..b4a73db298 100644
--- a/scene/main/node.compat.inc
+++ b/scene/main/node.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "node.h"
+
+#include "core/object/class_db.h"
+
 void Node::_set_name_bind_compat_76560(const String &p_name) {
 	set_name(p_name);
 }
@@ -43,4 +47,4 @@ void Node::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_rpc_config"), &Node::_get_rpc_config_bind_compat_106848);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 67ddee8229..c809d9b2d2 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -31,6 +31,8 @@
 #include "node.h"
 #include "node.compat.inc"
 
+#include "core/object/class_db.h"
+
 STATIC_ASSERT_INCOMPLETE_TYPE(class, Mesh);
 STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 STATIC_ASSERT_INCOMPLETE_TYPE(class, DisplayServer);
diff --git a/scene/main/resource_preloader.cpp b/scene/main/resource_preloader.cpp
index 9541fc1104..3f72241192 100644
--- a/scene/main/resource_preloader.cpp
+++ b/scene/main/resource_preloader.cpp
@@ -30,6 +30,7 @@
 
 #include "resource_preloader.h"
 
+#include "core/object/class_db.h"
 #include "core/templates/rb_set.h"
 
 void ResourcePreloader::_set_resources(const Array &p_data) {
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp
index 44045db1d6..c1092c2ede 100644
--- a/scene/main/scene_tree.cpp
+++ b/scene/main/scene_tree.cpp
@@ -36,6 +36,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 #include "core/input/input.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "core/object/message_queue.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"
diff --git a/scene/main/shader_globals_override.cpp b/scene/main/shader_globals_override.cpp
index 8b53879f11..ad3eea57b4 100644
--- a/scene/main/shader_globals_override.cpp
+++ b/scene/main/shader_globals_override.cpp
@@ -30,6 +30,7 @@
 
 #include "shader_globals_override.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 StringName *ShaderGlobalsOverride::_remap(const StringName &p_name) const {
diff --git a/scene/main/status_indicator.cpp b/scene/main/status_indicator.cpp
index ccf3885af5..1194952a39 100644
--- a/scene/main/status_indicator.cpp
+++ b/scene/main/status_indicator.cpp
@@ -30,6 +30,7 @@
 
 #include "status_indicator.h"
 
+#include "core/object/class_db.h"
 #include "scene/gui/popup_menu.h"
 
 void StatusIndicator::_notification(int p_what) {
diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp
index a6a11dbbd6..f1b0128219 100644
--- a/scene/main/timer.cpp
+++ b/scene/main/timer.cpp
@@ -31,6 +31,7 @@
 #include "timer.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 void Timer::_notification(int p_what) {
 	switch (p_what) {
diff --git a/scene/main/viewport.compat.inc b/scene/main/viewport.compat.inc
index b04da36042..da034713dd 100644
--- a/scene/main/viewport.compat.inc
+++ b/scene/main/viewport.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "viewport.h"
+
+#include "core/object/class_db.h"
+
 #ifndef XR_DISABLED
 bool Viewport::_is_using_xr_115799() {
 	return is_using_xr();
@@ -42,4 +46,4 @@ void Viewport::_bind_compatibility_methods() {
 #endif
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index ed2c79333c..5b7f3f9d18 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -36,6 +36,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "core/templates/pair.h"
 #include "core/templates/sort_array.h"
 #include "scene/gui/control.h"
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index 2766c7fdf7..1bfed5fd5f 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -35,6 +35,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "scene/gui/control.h"
 #include "scene/theme/theme_db.h"
 #include "scene/theme/theme_owner.h"
diff --git a/scene/resources/2d/capsule_shape_2d.cpp b/scene/resources/2d/capsule_shape_2d.cpp
index fc621790c3..54fe220b17 100644
--- a/scene/resources/2d/capsule_shape_2d.cpp
+++ b/scene/resources/2d/capsule_shape_2d.cpp
@@ -31,6 +31,7 @@
 #include "capsule_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/2d/circle_shape_2d.cpp b/scene/resources/2d/circle_shape_2d.cpp
index 8e86ae1f76..9a32eb11fe 100644
--- a/scene/resources/2d/circle_shape_2d.cpp
+++ b/scene/resources/2d/circle_shape_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "circle_shape_2d.h"
 
+#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/2d/concave_polygon_shape_2d.cpp b/scene/resources/2d/concave_polygon_shape_2d.cpp
index d551ed4543..43f39c8b7b 100644
--- a/scene/resources/2d/concave_polygon_shape_2d.cpp
+++ b/scene/resources/2d/concave_polygon_shape_2d.cpp
@@ -31,6 +31,7 @@
 #include "concave_polygon_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/2d/convex_polygon_shape_2d.cpp b/scene/resources/2d/convex_polygon_shape_2d.cpp
index a6b89de4a8..836d80d1b2 100644
--- a/scene/resources/2d/convex_polygon_shape_2d.cpp
+++ b/scene/resources/2d/convex_polygon_shape_2d.cpp
@@ -31,6 +31,7 @@
 #include "convex_polygon_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/2d/navigation_mesh_source_geometry_data_2d.cpp b/scene/resources/2d/navigation_mesh_source_geometry_data_2d.cpp
index 031fb6cb2e..fd69f1fc63 100644
--- a/scene/resources/2d/navigation_mesh_source_geometry_data_2d.cpp
+++ b/scene/resources/2d/navigation_mesh_source_geometry_data_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "navigation_mesh_source_geometry_data_2d.h"
 
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void NavigationMeshSourceGeometryData2D::clear() {
diff --git a/scene/resources/2d/navigation_polygon.cpp b/scene/resources/2d/navigation_polygon.cpp
index daa6ba7a4d..660f7c7656 100644
--- a/scene/resources/2d/navigation_polygon.cpp
+++ b/scene/resources/2d/navigation_polygon.cpp
@@ -31,6 +31,7 @@
 #include "navigation_polygon.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "core/os/mutex.h"
 
 #include "thirdparty/misc/polypartition.h"
diff --git a/scene/resources/2d/polygon_path_finder.cpp b/scene/resources/2d/polygon_path_finder.cpp
index e3da45f266..51fe4129f8 100644
--- a/scene/resources/2d/polygon_path_finder.cpp
+++ b/scene/resources/2d/polygon_path_finder.cpp
@@ -29,7 +29,9 @@
 /**************************************************************************/
 
 #include "polygon_path_finder.h"
+
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 
 bool PolygonPathFinder::_is_point_inside(const Vector2 &p_point) const {
 	int crosses = 0;
diff --git a/scene/resources/2d/rectangle_shape_2d.cpp b/scene/resources/2d/rectangle_shape_2d.cpp
index 1e6b339130..9a23f8ff12 100644
--- a/scene/resources/2d/rectangle_shape_2d.cpp
+++ b/scene/resources/2d/rectangle_shape_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "rectangle_shape_2d.h"
 
+#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 void RectangleShape2D::_update_shape() {
diff --git a/scene/resources/2d/segment_shape_2d.cpp b/scene/resources/2d/segment_shape_2d.cpp
index b8e9850ed8..36a3e71439 100644
--- a/scene/resources/2d/segment_shape_2d.cpp
+++ b/scene/resources/2d/segment_shape_2d.cpp
@@ -31,6 +31,7 @@
 #include "segment_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/2d/separation_ray_shape_2d.cpp b/scene/resources/2d/separation_ray_shape_2d.cpp
index 801282003c..dd292b4ecc 100644
--- a/scene/resources/2d/separation_ray_shape_2d.cpp
+++ b/scene/resources/2d/separation_ray_shape_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "separation_ray_shape_2d.h"
 
+#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/2d/shape_2d.cpp b/scene/resources/2d/shape_2d.cpp
index f48c318ce3..b670da2682 100644
--- a/scene/resources/2d/shape_2d.cpp
+++ b/scene/resources/2d/shape_2d.cpp
@@ -31,6 +31,7 @@
 #include "shape_2d.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 
 RID Shape2D::get_rid() const {
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d.cpp
index 825cea5cf7..eb81a4a30d 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d.cpp
@@ -31,6 +31,7 @@
 #include "skeleton_modification_2d.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp
index 2ed24be5a2..f6ddad9526 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp
@@ -31,6 +31,7 @@
 #include "skeleton_modification_2d_ccdik.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 bool SkeletonModification2DCCDIK::_set(const StringName &p_path, const Variant &p_value) {
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp
index bb1b81bd17..493f3da0b0 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp
@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "skeleton_modification_2d_fabrik.h"
+
+#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 bool SkeletonModification2DFABRIK::_set(const StringName &p_path, const Variant &p_value) {
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp
index c7e50f4e59..7a5c1c222d 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp
@@ -30,6 +30,7 @@
 
 #include "skeleton_modification_2d_jiggle.h"
 
+#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 #include "scene/resources/world_2d.h"
 
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp
index 6439714e9a..93299cabf7 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp
@@ -31,6 +31,7 @@
 #include "skeleton_modification_2d_lookat.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 bool SkeletonModification2DLookAt::_set(const StringName &p_path, const Variant &p_value) {
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp
index 9aee817450..b386046ad8 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp
@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "skeleton_modification_2d_physicalbones.h"
+
+#include "core/object/class_db.h"
 #include "scene/2d/physics/physical_bone_2d.h"
 #include "scene/2d/skeleton_2d.h"
 
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.cpp
index dd87ce821e..d82cda48d3 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.cpp
@@ -31,6 +31,7 @@
 #include "skeleton_modification_2d_stackholder.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 bool SkeletonModification2DStackHolder::_set(const StringName &p_path, const Variant &p_value) {
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp
index 36ab16c318..bc15d86417 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp
@@ -31,6 +31,7 @@
 #include "skeleton_modification_2d_twoboneik.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 #ifdef TOOLS_ENABLED
diff --git a/scene/resources/2d/skeleton/skeleton_modification_stack_2d.cpp b/scene/resources/2d/skeleton/skeleton_modification_stack_2d.cpp
index deaa60dc7c..36edaa4fe6 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_stack_2d.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_stack_2d.cpp
@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "skeleton_modification_stack_2d.h"
+
+#include "core/object/class_db.h"
 #include "scene/2d/skeleton_2d.h"
 
 void SkeletonModificationStack2D::_get_property_list(List<PropertyInfo> *p_list) const {
diff --git a/scene/resources/2d/tile_set.compat.inc b/scene/resources/2d/tile_set.compat.inc
index 9eb0367146..b2b1f66756 100644
--- a/scene/resources/2d/tile_set.compat.inc
+++ b/scene/resources/2d/tile_set.compat.inc
@@ -32,6 +32,8 @@
 
 #include "tile_set.h"
 
+#include "core/object/class_db.h"
+
 #ifndef NAVIGATION_2D_DISABLED
 Ref<NavigationPolygon> TileData::_get_navigation_polygon_bind_compat_84660(int p_layer_id) const {
 	return get_navigation_polygon(p_layer_id, false, false, false);
@@ -49,4 +51,4 @@ void TileData::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_occluder"), &TileData::_get_occluder_bind_compat_84660);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/resources/2d/tile_set.cpp b/scene/resources/2d/tile_set.cpp
index c6740dfafe..391f67ba48 100644
--- a/scene/resources/2d/tile_set.cpp
+++ b/scene/resources/2d/tile_set.cpp
@@ -33,6 +33,7 @@
 
 #include "core/io/marshalls.h"
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/rb_set.h"
 #include "scene/gui/control.h"
diff --git a/scene/resources/2d/world_boundary_shape_2d.cpp b/scene/resources/2d/world_boundary_shape_2d.cpp
index d229677df6..be648b23ac 100644
--- a/scene/resources/2d/world_boundary_shape_2d.cpp
+++ b/scene/resources/2d/world_boundary_shape_2d.cpp
@@ -31,6 +31,7 @@
 #include "world_boundary_shape_2d.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "servers/physics_2d/physics_server_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/3d/box_shape_3d.cpp b/scene/resources/3d/box_shape_3d.cpp
index 4dc45caf6a..e08345c78a 100644
--- a/scene/resources/3d/box_shape_3d.cpp
+++ b/scene/resources/3d/box_shape_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "box_shape_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
diff --git a/scene/resources/3d/capsule_shape_3d.cpp b/scene/resources/3d/capsule_shape_3d.cpp
index 234f5cbcbe..d92a1b90f4 100644
--- a/scene/resources/3d/capsule_shape_3d.cpp
+++ b/scene/resources/3d/capsule_shape_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "capsule_shape_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
diff --git a/scene/resources/3d/concave_polygon_shape_3d.cpp b/scene/resources/3d/concave_polygon_shape_3d.cpp
index 03785ea8a4..afce253a8e 100644
--- a/scene/resources/3d/concave_polygon_shape_3d.cpp
+++ b/scene/resources/3d/concave_polygon_shape_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "concave_polygon_shape_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
diff --git a/scene/resources/3d/convex_polygon_shape_3d.cpp b/scene/resources/3d/convex_polygon_shape_3d.cpp
index 41d1396753..4fcc9bbd9d 100644
--- a/scene/resources/3d/convex_polygon_shape_3d.cpp
+++ b/scene/resources/3d/convex_polygon_shape_3d.cpp
@@ -29,7 +29,9 @@
 /**************************************************************************/
 
 #include "convex_polygon_shape_3d.h"
+
 #include "core/math/convex_hull.h"
+#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
diff --git a/scene/resources/3d/cylinder_shape_3d.cpp b/scene/resources/3d/cylinder_shape_3d.cpp
index b9800595cf..60704b5cf5 100644
--- a/scene/resources/3d/cylinder_shape_3d.cpp
+++ b/scene/resources/3d/cylinder_shape_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "cylinder_shape_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
diff --git a/scene/resources/3d/fog_material.cpp b/scene/resources/3d/fog_material.cpp
index 9f679ff88a..61b394ecdc 100644
--- a/scene/resources/3d/fog_material.cpp
+++ b/scene/resources/3d/fog_material.cpp
@@ -30,6 +30,7 @@
 
 #include "fog_material.h"
 
+#include "core/object/class_db.h"
 #include "core/version.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/3d/height_map_shape_3d.cpp b/scene/resources/3d/height_map_shape_3d.cpp
index 7a30cf8956..494cea051c 100644
--- a/scene/resources/3d/height_map_shape_3d.cpp
+++ b/scene/resources/3d/height_map_shape_3d.cpp
@@ -31,6 +31,7 @@
 #include "height_map_shape_3d.h"
 
 #include "core/io/image.h"
+#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
diff --git a/scene/resources/3d/importer_mesh.cpp b/scene/resources/3d/importer_mesh.cpp
index 839325294d..04a798db11 100644
--- a/scene/resources/3d/importer_mesh.cpp
+++ b/scene/resources/3d/importer_mesh.cpp
@@ -32,6 +32,7 @@
 
 #include "core/io/marshalls.h"
 #include "core/math/random_pcg.h"
+#include "core/object/class_db.h"
 #include "scene/resources/surface_tool.h"
 
 #ifndef PHYSICS_3D_DISABLED
diff --git a/scene/resources/3d/joint_limitation_cone_3d.cpp b/scene/resources/3d/joint_limitation_cone_3d.cpp
index e6e46cf4a7..e85e159de6 100644
--- a/scene/resources/3d/joint_limitation_cone_3d.cpp
+++ b/scene/resources/3d/joint_limitation_cone_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "joint_limitation_cone_3d.h"
 
+#include "core/object/class_db.h"
+
 #ifndef DISABLE_DEPRECATED
 bool JointLimitationCone3D::_set(const StringName &p_path, const Variant &p_value) {
 	// To keep compatibility between 4.6.beta2 and beta3.
diff --git a/scene/resources/3d/mesh_library.cpp b/scene/resources/3d/mesh_library.cpp
index 8a1b66ea38..d6154bc354 100644
--- a/scene/resources/3d/mesh_library.cpp
+++ b/scene/resources/3d/mesh_library.cpp
@@ -30,6 +30,7 @@
 
 #include "mesh_library.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/texture.h"
 #include "servers/rendering/rendering_server.h" // IWYU pragma: Needed to bind RSE enums.
 
diff --git a/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp b/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp
index 4f696fa830..3a5d543298 100644
--- a/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp
+++ b/scene/resources/3d/navigation_mesh_source_geometry_data_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "navigation_mesh_source_geometry_data_3d.h"
 
+#include "core/object/class_db.h"
+
 void NavigationMeshSourceGeometryData3D::set_vertices(const Vector<float> &p_vertices) {
 	RWLockWrite write_lock(geometry_rwlock);
 	vertices = p_vertices;
diff --git a/scene/resources/3d/primitive_meshes.cpp b/scene/resources/3d/primitive_meshes.cpp
index 25e7b17010..a3babcb749 100644
--- a/scene/resources/3d/primitive_meshes.cpp
+++ b/scene/resources/3d/primitive_meshes.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 #include "core/os/main_loop.h"
 #include "scene/resources/theme.h"
 #include "scene/theme/theme_db.h"
diff --git a/scene/resources/3d/separation_ray_shape_3d.cpp b/scene/resources/3d/separation_ray_shape_3d.cpp
index 4d3a3cc895..9a4fa95999 100644
--- a/scene/resources/3d/separation_ray_shape_3d.cpp
+++ b/scene/resources/3d/separation_ray_shape_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "separation_ray_shape_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
diff --git a/scene/resources/3d/shape_3d.cpp b/scene/resources/3d/shape_3d.cpp
index 0c8744b79d..3a261e526d 100644
--- a/scene/resources/3d/shape_3d.cpp
+++ b/scene/resources/3d/shape_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "shape_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/scene_tree.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_3d/physics_server_3d.h"
diff --git a/scene/resources/3d/skin.cpp b/scene/resources/3d/skin.cpp
index a4fb371ece..56b77b6524 100644
--- a/scene/resources/3d/skin.cpp
+++ b/scene/resources/3d/skin.cpp
@@ -30,6 +30,8 @@
 
 #include "skin.h"
 
+#include "core/object/class_db.h"
+
 void Skin::set_bind_count(int p_size) {
 	ERR_FAIL_COND(p_size < 0);
 	binds.resize(p_size);
diff --git a/scene/resources/3d/sky_material.cpp b/scene/resources/3d/sky_material.cpp
index e6fc1f55b4..280c418b1e 100644
--- a/scene/resources/3d/sky_material.cpp
+++ b/scene/resources/3d/sky_material.cpp
@@ -31,6 +31,7 @@
 #include "sky_material.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/version.h"
 #include "scene/resources/texture.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/resources/3d/sphere_shape_3d.cpp b/scene/resources/3d/sphere_shape_3d.cpp
index aea1af2818..e5e05a24c0 100644
--- a/scene/resources/3d/sphere_shape_3d.cpp
+++ b/scene/resources/3d/sphere_shape_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "sphere_shape_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
diff --git a/scene/resources/3d/world_3d.cpp b/scene/resources/3d/world_3d.cpp
index 12e71b32ba..106059d096 100644
--- a/scene/resources/3d/world_3d.cpp
+++ b/scene/resources/3d/world_3d.cpp
@@ -31,6 +31,7 @@
 #include "world_3d.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/resources/camera_attributes.h"
 #include "scene/resources/environment.h"
diff --git a/scene/resources/3d/world_boundary_shape_3d.cpp b/scene/resources/3d/world_boundary_shape_3d.cpp
index 95eae75b17..cd06bd042c 100644
--- a/scene/resources/3d/world_boundary_shape_3d.cpp
+++ b/scene/resources/3d/world_boundary_shape_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "world_boundary_shape_3d.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_3d/physics_server_3d.h"
 
diff --git a/scene/resources/animated_texture.cpp b/scene/resources/animated_texture.cpp
index 2560729e8c..a8127eae06 100644
--- a/scene/resources/animated_texture.cpp
+++ b/scene/resources/animated_texture.cpp
@@ -30,6 +30,7 @@
 
 #include "animated_texture.h"
 
+#include "core/object/class_db.h"
 #include "core/object/message_queue.h"
 #include "core/os/os.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/resources/animation.compat.inc b/scene/resources/animation.compat.inc
index fc2672bb25..0b4fbfccb3 100644
--- a/scene/resources/animation.compat.inc
+++ b/scene/resources/animation.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "animation.h"
+
+#include "core/object/class_db.h"
+
 Vector3 Animation::_position_track_interpolate_bind_compat_86629(int p_track, double p_time) const {
 	return position_track_interpolate(p_track, p_time, false);
 }
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp
index a81371e669..9572e51e26 100644
--- a/scene/resources/animation.cpp
+++ b/scene/resources/animation.cpp
@@ -32,6 +32,7 @@
 #include "animation.compat.inc"
 
 #include "core/io/marshalls.h"
+#include "core/object/class_db.h"
 
 bool Animation::_set(const StringName &p_name, const Variant &p_value) {
 	String prop_name = p_name;
diff --git a/scene/resources/animation_library.cpp b/scene/resources/animation_library.cpp
index 8e2042a4eb..e5ebed82b3 100644
--- a/scene/resources/animation_library.cpp
+++ b/scene/resources/animation_library.cpp
@@ -30,6 +30,7 @@
 
 #include "animation_library.h"
 
+#include "core/object/class_db.h"
 #include "scene/scene_string_names.h"
 
 bool AnimationLibrary::is_valid_animation_name(const String &p_name) {
diff --git a/scene/resources/atlas_texture.cpp b/scene/resources/atlas_texture.cpp
index 4cca98b15d..cfce3a1a66 100644
--- a/scene/resources/atlas_texture.cpp
+++ b/scene/resources/atlas_texture.cpp
@@ -30,6 +30,8 @@
 
 #include "atlas_texture.h"
 
+#include "core/object/class_db.h"
+
 int AtlasTexture::get_width() const {
 	if (rounded_region.size.width == 0) {
 		if (atlas.is_valid()) {
diff --git a/scene/resources/audio_stream_polyphonic.compat.inc b/scene/resources/audio_stream_polyphonic.compat.inc
index 31074218e1..ab4ec1917c 100644
--- a/scene/resources/audio_stream_polyphonic.compat.inc
+++ b/scene/resources/audio_stream_polyphonic.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "audio_stream_polyphonic.h"
+
+#include "core/object/class_db.h"
+
 AudioStreamPlaybackPolyphonic::ID AudioStreamPlaybackPolyphonic::_play_stream_bind_compat_91382(const Ref<AudioStream> &p_stream, float p_from_offset, float p_volume_db, float p_pitch_scale) {
 	return play_stream(p_stream, p_from_offset, p_volume_db, p_pitch_scale, AudioServer::PlaybackType::PLAYBACK_TYPE_DEFAULT, SceneStringName(Master));
 }
@@ -38,4 +42,4 @@ void AudioStreamPlaybackPolyphonic::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("play_stream", "stream", "from_offset", "volume_db", "pitch_scale"), &AudioStreamPlaybackPolyphonic::_play_stream_bind_compat_91382, DEFVAL(0), DEFVAL(0), DEFVAL(1.0));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/resources/audio_stream_polyphonic.cpp b/scene/resources/audio_stream_polyphonic.cpp
index 3da9106e35..6d67b08e49 100644
--- a/scene/resources/audio_stream_polyphonic.cpp
+++ b/scene/resources/audio_stream_polyphonic.cpp
@@ -31,6 +31,7 @@
 #include "audio_stream_polyphonic.h"
 #include "audio_stream_polyphonic.compat.inc"
 
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 constexpr uint64_t ID_MASK = 0xFFFFFFFF;
diff --git a/scene/resources/audio_stream_wav.cpp b/scene/resources/audio_stream_wav.cpp
index d7b903e5e9..3cad3033a1 100644
--- a/scene/resources/audio_stream_wav.cpp
+++ b/scene/resources/audio_stream_wav.cpp
@@ -32,6 +32,7 @@
 
 #include "core/io/file_access_memory.h"
 #include "core/io/marshalls.h"
+#include "core/object/class_db.h"
 
 const float TRIM_DB_LIMIT = -50;
 const int TRIM_FADE_OUT_FRAMES = 500;
diff --git a/scene/resources/bit_map.cpp b/scene/resources/bit_map.cpp
index 322dbf5ae6..05d7c9086c 100644
--- a/scene/resources/bit_map.cpp
+++ b/scene/resources/bit_map.cpp
@@ -30,6 +30,7 @@
 
 #include "bit_map.h"
 
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void BitMap::create(const Size2i &p_size) {
diff --git a/scene/resources/blit_material.cpp b/scene/resources/blit_material.cpp
index 8e35701e6c..0e3c52f2da 100644
--- a/scene/resources/blit_material.cpp
+++ b/scene/resources/blit_material.cpp
@@ -30,6 +30,7 @@
 
 #include "blit_material.h"
 
+#include "core/object/class_db.h"
 #include "core/version.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/bone_map.cpp b/scene/resources/bone_map.cpp
index f4cda473a0..5d6a3ae044 100644
--- a/scene/resources/bone_map.cpp
+++ b/scene/resources/bone_map.cpp
@@ -31,6 +31,7 @@
 #include "bone_map.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 bool BoneMap::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
diff --git a/scene/resources/camera_attributes.cpp b/scene/resources/camera_attributes.cpp
index bd68c4e6d4..e6efdd1ab3 100644
--- a/scene/resources/camera_attributes.cpp
+++ b/scene/resources/camera_attributes.cpp
@@ -31,6 +31,7 @@
 #include "camera_attributes.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void CameraAttributes::set_exposure_multiplier(float p_multiplier) {
diff --git a/scene/resources/camera_texture.cpp b/scene/resources/camera_texture.cpp
index 9b10727fa5..9685cc9476 100644
--- a/scene/resources/camera_texture.cpp
+++ b/scene/resources/camera_texture.cpp
@@ -30,6 +30,7 @@
 
 #include "camera_texture.h"
 
+#include "core/object/class_db.h"
 #include "servers/camera/camera_feed.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/canvas_item_material.cpp b/scene/resources/canvas_item_material.cpp
index fac1abd1de..92977f6428 100644
--- a/scene/resources/canvas_item_material.cpp
+++ b/scene/resources/canvas_item_material.cpp
@@ -30,6 +30,7 @@
 
 #include "canvas_item_material.h"
 
+#include "core/object/class_db.h"
 #include "core/version.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/color_palette.cpp b/scene/resources/color_palette.cpp
index 7c1faeadfb..5f1465ec38 100644
--- a/scene/resources/color_palette.cpp
+++ b/scene/resources/color_palette.cpp
@@ -30,6 +30,8 @@
 
 #include "color_palette.h"
 
+#include "core/object/class_db.h"
+
 void ColorPalette::set_colors(const PackedColorArray &p_colors) {
 	colors = p_colors;
 }
diff --git a/scene/resources/compositor.cpp b/scene/resources/compositor.cpp
index 6194ffec49..1df1c632d3 100644
--- a/scene/resources/compositor.cpp
+++ b/scene/resources/compositor.cpp
@@ -30,6 +30,7 @@
 
 #include "compositor.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 /* Compositor Effect */
diff --git a/scene/resources/compressed_texture.cpp b/scene/resources/compressed_texture.cpp
index 125482e0b6..2ea03b3599 100644
--- a/scene/resources/compressed_texture.cpp
+++ b/scene/resources/compressed_texture.cpp
@@ -31,6 +31,7 @@
 #include "compressed_texture.h"
 
 #include "core/io/file_access.h"
+#include "core/object/class_db.h"
 #include "scene/resources/bit_map.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/curve.cpp b/scene/resources/curve.cpp
index 671ede225a..c21b0945b8 100644
--- a/scene/resources/curve.cpp
+++ b/scene/resources/curve.cpp
@@ -31,6 +31,7 @@
 #include "curve.h"
 
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 
 const char *Curve::SIGNAL_RANGE_CHANGED = "range_changed";
 const char *Curve::SIGNAL_DOMAIN_CHANGED = "domain_changed";
diff --git a/scene/resources/curve_texture.cpp b/scene/resources/curve_texture.cpp
index 7e7b89847f..455c3f6bba 100644
--- a/scene/resources/curve_texture.cpp
+++ b/scene/resources/curve_texture.cpp
@@ -30,6 +30,7 @@
 
 #include "curve_texture.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void CurveTexture::_bind_methods() {
diff --git a/scene/resources/dpi_texture.cpp b/scene/resources/dpi_texture.cpp
index bd8b2d79e3..7b96e8ede2 100644
--- a/scene/resources/dpi_texture.cpp
+++ b/scene/resources/dpi_texture.cpp
@@ -31,6 +31,7 @@
 #include "dpi_texture.h"
 
 #include "core/io/image_loader.h"
+#include "core/object/class_db.h"
 #include "scene/main/canvas_item.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/bit_map.h"
diff --git a/scene/resources/drawable_texture_2d.cpp b/scene/resources/drawable_texture_2d.cpp
index 76aea8e2bf..64dc034d84 100644
--- a/scene/resources/drawable_texture_2d.cpp
+++ b/scene/resources/drawable_texture_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "drawable_texture_2d.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 DrawableTexture2D::DrawableTexture2D() {
diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp
index 0c978013b2..364ad4f34d 100644
--- a/scene/resources/environment.cpp
+++ b/scene/resources/environment.cpp
@@ -31,6 +31,7 @@
 #include "environment.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/resources/gradient_texture.h"
 #include "scene/resources/sky.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/resources/external_texture.cpp b/scene/resources/external_texture.cpp
index 45d1f723e1..39e1a43cb2 100644
--- a/scene/resources/external_texture.cpp
+++ b/scene/resources/external_texture.cpp
@@ -30,6 +30,7 @@
 
 #include "external_texture.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void ExternalTexture::_bind_methods() {
diff --git a/scene/resources/font.compat.inc b/scene/resources/font.compat.inc
index 2b7420e111..45bda9aff7 100644
--- a/scene/resources/font.compat.inc
+++ b/scene/resources/font.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "font.h"
+
+#include "core/object/class_db.h"
+
 void Font::_draw_string_bind_compat_104872(RID p_canvas_item, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment, float p_width, int p_font_size, const Color &p_modulate, BitField<TextServer::JustificationFlag> p_jst_flags, TextServer::Direction p_direction, TextServer::Orientation p_orientation) const {
 	draw_string(p_canvas_item, p_pos, p_text, p_alignment, p_width, p_font_size, p_modulate, p_jst_flags, p_direction, p_orientation, 0.0);
 }
@@ -76,4 +80,4 @@ void Font::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("find_variation", "variation_coordinates", "face_index", "strength", "transform", "spacing_top", "spacing_bottom", "spacing_space", "spacing_glyph"), &Font::_find_variation_bind_compat_87668, DEFVAL(0), DEFVAL(0.0), DEFVAL(Transform2D()), DEFVAL(0), DEFVAL(0), DEFVAL(0), DEFVAL(0));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index 97078a8c8c..047f1a6be2 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -32,6 +32,7 @@
 #include "font.compat.inc"
 
 #include "core/io/image_loader.h"
+#include "core/object/class_db.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/hashfuncs.h"
 #include "scene/resources/image_texture.h"
diff --git a/scene/resources/gradient.cpp b/scene/resources/gradient.cpp
index 55c787ef73..ca027cdf52 100644
--- a/scene/resources/gradient.cpp
+++ b/scene/resources/gradient.cpp
@@ -31,6 +31,7 @@
 #include "gradient.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 Gradient::Gradient() {
 	//Set initial gradient transition from black to white
diff --git a/scene/resources/gradient_texture.cpp b/scene/resources/gradient_texture.cpp
index 2699e79808..cf7669a966 100644
--- a/scene/resources/gradient_texture.cpp
+++ b/scene/resources/gradient_texture.cpp
@@ -31,6 +31,7 @@
 #include "gradient_texture.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 GradientTexture1D::GradientTexture1D() {
diff --git a/scene/resources/image_texture.cpp b/scene/resources/image_texture.cpp
index ebc380ec4c..198c15ce16 100644
--- a/scene/resources/image_texture.cpp
+++ b/scene/resources/image_texture.cpp
@@ -31,6 +31,7 @@
 #include "image_texture.h"
 
 #include "core/io/image_loader.h"
+#include "core/object/class_db.h"
 #include "scene/resources/bit_map.h"
 #include "scene/resources/placeholder_textures.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/resources/immediate_mesh.cpp b/scene/resources/immediate_mesh.cpp
index 71cfacd6b2..3c7741bb24 100644
--- a/scene/resources/immediate_mesh.cpp
+++ b/scene/resources/immediate_mesh.cpp
@@ -30,6 +30,7 @@
 
 #include "immediate_mesh.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void ImmediateMesh::surface_begin(PrimitiveType p_primitive, const Ref<Material> &p_material) {
diff --git a/scene/resources/label_settings.cpp b/scene/resources/label_settings.cpp
index 46768b24a2..4dc5587f1e 100644
--- a/scene/resources/label_settings.cpp
+++ b/scene/resources/label_settings.cpp
@@ -30,6 +30,8 @@
 
 #include "label_settings.h"
 
+#include "core/object/class_db.h"
+
 void LabelSettings::_font_changed() {
 	emit_changed();
 }
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index 89c6fb4b57..19b293f29a 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -33,6 +33,7 @@
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
+#include "core/object/class_db.h"
 #include "core/version.h"
 #include "scene/main/scene_tree.h"
 #include "scene/resources/texture.h"
diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp
index bdb0148fda..383c28fc45 100644
--- a/scene/resources/mesh.cpp
+++ b/scene/resources/mesh.cpp
@@ -31,6 +31,7 @@
 #include "mesh.h"
 
 #include "core/math/convex_hull.h"
+#include "core/object/class_db.h"
 #include "core/templates/pair.h"
 #include "scene/resources/surface_tool.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/resources/mesh_data_tool.compat.inc b/scene/resources/mesh_data_tool.compat.inc
index 6299b0a2ab..8b7a3513f6 100644
--- a/scene/resources/mesh_data_tool.compat.inc
+++ b/scene/resources/mesh_data_tool.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "mesh_data_tool.h"
+
+#include "core/object/class_db.h"
+
 Error MeshDataTool::commit_to_surface_bind_compat_81138(const Ref<ArrayMesh> &p_mesh) {
 	return commit_to_surface(p_mesh, 0);
 }
@@ -38,4 +42,4 @@ void MeshDataTool::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("commit_to_surface", "mesh"), &MeshDataTool::commit_to_surface_bind_compat_81138);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/resources/mesh_data_tool.cpp b/scene/resources/mesh_data_tool.cpp
index 7ec571214f..f6d285a3fc 100644
--- a/scene/resources/mesh_data_tool.cpp
+++ b/scene/resources/mesh_data_tool.cpp
@@ -31,6 +31,8 @@
 #include "mesh_data_tool.h"
 #include "mesh_data_tool.compat.inc"
 
+#include "core/object/class_db.h"
+
 void MeshDataTool::clear() {
 	vertices.clear();
 	edges.clear();
diff --git a/scene/resources/mesh_texture.cpp b/scene/resources/mesh_texture.cpp
index cb58a2f998..cde5c71b09 100644
--- a/scene/resources/mesh_texture.cpp
+++ b/scene/resources/mesh_texture.cpp
@@ -30,6 +30,7 @@
 
 #include "mesh_texture.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/mesh.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/multimesh.cpp b/scene/resources/multimesh.cpp
index 4ab93df347..b5629523aa 100644
--- a/scene/resources/multimesh.cpp
+++ b/scene/resources/multimesh.cpp
@@ -30,6 +30,7 @@
 
 #include "multimesh.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 #ifndef DISABLE_DEPRECATED
diff --git a/scene/resources/navigation_mesh.cpp b/scene/resources/navigation_mesh.cpp
index 96602a4d27..505dba4586 100644
--- a/scene/resources/navigation_mesh.cpp
+++ b/scene/resources/navigation_mesh.cpp
@@ -30,6 +30,8 @@
 
 #include "navigation_mesh.h"
 
+#include "core/object/class_db.h"
+
 #ifdef DEBUG_ENABLED
 #include "servers/navigation_3d/navigation_server_3d.h"
 #endif // DEBUG_ENABLED
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index 633987a849..14f829843c 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -34,6 +34,7 @@
 #include "core/io/file_access.h"
 #include "core/io/missing_resource.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 "core/variant/callable_bind.h"
diff --git a/scene/resources/particle_process_material.cpp b/scene/resources/particle_process_material.cpp
index 1f9cdc6b8d..6e6f766633 100644
--- a/scene/resources/particle_process_material.cpp
+++ b/scene/resources/particle_process_material.cpp
@@ -30,6 +30,7 @@
 
 #include "particle_process_material.h"
 
+#include "core/object/class_db.h"
 #include "core/version.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/physics_material.cpp b/scene/resources/physics_material.cpp
index cd762a5813..658a4d975d 100644
--- a/scene/resources/physics_material.cpp
+++ b/scene/resources/physics_material.cpp
@@ -31,6 +31,9 @@
 #include "physics_material.h"
 
 #if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
+
+#include "core/object/class_db.h"
+
 void PhysicsMaterial::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_friction", "friction"), &PhysicsMaterial::set_friction);
 	ClassDB::bind_method(D_METHOD("get_friction"), &PhysicsMaterial::get_friction);
diff --git a/scene/resources/placeholder_textures.cpp b/scene/resources/placeholder_textures.cpp
index 11148bdf63..54b7195f3d 100644
--- a/scene/resources/placeholder_textures.cpp
+++ b/scene/resources/placeholder_textures.cpp
@@ -30,6 +30,7 @@
 
 #include "placeholder_textures.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void PlaceholderTexture2D::set_size(Size2 p_size) {
diff --git a/scene/resources/portable_compressed_texture.cpp b/scene/resources/portable_compressed_texture.cpp
index e354e168ba..bdc27b5337 100644
--- a/scene/resources/portable_compressed_texture.cpp
+++ b/scene/resources/portable_compressed_texture.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
+#include "core/object/class_db.h"
 #include "scene/resources/bit_map.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/shader.compat.inc b/scene/resources/shader.compat.inc
index b68020605f..06f34d6839 100644
--- a/scene/resources/shader.compat.inc
+++ b/scene/resources/shader.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "shader.h"
+
+#include "core/object/class_db.h"
+
 void Shader::_set_default_texture_parameter_bind_compat_95126(const StringName &p_name, const Ref<Texture2D> &p_texture, int p_index) {
 	set_default_texture_parameter(p_name, p_texture, p_index);
 }
diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp
index c650f92ee5..7bcadd4c0f 100644
--- a/scene/resources/shader.cpp
+++ b/scene/resources/shader.cpp
@@ -32,6 +32,7 @@
 #include "shader.compat.inc"
 
 #include "core/io/file_access.h"
+#include "core/object/class_db.h"
 #include "scene/main/scene_tree.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/rendering/shader_language.h"
diff --git a/scene/resources/shader_include.cpp b/scene/resources/shader_include.cpp
index a051683b53..123421af80 100644
--- a/scene/resources/shader_include.cpp
+++ b/scene/resources/shader_include.cpp
@@ -31,6 +31,7 @@
 #include "shader_include.h"
 
 #include "core/io/file_access.h"
+#include "core/object/class_db.h"
 #include "servers/rendering/shader_preprocessor.h"
 
 void ShaderInclude::_dependency_changed() {
diff --git a/scene/resources/skeleton_profile.cpp b/scene/resources/skeleton_profile.cpp
index c1d5d2e759..f08b53c5f5 100644
--- a/scene/resources/skeleton_profile.cpp
+++ b/scene/resources/skeleton_profile.cpp
@@ -31,6 +31,7 @@
 #include "skeleton_profile.h"
 
 #include "core/config/engine.h"
+#include "core/object/class_db.h"
 
 bool SkeletonProfile::_set(const StringName &p_path, const Variant &p_value) {
 	ERR_FAIL_COND_V(is_read_only, false);
diff --git a/scene/resources/sky.cpp b/scene/resources/sky.cpp
index 9e739db258..b45d82ec5c 100644
--- a/scene/resources/sky.cpp
+++ b/scene/resources/sky.cpp
@@ -30,6 +30,7 @@
 
 #include "sky.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void Sky::set_radiance_size(RadianceSize p_size) {
diff --git a/scene/resources/sprite_frames.cpp b/scene/resources/sprite_frames.cpp
index 094394f6fa..c327a431ed 100644
--- a/scene/resources/sprite_frames.cpp
+++ b/scene/resources/sprite_frames.cpp
@@ -30,6 +30,7 @@
 
 #include "sprite_frames.h"
 
+#include "core/object/class_db.h"
 #include "scene/scene_string_names.h"
 
 void SpriteFrames::add_frame(const StringName &p_anim, const Ref<Texture2D> &p_texture, float p_duration, int p_at_pos) {
diff --git a/scene/resources/style_box.cpp b/scene/resources/style_box.cpp
index 1203c21a1b..4c939702ba 100644
--- a/scene/resources/style_box.cpp
+++ b/scene/resources/style_box.cpp
@@ -30,6 +30,7 @@
 
 #include "style_box.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/canvas_item.h"
 
 Size2 StyleBox::get_minimum_size() const {
diff --git a/scene/resources/style_box_flat.cpp b/scene/resources/style_box_flat.cpp
index 9637f9d702..c5901f3f26 100644
--- a/scene/resources/style_box_flat.cpp
+++ b/scene/resources/style_box_flat.cpp
@@ -30,6 +30,7 @@
 
 #include "style_box_flat.h"
 
+#include "core/object/class_db.h"
 #include "scene/main/canvas_item.h"
 #include "scene/main/viewport.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/scene/resources/style_box_line.cpp b/scene/resources/style_box_line.cpp
index 77726d62eb..928e941bb7 100644
--- a/scene/resources/style_box_line.cpp
+++ b/scene/resources/style_box_line.cpp
@@ -30,6 +30,7 @@
 
 #include "style_box_line.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 float StyleBoxLine::get_style_margin(Side p_side) const {
diff --git a/scene/resources/style_box_texture.cpp b/scene/resources/style_box_texture.cpp
index 46dac1bd98..1358483b57 100644
--- a/scene/resources/style_box_texture.cpp
+++ b/scene/resources/style_box_texture.cpp
@@ -30,6 +30,7 @@
 
 #include "style_box_texture.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 float StyleBoxTexture::get_style_margin(Side p_side) const {
diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp
index e8aa03648b..0f34b2fce9 100644
--- a/scene/resources/surface_tool.cpp
+++ b/scene/resources/surface_tool.cpp
@@ -30,6 +30,7 @@
 
 #include "surface_tool.h"
 
+#include "core/object/class_db.h"
 #include "core/templates/a_hash_map.h"
 
 #define EQ_VERTEX_DIST 0.00001
diff --git a/scene/resources/syntax_highlighter.cpp b/scene/resources/syntax_highlighter.cpp
index 652a12559f..f598cfa98b 100644
--- a/scene/resources/syntax_highlighter.cpp
+++ b/scene/resources/syntax_highlighter.cpp
@@ -30,6 +30,7 @@
 
 #include "syntax_highlighter.h"
 
+#include "core/object/class_db.h"
 #include "scene/gui/text_edit.h"
 
 Dictionary SyntaxHighlighter::get_line_syntax_highlighting(int p_line) {
diff --git a/scene/resources/text_line.compat.inc b/scene/resources/text_line.compat.inc
index b1c243fe4a..d4a60c7fed 100644
--- a/scene/resources/text_line.compat.inc
+++ b/scene/resources/text_line.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "text_line.h"
+
+#include "core/object/class_db.h"
+
 void TextLine::_draw_bind_compat_104872(RID p_canvas, const Vector2 &p_pos, const Color &p_color) const {
 	draw(p_canvas, p_pos, p_color, 0.0);
 }
@@ -43,4 +47,4 @@ void TextLine::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("draw_outline", "canvas", "pos", "outline_size", "color"), &TextLine::_draw_outline_bind_compat_104872, DEFVAL(1), DEFVAL(Color(1, 1, 1)));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/resources/text_line.cpp b/scene/resources/text_line.cpp
index 459180dd57..c27f0231e5 100644
--- a/scene/resources/text_line.cpp
+++ b/scene/resources/text_line.cpp
@@ -31,6 +31,8 @@
 #include "text_line.h"
 #include "text_line.compat.inc"
 
+#include "core/object/class_db.h"
+
 void TextLine::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("clear"), &TextLine::clear);
 	ClassDB::bind_method(D_METHOD("duplicate"), &TextLine::duplicate);
diff --git a/scene/resources/text_paragraph.compat.inc b/scene/resources/text_paragraph.compat.inc
index f0e7408565..c0c4aff4f5 100644
--- a/scene/resources/text_paragraph.compat.inc
+++ b/scene/resources/text_paragraph.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "text_paragraph.h"
+
+#include "core/object/class_db.h"
+
 void TextParagraph::_draw_bind_compat_104872(RID p_canvas, const Vector2 &p_pos, const Color &p_color, const Color &p_dc_color) const {
 	draw(p_canvas, p_pos, p_color, p_dc_color, 0.0);
 }
@@ -65,4 +69,4 @@ void TextParagraph::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("draw_dropcap_outline", "canvas", "pos", "outline_size", "color"), &TextParagraph::_draw_dropcap_outline_bind_compat_104872, DEFVAL(1), DEFVAL(Color(1, 1, 1)));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/scene/resources/text_paragraph.cpp b/scene/resources/text_paragraph.cpp
index 2f7097002b..ec2c31e290 100644
--- a/scene/resources/text_paragraph.cpp
+++ b/scene/resources/text_paragraph.cpp
@@ -31,6 +31,8 @@
 #include "text_paragraph.h"
 #include "text_paragraph.compat.inc"
 
+#include "core/object/class_db.h"
+
 void TextParagraph::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("clear"), &TextParagraph::clear);
 	ClassDB::bind_method(D_METHOD("duplicate"), &TextParagraph::duplicate);
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp
index 97dd1c8a10..0b33a1607c 100644
--- a/scene/resources/texture.cpp
+++ b/scene/resources/texture.cpp
@@ -30,6 +30,7 @@
 
 #include "texture.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/placeholder_textures.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/texture_rd.cpp b/scene/resources/texture_rd.cpp
index 6fd16c7a1e..0e9ff0023d 100644
--- a/scene/resources/texture_rd.cpp
+++ b/scene/resources/texture_rd.cpp
@@ -30,6 +30,7 @@
 
 #include "texture_rd.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_device.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp
index 16db4a3d74..71dbc8095c 100644
--- a/scene/resources/theme.cpp
+++ b/scene/resources/theme.cpp
@@ -30,6 +30,7 @@
 
 #include "theme.h"
 
+#include "core/object/class_db.h"
 #include "scene/theme/theme_db.h"
 
 // Dynamic properties.
diff --git a/scene/resources/video_stream.cpp b/scene/resources/video_stream.cpp
index 32e87c38f3..9ed5d0b1f5 100644
--- a/scene/resources/video_stream.cpp
+++ b/scene/resources/video_stream.cpp
@@ -30,6 +30,8 @@
 
 #include "video_stream.h"
 
+#include "core/object/class_db.h"
+
 // VideoStreamPlayback starts here.
 
 void VideoStreamPlayback::_bind_methods() {
diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp
index 0ff5e4d8f5..2a4d8ab545 100644
--- a/scene/resources/visual_shader.cpp
+++ b/scene/resources/visual_shader.cpp
@@ -30,6 +30,7 @@
 
 #include "visual_shader.h"
 
+#include "core/object/class_db.h"
 #include "core/templates/rb_map.h"
 #include "core/variant/variant_utility.h"
 #include "scene/resources/visual_shader_nodes.h"
diff --git a/scene/resources/visual_shader_nodes.compat.inc b/scene/resources/visual_shader_nodes.compat.inc
index e02c3e30ce..8e4a977f62 100644
--- a/scene/resources/visual_shader_nodes.compat.inc
+++ b/scene/resources/visual_shader_nodes.compat.inc
@@ -30,6 +30,9 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "visual_shader_nodes.h"
+
+#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 
 // VisualShaderNodeCubemap
diff --git a/scene/resources/visual_shader_nodes.cpp b/scene/resources/visual_shader_nodes.cpp
index 1ad2c136c9..b4ebb3e17a 100644
--- a/scene/resources/visual_shader_nodes.cpp
+++ b/scene/resources/visual_shader_nodes.cpp
@@ -31,6 +31,7 @@
 #include "visual_shader_nodes.h"
 #include "visual_shader_nodes.compat.inc"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 ////////////// Vector Base
diff --git a/scene/resources/visual_shader_particle_nodes.cpp b/scene/resources/visual_shader_particle_nodes.cpp
index 924ea55d0f..64ec785dc2 100644
--- a/scene/resources/visual_shader_particle_nodes.cpp
+++ b/scene/resources/visual_shader_particle_nodes.cpp
@@ -30,6 +30,7 @@
 
 #include "visual_shader_particle_nodes.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/mesh.h"
 
diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp
index 7db5f1e079..c2749aadd8 100644
--- a/scene/resources/world_2d.cpp
+++ b/scene/resources/world_2d.cpp
@@ -31,6 +31,7 @@
 #include "world_2d.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/2d/visible_on_screen_notifier_2d.h"
 #include "servers/rendering/rendering_server.h"
 
diff --git a/scene/theme/theme_db.cpp b/scene/theme/theme_db.cpp
index c1c16d2163..9f34b4c280 100644
--- a/scene/theme/theme_db.cpp
+++ b/scene/theme/theme_db.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
+#include "core/object/class_db.h"
 #include "scene/gui/control.h"
 #include "scene/main/node.h"
 #include "scene/main/window.h"
diff --git a/servers/audio/audio_effect.cpp b/servers/audio/audio_effect.cpp
index ac334eb764..79d2483f5d 100644
--- a/servers/audio/audio_effect.cpp
+++ b/servers/audio/audio_effect.cpp
@@ -30,6 +30,8 @@
 
 #include "audio_effect.h"
 
+#include "core/object/class_db.h"
+
 void AudioEffectInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	GDVIRTUAL_CALL(_process, p_src_frames, p_dst_frames, p_frame_count);
 }
diff --git a/servers/audio/audio_server.cpp b/servers/audio/audio_server.cpp
index b90ce16929..5ac1e9efd0 100644
--- a/servers/audio/audio_server.cpp
+++ b/servers/audio/audio_server.cpp
@@ -35,6 +35,7 @@
 #include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/math/audio_frame.h"
+#include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/string/string_name.h"
 #include "core/templates/pair.h"
diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp
index fd846ea3cb..a9e4909fa3 100644
--- a/servers/audio/audio_stream.cpp
+++ b/servers/audio/audio_stream.cpp
@@ -31,6 +31,7 @@
 #include "audio_stream.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 
 void AudioStreamPlayback::start(double p_from_pos) {
 	GDVIRTUAL_CALL(_start, p_from_pos);
diff --git a/servers/audio/effects/audio_effect_amplify.cpp b/servers/audio/effects/audio_effect_amplify.cpp
index 9824ed0a7e..78721452f1 100644
--- a/servers/audio/effects/audio_effect_amplify.cpp
+++ b/servers/audio/effects/audio_effect_amplify.cpp
@@ -30,6 +30,8 @@
 
 #include "audio_effect_amplify.h"
 
+#include "core/object/class_db.h"
+
 void AudioEffectAmplifyInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	//multiply volume interpolating to avoid clicks if this changes
 	float volume_db = base->volume_db;
diff --git a/servers/audio/effects/audio_effect_capture.cpp b/servers/audio/effects/audio_effect_capture.cpp
index 4246084c5c..467b8c1cab 100644
--- a/servers/audio/effects/audio_effect_capture.cpp
+++ b/servers/audio/effects/audio_effect_capture.cpp
@@ -30,6 +30,7 @@
 
 #include "audio_effect_capture.h"
 
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 bool AudioEffectCapture::can_get_buffer(int p_frames) const {
diff --git a/servers/audio/effects/audio_effect_chorus.cpp b/servers/audio/effects/audio_effect_chorus.cpp
index 99f40c0f6b..1fb48eec2f 100644
--- a/servers/audio/effects/audio_effect_chorus.cpp
+++ b/servers/audio/effects/audio_effect_chorus.cpp
@@ -29,7 +29,9 @@
 /**************************************************************************/
 
 #include "audio_effect_chorus.h"
+
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectChorusInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/servers/audio/effects/audio_effect_compressor.cpp b/servers/audio/effects/audio_effect_compressor.cpp
index 694b423a01..5957097f3f 100644
--- a/servers/audio/effects/audio_effect_compressor.cpp
+++ b/servers/audio/effects/audio_effect_compressor.cpp
@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "audio_effect_compressor.h"
+
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectCompressorInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/servers/audio/effects/audio_effect_delay.cpp b/servers/audio/effects/audio_effect_delay.cpp
index 7f4848ce89..c40a68bd6e 100644
--- a/servers/audio/effects/audio_effect_delay.cpp
+++ b/servers/audio/effects/audio_effect_delay.cpp
@@ -31,6 +31,7 @@
 #include "audio_effect_delay.h"
 
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectDelayInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/servers/audio/effects/audio_effect_distortion.cpp b/servers/audio/effects/audio_effect_distortion.cpp
index 8cd99abacb..62c618270d 100644
--- a/servers/audio/effects/audio_effect_distortion.cpp
+++ b/servers/audio/effects/audio_effect_distortion.cpp
@@ -29,7 +29,9 @@
 /**************************************************************************/
 
 #include "audio_effect_distortion.h"
+
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectDistortionInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/servers/audio/effects/audio_effect_eq.cpp b/servers/audio/effects/audio_effect_eq.cpp
index dfa463feb6..fc9f0dfc6a 100644
--- a/servers/audio/effects/audio_effect_eq.cpp
+++ b/servers/audio/effects/audio_effect_eq.cpp
@@ -30,6 +30,7 @@
 
 #include "audio_effect_eq.h"
 
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectEQInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/servers/audio/effects/audio_effect_filter.cpp b/servers/audio/effects/audio_effect_filter.cpp
index cd393d6553..190ec44ac0 100644
--- a/servers/audio/effects/audio_effect_filter.cpp
+++ b/servers/audio/effects/audio_effect_filter.cpp
@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "audio_effect_filter.h"
+
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 template <int S>
diff --git a/servers/audio/effects/audio_effect_hard_limiter.cpp b/servers/audio/effects/audio_effect_hard_limiter.cpp
index 213dbf0881..f925a738b8 100644
--- a/servers/audio/effects/audio_effect_hard_limiter.cpp
+++ b/servers/audio/effects/audio_effect_hard_limiter.cpp
@@ -30,6 +30,7 @@
 
 #include "audio_effect_hard_limiter.h"
 
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectHardLimiterInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/servers/audio/effects/audio_effect_limiter.cpp b/servers/audio/effects/audio_effect_limiter.cpp
index 8c5dc731bb..42faac5353 100644
--- a/servers/audio/effects/audio_effect_limiter.cpp
+++ b/servers/audio/effects/audio_effect_limiter.cpp
@@ -30,6 +30,8 @@
 
 #include "audio_effect_limiter.h"
 
+#include "core/object/class_db.h"
+
 void AudioEffectLimiterInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	float threshdb = base->threshold;
 	float ceiling = Math::db_to_linear(base->ceiling);
diff --git a/servers/audio/effects/audio_effect_panner.cpp b/servers/audio/effects/audio_effect_panner.cpp
index 3fbdcd450a..5d755a589f 100644
--- a/servers/audio/effects/audio_effect_panner.cpp
+++ b/servers/audio/effects/audio_effect_panner.cpp
@@ -30,6 +30,8 @@
 
 #include "audio_effect_panner.h"
 
+#include "core/object/class_db.h"
+
 void AudioEffectPannerInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	float lvol = CLAMP(1.0 - base->pan, 0, 1);
 	float rvol = CLAMP(1.0 + base->pan, 0, 1);
diff --git a/servers/audio/effects/audio_effect_phaser.cpp b/servers/audio/effects/audio_effect_phaser.cpp
index 699d772b07..839e4b0097 100644
--- a/servers/audio/effects/audio_effect_phaser.cpp
+++ b/servers/audio/effects/audio_effect_phaser.cpp
@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "audio_effect_phaser.h"
+
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectPhaserInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/servers/audio/effects/audio_effect_pitch_shift.cpp b/servers/audio/effects/audio_effect_pitch_shift.cpp
index 6b7c406e41..a64137cb05 100644
--- a/servers/audio/effects/audio_effect_pitch_shift.cpp
+++ b/servers/audio/effects/audio_effect_pitch_shift.cpp
@@ -31,6 +31,7 @@
 #include "audio_effect_pitch_shift.h"
 
 #include "core/math/math_funcs.h"
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 /* Thirdparty code, so disable clang-format with Godot style */
diff --git a/servers/audio/effects/audio_effect_record.cpp b/servers/audio/effects/audio_effect_record.cpp
index 2e2560f1d3..d07715a3e7 100644
--- a/servers/audio/effects/audio_effect_record.cpp
+++ b/servers/audio/effects/audio_effect_record.cpp
@@ -31,6 +31,7 @@
 #include "audio_effect_record.h"
 
 #include "core/io/marshalls.h"
+#include "core/object/class_db.h"
 
 void AudioEffectRecordInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	if (!is_recording) {
diff --git a/servers/audio/effects/audio_effect_reverb.cpp b/servers/audio/effects/audio_effect_reverb.cpp
index d77b8bbeb7..ea5161698e 100644
--- a/servers/audio/effects/audio_effect_reverb.cpp
+++ b/servers/audio/effects/audio_effect_reverb.cpp
@@ -30,6 +30,7 @@
 
 #include "audio_effect_reverb.h"
 
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectReverbInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/servers/audio/effects/audio_effect_spectrum_analyzer.compat.inc b/servers/audio/effects/audio_effect_spectrum_analyzer.compat.inc
index b933757939..1f3a7b3a2c 100644
--- a/servers/audio/effects/audio_effect_spectrum_analyzer.compat.inc
+++ b/servers/audio/effects/audio_effect_spectrum_analyzer.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "audio_effect_spectrum_analyzer.h"
+
+#include "core/object/class_db.h"
+
 void AudioEffectSpectrumAnalyzer::_set_tap_back_pos_bind_compat_114355(float p_seconds) {
 	WARN_PRINT_ONCE("AudioEffectSpectrumAnalyzer.set_tap_back_pos() is deprecated and the value will be discarded.");
 }
diff --git a/servers/audio/effects/audio_effect_spectrum_analyzer.cpp b/servers/audio/effects/audio_effect_spectrum_analyzer.cpp
index 0b803c7758..cfcf813675 100644
--- a/servers/audio/effects/audio_effect_spectrum_analyzer.cpp
+++ b/servers/audio/effects/audio_effect_spectrum_analyzer.cpp
@@ -30,6 +30,8 @@
 
 #include "audio_effect_spectrum_analyzer.h"
 #include "audio_effect_spectrum_analyzer.compat.inc"
+
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 static void smbFft(float *fftBuffer, long fftFrameSize, long sign)
diff --git a/servers/audio/effects/audio_effect_stereo_enhance.cpp b/servers/audio/effects/audio_effect_stereo_enhance.cpp
index 93559d2556..582fda353c 100644
--- a/servers/audio/effects/audio_effect_stereo_enhance.cpp
+++ b/servers/audio/effects/audio_effect_stereo_enhance.cpp
@@ -30,6 +30,7 @@
 
 #include "audio_effect_stereo_enhance.h"
 
+#include "core/object/class_db.h"
 #include "servers/audio/audio_server.h"
 
 void AudioEffectStereoEnhanceInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
diff --git a/servers/audio/effects/audio_stream_generator.cpp b/servers/audio/effects/audio_stream_generator.cpp
index aa33b8f372..709fd2727c 100644
--- a/servers/audio/effects/audio_stream_generator.cpp
+++ b/servers/audio/effects/audio_stream_generator.cpp
@@ -30,6 +30,8 @@
 
 #include "audio_stream_generator.h"
 
+#include "core/object/class_db.h"
+
 void AudioStreamGenerator::set_mix_rate(float p_mix_rate) {
 	mix_rate = p_mix_rate;
 }
diff --git a/servers/camera/camera_feed.cpp b/servers/camera/camera_feed.cpp
index fcd29bd44d..34fc8fca76 100644
--- a/servers/camera/camera_feed.cpp
+++ b/servers/camera/camera_feed.cpp
@@ -30,6 +30,7 @@
 
 #include "camera_feed.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 
 void CameraFeed::_bind_methods() {
diff --git a/servers/camera/camera_server.cpp b/servers/camera/camera_server.cpp
index 2b501d8396..e9403bae7a 100644
--- a/servers/camera/camera_server.cpp
+++ b/servers/camera/camera_server.cpp
@@ -30,6 +30,7 @@
 
 #include "camera_server.h"
 
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 #include "servers/camera/camera_feed.h"
 
diff --git a/servers/display/display_server.compat.inc b/servers/display/display_server.compat.inc
index f3f0b482e1..f0a49cc1de 100644
--- a/servers/display/display_server.compat.inc
+++ b/servers/display/display_server.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "display_server.h"
+
+#include "core/object/class_db.h"
+
 Error DisplayServer::_file_dialog_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) {
 	return file_dialog_show(p_title, p_current_directory, p_filename, p_show_hidden, p_mode, p_filters, p_callback, MAIN_WINDOW_ID);
 }
@@ -48,4 +52,4 @@ void DisplayServer::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("accessibility_create_sub_text_edit_elements", "parent_rid", "shaped_text", "min_height", "insert_pos"), &DisplayServer::_accessibility_create_sub_text_edit_elements_bind_compat_113459, DEFVAL(-1));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/servers/display/display_server.cpp b/servers/display/display_server.cpp
index 1a34068765..58a99eefe7 100644
--- a/servers/display/display_server.cpp
+++ b/servers/display/display_server.cpp
@@ -37,6 +37,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, Texture2D);
 STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 
 #include "core/input/input.h"
+#include "core/object/class_db.h"
 #include "scene/resources/texture.h"
 #include "servers/display/display_server_headless.h"
 #include "servers/display/native_menu.h"
diff --git a/servers/display/native_menu.cpp b/servers/display/native_menu.cpp
index 680d8ca945..e906288d9c 100644
--- a/servers/display/native_menu.cpp
+++ b/servers/display/native_menu.cpp
@@ -30,6 +30,7 @@
 
 #include "native_menu.h"
 
+#include "core/object/class_db.h"
 #include "scene/resources/texture.h"
 
 NativeMenu *NativeMenu::singleton = nullptr;
diff --git a/servers/movie_writer/movie_writer.cpp b/servers/movie_writer/movie_writer.cpp
index 1052204448..f47b675d83 100644
--- a/servers/movie_writer/movie_writer.cpp
+++ b/servers/movie_writer/movie_writer.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/object/class_db.h"
 #include "core/os/time.h"
 #include "core/templates/rb_set.h"
 #include "scene/main/window.h"
diff --git a/servers/navigation_2d/navigation_path_query_parameters_2d.cpp b/servers/navigation_2d/navigation_path_query_parameters_2d.cpp
index f82890b0c2..88c4a53684 100644
--- a/servers/navigation_2d/navigation_path_query_parameters_2d.cpp
+++ b/servers/navigation_2d/navigation_path_query_parameters_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "navigation_path_query_parameters_2d.h"
 
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void NavigationPathQueryParameters2D::set_pathfinding_algorithm(const NavigationPathQueryParameters2D::PathfindingAlgorithm p_pathfinding_algorithm) {
diff --git a/servers/navigation_2d/navigation_path_query_result_2d.cpp b/servers/navigation_2d/navigation_path_query_result_2d.cpp
index f41c2e85e9..d6ec5762ad 100644
--- a/servers/navigation_2d/navigation_path_query_result_2d.cpp
+++ b/servers/navigation_2d/navigation_path_query_result_2d.cpp
@@ -30,6 +30,8 @@
 
 #include "navigation_path_query_result_2d.h"
 
+#include "core/object/class_db.h"
+
 void NavigationPathQueryResult2D::set_path(const Vector<Vector2> &p_path) {
 	path = p_path;
 }
diff --git a/servers/navigation_2d/navigation_server_2d.compat.inc b/servers/navigation_2d/navigation_server_2d.compat.inc
index 14205ef536..6a1b6fab32 100644
--- a/servers/navigation_2d/navigation_server_2d.compat.inc
+++ b/servers/navigation_2d/navigation_server_2d.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "navigation_server_2d.h"
+
+#include "core/object/class_db.h"
+
 Vector<Vector2> NavigationServer2D::_map_get_path_bind_compat_100129(RID p_map, Vector2 p_origin, Vector2 p_destination, bool p_optimize, uint32_t p_navigation_layers) const {
 	return const_cast<NavigationServer2D *>(this)->map_get_path(p_map, p_origin, p_destination, p_optimize, p_navigation_layers);
 }
diff --git a/servers/navigation_2d/navigation_server_2d.cpp b/servers/navigation_2d/navigation_server_2d.cpp
index e462d1122e..62ef0dc667 100644
--- a/servers/navigation_2d/navigation_server_2d.cpp
+++ b/servers/navigation_2d/navigation_server_2d.cpp
@@ -32,6 +32,7 @@
 #include "navigation_server_2d.compat.inc"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/main/node.h"
 #include "servers/navigation_2d/navigation_server_2d_dummy.h"
 
diff --git a/servers/navigation_3d/navigation_path_query_parameters_3d.cpp b/servers/navigation_3d/navigation_path_query_parameters_3d.cpp
index 1e6947b484..f7be656cad 100644
--- a/servers/navigation_3d/navigation_path_query_parameters_3d.cpp
+++ b/servers/navigation_3d/navigation_path_query_parameters_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "navigation_path_query_parameters_3d.h"
 
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void NavigationPathQueryParameters3D::set_pathfinding_algorithm(const NavigationPathQueryParameters3D::PathfindingAlgorithm p_pathfinding_algorithm) {
diff --git a/servers/navigation_3d/navigation_path_query_result_3d.cpp b/servers/navigation_3d/navigation_path_query_result_3d.cpp
index dad8179561..247f1b23a5 100644
--- a/servers/navigation_3d/navigation_path_query_result_3d.cpp
+++ b/servers/navigation_3d/navigation_path_query_result_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "navigation_path_query_result_3d.h"
 
+#include "core/object/class_db.h"
+
 void NavigationPathQueryResult3D::set_path(const Vector<Vector3> &p_path) {
 	path = p_path;
 }
diff --git a/servers/navigation_3d/navigation_server_3d.compat.inc b/servers/navigation_3d/navigation_server_3d.compat.inc
index 633e4d5ddf..250320be54 100644
--- a/servers/navigation_3d/navigation_server_3d.compat.inc
+++ b/servers/navigation_3d/navigation_server_3d.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "navigation_server_3d.h"
+
+#include "core/object/class_db.h"
+
 Vector<Vector3> NavigationServer3D::_map_get_path_bind_compat_100129(RID p_map, Vector3 p_origin, Vector3 p_destination, bool p_optimize, uint32_t p_navigation_layers) const {
 	return const_cast<NavigationServer3D *>(this)->map_get_path(p_map, p_origin, p_destination, p_optimize, p_navigation_layers);
 }
diff --git a/servers/navigation_3d/navigation_server_3d.cpp b/servers/navigation_3d/navigation_server_3d.cpp
index 0ed55691e2..b31592fdf4 100644
--- a/servers/navigation_3d/navigation_server_3d.cpp
+++ b/servers/navigation_3d/navigation_server_3d.cpp
@@ -32,6 +32,7 @@
 #include "navigation_server_3d.compat.inc"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "scene/main/node.h"
 #include "servers/navigation_3d/navigation_server_3d_dummy.h"
 
diff --git a/servers/physics_2d/physics_server_2d.compat.inc b/servers/physics_2d/physics_server_2d.compat.inc
index d6d48d6c22..42dd9b4c04 100644
--- a/servers/physics_2d/physics_server_2d.compat.inc
+++ b/servers/physics_2d/physics_server_2d.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "physics_server_2d.h"
+
+#include "core/object/class_db.h"
+
 void PhysicsServer2D::_body_set_shape_as_one_way_collision_bind_compat_104736(RID p_body, int p_shape_idx, bool p_enable, real_t p_margin) {
 	body_set_shape_as_one_way_collision(p_body, p_shape_idx, p_enable, p_margin, Vector2(0, 1));
 }
@@ -38,4 +42,4 @@ void PhysicsServer2D::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("body_set_shape_as_one_way_collision", "body", "shape_idx", "enable", "margin"), &PhysicsServer2D::_body_set_shape_as_one_way_collision_bind_compat_104736);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/servers/physics_2d/physics_server_2d.cpp b/servers/physics_2d/physics_server_2d.cpp
index 5cd1da41f1..56cd195fb6 100644
--- a/servers/physics_2d/physics_server_2d.cpp
+++ b/servers/physics_2d/physics_server_2d.cpp
@@ -32,6 +32,7 @@
 #include "physics_server_2d.compat.inc"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 PhysicsServer2D *PhysicsServer2D::singleton = nullptr;
diff --git a/servers/physics_2d/physics_server_2d_extension.cpp b/servers/physics_2d/physics_server_2d_extension.cpp
index 6a9d23d7ac..0fad83847a 100644
--- a/servers/physics_2d/physics_server_2d_extension.cpp
+++ b/servers/physics_2d/physics_server_2d_extension.cpp
@@ -30,6 +30,8 @@
 
 #include "physics_server_2d_extension.h"
 
+#include "core/object/class_db.h"
+
 bool PhysicsDirectSpaceState2DExtension::is_body_excluded_from_query(const RID &p_body) const {
 	return exclude && exclude->has(p_body);
 }
diff --git a/servers/physics_3d/physics_server_3d.cpp b/servers/physics_3d/physics_server_3d.cpp
index b1e0905c08..67dee00fe2 100644
--- a/servers/physics_3d/physics_server_3d.cpp
+++ b/servers/physics_3d/physics_server_3d.cpp
@@ -31,6 +31,7 @@
 #include "physics_server_3d.h"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 
 void PhysicsServer3DRenderingServerHandler::set_vertex(int p_vertex_id, const Vector3 &p_vertex) {
diff --git a/servers/physics_3d/physics_server_3d_extension.cpp b/servers/physics_3d/physics_server_3d_extension.cpp
index f630b093cd..d753aa39de 100644
--- a/servers/physics_3d/physics_server_3d_extension.cpp
+++ b/servers/physics_3d/physics_server_3d_extension.cpp
@@ -30,6 +30,8 @@
 
 #include "physics_server_3d_extension.h"
 
+#include "core/object/class_db.h"
+
 bool PhysicsDirectSpaceState3DExtension::is_body_excluded_from_query(const RID &p_body) const {
 	return exclude && exclude->has(p_body);
 }
diff --git a/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp b/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp
index ec037b71fa..6dc11b857e 100644
--- a/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp
+++ b/servers/rendering/renderer_rd/framebuffer_cache_rd.cpp
@@ -30,6 +30,8 @@
 
 #include "framebuffer_cache_rd.h"
 
+#include "core/object/class_db.h"
+
 FramebufferCacheRD *FramebufferCacheRD::singleton = nullptr;
 
 void FramebufferCacheRD::_bind_methods() {
diff --git a/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.compat.inc b/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.compat.inc
index 9532be6da2..5a66951bcd 100644
--- a/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.compat.inc
+++ b/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "render_scene_buffers_rd.h"
+
+#include "core/object/class_db.h"
+
 RID RenderSceneBuffersRD::_get_color_texture_compat_80214() {
 	return _get_color_texture(msaa_3d != RSE::VIEWPORT_MSAA_DISABLED);
 }
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 2ccf5a174c..83b6df09a9 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
@@ -31,6 +31,7 @@
 #include "render_scene_buffers_rd.h"
 #include "render_scene_buffers_rd.compat.inc"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.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/uniform_set_cache_rd.cpp b/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp
index 54be667d25..0a7ea9bd7e 100644
--- a/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp
+++ b/servers/rendering/renderer_rd/uniform_set_cache_rd.cpp
@@ -30,6 +30,8 @@
 
 #include "uniform_set_cache_rd.h"
 
+#include "core/object/class_db.h"
+
 UniformSetCacheRD *UniformSetCacheRD::singleton = nullptr;
 
 void UniformSetCacheRD::_bind_methods() {
diff --git a/servers/rendering/rendering_device.compat.inc b/servers/rendering/rendering_device.compat.inc
index 024a88a4c1..6ac75cc5d4 100644
--- a/servers/rendering/rendering_device.compat.inc
+++ b/servers/rendering/rendering_device.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "rendering_device.h"
+
+#include "core/object/class_db.h"
+
 RID RenderingDevice::_shader_create_from_bytecode_bind_compat_79606(const Vector<uint8_t> &p_shader_binary) {
 	return shader_create_from_bytecode(p_shader_binary, RID());
 }
@@ -195,4 +199,4 @@ void RenderingDevice::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("texture_create_from_extension", "type", "format", "samples", "usage_flags", "image", "width", "height", "depth", "layers"), &RenderingDevice::_texture_create_from_extension_compat_105570);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/servers/rendering/rendering_device.cpp b/servers/rendering/rendering_device.cpp
index 9d79ec31bf..77fff88d86 100644
--- a/servers/rendering/rendering_device.cpp
+++ b/servers/rendering/rendering_device.cpp
@@ -37,6 +37,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
+#include "core/object/class_db.h"
 #include "core/profiling/profiling.h"
 #include "core/templates/fixed_vector.h"
 #include "modules/modules_enabled.gen.h"
diff --git a/servers/rendering/rendering_server.compat.inc b/servers/rendering/rendering_server.compat.inc
index a39b1381b0..a37ec22791 100644
--- a/servers/rendering/rendering_server.compat.inc
+++ b/servers/rendering/rendering_server.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "rendering_server.h"
+
+#include "core/object/class_db.h"
+
 void RenderingServer::_multimesh_allocate_data_bind_compat_99455(RID p_multimesh, int p_instances, RSE::MultimeshTransformFormat p_transform_format, bool p_use_colors, bool p_use_custom_data) {
 	multimesh_allocate_data(p_multimesh, p_instances, p_transform_format, p_use_colors, p_use_custom_data, false);
 }
@@ -73,4 +77,4 @@ void RenderingServer::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("viewport_set_size", "viewport", "width", "height"), &RenderingServer::_viewport_set_size_compat_115799);
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/servers/rendering/rendering_server.cpp b/servers/rendering/rendering_server.cpp
index 49424c0c1e..450e8ea119 100644
--- a/servers/rendering/rendering_server.cpp
+++ b/servers/rendering/rendering_server.cpp
@@ -33,6 +33,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/math/geometry_3d.h"
+#include "core/object/class_db.h"
 #include "core/variant/typed_array.h"
 #include "servers/rendering/rendering_device.h"
 #include "servers/rendering/rendering_server_types.h"
diff --git a/servers/rendering/shader_include_db.cpp b/servers/rendering/shader_include_db.cpp
index bc62c1fe02..48403a22c4 100644
--- a/servers/rendering/shader_include_db.cpp
+++ b/servers/rendering/shader_include_db.cpp
@@ -30,6 +30,8 @@
 
 #include "shader_include_db.h"
 
+#include "core/object/class_db.h"
+
 HashMap<String, String> ShaderIncludeDB::built_in_includes;
 
 void ShaderIncludeDB::_bind_methods() {
diff --git a/servers/rendering/storage/render_data.cpp b/servers/rendering/storage/render_data.cpp
index fca19d7292..188530a338 100644
--- a/servers/rendering/storage/render_data.cpp
+++ b/servers/rendering/storage/render_data.cpp
@@ -30,6 +30,8 @@
 
 #include "render_data.h"
 
+#include "core/object/class_db.h"
+
 void RenderData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_render_scene_buffers"), &RenderData::get_render_scene_buffers);
 	ClassDB::bind_method(D_METHOD("get_render_scene_data"), &RenderData::get_render_scene_data);
diff --git a/servers/rendering/storage/render_scene_buffers.cpp b/servers/rendering/storage/render_scene_buffers.cpp
index c8da5f49fd..df3fd69045 100644
--- a/servers/rendering/storage/render_scene_buffers.cpp
+++ b/servers/rendering/storage/render_scene_buffers.cpp
@@ -30,7 +30,8 @@
 
 #include "render_scene_buffers.h"
 
-#include "servers/rendering/rendering_server.h" // IWYU pragma: Needed to bind RSE enums.
+#include "core/object/class_db.h"
+#include "servers/rendering/rendering_server.h" // IWYU pragma: keep // Needed to bind RSE enums.
 
 void RenderSceneBuffersConfiguration::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_render_target"), &RenderSceneBuffersConfiguration::get_render_target);
diff --git a/servers/text/text_server.compat.inc b/servers/text/text_server.compat.inc
index 2e035c97f8..d614043dab 100644
--- a/servers/text/text_server.compat.inc
+++ b/servers/text/text_server.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "text_server.h"
+
+#include "core/object/class_db.h"
+
 void TextServer::_font_draw_glyph_bind_compat_104872(const RID &p_font, const RID &p_canvas, int64_t p_size, const Vector2 &p_pos, int64_t p_index, const Color &p_color) const {
 	font_draw_glyph(p_font, p_canvas, p_size, p_pos, p_index, p_color, 0.0);
 }
@@ -58,4 +62,4 @@ void TextServer::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("shaped_text_get_word_breaks", "shaped", "grapheme_flags"), &TextServer::_shaped_text_get_word_breaks_bind_compat_90732, DEFVAL(GRAPHEME_IS_SPACE | GRAPHEME_IS_PUNCTUATION));
 }
 
-#endif
+#endif // DISABLE_DEPRECATED
diff --git a/servers/text/text_server.cpp b/servers/text/text_server.cpp
index 3d43958132..a81f6fc374 100644
--- a/servers/text/text_server.cpp
+++ b/servers/text/text_server.cpp
@@ -32,6 +32,7 @@
 #include "text_server.compat.inc"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "core/os/main_loop.h"
 #include "core/variant/typed_array.h"
 #include "servers/rendering/rendering_server.h"
diff --git a/servers/text/text_server_extension.cpp b/servers/text/text_server_extension.cpp
index 47e4ea4798..62132d6b26 100644
--- a/servers/text/text_server_extension.cpp
+++ b/servers/text/text_server_extension.cpp
@@ -30,6 +30,8 @@
 
 #include "text_server_extension.h"
 
+#include "core/object/class_db.h"
+
 void TextServerExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_has_feature, "feature");
 	GDVIRTUAL_BIND(_get_name);
diff --git a/servers/xr/xr_body_tracker.cpp b/servers/xr/xr_body_tracker.cpp
index 93722fea05..a5f8284699 100644
--- a/servers/xr/xr_body_tracker.cpp
+++ b/servers/xr/xr_body_tracker.cpp
@@ -30,6 +30,8 @@
 
 #include "xr_body_tracker.h"
 
+#include "core/object/class_db.h"
+
 void XRBodyTracker::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_has_tracking_data", "has_data"), &XRBodyTracker::set_has_tracking_data);
 	ClassDB::bind_method(D_METHOD("get_has_tracking_data"), &XRBodyTracker::get_has_tracking_data);
diff --git a/servers/xr/xr_face_tracker.cpp b/servers/xr/xr_face_tracker.cpp
index 7015cd0805..f61434a832 100644
--- a/servers/xr/xr_face_tracker.cpp
+++ b/servers/xr/xr_face_tracker.cpp
@@ -30,6 +30,8 @@
 
 #include "xr_face_tracker.h"
 
+#include "core/object/class_db.h"
+
 void XRFaceTracker::_bind_methods() {
 	// Base Shapes
 	BIND_ENUM_CONSTANT(FT_EYE_LOOK_OUT_RIGHT);
diff --git a/servers/xr/xr_hand_tracker.cpp b/servers/xr/xr_hand_tracker.cpp
index 9013d8854b..4edfccceae 100644
--- a/servers/xr/xr_hand_tracker.cpp
+++ b/servers/xr/xr_hand_tracker.cpp
@@ -30,6 +30,8 @@
 
 #include "xr_hand_tracker.h"
 
+#include "core/object/class_db.h"
+
 void XRHandTracker::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_has_tracking_data", "has_data"), &XRHandTracker::set_has_tracking_data);
 	ClassDB::bind_method(D_METHOD("get_has_tracking_data"), &XRHandTracker::get_has_tracking_data);
diff --git a/servers/xr/xr_interface.cpp b/servers/xr/xr_interface.cpp
index 88feb96979..1800c91dfe 100644
--- a/servers/xr/xr_interface.cpp
+++ b/servers/xr/xr_interface.cpp
@@ -30,6 +30,7 @@
 
 #include "xr_interface.h"
 
+#include "core/object/class_db.h"
 #include "servers/xr/xr_server.h"
 
 void XRInterface::_bind_methods() {
diff --git a/servers/xr/xr_interface_extension.cpp b/servers/xr/xr_interface_extension.cpp
index 7a92e70536..505570f1b6 100644
--- a/servers/xr/xr_interface_extension.cpp
+++ b/servers/xr/xr_interface_extension.cpp
@@ -30,6 +30,7 @@
 
 #include "xr_interface_extension.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
 
 void XRInterfaceExtension::_bind_methods() {
diff --git a/servers/xr/xr_pose.cpp b/servers/xr/xr_pose.cpp
index 32628dce44..6d83b11da9 100644
--- a/servers/xr/xr_pose.cpp
+++ b/servers/xr/xr_pose.cpp
@@ -30,6 +30,7 @@
 
 #include "xr_pose.h"
 
+#include "core/object/class_db.h"
 #include "servers/xr/xr_server.h"
 
 void XRPose::_bind_methods() {
diff --git a/servers/xr/xr_positional_tracker.cpp b/servers/xr/xr_positional_tracker.cpp
index 0c71a0f7ea..235d3462d7 100644
--- a/servers/xr/xr_positional_tracker.cpp
+++ b/servers/xr/xr_positional_tracker.cpp
@@ -32,6 +32,8 @@
 
 #include "xr_controller_tracker.h"
 
+#include "core/object/class_db.h"
+
 void XRPositionalTracker::_bind_methods() {
 	BIND_ENUM_CONSTANT(TRACKER_HAND_UNKNOWN);
 	BIND_ENUM_CONSTANT(TRACKER_HAND_LEFT);
diff --git a/servers/xr/xr_server.compat.inc b/servers/xr/xr_server.compat.inc
index 967666fa6f..878dec022c 100644
--- a/servers/xr/xr_server.compat.inc
+++ b/servers/xr/xr_server.compat.inc
@@ -30,6 +30,10 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "xr_server.h"
+
+#include "core/object/class_db.h"
+
 void XRServer::_add_tracker_bind_compat_90645(const Ref<XRPositionalTracker> &p_tracker) {
 	add_tracker(p_tracker);
 }
diff --git a/servers/xr/xr_server.cpp b/servers/xr/xr_server.cpp
index 00210fe85d..ad8846cb40 100644
--- a/servers/xr/xr_server.cpp
+++ b/servers/xr/xr_server.cpp
@@ -32,6 +32,7 @@
 #include "xr_server.compat.inc"
 
 #include "core/config/project_settings.h"
+#include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/xr/xr_interface.h"
 #include "servers/xr/xr_positional_tracker.h"
diff --git a/servers/xr/xr_tracker.cpp b/servers/xr/xr_tracker.cpp
index b0b2f3f30a..22f87da27d 100644
--- a/servers/xr/xr_tracker.cpp
+++ b/servers/xr/xr_tracker.cpp
@@ -30,6 +30,8 @@
 
 #include "xr_tracker.h"
 
+#include "core/object/class_db.h"
+
 void XRTracker::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_tracker_type"), &XRTracker::get_tracker_type);
 	ClassDB::bind_method(D_METHOD("set_tracker_type", "type"), &XRTracker::set_tracker_type);
diff --git a/servers/xr/xr_vrs.cpp b/servers/xr/xr_vrs.cpp
index 0a8ad783c6..0a6b38c578 100644
--- a/servers/xr/xr_vrs.cpp
+++ b/servers/xr/xr_vrs.cpp
@@ -30,6 +30,7 @@
 
 #include "xr_vrs.h"
 
+#include "core/object/class_db.h"
 #include "servers/rendering/renderer_scene_render.h"
 #include "servers/rendering/rendering_device.h"
 #include "servers/rendering/rendering_server.h"