diff --git a/core/variant/binder_common.h b/core/variant/binder_common.h
index 0aa49f6d68f..65f64841bde 100644
--- a/core/variant/binder_common.h
+++ b/core/variant/binder_common.h
@@ -34,7 +34,6 @@
 #include "core/input/input_enums.h"
 #include "core/object/object.h"
 #include "core/os/keyboard.h"
-#include "core/templates/list.h"
 #include "core/templates/simple_type.h"
 #include "core/typedefs.h"
 #include "core/variant/method_ptrcall.h"
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index c49004210f8..f904f939b98 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -48,16 +48,15 @@
 #include "editor/editor_string_names.h"
 #include "editor/plugins/editor_context_menu_plugin.h"
 #include "main/main.h"
+#include "scene/2d/node_2d.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/animation/animation_tree.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/file_dialog.h"
-#include "scene/gui/link_button.h"
 #include "scene/gui/menu_bar.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
-#include "scene/gui/panel_container.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/split_container.h"
@@ -97,8 +96,6 @@
 #include "editor/editor_property_name_processor.h"
 #include "editor/editor_resource_picker.h"
 #include "editor/editor_resource_preview.h"
-#include "editor/editor_run.h"
-#include "editor/editor_run_native.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_settings_dialog.h"
 #include "editor/editor_translation_parser.h"
diff --git a/editor/gui/scene_tree_editor.cpp b/editor/gui/scene_tree_editor.cpp
index 934bdc0beae..6e65d4d8ee4 100644
--- a/editor/gui/scene_tree_editor.cpp
+++ b/editor/gui/scene_tree_editor.cpp
@@ -43,6 +43,7 @@
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/2d/node_2d.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/texture_rect.h"
diff --git a/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp b/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp
index 94d6be22f49..9aa1d1da7ce 100644
--- a/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp
+++ b/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp
@@ -33,6 +33,7 @@
 #include "editor/editor_settings.h"
 #include "editor/plugins/gizmos/joint_3d_gizmo_plugin.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
+#include "scene/3d/physical_bone_simulator_3d.h"
 #include "scene/3d/physics/physical_bone_3d.h"
 #include "scene/3d/physics/physics_body_3d.h"
 
diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp
index 8bdc763ebef..f314b018e88 100644
--- a/editor/plugins/material_editor_plugin.cpp
+++ b/editor/plugins/material_editor_plugin.cpp
@@ -47,6 +47,7 @@
 #include "scene/main/viewport.h"
 #include "scene/resources/3d/fog_material.h"
 #include "scene/resources/3d/sky_material.h"
