Decouple node.h from scene_tree.h, minimize its other includes

core/input/input_event.cpp

@@ -32,9 +32,11 @@
 
 #include "core/input/input_map.h"
 #include "core/input/shortcut.h"
+#include "core/math/transform_2d.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
+#include "core/string/ustring.h"
 
 void InputEvent::set_device(int p_device) {
 	device = p_device;

core/input/input_event.h

@@ -32,9 +32,7 @@
 
 #include "core/input/input_enums.h"
 #include "core/io/resource.h"
-#include "core/math/transform_2d.h"
 #include "core/os/keyboard.h"
-#include "core/string/ustring.h"
 #include "core/typedefs.h"
 
 /**
@@ -43,6 +41,8 @@
  */
 
 class Shortcut;
+class String;
+struct Transform2D;
 
 /**
  * Input Modifier Status

core/io/resource.h

@@ -33,7 +33,6 @@
 #include "core/io/resource_uid.h"
 #include "core/object/gdvirtual.gen.h"
 #include "core/object/ref_counted.h"
-#include "core/templates/safe_refcount.h"
 #include "core/templates/self_list.h"
 
 class Node;
@@ -68,7 +67,6 @@ protected:
 	};
 
 private:
-	friend class ResBase;
 	friend class ResourceCache;
 
 	String name;

core/io/resource_uid.h

@@ -30,8 +30,8 @@
 
 #pragma once
 
-#include "core/object/ref_counted.h"
-#include "core/string/string_name.h"
+#include "core/object/object.h"
+#include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 
 class FileAccess;

core/object/message_queue.h

@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/object/object_id.h"
-#include "core/os/thread_safe.h"
+#include "core/os/mutex.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/paged_allocator.h"
 #include "core/variant/variant.h"

core/os/keyboard.cpp

@@ -31,6 +31,7 @@
 #include "keyboard.h"
 
 #include "core/os/os.h"
+#include "core/string/ustring.h"
 
 struct _KeyCodeText {
 	Key code;

core/os/keyboard.h

@@ -30,7 +30,9 @@
 
 #pragma once
 
-#include "core/string/ustring.h"
+class String;
+
+#include <cstdint>
 
 // Keep the values in this enum in sync with `_keycodes` in `keyboard.cpp`,
 // and the bindings in `core_constants.cpp`.

editor/animation/animation_library_editor.cpp

@@ -46,6 +46,7 @@
 #include "scene/animation/animation_mixer.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/packed_scene.h"
 
 void AnimationLibraryEditor::set_animation_mixer(Object *p_mixer) {

editor/animation/animation_player_editor_plugin.cpp

@@ -52,6 +52,7 @@
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/animation/animation_tree.h"
 #include "scene/gui/separator.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/image_texture.h"
@@ -471,12 +472,12 @@ void AnimationPlayerEditor::_animation_selected(int p_which) {
 			Node *root = player->get_node_or_null(player->get_root_node());
 
 			// Player shouldn't access parent if it's the scene root.
-			if (!root || (player == get_tree()->get_edited_scene_root() && player->get_root_node() == SceneStringName(path_pp))) {
+			if (!root || (player == get_tree()->get_edited_scene_root() && player->get_root_node() == NodePath(".."))) {
 				NodePath cached_root_path = player->get_path_to(get_cached_root_node());
 				if (player->get_node_or_null(cached_root_path) != nullptr) {
 					player->set_root_node(cached_root_path);
 				} else {
-					player->set_root_node(SceneStringName(path_pp)); // No other choice, preventing crash.
+					player->set_root_node(NodePath("..")); // No other choice, preventing crash.
 				}
 			} else {
 				cached_root_node_id = root->get_instance_id(); // Caching as `track_editor` can lose track of player's root node.

editor/animation/animation_track_editor.cpp

@@ -64,6 +64,7 @@
 #include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/view_panner.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "servers/audio/audio_stream.h"
 

editor/animation/animation_tree_editor_plugin.cpp

@@ -45,6 +45,7 @@
 #include "scene/gui/margin_container.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/gui/separator.h"
+#include "scene/main/scene_tree.h"
 
 void AnimationTreeEditor::edit(AnimationTree *p_tree) {
 	if (p_tree && !p_tree->is_connected("animation_list_changed", callable_mp(this, &AnimationTreeEditor::_animation_list_changed))) {

editor/docks/scene_tree_dock.cpp

@@ -67,6 +67,7 @@
 #include "scene/audio/audio_stream_player.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
+#include "scene/main/scene_tree.h"
 #include "scene/property_utils.h"
 #include "scene/resources/packed_scene.h"
 #include "servers/display/display_server.h"

editor/editor_log.cpp

@@ -32,6 +32,7 @@
 
 #include "core/io/resource_loader.h"
 #include "core/object/callable_mp.h"
+#include "core/object/message_queue.h"
 #include "core/object/undo_redo.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"

editor/export/editor_export_plugin.h

@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/os/shared_object.h"
+#include "core/variant/typed_array.h"
 #include "editor_export_platform.h"
 #include "editor_export_preset.h"
 #include "scene/main/node.h"

editor/file_system/editor_file_system.cpp

@@ -47,6 +47,7 @@
 #include "editor/script/script_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/settings/project_settings_editor.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/packed_scene.h"
 #include "servers/display/display_server.h"
 

editor/gui/credits_roll.cpp

@@ -43,6 +43,7 @@
 #include "scene/gui/color_rect.h"
 #include "scene/gui/label.h"
 #include "scene/gui/texture_rect.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 
 Label *CreditsRoll::_create_label(const String &p_with_text, LabelSize p_size) {

editor/gui/editor_about.cpp

@@ -50,6 +50,7 @@
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/style_box.h"
 
 void EditorAbout::_notification(int p_what) {

editor/gui/editor_toaster.cpp

@@ -32,6 +32,7 @@
 
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
+#include "core/object/message_queue.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"

editor/inspector/editor_inspector.cpp

@@ -59,6 +59,7 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/texture_rect.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/timer.h"
 #include "scene/property_utils.h"
 #include "scene/resources/packed_scene.h"

editor/inspector/editor_properties.cpp

@@ -59,6 +59,7 @@
 #include "scene/gui/color_picker.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/text_edit.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/font.h"
 #include "scene/resources/mesh.h"

editor/inspector/editor_properties_array_dict.cpp

@@ -46,6 +46,7 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/button.h"
 #include "scene/gui/margin_container.h"
+#include "scene/main/scene_tree.h"
 
 bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_value) {
 	String name = p_name;

editor/inspector/editor_resource_preview.cpp

@@ -36,6 +36,7 @@
 #include "core/io/resource_saver.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
+#include "core/os/main_loop.h"
 #include "core/os/os.h"
 #include "core/variant/variant_utility.h"
 #include "editor/editor_node.h"
@@ -43,6 +44,7 @@
 #include "editor/file_system/editor_paths.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/image_texture.h"
 #include "servers/display/display_server.h"

editor/run/editor_run_bar.cpp

@@ -50,6 +50,7 @@
 #include "scene/gui/button.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel_container.h"
+#include "scene/main/scene_tree.h"
 
 #ifndef XR_DISABLED
 #include "servers/xr/xr_server.h"

editor/run/game_view_plugin.cpp

@@ -56,6 +56,7 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/separator.h"
+#include "scene/main/scene_tree.h"
 #include "servers/display/display_server.h"
 
 void GameViewDebugger::_session_started(Ref<EditorDebuggerSession> p_session) {

editor/scene/2d/abstract_polygon_2d_editor.cpp

@@ -41,6 +41,7 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
+#include "scene/main/scene_tree.h"
 
 bool AbstractPolygon2DEditor::Vertex::operator==(const AbstractPolygon2DEditor::Vertex &p_vertex) const {
 	return polygon == p_vertex.polygon && vertex == p_vertex.vertex;

editor/scene/2d/physics/cast_2d_editor_plugin.cpp

@@ -36,6 +36,7 @@
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "scene/2d/physics/ray_cast_2d.h"
 #include "scene/2d/physics/shape_cast_2d.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 
 void Cast2DEditor::_notification(int p_what) {

editor/scene/2d/physics/collision_shape_2d_editor_plugin.cpp

@@ -37,6 +37,7 @@
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/2d/capsule_shape_2d.h"
 #include "scene/resources/2d/circle_shape_2d.h"

editor/scene/2d/polygon_2d_editor_plugin.cpp

@@ -56,6 +56,7 @@
 #include "scene/gui/spin_box.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/view_panner.h"
+#include "scene/main/scene_tree.h"
 #include "servers/rendering/rendering_server.h"
 
 Node2D *Polygon2DEditor::_get_node() const {

editor/scene/2d/sprite_2d_editor_plugin.cpp

@@ -48,6 +48,7 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/view_panner.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/mesh.h"
 #include "thirdparty/clipper2/include/clipper2/clipper.h"
 

editor/scene/2d/tiles/tile_data_editors.cpp

@@ -37,6 +37,7 @@
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
+#include "scene/main/scene_tree.h"
 
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/scene/2d/tiles/tile_map_layer_editor.cpp

@@ -51,6 +51,7 @@
 #include "scene/2d/tile_map_layer.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/split_container.h"
+#include "scene/main/scene_tree.h"
 
 void SwitchSeparator::set_vertical(bool p_vertical) {
 	h_separator->set_visible(p_vertical);

editor/scene/2d/tiles/tiles_editor_plugin.cpp

@@ -48,6 +48,7 @@
 #include "scene/2d/tile_map_layer.h"
 #include "scene/gui/button.h"
 #include "scene/gui/control.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/2d/tile_set.h"
 #include "scene/resources/image_texture.h"
 #include "servers/rendering/rendering_server.h"

editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp

@@ -35,6 +35,7 @@
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "scene/main/scene_tree.h"
 
 void GPUParticlesCollisionSDF3DEditorPlugin::_bake() {
 	if (col_sdf) {

editor/scene/3d/lightmap_gi_editor_plugin.cpp

@@ -36,6 +36,7 @@
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "scene/main/scene_tree.h"
 #include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 

editor/scene/3d/mesh_instance_3d_editor_plugin.cpp

@@ -45,6 +45,7 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/spin_box.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"

editor/scene/3d/node_3d_editor_gizmos.cpp

@@ -37,6 +37,7 @@
 #include "editor/editor_string_names.h"
 #include "editor/scene/3d/node_3d_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "servers/rendering/rendering_server.h"
 

editor/scene/3d/node_3d_editor_plugin.cpp

@@ -105,6 +105,7 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/subviewport_container.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/sky_material.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/sky.h"

editor/scene/3d/occluder_instance_3d_editor_plugin.cpp

@@ -35,6 +35,7 @@
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "scene/main/scene_tree.h"
 
 void OccluderInstance3DEditorPlugin::_bake_select_file(const String &p_file) {
 	if (occluder_instance) {

editor/scene/3d/polygon_3d_editor_plugin.cpp

@@ -42,6 +42,7 @@
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/3d/camera_3d.h"
+#include "scene/main/scene_tree.h"
 
 void Polygon3DEditor::_notification(int p_what) {
 	switch (p_what) {

editor/scene/3d/skeleton_3d_editor_plugin.cpp

@@ -48,6 +48,7 @@
 #include "scene/3d/physics/physical_bone_simulator_3d.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
 #include "scene/resources/skeleton_profile.h"
 #include "scene/resources/surface_tool.h"

editor/scene/3d/voxel_gi_editor_plugin.cpp

@@ -37,6 +37,7 @@
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "scene/main/scene_tree.h"
 
 void VoxelGIEditorPlugin::_bake() {
 	if (voxel_gi) {

editor/scene/canvas_item_editor_plugin.cpp

@@ -68,6 +68,7 @@
 #include "scene/gui/subviewport_container.h"
 #include "scene/gui/view_panner.h"
 #include "scene/main/canvas_layer.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/timer.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"

editor/scene/connections_dialog.cpp

@@ -56,6 +56,7 @@
 #include "scene/gui/margin_container.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/spin_box.h"
+#include "scene/main/scene_tree.h"
 #include "servers/display/display_server.h"
 
 static Node *_find_first_script(Node *p_root, Node *p_node) {

editor/scene/gui/theme_editor_preview.h

@@ -37,6 +37,7 @@ class Button;
 class ColorPickerButton;
 class ColorRect;
 class MarginContainer;
+class PackedScene;
 class ScrollContainer;
 
 class ThemeEditorPreview : public VBoxContainer {

editor/scene/packed_scene_editor_plugin.h

@@ -34,6 +34,8 @@
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/box_container.h"
 
+class PackedScene;
+
 class PackedSceneEditor : public VBoxContainer {
 	GDCLASS(PackedSceneEditor, VBoxContainer);
 

editor/scene/scene_tree_editor.cpp

@@ -54,6 +54,7 @@
 #include "scene/gui/flow_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/texture_rect.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 

editor/scene/sprite_frames_editor_plugin.cpp

@@ -56,6 +56,7 @@
 #include "scene/gui/panel_container.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/atlas_texture.h"
 
 static void _draw_shadowed_line(Control *p_control, const Point2 &p_from, const Size2 &p_size, const Size2 &p_shadow_offset, Color p_color, Color p_shadow_color) {

editor/scene/texture/texture_region_editor_plugin.cpp

@@ -47,6 +47,7 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/spin_box.h"
 #include "scene/gui/view_panner.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/style_box_texture.h"
 #include "servers/rendering/rendering_server.h"

editor/script/find_in_files.cpp

@@ -50,6 +50,7 @@
 #include "scene/gui/progress_bar.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/tree.h"
+#include "scene/main/scene_tree.h"
 
 const char *FindInFiles::SIGNAL_RESULT_FOUND = "result_found";
 

editor/script/script_editor_plugin.cpp

@@ -77,6 +77,7 @@
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/main/node.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "servers/display/display_server.h"
 

editor/script/script_text_editor.cpp

@@ -56,6 +56,7 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/split_container.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/style_box_flat.h"
 #include "servers/rendering/rendering_server.h"
 

editor/settings/editor_autoload_settings.cpp

@@ -43,6 +43,7 @@
 #include "editor/settings/project_settings_editor.h"
 #include "scene/gui/button.h"
 #include "scene/gui/tree.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 

editor/shader/shader_create_dialog.cpp

@@ -39,6 +39,7 @@
 #include "editor/gui/editor_validation_panel.h"
 #include "editor/shader/editor_shader_language_plugin.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/shader_include.h"
 #include "servers/rendering/shader_types.h"
 

modules/csg/csg_shape.cpp

@@ -34,6 +34,7 @@
 #include "core/math/geometry_2d.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/rendering/rendering_server.h"

modules/csg/editor/csg_gizmos.cpp

@@ -43,6 +43,7 @@
 #include "scene/3d/physics/collision_shape_3d.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/menu_button.h"
+#include "scene/main/scene_tree.h"
 
 void CSGShapeEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {

modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp

@@ -40,6 +40,7 @@
 #include "editor/inspector/editor_inspector.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/dialogs.h"
+#include "scene/main/scene_tree.h"
 
 String SceneExporterGLTFPlugin::get_plugin_name() const {
 	return "ConvertGLTF2";

modules/gridmap/editor/grid_map_editor_plugin.cpp

@@ -55,6 +55,7 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "servers/rendering/rendering_server.h"
 

modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp

@@ -34,6 +34,7 @@
 
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
+#include "core/object/message_queue.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"

modules/multiplayer/editor/multiplayer_editor_plugin.cpp

@@ -39,6 +39,7 @@
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"
+#include "scene/main/scene_tree.h"
 
 void MultiplayerEditorDebugger::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("open_request", PropertyInfo(Variant::STRING, "path")));

modules/navigation_2d/2d/nav_mesh_generator_2d.cpp

@@ -33,6 +33,7 @@
 #include "nav_mesh_generator_2d.h"
 
 #include "core/config/project_settings.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
 

modules/navigation_2d/editor/navigation_link_2d_editor_plugin.cpp

@@ -35,6 +35,7 @@
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/canvas_item_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 
 void NavigationLink2DEditor::_notification(int p_what) {

modules/navigation_3d/3d/nav_mesh_generator_3d.cpp

@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/os/thread.h"
 #include "scene/3d/node_3d.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
 

modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp

@@ -41,6 +41,7 @@
 #include "scene/3d/navigation/navigation_obstacle_3d.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
+#include "scene/main/scene_tree.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 #include "servers/rendering/rendering_server.h"
 

modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp

@@ -40,6 +40,7 @@
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/label.h"
+#include "scene/main/scene_tree.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
 void NavigationRegion3DEditor::_node_removed(Node *p_node) {

modules/objectdb_profiler/editor/data_viewers/refcounted_view.cpp

@@ -35,6 +35,7 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/split_container.h"
+#include "scene/main/scene_tree.h"
 
 SnapshotRefCountedView::SnapshotRefCountedView() {
 	set_name(TTRC("RefCounted"));

modules/objectdb_profiler/editor/objectdb_profiler_panel.cpp

@@ -52,6 +52,7 @@
 #include "scene/gui/option_button.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/tab_container.h"
+#include "scene/main/scene_tree.h"
 
 // ObjectDB snapshots are very large. In remote_debugger_peer.cpp, the max in_buf and out_buf size is 8mb.
 // Snapshots are typically larger than that, so we send them 6mb at a time. Leaving 2mb for other data.

platform/macos/key_mapping_macos.mm

@@ -30,6 +30,7 @@
 
 #import "key_mapping_macos.h"
 
+#include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/hash_set.h"
 

platform/web/audio_driver_web.cpp

@@ -34,6 +34,7 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
+#include "core/math/math_funcs_binary.h"
 #include "core/object/object.h"
 #include "scene/main/node.h"
 #include "servers/audio/audio_stream.h"

scene/2d/camera_2d.cpp

@@ -35,6 +35,7 @@
 #include "core/input/input.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 
 void Camera2D::_update_scroll() {

scene/2d/canvas_modulate.cpp

@@ -31,6 +31,7 @@
 #include "canvas_modulate.h"
 
 #include "core/object/class_db.h"
+#include "scene/main/scene_tree.h"
 #include "servers/rendering/rendering_server.h"
 
 void CanvasModulate::_on_in_canvas_visibility_changed(bool p_new_visibility) {

scene/2d/cpu_particles_2d.cpp

@@ -37,6 +37,7 @@
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "scene/2d/gpu_particles_2d.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/canvas_item_material.h"
 #include "scene/resources/curve_texture.h"

scene/2d/light_2d.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/engine.h"
 #include "core/object/class_db.h"
+#include "scene/main/scene_tree.h"
 #include "servers/rendering/rendering_server.h"
 
 void Light2D::owner_changed_notify() {

scene/2d/navigation/navigation_agent_2d.cpp

@@ -34,6 +34,7 @@
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "scene/2d/navigation/navigation_link_2d.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 #include "servers/rendering/rendering_server.h"

scene/2d/navigation/navigation_obstacle_2d.cpp

@@ -34,6 +34,7 @@
 #include "core/math/geometry_2d.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
+#include "scene/main/scene_tree.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"

scene/2d/navigation/navigation_region_2d.cpp

@@ -34,6 +34,7 @@
 #include "core/math/random_pcg.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 #include "servers/rendering/rendering_server.h"

scene/2d/physics/collision_polygon_2d.cpp

@@ -35,6 +35,7 @@
 #include "core/object/class_db.h"
 #include "scene/2d/physics/area_2d.h"
 #include "scene/2d/physics/collision_object_2d.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/2d/concave_polygon_shape_2d.h"
 #include "scene/resources/2d/convex_polygon_shape_2d.h"
 

scene/2d/physics/joints/damped_spring_joint_2d.cpp

@@ -33,6 +33,7 @@
 #include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
+#include "scene/main/scene_tree.h"
 
 void DampedSpringJoint2D::_notification(int p_what) {
 	switch (p_what) {

scene/2d/physics/joints/groove_joint_2d.cpp

@@ -33,6 +33,7 @@
 #include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
+#include "scene/main/scene_tree.h"
 
 void GrooveJoint2D::_notification(int p_what) {
 	switch (p_what) {

scene/2d/physics/joints/pin_joint_2d.cpp

@@ -33,6 +33,7 @@
 #include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
+#include "scene/main/scene_tree.h"
 
 void PinJoint2D::_notification(int p_what) {
 	switch (p_what) {

scene/2d/physics/ray_cast_2d.cpp

@@ -33,6 +33,7 @@
 #include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/2d/physics/collision_object_2d.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/world_2d.h"
 
 void RayCast2D::set_target_position(const Vector2 &p_point) {

scene/2d/physics/shape_cast_2d.cpp

@@ -34,6 +34,7 @@
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "scene/2d/physics/collision_object_2d.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/world_2d.h"
 #include "servers/physics_2d/physics_server_2d.h"
 

scene/2d/physics/touch_screen_button.cpp

@@ -34,6 +34,7 @@
 #include "core/input/input.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
+#include "scene/main/scene_tree.h"
 #include "scene/main/viewport.h"
 #include "servers/display/accessibility_server.h"
 #include "servers/display/display_server.h"

scene/3d/light_3d.cpp

@@ -34,6 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
+#include "scene/main/scene_tree.h"
 #include "servers/rendering/rendering_server.h"
 
 void Light3D::set_param(Param p_param, real_t p_value) {

scene/3d/mesh_instance_3d.cpp

@@ -33,6 +33,7 @@
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "scene/3d/skeleton_3d.h"
+#include "scene/main/scene_tree.h"
 
 #ifndef PHYSICS_3D_DISABLED
 #include "scene/3d/physics/collision_shape_3d.h"

scene/3d/navigation/navigation_agent_3d.cpp

@@ -34,6 +34,7 @@
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "scene/3d/navigation/navigation_link_3d.h"
+#include "scene/main/scene_tree.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 #include "servers/rendering/rendering_server.h"
 

scene/3d/navigation/navigation_agent_3d.h

@@ -35,6 +35,7 @@
 #include "servers/navigation_3d/navigation_path_query_parameters_3d.h"
 #include "servers/navigation_3d/navigation_path_query_result_3d.h"
 
+class ArrayMesh;
 class Node3D;
 class StandardMaterial3D;
 

scene/3d/navigation/navigation_link_3d.h

@@ -32,6 +32,8 @@
 
 #include "scene/3d/node_3d.h"
 
+class ArrayMesh;
+
 class NavigationLink3D : public Node3D {
 	GDCLASS(NavigationLink3D, Node3D);
 

scene/3d/navigation/navigation_obstacle_3d.cpp

@@ -34,6 +34,7 @@
 #include "core/math/geometry_2d.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
+#include "scene/main/scene_tree.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"

scene/3d/node_3d.h

@@ -31,7 +31,6 @@
 #pragma once
 
 #include "scene/main/node.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/world_3d.h"
 
 class Node3DGizmo : public RefCounted {
@@ -233,7 +232,7 @@ protected:
 
 public:
 	enum {
-		NOTIFICATION_TRANSFORM_CHANGED = SceneTree::NOTIFICATION_TRANSFORM_CHANGED,
+		NOTIFICATION_TRANSFORM_CHANGED = 2000, // Keep in sync with SceneTree.
 		NOTIFICATION_ENTER_WORLD = 41,
 		NOTIFICATION_EXIT_WORLD = 42,
 		NOTIFICATION_VISIBILITY_CHANGED = 43,

scene/3d/occluder_instance_3d.h

@@ -32,6 +32,8 @@
 
 #include "scene/3d/visual_instance_3d.h"
 
+class ArrayMesh;
+
 class Occluder3D : public Resource {
 	GDCLASS(Occluder3D, Resource);
 	RES_BASE_EXTENSION("occ");

scene/3d/path_3d.h

@@ -34,6 +34,8 @@
 #include "scene/resources/curve.h"
 #include "scene/resources/material.h"
 
+class ArrayMesh;
+
 class Path3D : public Node3D {
 	GDCLASS(Path3D, Node3D);
 

scene/3d/physics/collision_object_3d.cpp

@@ -33,6 +33,7 @@
 #include "core/config/engine.h"
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/shape_3d.h"
 #include "scene/resources/mesh.h"
 #include "servers/rendering/rendering_server.h"

scene/3d/physics/ray_cast_3d.cpp

@@ -33,6 +33,7 @@
 #include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/3d/physics/collision_object_3d.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/mesh.h"
 #include "servers/rendering/rendering_server.h"
 

scene/3d/physics/ray_cast_3d.h

@@ -33,6 +33,7 @@
 #include "scene/3d/node_3d.h"
 #include "scene/resources/material.h"
 
+class ArrayMesh;
 class CollisionObject3D;
 
 class RayCast3D : public Node3D {

scene/3d/physics/shape_cast_3d.cpp

@@ -34,6 +34,7 @@
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "scene/3d/physics/collision_object_3d.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/mesh.h"
 #include "servers/rendering/rendering_server.h"

scene/3d/physics/spring_arm_3d.cpp

@@ -33,6 +33,7 @@
 #include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/3d/camera_3d.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/3d/shape_3d.h"
 
 void SpringArm3D::_notification(int p_what) {

scene/3d/visual_instance_3d.cpp

@@ -36,6 +36,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/material.h"
 #include "servers/rendering/rendering_server.h"
 

scene/3d/visual_instance_3d.h

@@ -33,6 +33,7 @@
 #include "scene/3d/node_3d.h"
 #include "servers/rendering/rendering_server_enums.h"
 
+class Material;
 class TriangleMesh;
 
 class VisualInstance3D : public Node3D {

scene/3d/voxel_gi.cpp

@@ -36,6 +36,7 @@
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/multimesh_instance_3d.h"
 #include "scene/3d/voxelizer.h"
+#include "scene/main/scene_tree.h"
 #include "scene/resources/camera_attributes.h"
 #include "servers/rendering/rendering_server.h"
 

scene/animation/animation_mixer.cpp

@@ -2489,7 +2489,7 @@ void AnimationMixer::_bind_methods() {
 }
 
 AnimationMixer::AnimationMixer() {
-	root_node = SceneStringName(path_pp);
+	root_node = NodePath("..");
 }
 
 AnimationMixer::~AnimationMixer() {