+#include "scene/resources/canvas_item_material.h"
 #include "scene/resources/particle_process_material.h"
 
 void MaterialEditor::gui_input(const Ref<InputEvent> &p_event) {
diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/plugins/skeleton_3d_editor_plugin.cpp
index 9cffef89aa4..f0cd92171de 100644
--- a/editor/plugins/skeleton_3d_editor_plugin.cpp
+++ b/editor/plugins/skeleton_3d_editor_plugin.cpp
@@ -41,6 +41,7 @@
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/3d/mesh_instance_3d.h"
+#include "scene/3d/physical_bone_simulator_3d.h"
 #include "scene/3d/physics/collision_shape_3d.h"
 #include "scene/3d/physics/joints/joint_3d.h"
 #include "scene/3d/physics/physical_bone_3d.h"
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index 0bacce62faa..d84989164f4 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -58,6 +58,7 @@
 #include "editor/reparent_dialog.h"
 #include "editor/shader_create_dialog.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/2d/node_2d.h"
 #include "scene/animation/animation_tree.h"
 #include "scene/audio/audio_stream_player.h"
 #include "scene/gui/check_box.h"
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
index bfd21891299..6da56616b71 100644
--- a/modules/gltf/gltf_document.cpp
+++ b/modules/gltf/gltf_document.cpp
@@ -45,12 +45,14 @@
 #include "core/io/stream_peer.h"
 #include "core/object/object_id.h"
 #include "core/version.h"
+#include "scene/2d/node_2d.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/light_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/multimesh_instance_3d.h"
+#include "scene/animation/animation_player.h"
 #include "scene/resources/3d/skin.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/portable_compressed_texture.h"
diff --git a/modules/gltf/gltf_state.h b/modules/gltf/gltf_state.h
index d667cf8858f..403f94b1597 100644
--- a/modules/gltf/gltf_state.h
+++ b/modules/gltf/gltf_state.h
@@ -45,6 +45,7 @@
 #include "structures/gltf_texture_sampler.h"
 
 #include "scene/3d/importer_mesh_instance_3d.h"
+#include "scene/animation/animation_player.h"
 
 class GLTFState : public Resource {
 	GDCLASS(GLTFState, Resource);
diff --git a/modules/gltf/structures/gltf_animation.h b/modules/gltf/structures/gltf_animation.h
index 6b692d06e6b..755e4ebd973 100644
--- a/modules/gltf/structures/gltf_animation.h
+++ b/modules/gltf/structures/gltf_animation.h
@@ -31,7 +31,7 @@
 #ifndef GLTF_ANIMATION_H
 #define GLTF_ANIMATION_H
 
-#include "scene/animation/animation_player.h"
+#include "scene/resources/animation.h"
 
 class GLTFAnimation : public Resource {
 	GDCLASS(GLTFAnimation, Resource);
diff --git a/scene/2d/audio_listener_2d.cpp b/scene/2d/audio_listener_2d.cpp
index cff0654ecc9..2d6ef2039e6 100644
--- a/scene/2d/audio_listener_2d.cpp
+++ b/scene/2d/audio_listener_2d.cpp
@@ -30,6 +30,8 @@
 
 #include "audio_listener_2d.h"
 
+#include "scene/main/viewport.h"
+
 bool AudioListener2D::_set(const StringName &p_name, const Variant &p_value) {
 	if (p_name == "current") {
 		if (p_value.operator bool()) {
diff --git a/scene/2d/audio_listener_2d.h b/scene/2d/audio_listener_2d.h
index abada06971e..8e2e6b26715 100644
--- a/scene/2d/audio_listener_2d.h
+++ b/scene/2d/audio_listener_2d.h
@@ -32,7 +32,6 @@
 #define AUDIO_LISTENER_2D_H
 
 #include "scene/2d/node_2d.h"
-#include "scene/main/window.h"
 
 class AudioListener2D : public Node2D {
 	GDCLASS(AudioListener2D, Node2D);
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp
index e8bd2766ccf..434671a1c7f 100644
--- a/scene/2d/camera_2d.cpp
+++ b/scene/2d/camera_2d.cpp
@@ -31,7 +31,7 @@
 #include "camera_2d.h"
 
 #include "core/config/project_settings.h"
-#include "scene/main/window.h"
+#include "scene/main/viewport.h"
 
 bool Camera2D::_is_editing_in_editor() const {
 #ifdef TOOLS_ENABLED
diff --git a/scene/2d/cpu_particles_2d.cpp b/scene/2d/cpu_particles_2d.cpp
index 6eeb2ba0615..99dc6a4d494 100644
--- a/scene/2d/cpu_particles_2d.cpp
+++ b/scene/2d/cpu_particles_2d.cpp
@@ -32,6 +32,7 @@
 
 #include "scene/2d/gpu_particles_2d.h"
 #include "scene/resources/atlas_texture.h"
+#include "scene/resources/canvas_item_material.h"
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/gradient_texture.h"
 #include "scene/resources/particle_process_material.h"
diff --git a/scene/2d/gpu_particles_2d.cpp b/scene/2d/gpu_particles_2d.cpp
index f673b2a78f7..945f03d8ec1 100644
--- a/scene/2d/gpu_particles_2d.cpp
+++ b/scene/2d/gpu_particles_2d.cpp
@@ -32,14 +32,11 @@
 
 #include "scene/2d/cpu_particles_2d.h"
 #include "scene/resources/atlas_texture.h"
+#include "scene/resources/canvas_item_material.h"
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/gradient_texture.h"
 #include "scene/resources/particle_process_material.h"
 
-#ifdef TOOLS_ENABLED
-#include "core/config/engine.h"
-#endif
-
 void GPUParticles2D::set_emitting(bool p_emitting) {
 	// Do not return even if `p_emitting == emitting` because `emitting` is just an approximation.
 
diff --git a/scene/2d/navigation_link_2d.cpp b/scene/2d/navigation_link_2d.cpp
index d90793a4c56..1db88abe684 100644
--- a/scene/2d/navigation_link_2d.cpp
+++ b/scene/2d/navigation_link_2d.cpp
@@ -33,7 +33,6 @@
 #include "core/math/geometry_2d.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_server_2d.h"
-#include "servers/navigation_server_3d.h"
 
 void NavigationLink2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_rid"), &NavigationLink2D::get_rid);
diff --git a/scene/2d/navigation_obstacle_2d.cpp b/scene/2d/navigation_obstacle_2d.cpp
index 46bcda9c6dd..d2f86c1631e 100644
--- a/scene/2d/navigation_obstacle_2d.cpp
+++ b/scene/2d/navigation_obstacle_2d.cpp
@@ -33,7 +33,6 @@
 #include "core/math/geometry_2d.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_server_2d.h"
-#include "servers/navigation_server_3d.h"
 
 void NavigationObstacle2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_rid"), &NavigationObstacle2D::get_rid);
diff --git a/scene/2d/navigation_region_2d.cpp b/scene/2d/navigation_region_2d.cpp
index 94e479a0d94..f966f438af4 100644
--- a/scene/2d/navigation_region_2d.cpp
+++ b/scene/2d/navigation_region_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "navigation_region_2d.h"
 
-#include "core/math/geometry_2d.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_server_2d.h"
 
diff --git a/scene/2d/parallax_2d.cpp b/scene/2d/parallax_2d.cpp
index c6176390dc1..5cb9bf45f78 100644
--- a/scene/2d/parallax_2d.cpp
+++ b/scene/2d/parallax_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "parallax_2d.h"
 
-#include "core/config/project_settings.h"
 #include "scene/main/viewport.h"
 
 void Parallax2D::_notification(int p_what) {
diff --git a/scene/2d/physics/collision_polygon_2d.cpp b/scene/2d/physics/collision_polygon_2d.cpp
index a3e9fcce7e8..f71d561f18a 100644
--- a/scene/2d/physics/collision_polygon_2d.cpp
+++ b/scene/2d/physics/collision_polygon_2d.cpp
@@ -36,8 +36,6 @@
 #include "scene/resources/2d/concave_polygon_shape_2d.h"
 #include "scene/resources/2d/convex_polygon_shape_2d.h"
 
-#include "thirdparty/misc/polypartition.h"
-
 void CollisionPolygon2D::_build_polygon() {
 	collision_object->shape_owner_clear_shapes(owner_id);
 
diff --git a/scene/2d/physics/kinematic_collision_2d.cpp b/scene/2d/physics/kinematic_collision_2d.cpp
index 18b02547697..a8ba211d4bc 100644
--- a/scene/2d/physics/kinematic_collision_2d.cpp
+++ b/scene/2d/physics/kinematic_collision_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "kinematic_collision_2d.h"
 
-#include "scene/2d/physics/character_body_2d.h"
 #include "scene/2d/physics/physics_body_2d.h"
 
 Vector2 KinematicCollision2D::get_position() const {
diff --git a/scene/2d/physics/physics_body_2d.h b/scene/2d/physics/physics_body_2d.h
index d44eebabee9..637f76aaf8d 100644
--- a/scene/2d/physics/physics_body_2d.h
+++ b/scene/2d/physics/physics_body_2d.h
@@ -31,7 +31,6 @@
 #ifndef PHYSICS_BODY_2D_H
 #define PHYSICS_BODY_2D_H
 
-#include "core/templates/vset.h"
 #include "scene/2d/physics/collision_object_2d.h"
 #include "scene/2d/physics/kinematic_collision_2d.h"
 #include "scene/resources/physics_material.h"
diff --git a/scene/2d/physics/rigid_body_2d.h b/scene/2d/physics/rigid_body_2d.h
index 40af66f28d6..bee5ecb3c30 100644
--- a/scene/2d/physics/rigid_body_2d.h
+++ b/scene/2d/physics/rigid_body_2d.h
@@ -31,7 +31,8 @@
 #ifndef RIGID_BODY_2D_H
 #define RIGID_BODY_2D_H
 
-#include "scene/2d/physics/static_body_2d.h"
+#include "core/templates/vset.h"
+#include "scene/2d/physics/physics_body_2d.h"
 
 class RigidBody2D : public PhysicsBody2D {
 	GDCLASS(RigidBody2D, PhysicsBody2D);
diff --git a/scene/2d/physics/shape_cast_2d.cpp b/scene/2d/physics/shape_cast_2d.cpp
index dd9d5891657..caf3f564fc6 100644
--- a/scene/2d/physics/shape_cast_2d.cpp
+++ b/scene/2d/physics/shape_cast_2d.cpp
@@ -32,8 +32,7 @@
 
 #include "core/config/engine.h"
 #include "scene/2d/physics/collision_object_2d.h"
-#include "scene/2d/physics/physics_body_2d.h"
-#include "scene/resources/2d/circle_shape_2d.h"
+#include "scene/resources/world_2d.h"
 #include "servers/physics_server_2d.h"
 
 void ShapeCast2D::set_target_position(const Vector2 &p_point) {
diff --git a/scene/2d/physics/shape_cast_2d.h b/scene/2d/physics/shape_cast_2d.h
index d866dd4edb8..a08f13709cd 100644
--- a/scene/2d/physics/shape_cast_2d.h
+++ b/scene/2d/physics/shape_cast_2d.h
@@ -33,7 +33,7 @@
 
 #include "scene/2d/node_2d.h"
 #include "scene/resources/2d/shape_2d.h"
-#include "scene/resources/world_2d.h"
+#include "servers/physics_server_2d.h"
 
 class CollisionObject2D;
 
diff --git a/scene/2d/sprite_2d.cpp b/scene/2d/sprite_2d.cpp
index a182f63171b..fc4cb6d8b4c 100644
--- a/scene/2d/sprite_2d.cpp
+++ b/scene/2d/sprite_2d.cpp
@@ -30,7 +30,7 @@
 
 #include "sprite_2d.h"
 
-#include "scene/main/window.h"
+#include "scene/main/viewport.h"
 
 #ifdef TOOLS_ENABLED
 Dictionary Sprite2D::_edit_get_state() const {
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index 8e9500cdbe1..1b385c0aa92 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -32,7 +32,6 @@
 #include "tile_map.compat.inc"
 
 #include "core/io/marshalls.h"
-#include "scene/gui/control.h"
 
 #define TILEMAP_CALL_FOR_LAYER(layer, function, ...) \
 	if (layer < 0) {                                 \
diff --git a/scene/2d/tile_map_layer.cpp b/scene/2d/tile_map_layer.cpp
index c4a2f35d318..889f61b3967 100644
--- a/scene/2d/tile_map_layer.cpp
+++ b/scene/2d/tile_map_layer.cpp
@@ -36,10 +36,6 @@
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_server_2d.h"
 
-#ifdef DEBUG_ENABLED
-#include "servers/navigation_server_3d.h"
-#endif // DEBUG_ENABLED
-
 #ifdef DEBUG_ENABLED
 /////////////////////////////// Debug //////////////////////////////////////////
 constexpr int TILE_MAP_DEBUG_QUADRANT_SIZE = 16;
diff --git a/scene/2d/touch_screen_button.cpp b/scene/2d/touch_screen_button.cpp
index 220608a250d..eeda8627392 100644
--- a/scene/2d/touch_screen_button.cpp
+++ b/scene/2d/touch_screen_button.cpp
@@ -30,7 +30,7 @@
 
 #include "touch_screen_button.h"
 
-#include "scene/main/window.h"
+#include "scene/main/viewport.h"
 
 void TouchScreenButton::set_texture_normal(const Ref<Texture2D> &p_texture) {
 	if (texture_normal == p_texture) {
diff --git a/scene/3d/audio_stream_player_3d.h b/scene/3d/audio_stream_player_3d.h
index 8f6c5c1a729..8f18ce08421 100644
--- a/scene/3d/audio_stream_player_3d.h
+++ b/scene/3d/audio_stream_player_3d.h
@@ -39,7 +39,6 @@ struct AudioFrame;
 class AudioStream;
 class AudioStreamPlayback;
 class AudioStreamPlayerInternal;
-class Camera3D;
 class VelocityTracker3D;
 
 class AudioStreamPlayer3D : public Node3D {
diff --git a/scene/3d/bone_attachment_3d.h b/scene/3d/bone_attachment_3d.h
index 5435c4ad0cd..d3ba804e583 100644
--- a/scene/3d/bone_attachment_3d.h
+++ b/scene/3d/bone_attachment_3d.h
@@ -32,9 +32,6 @@
 #define BONE_ATTACHMENT_3D_H
 
 #include "scene/3d/skeleton_3d.h"
-#ifdef TOOLS_ENABLED
-#include "scene/resources/bone_map.h"
-#endif // TOOLS_ENABLED
 
 class BoneAttachment3D : public Node3D {
 	GDCLASS(BoneAttachment3D, Node3D);
diff --git a/scene/3d/camera_3d.cpp b/scene/3d/camera_3d.cpp
index c520a42efbc..28e712704b1 100644
--- a/scene/3d/camera_3d.cpp
+++ b/scene/3d/camera_3d.cpp
@@ -33,7 +33,6 @@
 #include "core/math/projection.h"
 #include "core/math/transform_interpolator.h"
 #include "scene/main/viewport.h"
-#include "servers/rendering/rendering_server_constants.h"
 
 void Camera3D::_update_audio_listener_state() {
 }
diff --git a/scene/3d/cpu_particles_3d.cpp b/scene/3d/cpu_particles_3d.cpp
index 87a0970a636..a9ff003abce 100644
--- a/scene/3d/cpu_particles_3d.cpp
+++ b/scene/3d/cpu_particles_3d.cpp
@@ -35,7 +35,6 @@
 #include "scene/main/viewport.h"
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/gradient_texture.h"
-#include "scene/resources/image_texture.h"
 #include "scene/resources/particle_process_material.h"
 
 AABB CPUParticles3D::get_aabb() const {
diff --git a/scene/3d/fog_volume.cpp b/scene/3d/fog_volume.cpp
index ede33bed016..1ed8e3b37a8 100644
--- a/scene/3d/fog_volume.cpp
+++ b/scene/3d/fog_volume.cpp
@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "fog_volume.h"
+
+#include "scene/main/viewport.h"
 #include "scene/resources/environment.h"
 
 ///////////////////////////
diff --git a/scene/3d/fog_volume.h b/scene/3d/fog_volume.h
index f7e861e3d05..9052ad77f3a 100644
--- a/scene/3d/fog_volume.h
+++ b/scene/3d/fog_volume.h
@@ -33,8 +33,6 @@
 
 #include "core/templates/rid.h"
 #include "scene/3d/visual_instance_3d.h"
-#include "scene/main/node.h"
-#include "scene/main/viewport.h"
 #include "scene/resources/material.h"
 
 class FogVolume : public VisualInstance3D {
diff --git a/scene/3d/importer_mesh_instance_3d.h b/scene/3d/importer_mesh_instance_3d.h
index fbd95d4b680..481fb79a5af 100644
--- a/scene/3d/importer_mesh_instance_3d.h
+++ b/scene/3d/importer_mesh_instance_3d.h
@@ -34,7 +34,6 @@
 #include "scene/3d/node_3d.h"
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/resources/3d/skin.h"
-#include "scene/resources/immediate_mesh.h"
 
 class ImporterMesh;
 
diff --git a/scene/3d/navigation_link_3d.cpp b/scene/3d/navigation_link_3d.cpp
index 9e29384fc9b..40199ea3ca3 100644
--- a/scene/3d/navigation_link_3d.cpp
+++ b/scene/3d/navigation_link_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "navigation_link_3d.h"
 
-#include "mesh_instance_3d.h"
 #include "servers/navigation_server_3d.h"
 
 #ifdef DEBUG_ENABLED
diff --git a/scene/3d/physical_bone_simulator_3d.cpp b/scene/3d/physical_bone_simulator_3d.cpp
index 8874c9cfc6e..4a619da4e44 100644
--- a/scene/3d/physical_bone_simulator_3d.cpp
+++ b/scene/3d/physical_bone_simulator_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "physical_bone_simulator_3d.h"
 
+#include "scene/3d/physics/physical_bone_3d.h"
+
 void PhysicalBoneSimulator3D::_skeleton_changed(Skeleton3D *p_old, Skeleton3D *p_new) {
 	if (p_old) {
 		if (p_old->is_connected(SNAME("bone_list_changed"), callable_mp(this, &PhysicalBoneSimulator3D::_bone_list_changed))) {
diff --git a/scene/3d/physical_bone_simulator_3d.h b/scene/3d/physical_bone_simulator_3d.h
index 24136be2b81..6c1c70b580d 100644
--- a/scene/3d/physical_bone_simulator_3d.h
+++ b/scene/3d/physical_bone_simulator_3d.h
@@ -33,8 +33,6 @@
 
 #include "scene/3d/skeleton_modifier_3d.h"
 
-#include "scene/3d/physics/physical_bone_3d.h"
-
 class PhysicalBone3D;
 
 class PhysicalBoneSimulator3D : public SkeletonModifier3D {
diff --git a/scene/3d/physics/collision_polygon_3d.h b/scene/3d/physics/collision_polygon_3d.h
index fe4cf40ee31..48c5284ae33 100644
--- a/scene/3d/physics/collision_polygon_3d.h
+++ b/scene/3d/physics/collision_polygon_3d.h
@@ -32,7 +32,6 @@
 #define COLLISION_POLYGON_3D_H
 
 #include "scene/3d/node_3d.h"
-#include "scene/resources/3d/shape_3d.h"
 
 class CollisionObject3D;
 class CollisionPolygon3D : public Node3D {
diff --git a/scene/3d/physics/collision_shape_3d.cpp b/scene/3d/physics/collision_shape_3d.cpp
index 9f9e5f33b97..04f71f6a234 100644
--- a/scene/3d/physics/collision_shape_3d.cpp
+++ b/scene/3d/physics/collision_shape_3d.cpp
@@ -32,7 +32,6 @@
 
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/physics/character_body_3d.h"
-#include "scene/3d/physics/physics_body_3d.h"
 #include "scene/3d/physics/vehicle_body_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/convex_polygon_shape_3d.h"
diff --git a/scene/3d/physics/kinematic_collision_3d.cpp b/scene/3d/physics/kinematic_collision_3d.cpp
index de13831ac39..7e19106c5fd 100644
--- a/scene/3d/physics/kinematic_collision_3d.cpp
+++ b/scene/3d/physics/kinematic_collision_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "kinematic_collision_3d.h"
 
-#include "scene/3d/physics/character_body_3d.h"
 #include "scene/3d/physics/physics_body_3d.h"
 
 Vector3 KinematicCollision3D::get_travel() const {
diff --git a/scene/3d/physics/kinematic_collision_3d.h b/scene/3d/physics/kinematic_collision_3d.h
index 0573af0c215..38852bebd6f 100644
--- a/scene/3d/physics/kinematic_collision_3d.h
+++ b/scene/3d/physics/kinematic_collision_3d.h
@@ -34,9 +34,6 @@
 #include "core/object/ref_counted.h"
 #include "servers/physics_server_3d.h"
 
-class CharacterBody3D;
-class PhysicsBody3D;
-
 class KinematicCollision3D : public RefCounted {
 	GDCLASS(KinematicCollision3D, RefCounted);
 
diff --git a/scene/3d/physics/physical_bone_3d.cpp b/scene/3d/physics/physical_bone_3d.cpp
index 294690a89a0..cf6af50d2ef 100644
--- a/scene/3d/physics/physical_bone_3d.cpp
+++ b/scene/3d/physics/physical_bone_3d.cpp
@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "physical_bone_3d.h"
+
+#include "scene/3d/physical_bone_simulator_3d.h"
 #ifndef DISABLE_DEPRECATED
 #include "scene/3d/skeleton_3d.h"
 #endif //_DISABLE_DEPRECATED
diff --git a/scene/3d/physics/physical_bone_3d.h b/scene/3d/physics/physical_bone_3d.h
index 4765e415722..415eebb0250 100644
--- a/scene/3d/physics/physical_bone_3d.h
+++ b/scene/3d/physics/physical_bone_3d.h
@@ -31,8 +31,8 @@
 #ifndef PHYSICAL_BONE_3D_H
 #define PHYSICAL_BONE_3D_H
 
-#include "scene/3d/physical_bone_simulator_3d.h"
 #include "scene/3d/physics/physics_body_3d.h"
+#include "scene/3d/skeleton_3d.h"
 
 class PhysicalBoneSimulator3D;
 
diff --git a/scene/3d/physics/physics_body_3d.h b/scene/3d/physics/physics_body_3d.h
index 71253be0b80..5a5dae64f63 100644
--- a/scene/3d/physics/physics_body_3d.h
+++ b/scene/3d/physics/physics_body_3d.h
@@ -31,7 +31,6 @@
 #ifndef PHYSICS_BODY_3D_H
 #define PHYSICS_BODY_3D_H
 
-#include "core/templates/vset.h"
 #include "scene/3d/physics/collision_object_3d.h"
 #include "scene/3d/physics/kinematic_collision_3d.h"
 #include "scene/resources/physics_material.h"
diff --git a/scene/3d/physics/ray_cast_3d.cpp b/scene/3d/physics/ray_cast_3d.cpp
index b9159f072b2..ce763b10b4b 100644
--- a/scene/3d/physics/ray_cast_3d.cpp
+++ b/scene/3d/physics/ray_cast_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "ray_cast_3d.h"
 
-#include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/physics/collision_object_3d.h"
 
 void RayCast3D::set_target_position(const Vector3 &p_point) {
diff --git a/scene/3d/physics/rigid_body_3d.h b/scene/3d/physics/rigid_body_3d.h
index ec051e5e0fb..5a37b82b22b 100644
--- a/scene/3d/physics/rigid_body_3d.h
+++ b/scene/3d/physics/rigid_body_3d.h
@@ -31,7 +31,8 @@
 #ifndef RIGID_BODY_3D_H
 #define RIGID_BODY_3D_H
 
-#include "scene/3d/physics/static_body_3d.h"
+#include "core/templates/vset.h"
+#include "scene/3d/physics/physics_body_3d.h"
 
 class RigidBody3D : public PhysicsBody3D {
 	GDCLASS(RigidBody3D, PhysicsBody3D);
diff --git a/scene/3d/physics/shape_cast_3d.cpp b/scene/3d/physics/shape_cast_3d.cpp
index 19c74bc9254..019cf54b23e 100644
--- a/scene/3d/physics/shape_cast_3d.cpp
+++ b/scene/3d/physics/shape_cast_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "shape_cast_3d.h"
 
-#include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/physics/collision_object_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 
diff --git a/scene/3d/skeleton_3d.cpp b/scene/3d/skeleton_3d.cpp
index 9cf5b19a5a3..8c31878c241 100644
--- a/scene/3d/skeleton_3d.cpp
+++ b/scene/3d/skeleton_3d.cpp
@@ -31,9 +31,7 @@
 #include "skeleton_3d.h"
 #include "skeleton_3d.compat.inc"
 
-#include "core/variant/type_info.h"
 #include "scene/3d/skeleton_modifier_3d.h"
-#include "scene/resources/surface_tool.h"
 #ifndef DISABLE_DEPRECATED
 #include "scene/3d/physical_bone_simulator_3d.h"
 #endif // _DISABLE_DEPRECATED
diff --git a/scene/3d/skeleton_3d.h b/scene/3d/skeleton_3d.h
index 73731462871..8b03bb83121 100644
--- a/scene/3d/skeleton_3d.h
+++ b/scene/3d/skeleton_3d.h
@@ -38,7 +38,6 @@
 typedef int BoneId;
 
 class Skeleton3D;
-class SkeletonModifier3D;
 
 class SkinReference : public RefCounted {
 	GDCLASS(SkinReference, RefCounted)
diff --git a/scene/3d/skeleton_modifier_3d.h b/scene/3d/skeleton_modifier_3d.h
index 728b000ff52..9e216354d17 100644
--- a/scene/3d/skeleton_modifier_3d.h
+++ b/scene/3d/skeleton_modifier_3d.h
@@ -34,7 +34,6 @@
 #include "scene/3d/node_3d.h"
 
 #include "scene/3d/skeleton_3d.h"
-#include "scene/animation/animation_mixer.h"
 
 class SkeletonModifier3D : public Node3D {
 	GDCLASS(SkeletonModifier3D, Node3D);
diff --git a/scene/3d/soft_body_3d.h b/scene/3d/soft_body_3d.h
index b01d462d9f1..72544b233cb 100644
--- a/scene/3d/soft_body_3d.h
+++ b/scene/3d/soft_body_3d.h
@@ -35,7 +35,6 @@
 #include "servers/physics_server_3d.h"
 
 class PhysicsBody3D;
-class SoftBody3D;
 
 class SoftBodyRenderingServerHandler : public PhysicsServer3DRenderingServerHandler {
 	friend class SoftBody3D;
diff --git a/scene/3d/velocity_tracker_3d.cpp b/scene/3d/velocity_tracker_3d.cpp
index 4d1d80402bf..822fb3c5106 100644
--- a/scene/3d/velocity_tracker_3d.cpp
+++ b/scene/3d/velocity_tracker_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "velocity_tracker_3d.h"
 
+#include "core/config/engine.h"
+
 void VelocityTracker3D::set_track_physics_step(bool p_track_physics_step) {
 	physics_step = p_track_physics_step;
 }
diff --git a/scene/3d/velocity_tracker_3d.h b/scene/3d/velocity_tracker_3d.h
index ed3abb264fe..418438eda20 100644
--- a/scene/3d/velocity_tracker_3d.h
+++ b/scene/3d/velocity_tracker_3d.h
@@ -31,7 +31,7 @@
 #ifndef VELOCITY_TRACKER_3D_H
 #define VELOCITY_TRACKER_3D_H
 
-#include "scene/3d/node_3d.h"
+#include "core/object/ref_counted.h"
 
 class VelocityTracker3D : public RefCounted {
 	struct PositionHistory {
diff --git a/scene/3d/visible_on_screen_notifier_3d.h b/scene/3d/visible_on_screen_notifier_3d.h
index 7115de536f3..cb4c535c54f 100644
--- a/scene/3d/visible_on_screen_notifier_3d.h
+++ b/scene/3d/visible_on_screen_notifier_3d.h
@@ -33,8 +33,6 @@
 
 #include "scene/3d/visual_instance_3d.h"
 
-class World3D;
-class Camera3D;
 class VisibleOnScreenNotifier3D : public VisualInstance3D {
 	GDCLASS(VisibleOnScreenNotifier3D, VisualInstance3D);
 
diff --git a/scene/3d/world_environment.cpp b/scene/3d/world_environment.cpp
index 82b7c160a4c..56b6b3cde80 100644
--- a/scene/3d/world_environment.cpp
+++ b/scene/3d/world_environment.cpp
@@ -31,7 +31,7 @@
 #include "world_environment.h"
 
 #include "scene/3d/node_3d.h"
-#include "scene/main/window.h"
+#include "scene/main/viewport.h"
 
 void WorldEnvironment::_notification(int p_what) {
 	switch (p_what) {
diff --git a/scene/3d/xr_body_modifier_3d.cpp b/scene/3d/xr_body_modifier_3d.cpp
index cf73882a7b5..781738aba19 100644
--- a/scene/3d/xr_body_modifier_3d.cpp
+++ b/scene/3d/xr_body_modifier_3d.cpp
@@ -31,7 +31,6 @@
 #include "xr_body_modifier_3d.h"
 
 #include "scene/3d/skeleton_3d.h"
-#include "servers/xr/xr_pose.h"
 #include "servers/xr_server.h"
 
 void XRBodyModifier3D::_bind_methods() {
diff --git a/scene/3d/xr_hand_modifier_3d.cpp b/scene/3d/xr_hand_modifier_3d.cpp
index 3b533da701f..7a44f1ad3b5 100644
--- a/scene/3d/xr_hand_modifier_3d.cpp
+++ b/scene/3d/xr_hand_modifier_3d.cpp
@@ -31,7 +31,6 @@
 #include "xr_hand_modifier_3d.h"
 
 #include "core/config/project_settings.h"
-#include "servers/xr/xr_pose.h"
 #include "servers/xr_server.h"
 
 void XRHandModifier3D::_bind_methods() {
diff --git a/scene/animation/animation_mixer.cpp b/scene/animation/animation_mixer.cpp
index 0a798670062..c467034c6a6 100644
--- a/scene/animation/animation_mixer.cpp
+++ b/scene/animation/animation_mixer.cpp
@@ -33,7 +33,6 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "core/string/print_string.h"
 #include "core/string/string_name.h"
 #include "scene/2d/audio_stream_player_2d.h"
 #include "scene/animation/animation_player.h"
@@ -47,11 +46,9 @@
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/node_3d.h"
 #include "scene/3d/skeleton_3d.h"
-#include "scene/3d/skeleton_modifier_3d.h"
 #endif // _3D_DISABLED
 
 #ifdef TOOLS_ENABLED
-#include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #endif // TOOLS_ENABLED
 
diff --git a/scene/animation/animation_node_state_machine.cpp b/scene/animation/animation_node_state_machine.cpp
index e367d3d181b..cc368572260 100644
--- a/scene/animation/animation_node_state_machine.cpp
+++ b/scene/animation/animation_node_state_machine.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "animation_node_state_machine.h"
-#include "scene/main/window.h"
 
 /////////////////////////////////////////////////
 
diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h
index c87719a2b3e..b8862ac1a15 100644
--- a/scene/animation/animation_player.h
+++ b/scene/animation/animation_player.h
@@ -32,7 +32,6 @@
 #define ANIMATION_PLAYER_H
 
 #include "animation_mixer.h"
-#include "scene/2d/node_2d.h"
 #include "scene/resources/animation.h"
 
 class AnimationPlayer : public AnimationMixer {
diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp
index 017b47535a8..cf604904015 100644
--- a/scene/animation/animation_tree.cpp
+++ b/scene/animation/animation_tree.cpp
@@ -32,7 +32,6 @@
 #include "animation_tree.compat.inc"
 
 #include "animation_blend_tree.h"
-#include "core/config/engine.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 2c0222b3b8a..5c4a71f4d65 100644
--- a/scene/animation/root_motion_view.cpp
+++ b/scene/animation/root_motion_view.cpp
@@ -32,7 +32,7 @@
 
 #include "root_motion_view.h"
 
-#include "scene/animation/animation_tree.h"
+#include "scene/animation/animation_mixer.h"
 #include "scene/resources/material.h"
 
 void RootMotionView::set_animation_mixer(const NodePath &p_path) {
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index bd4770bcc36..68f9ea9683c 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -31,7 +31,6 @@
 #include "base_button.h"
 
 #include "core/config/project_settings.h"
-#include "core/os/keyboard.h"
 #include "scene/gui/label.h"
 #include "scene/main/window.h"
 
diff --git a/scene/gui/check_box.cpp b/scene/gui/check_box.cpp
index 99937aaf41f..0aeed7b38ab 100644
--- a/scene/gui/check_box.cpp
+++ b/scene/gui/check_box.cpp
@@ -31,7 +31,6 @@
 #include "check_box.h"
 
 #include "scene/theme/theme_db.h"
-#include "servers/rendering_server.h"
 
 Size2 CheckBox::get_icon_size() const {
 	Size2 tex_size = Size2(0, 0);
diff --git a/scene/gui/check_button.cpp b/scene/gui/check_button.cpp
index 29b9504776f..8661d5320fe 100644
--- a/scene/gui/check_button.cpp
+++ b/scene/gui/check_button.cpp
@@ -31,7 +31,6 @@
 #include "check_button.h"
 
 #include "scene/theme/theme_db.h"
-#include "servers/rendering_server.h"
 
 Size2 CheckButton::get_icon_size() const {
 	Ref<Texture2D> on_tex;
diff --git a/scene/gui/color_mode.cpp b/scene/gui/color_mode.cpp
index 7d068a101e6..43d571312e6 100644
--- a/scene/gui/color_mode.cpp
+++ b/scene/gui/color_mode.cpp
@@ -32,7 +32,6 @@
 
 #include "core/math/color.h"
 #include "scene/gui/slider.h"
-#include "thirdparty/misc/ok_color.h"
 
 ColorMode::ColorMode(ColorPicker *p_color_picker) {
 	color_picker = p_color_picker;
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 373411e668f..eb4cdeb0265 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -39,7 +39,6 @@
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/slider.h"
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index de9d5fbfc8a..6c21318ea83 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -31,9 +31,6 @@
 #include "dialogs.h"
 #include "dialogs.compat.inc"
 
-#include "core/os/keyboard.h"
-#include "core/string/print_string.h"
-#include "core/string/translation.h"
 #include "scene/gui/line_edit.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp
index bc943561f36..de1ec3c6164 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/file_dialog.cpp
@@ -32,7 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/os/keyboard.h"
-#include "core/string/print_string.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
diff --git a/scene/gui/graph_element.cpp b/scene/gui/graph_element.cpp
index b63ed8d1ada..878a1313687 100644
--- a/scene/gui/graph_element.cpp
+++ b/scene/gui/graph_element.cpp
@@ -30,7 +30,6 @@
 
 #include "graph_element.h"
 
-#include "core/string/translation.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 e85d0072622..42f1065f653 100644
--- a/scene/gui/graph_frame.cpp
+++ b/scene/gui/graph_frame.cpp
@@ -30,7 +30,6 @@
 
 #include "graph_frame.h"
 
-#include "core/string/translation.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 8f5023104a6..4e9743daeb0 100644
--- a/scene/gui/graph_node.cpp
+++ b/scene/gui/graph_node.cpp
@@ -30,7 +30,6 @@
 
 #include "graph_node.h"
 
-#include "core/string/translation.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"
 #include "scene/theme/theme_db.h"
diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp
index e79a7f03a72..b5acbcc6f22 100644
--- a/scene/gui/label.cpp
+++ b/scene/gui/label.cpp
@@ -30,9 +30,6 @@
 
 #include "label.h"
 
-#include "core/config/project_settings.h"
-#include "core/string/print_string.h"
-#include "core/string/translation.h"
 #include "scene/gui/container.h"
 #include "scene/theme/theme_db.h"
 #include "servers/text_server.h"
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index b92cdf2b353..5bbf712d5c6 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -33,8 +33,6 @@
 #include "core/input/input_map.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/string/print_string.h"
-#include "core/string/translation.h"
 #include "scene/gui/label.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp
index 1142ba37f56..8b330555221 100644
--- a/scene/gui/link_button.cpp
+++ b/scene/gui/link_button.cpp
@@ -30,7 +30,6 @@
 
 #include "link_button.h"
 
-#include "core/string/translation.h"
 #include "scene/theme/theme_db.h"
 
 void LinkButton::_shape() {
diff --git a/scene/gui/menu_bar.cpp b/scene/gui/menu_bar.cpp
index 0c5e42c4c82..14b717d050b 100644
--- a/scene/gui/menu_bar.cpp
+++ b/scene/gui/menu_bar.cpp
@@ -30,7 +30,6 @@
 
 #include "menu_bar.h"
 
-#include "core/os/keyboard.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/menu_bar.h b/scene/gui/menu_bar.h
index c9f2550cc73..d9ec54a0b54 100644
--- a/scene/gui/menu_bar.h
+++ b/scene/gui/menu_bar.h
@@ -31,7 +31,6 @@
 #ifndef MENU_BAR_H
 #define MENU_BAR_H
 
-#include "scene/gui/button.h"
 #include "scene/gui/popup_menu.h"
 
 class MenuBar : public Control {
diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp
index 02de3d4aaac..ae4b45d3eed 100644
--- a/scene/gui/menu_button.cpp
+++ b/scene/gui/menu_button.cpp
@@ -30,7 +30,6 @@
 
 #include "menu_button.h"
 
-#include "core/os/keyboard.h"
 #include "scene/main/window.h"
 
 void MenuButton::shortcut_input(const Ref<InputEvent> &p_event) {
diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp
index 26d164a62d3..8540e95fb93 100644
--- a/scene/gui/option_button.cpp
+++ b/scene/gui/option_button.cpp
@@ -30,8 +30,6 @@
 
 #include "option_button.h"
 
-#include "core/os/keyboard.h"
-#include "core/string/print_string.h"
 #include "scene/theme/theme_db.h"
 
 static const int NONE_SELECTED = -1;
diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
index 10fadeeba1e..a9baf03168a 100644
--- a/scene/gui/popup.cpp
+++ b/scene/gui/popup.cpp
@@ -30,8 +30,6 @@
 
 #include "popup.h"
 
-#include "core/config/engine.h"
-#include "core/os/keyboard.h"
 #include "scene/gui/panel.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index 13cfa3d2304..bacbc24b9e6 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -35,8 +35,6 @@
 #include "core/input/input.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/string/print_string.h"
-#include "core/string/translation.h"
 #include "scene/gui/menu_bar.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 0ba59eb37e4..993a93202f5 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -35,7 +35,6 @@
 #include "core/math/math_defs.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/string/translation.h"
 #include "scene/gui/label.h"
 #include "scene/gui/rich_text_effect.h"
 #include "scene/resources/atlas_texture.h"
diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp
index 38a4bb427a9..b81927f1e00 100644
--- a/scene/gui/scroll_bar.cpp
+++ b/scene/gui/scroll_bar.cpp
@@ -30,9 +30,6 @@
 
 #include "scroll_bar.h"
 
-#include "core/os/keyboard.h"
-#include "core/os/os.h"
-#include "core/string/print_string.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
 
diff --git a/scene/gui/slider.cpp b/scene/gui/slider.cpp
index 7099b1892b9..fe6f29a314c 100644
--- a/scene/gui/slider.cpp
+++ b/scene/gui/slider.cpp
@@ -30,7 +30,6 @@
 
 #include "slider.h"
 
-#include "core/os/keyboard.h"
 #include "scene/theme/theme_db.h"
 
 Size2 Slider::get_minimum_size() const {
diff --git a/scene/gui/split_container.cpp b/scene/gui/split_container.cpp
index be03db526d0..fed66405f65 100644
--- a/scene/gui/split_container.cpp
+++ b/scene/gui/split_container.cpp
@@ -30,9 +30,7 @@
 
 #include "split_container.h"
 
-#include "scene/gui/label.h"
-#include "scene/gui/margin_container.h"
-#include "scene/main/window.h"
+#include "scene/main/viewport.h"
 #include "scene/theme/theme_db.h"
 
 void SplitContainerDragger::gui_input(const Ref<InputEvent> &p_event) {
diff --git a/scene/gui/tab_bar.cpp b/scene/gui/tab_bar.cpp
index 6cc7ec3bd5c..7d47fa84fda 100644
--- a/scene/gui/tab_bar.cpp
+++ b/scene/gui/tab_bar.cpp
@@ -30,7 +30,6 @@
 
 #include "tab_bar.h"
 
-#include "core/string/translation.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"
 #include "scene/gui/texture_rect.h"
diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp
index 392bb50ead9..9f459b9ce9e 100644
--- a/scene/gui/texture_button.cpp
+++ b/scene/gui/texture_button.cpp
@@ -32,8 +32,6 @@
 
 #include "core/typedefs.h"
 
-#include <stdlib.h>
-
 Size2 TextureButton::get_minimum_size() const {
 	Size2 rscale = Control::get_minimum_size();
 
diff --git a/scene/gui/texture_progress_bar.cpp b/scene/gui/texture_progress_bar.cpp
index 40311344170..853bde3f85d 100644
--- a/scene/gui/texture_progress_bar.cpp
+++ b/scene/gui/texture_progress_bar.cpp
@@ -30,8 +30,6 @@
 
 #include "texture_progress_bar.h"
 
-#include "core/config/engine.h"
-
 void TextureProgressBar::set_under_texture(const Ref<Texture2D> &p_texture) {
 	_set_texture(&under, p_texture);
 }
diff --git a/scene/gui/texture_rect.cpp b/scene/gui/texture_rect.cpp
index 972a8329854..a06c92e3b7a 100644
--- a/scene/gui/texture_rect.cpp
+++ b/scene/gui/texture_rect.cpp
@@ -30,8 +30,6 @@
 
 #include "texture_rect.h"
 
-#include "servers/rendering_server.h"
-
 void TextureRect::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_DRAW: {
diff --git a/scene/gui/video_stream_player.h b/scene/gui/video_stream_player.h
index c173c8bfa38..2cbe6cac218 100644
--- a/scene/gui/video_stream_player.h
+++ b/scene/gui/video_stream_player.h
@@ -34,7 +34,6 @@
 #include "scene/gui/control.h"
 #include "scene/resources/video_stream.h"
 #include "servers/audio/audio_rb_resampler.h"
-#include "servers/audio_server.h"
 
 class VideoStreamPlayer : public Control {
 	GDCLASS(VideoStreamPlayer, Control);
diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp
index 864b2b5127f..2cbe9acb3e8 100644
--- a/scene/main/canvas_item.cpp
+++ b/scene/main/canvas_item.cpp
@@ -35,7 +35,6 @@
 #include "scene/main/canvas_layer.h"
 #include "scene/main/window.h"
 #include "scene/resources/atlas_texture.h"
-#include "scene/resources/canvas_item_material.h"
 #include "scene/resources/font.h"
 #include "scene/resources/multimesh.h"
 #include "scene/resources/style_box.h"
diff --git a/scene/main/canvas_item.h b/scene/main/canvas_item.h
index 9eb21b17d97..e3c154b0176 100644
--- a/scene/main/canvas_item.h
+++ b/scene/main/canvas_item.h
@@ -32,7 +32,6 @@
 #define CANVAS_ITEM_H
 
 #include "scene/main/node.h"
-#include "scene/resources/canvas_item_material.h"
 #include "scene/resources/font.h"
 
 class CanvasLayer;
diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp
index 986bd87af28..9de2d62e40f 100644
--- a/scene/main/http_request.cpp
+++ b/scene/main/http_request.cpp
@@ -29,7 +29,7 @@
 /**************************************************************************/
 
 #include "http_request.h"
-#include "core/io/compression.h"
+
 #include "scene/main/timer.h"
 
 Error HTTPRequest::_request() {
diff --git a/scene/main/missing_node.h b/scene/main/missing_node.h
index fb1c957988b..8ec21ad310b 100644
--- a/scene/main/missing_node.h
+++ b/scene/main/missing_node.h
@@ -31,7 +31,6 @@
 #ifndef MISSING_NODE_H
 #define MISSING_NODE_H
 
-#include "core/io/missing_resource.h"
 #include "scene/main/node.h"
 
 class MissingNode : public Node {
diff --git a/scene/main/multiplayer_api.cpp b/scene/main/multiplayer_api.cpp
index bd097ec2d05..d872dd36e24 100644
--- a/scene/main/multiplayer_api.cpp
+++ b/scene/main/multiplayer_api.cpp
@@ -30,15 +30,7 @@
 
 #include "multiplayer_api.h"
 
-#include "core/debugger/engine_debugger.h"
 #include "core/io/marshalls.h"
-
-#include <stdint.h>
-
-#ifdef DEBUG_ENABLED
-#include "core/os/os.h"
-#endif
-
 StringName MultiplayerAPI::default_interface;
 
 void MultiplayerAPI::set_default_interface(const StringName &p_interface) {
diff --git a/scene/main/node.h b/scene/main/node.h
index 2a13bda9c10..2d6fa157506 100644
--- a/scene/main/node.h
+++ b/scene/main/node.h
@@ -32,7 +32,6 @@
 #define NODE_H
 
 #include "core/string/node_path.h"
-#include "core/templates/rb_map.h"
 #include "core/variant/typed_array.h"
 #include "scene/main/scene_tree.h"
 #include "scene/scene_string_names.h"
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp
index 986c1c64e77..0a69ef03bb3 100644
--- a/scene/main/scene_tree.cpp
+++ b/scene/main/scene_tree.cpp
@@ -31,17 +31,12 @@
 #include "scene_tree.h"
 
 #include "core/config/project_settings.h"
-#include "core/debugger/engine_debugger.h"
 #include "core/input/input.h"
-#include "core/io/dir_access.h"
 #include "core/io/image_loader.h"
-#include "core/io/marshalls.h"
 #include "core/io/resource_loader.h"
 #include "core/object/message_queue.h"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/keyboard.h"
 #include "core/os/os.h"
-#include "core/string/print_string.h"
 #include "node.h"
 #include "scene/animation/tween.h"
 #include "scene/debugger/scene_debugger.h"
@@ -49,14 +44,11 @@
 #include "scene/main/multiplayer_api.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/environment.h"
-#include "scene/resources/font.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/world_2d.h"
-#include "servers/display_server.h"
-#include "servers/navigation_server_3d.h"
 #include "servers/physics_server_2d.h"
 #ifndef _3D_DISABLED
 #include "scene/3d/node_3d.h"
@@ -64,8 +56,6 @@
 #include "servers/physics_server_3d.h"
 #endif // _3D_DISABLED
 #include "window.h"
-#include <stdio.h>
-#include <stdlib.h>
 
 void SceneTreeTimer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_time_left", "time"), &SceneTreeTimer::set_time_left);
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 018ac748e67..81778f62827 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -32,7 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
-#include "core/string/translation.h"
 #include "core/templates/pair.h"
 #include "core/templates/sort_array.h"
 #include "scene/2d/audio_listener_2d.h"
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index 171377f0346..64bc90f8843 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -114,6 +114,7 @@
 #include "scene/resources/bone_map.h"
 #include "scene/resources/camera_attributes.h"
 #include "scene/resources/camera_texture.h"
+#include "scene/resources/canvas_item_material.h"
 #include "scene/resources/color_palette.h"
 #include "scene/resources/compositor.h"
 #include "scene/resources/compressed_texture.h"
@@ -146,7 +147,6 @@
 #include "scene/resources/style_box_texture.h"
 #include "scene/resources/surface_tool.h"
 #include "scene/resources/syntax_highlighter.h"
-#include "scene/resources/text_file.h"
 #include "scene/resources/text_line.h"
 #include "scene/resources/text_paragraph.h"
 #include "scene/resources/texture.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 07e9caa713d..031fb6cb2e6 100644
--- a/scene/resources/2d/navigation_mesh_source_geometry_data_2d.cpp
+++ b/scene/resources/2d/navigation_mesh_source_geometry_data_2d.cpp
@@ -30,7 +30,7 @@
 
 #include "navigation_mesh_source_geometry_data_2d.h"
 
-#include "scene/resources/mesh.h"
+#include "core/variant/typed_array.h"
 
 void NavigationMeshSourceGeometryData2D::clear() {
 	RWLockWrite write_lock(geometry_rwlock);
diff --git a/scene/resources/2d/navigation_mesh_source_geometry_data_2d.h b/scene/resources/2d/navigation_mesh_source_geometry_data_2d.h
index 2812925770f..6ddc05742cb 100644
--- a/scene/resources/2d/navigation_mesh_source_geometry_data_2d.h
+++ b/scene/resources/2d/navigation_mesh_source_geometry_data_2d.h
@@ -31,9 +31,8 @@
 #ifndef NAVIGATION_MESH_SOURCE_GEOMETRY_DATA_2D_H
 #define NAVIGATION_MESH_SOURCE_GEOMETRY_DATA_2D_H
 
+#include "core/io/resource.h"
 #include "core/os/rw_lock.h"
-#include "scene/2d/node_2d.h"
-#include "scene/resources/2d/navigation_polygon.h"
 
 class NavigationMeshSourceGeometryData2D : public Resource {
 	friend class NavMeshGenerator2D;
diff --git a/scene/resources/2d/navigation_polygon.cpp b/scene/resources/2d/navigation_polygon.cpp
index 37240e80384..0e293b68c52 100644
--- a/scene/resources/2d/navigation_polygon.cpp
+++ b/scene/resources/2d/navigation_polygon.cpp
@@ -32,7 +32,6 @@
 
 #include "core/math/geometry_2d.h"
 #include "core/os/mutex.h"
-#include "servers/navigation_server_2d.h"
 
 #include "thirdparty/misc/polypartition.h"
 
diff --git a/scene/resources/2d/shape_2d.cpp b/scene/resources/2d/shape_2d.cpp
index e94280fe3d7..5a5a27d3a6a 100644
--- a/scene/resources/2d/shape_2d.cpp
+++ b/scene/resources/2d/shape_2d.cpp
@@ -30,7 +30,6 @@
 
 #include "shape_2d.h"
 
-#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "servers/physics_server_2d.h"
 
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d.cpp
index 5450f544c33..62eaf81223b 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d.cpp
@@ -31,10 +31,6 @@
 #include "skeleton_modification_2d.h"
 #include "scene/2d/skeleton_2d.h"
 
-#include "scene/2d/physics/collision_object_2d.h"
-#include "scene/2d/physics/collision_shape_2d.h"
-#include "scene/2d/physics/physical_bone_2d.h"
-
 #ifdef TOOLS_ENABLED
 #include "editor/editor_settings.h"
 #endif // TOOLS_ENABLED
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d.h b/scene/resources/2d/skeleton/skeleton_modification_2d.h
index 6a6f1bb39b7..4f96e290b15 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d.h
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d.h
@@ -31,14 +31,12 @@
 #ifndef SKELETON_MODIFICATION_2D_H
 #define SKELETON_MODIFICATION_2D_H
 
-#include "scene/2d/skeleton_2d.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_stack_2d.h"
 
 ///////////////////////////////////////
 // SkeletonModification2D
 ///////////////////////////////////////
 
-class SkeletonModificationStack2D;
 class Bone2D;
 
 class SkeletonModification2D : public Resource {
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp
index 051c4eabc09..0d2852da782 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp
@@ -31,10 +31,6 @@
 #include "skeleton_modification_2d_ccdik.h"
 #include "scene/2d/skeleton_2d.h"
 
-#ifdef TOOLS_ENABLED
-#include "editor/editor_settings.h"
-#endif // TOOLS_ENABLED
-
 bool SkeletonModification2DCCDIK::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp
index 16a61668787..77db39db653 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp
@@ -31,10 +31,6 @@
 #include "skeleton_modification_2d_fabrik.h"
 #include "scene/2d/skeleton_2d.h"
 
-#ifdef TOOLS_ENABLED
-#include "editor/editor_settings.h"
-#endif // TOOLS_ENABLED
-
 bool SkeletonModification2DFABRIK::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
diff --git a/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp b/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp
index cd4ca8e0903..e99a1fd23b9 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp
+++ b/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp
@@ -31,10 +31,6 @@
 #include "skeleton_modification_2d_lookat.h"
 #include "scene/2d/skeleton_2d.h"
 
-#ifdef TOOLS_ENABLED
-#include "editor/editor_settings.h"
-#endif // TOOLS_ENABLED
-
 bool SkeletonModification2DLookAt::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 
diff --git a/scene/resources/2d/skeleton/skeleton_modification_stack_2d.h b/scene/resources/2d/skeleton/skeleton_modification_stack_2d.h
index d1e50cb702f..c8616933e19 100644
--- a/scene/resources/2d/skeleton/skeleton_modification_stack_2d.h
+++ b/scene/resources/2d/skeleton/skeleton_modification_stack_2d.h
@@ -31,8 +31,7 @@
 #ifndef SKELETON_MODIFICATION_STACK_2D_H
 #define SKELETON_MODIFICATION_STACK_2D_H
 
-#include "scene/2d/skeleton_2d.h"
-#include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
+#include "core/io/resource.h"
 
 ///////////////////////////////////////
 // SkeletonModificationStack2D
diff --git a/scene/resources/3d/importer_mesh.h b/scene/resources/3d/importer_mesh.h
index 2bdf759da61..30da76a0c1e 100644
--- a/scene/resources/3d/importer_mesh.h
+++ b/scene/resources/3d/importer_mesh.h
@@ -32,7 +32,6 @@
 #define IMPORTER_MESH_H
 
 #include "core/io/resource.h"
-#include "core/templates/local_vector.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/convex_polygon_shape_3d.h"
 #include "scene/resources/mesh.h"
diff --git a/scene/resources/3d/mesh_library.h b/scene/resources/3d/mesh_library.h
index fc38b848a2d..1d6f4806141 100644
--- a/scene/resources/3d/mesh_library.h
+++ b/scene/resources/3d/mesh_library.h
@@ -33,8 +33,8 @@
 
 #include "core/io/resource.h"
 #include "core/templates/rb_map.h"
-#include "scene/3d/navigation_region_3d.h"
 #include "scene/resources/mesh.h"
+#include "scene/resources/navigation_mesh.h"
 #include "servers/rendering_server.h"
 #include "shape_3d.h"
 
diff --git a/scene/resources/3d/shape_3d.cpp b/scene/resources/3d/shape_3d.cpp
index f2b14d314cb..9f8d403133f 100644
--- a/scene/resources/3d/shape_3d.cpp
+++ b/scene/resources/3d/shape_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "shape_3d.h"
 
-#include "core/os/os.h"
 #include "scene/main/scene_tree.h"
 #include "scene/resources/mesh.h"
 #include "servers/physics_server_3d.h"
diff --git a/scene/resources/3d/sphere_shape_3d.cpp b/scene/resources/3d/sphere_shape_3d.cpp
index bdce41c16f1..9ab2f1b0d8b 100644
--- a/scene/resources/3d/sphere_shape_3d.cpp
+++ b/scene/resources/3d/sphere_shape_3d.cpp
@@ -31,7 +31,6 @@
 #include "sphere_shape_3d.h"
 
 #include "scene/resources/3d/primitive_meshes.h"
-#include "scene/resources/material.h"
 #include "servers/physics_server_3d.h"
 
 Vector<Vector3> SphereShape3D::get_debug_mesh_lines() const {
diff --git a/scene/resources/3d/world_3d.cpp b/scene/resources/3d/world_3d.cpp
index b743b242628..5e4c70b632a 100644
--- a/scene/resources/3d/world_3d.cpp
+++ b/scene/resources/3d/world_3d.cpp
@@ -32,7 +32,6 @@
 
 #include "core/config/project_settings.h"
 #include "scene/3d/camera_3d.h"
-#include "scene/3d/visible_on_screen_notifier_3d.h"
 #include "scene/resources/camera_attributes.h"
 #include "scene/resources/environment.h"
 #include "servers/navigation_server_3d.h"
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp
index f0b182503a7..d64ac916056 100644
--- a/scene/resources/animation.cpp
+++ b/scene/resources/animation.cpp
@@ -32,7 +32,6 @@
 #include "animation.compat.inc"
 
 #include "core/io/marshalls.h"
-#include "core/math/geometry_3d.h"
 
 bool Animation::_set(const StringName &p_name, const Variant &p_value) {
 	String prop_name = p_name;
diff --git a/scene/resources/audio_stream_polyphonic.cpp b/scene/resources/audio_stream_polyphonic.cpp
index 1bf5ea79eed..5090d41eb48 100644
--- a/scene/resources/audio_stream_polyphonic.cpp
+++ b/scene/resources/audio_stream_polyphonic.cpp
@@ -31,7 +31,6 @@
 #include "audio_stream_polyphonic.h"
 #include "audio_stream_polyphonic.compat.inc"
 
-#include "scene/main/scene_tree.h"
 #include "servers/audio_server.h"
 
 constexpr uint64_t ID_MASK = 0xFFFFFFFF;
diff --git a/scene/resources/bit_map.cpp b/scene/resources/bit_map.cpp
index 53f97fefc9f..a2222f8d638 100644
--- a/scene/resources/bit_map.cpp
+++ b/scene/resources/bit_map.cpp
@@ -30,7 +30,6 @@
 
 #include "bit_map.h"
 
-#include "core/io/image_loader.h"
 #include "core/variant/typed_array.h"
 
 void BitMap::create(const Size2i &p_size) {
diff --git a/scene/resources/bit_map.h b/scene/resources/bit_map.h
index 8912e3992e2..771eb327a07 100644
--- a/scene/resources/bit_map.h
+++ b/scene/resources/bit_map.h
@@ -33,7 +33,6 @@
 
 #include "core/io/image.h"
 #include "core/io/resource.h"
-#include "core/io/resource_loader.h"
 
 template <typename T>
 class TypedArray;
diff --git a/scene/resources/compressed_texture.h b/scene/resources/compressed_texture.h
index 439f7c097e2..0c5dcd5caa7 100644
--- a/scene/resources/compressed_texture.h
+++ b/scene/resources/compressed_texture.h
@@ -31,6 +31,7 @@
 #ifndef COMPRESSED_TEXTURE_H
 #define COMPRESSED_TEXTURE_H
 
+#include "core/io/resource_loader.h"
 #include "scene/resources/texture.h"
 
 class BitMap;
diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index 147a342853a..9d9d46e7bdf 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -32,8 +32,6 @@
 #include "font.compat.inc"
 
 #include "core/io/image_loader.h"
-#include "core/io/resource_loader.h"
-#include "core/string/translation.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/hashfuncs.h"
 #include "scene/resources/image_texture.h"
diff --git a/scene/resources/font.h b/scene/resources/font.h
index 1a5c79fef3c..8431f820c73 100644
--- a/scene/resources/font.h
+++ b/scene/resources/font.h
@@ -33,7 +33,6 @@
 
 #include "core/io/resource.h"
 #include "core/templates/lru.h"
-#include "core/templates/rb_map.h"
 #include "scene/resources/texture.h"
 #include "servers/text_server.h"
 
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index d6748ed2e64..9edeba60fd9 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -31,7 +31,6 @@
 #include "packed_scene.h"
 
 #include "core/config/engine.h"
-#include "core/config/project_settings.h"
 #include "core/io/missing_resource.h"
 #include "core/io/resource_loader.h"
 #include "core/templates/local_vector.h"
diff --git a/scene/resources/physics_material.h b/scene/resources/physics_material.h
index 9653cc3d861..2629044f40f 100644
--- a/scene/resources/physics_material.h
+++ b/scene/resources/physics_material.h
@@ -32,7 +32,6 @@
 #define PHYSICS_MATERIAL_H
 
 #include "core/io/resource.h"
-#include "servers/physics_server_3d.h"
 
 class PhysicsMaterial : public Resource {
 	GDCLASS(PhysicsMaterial, Resource);
diff --git a/scene/resources/shader_include.cpp b/scene/resources/shader_include.cpp
index 0a2a686b4e1..2a2cd3d93a6 100644
--- a/scene/resources/shader_include.cpp
+++ b/scene/resources/shader_include.cpp
@@ -29,7 +29,7 @@
 /**************************************************************************/
 
 #include "shader_include.h"
-#include "servers/rendering/shader_language.h"
+
 #include "servers/rendering/shader_preprocessor.h"
 
 void ShaderInclude::_dependency_changed() {
diff --git a/scene/resources/sky.h b/scene/resources/sky.h
index e445003c381..3316142f0cd 100644
--- a/scene/resources/sky.h
+++ b/scene/resources/sky.h
@@ -31,7 +31,7 @@
 #ifndef SKY_H
 #define SKY_H
 
-#include "core/os/thread.h"
+#include "core/io/resource.h"
 #include "scene/resources/material.h"
 
 class Sky : public Resource {
diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h
index e09b271c477..e1f392de6e7 100644
--- a/scene/resources/style_box.h
+++ b/scene/resources/style_box.h
@@ -32,7 +32,6 @@
 #define STYLE_BOX_H
 
 #include "core/io/resource.h"
-#include "core/object/class_db.h"
 #include "core/object/gdvirtual.gen.inc"
 
 class CanvasItem;
diff --git a/scene/resources/syntax_highlighter.cpp b/scene/resources/syntax_highlighter.cpp
index 4bc03a049a9..a2113a89e22 100644
--- a/scene/resources/syntax_highlighter.cpp
+++ b/scene/resources/syntax_highlighter.cpp
@@ -30,7 +30,6 @@
 
 #include "syntax_highlighter.h"
 
-#include "core/object/script_language.h"
 #include "scene/gui/text_edit.h"
 
 Dictionary SyntaxHighlighter::get_line_syntax_highlighting(int p_line) {
diff --git a/scene/resources/text_file.cpp b/scene/resources/text_file.cpp
index 77ff0f55b13..9960e1e81c1 100644
--- a/scene/resources/text_file.cpp
+++ b/scene/resources/text_file.cpp
@@ -30,7 +30,7 @@
 
 #include "text_file.h"
 
-#include "core/io/file_access.h"
+#include "core/io/resource_loader.h"
 
 bool TextFile::has_text() const {
 	return !text.is_empty();
diff --git a/scene/resources/text_file.h b/scene/resources/text_file.h
index 739ee083ced..aac8eb6aefe 100644
--- a/scene/resources/text_file.h
+++ b/scene/resources/text_file.h
@@ -31,8 +31,7 @@
 #ifndef TEXT_FILE_H
 #define TEXT_FILE_H
 
-#include "core/io/resource_loader.h"
-#include "core/io/resource_saver.h"
+#include "core/io/resource.h"
 
 class TextFile : public Resource {
 	GDCLASS(TextFile, Resource);
diff --git a/scene/resources/texture.h b/scene/resources/texture.h
index cdad884e71d..cdfacada941 100644
--- a/scene/resources/texture.h
+++ b/scene/resources/texture.h
@@ -31,13 +31,8 @@
 #ifndef TEXTURE_H
 #define TEXTURE_H
 
-#include "core/io/file_access.h"
 #include "core/io/resource.h"
-#include "core/io/resource_loader.h"
 #include "core/math/rect2.h"
-#include "core/os/mutex.h"
-#include "core/os/rw_lock.h"
-#include "core/os/thread_safe.h"
 #include "scene/resources/curve.h"
 #include "scene/resources/gradient.h"
 #include "servers/camera_server.h"
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp
index 16929bc9795..b4f0f1834d6 100644
--- a/scene/resources/theme.cpp
+++ b/scene/resources/theme.cpp
@@ -30,7 +30,6 @@
 
 #include "theme.h"
 
-#include "core/string/print_string.h"
 #include "scene/theme/theme_db.h"
 
 // Dynamic properties.
diff --git a/scene/resources/video_stream.cpp b/scene/resources/video_stream.cpp
index 1fcc1821dc4..32e87c38f3e 100644
--- a/scene/resources/video_stream.cpp
+++ b/scene/resources/video_stream.cpp
@@ -30,9 +30,6 @@
 
 #include "video_stream.h"
 
-#include "core/config/project_settings.h"
-#include "servers/audio_server.h"
-
 // VideoStreamPlayback starts here.
 
 void VideoStreamPlayback::_bind_methods() {
diff --git a/scene/resources/video_stream.h b/scene/resources/video_stream.h
index 3843cc99c40..b3d0739e759 100644
--- a/scene/resources/video_stream.h
+++ b/scene/resources/video_stream.h
@@ -31,7 +31,6 @@
 #ifndef VIDEO_STREAM_H
 #define VIDEO_STREAM_H
 
-#include "core/io/file_access.h"
 #include "scene/resources/texture.h"
 
 class VideoStreamPlayback : public Resource {
diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp
index fa2c01d354d..24671bf3c9b 100644
--- a/scene/resources/visual_shader.cpp
+++ b/scene/resources/visual_shader.cpp
@@ -36,7 +36,6 @@
 #include "servers/rendering/shader_types.h"
 #include "visual_shader_nodes.h"
 #include "visual_shader_particle_nodes.h"
-#include "visual_shader_sdf_nodes.h"
 
 String make_unique_id(VisualShader::Type p_type, int p_id, const String &p_name) {
 	static const char *typepf[VisualShader::TYPE_MAX] = { "vtx", "frg", "lgt", "start", "process", "collide", "start_custom", "process_custom", "sky", "fog" };
diff --git a/scene/resources/visual_shader_nodes.compat.inc b/scene/resources/visual_shader_nodes.compat.inc
index 31d96d9c0f7..e02c3e30ce7 100644
--- a/scene/resources/visual_shader_nodes.compat.inc
+++ b/scene/resources/visual_shader_nodes.compat.inc
@@ -30,6 +30,8 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "scene/resources/image_texture.h"
+
 // VisualShaderNodeCubemap
 
 void VisualShaderNodeCubemap::_set_cube_map_bind_compat_95126(Ref<Cubemap> p_cube_map) {
diff --git a/scene/resources/visual_shader_nodes.cpp b/scene/resources/visual_shader_nodes.cpp
index b831a3835a0..a82765af9ce 100644
--- a/scene/resources/visual_shader_nodes.cpp
+++ b/scene/resources/visual_shader_nodes.cpp
@@ -31,8 +31,6 @@
 #include "visual_shader_nodes.h"
 #include "visual_shader_nodes.compat.inc"
 
-#include "scene/resources/image_texture.h"
-
 ////////////// Vector Base
 
 VisualShaderNodeVectorBase::PortType VisualShaderNodeVectorBase::get_input_port_type(int p_port) const {
diff --git a/scene/resources/visual_shader_nodes.h b/scene/resources/visual_shader_nodes.h
index 36b9560ced4..a3235a0f98b 100644
--- a/scene/resources/visual_shader_nodes.h
+++ b/scene/resources/visual_shader_nodes.h
@@ -31,7 +31,6 @@
 #ifndef VISUAL_SHADER_NODES_H
 #define VISUAL_SHADER_NODES_H
 
-#include "scene/resources/compressed_texture.h"
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/visual_shader.h"
 
diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp
index ec2c8ddb7b2..21bfc2959a5 100644
--- a/scene/resources/world_2d.cpp
+++ b/scene/resources/world_2d.cpp
@@ -31,9 +31,7 @@
 #include "world_2d.h"
 
 #include "core/config/project_settings.h"
-#include "scene/2d/camera_2d.h"
 #include "scene/2d/visible_on_screen_notifier_2d.h"
-#include "scene/main/window.h"
 #include "servers/navigation_server_2d.h"
 #include "servers/physics_server_2d.h"
 #include "servers/rendering_server.h"
diff --git a/scene/theme/default_theme.cpp b/scene/theme/default_theme.cpp
index f4dd8a93825..c1eda4db948 100644
--- a/scene/theme/default_theme.cpp
+++ b/scene/theme/default_theme.cpp
@@ -31,7 +31,6 @@
 #include "default_theme.h"
 
 #include "core/io/image.h"
-#include "core/os/os.h"
 #include "default_font.gen.h"
 #include "default_theme_icons.gen.h"
 #include "scene/resources/font.h"
diff --git a/scene/theme/theme_db.h b/scene/theme/theme_db.h
index 353894f41e4..474ea081d27 100644
--- a/scene/theme/theme_db.h
+++ b/scene/theme/theme_db.h
@@ -31,7 +31,6 @@
 #ifndef THEME_DB_H
 #define THEME_DB_H
 
-#include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
 #include "scene/resources/theme.h"