Bladeren bron

Remove unused headers in scene.

Co-authored-by: Thaddeus Crews <[email protected]>

Co-authored-by: A Thousand Ships <[email protected]>
Yufeng Ying 7 maanden geleden
bovenliggende
commit
73d85f46c9
100 gewijzigde bestanden met toevoegingen van 37 en 139 verwijderingen
  1. 0 1
      core/variant/binder_common.h
  2. 1 4
      editor/editor_node.cpp
  3. 1 0
      editor/gui/scene_tree_editor.cpp
  4. 1 0
      editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp
  5. 1 0
      editor/plugins/material_editor_plugin.cpp
  6. 1 0
      editor/plugins/skeleton_3d_editor_plugin.cpp
  7. 1 0
      editor/scene_tree_dock.cpp
  8. 2 0
      modules/gltf/gltf_document.cpp
  9. 1 0
      modules/gltf/gltf_state.h
  10. 1 1
      modules/gltf/structures/gltf_animation.h
  11. 2 0
      scene/2d/audio_listener_2d.cpp
  12. 0 1
      scene/2d/audio_listener_2d.h
  13. 1 1
      scene/2d/camera_2d.cpp
  14. 1 0
      scene/2d/cpu_particles_2d.cpp
  15. 1 4
      scene/2d/gpu_particles_2d.cpp
  16. 0 1
      scene/2d/navigation_link_2d.cpp
  17. 0 1
      scene/2d/navigation_obstacle_2d.cpp
  18. 0 1
      scene/2d/navigation_region_2d.cpp
  19. 0 1
      scene/2d/parallax_2d.cpp
  20. 0 2
      scene/2d/physics/collision_polygon_2d.cpp
  21. 0 1
      scene/2d/physics/kinematic_collision_2d.cpp
  22. 0 1
      scene/2d/physics/physics_body_2d.h
  23. 2 1
      scene/2d/physics/rigid_body_2d.h
  24. 1 2
      scene/2d/physics/shape_cast_2d.cpp
  25. 1 1
      scene/2d/physics/shape_cast_2d.h
  26. 1 1
      scene/2d/sprite_2d.cpp
  27. 0 1
      scene/2d/tile_map.cpp
  28. 0 4
      scene/2d/tile_map_layer.cpp
  29. 1 1
      scene/2d/touch_screen_button.cpp
  30. 0 1
      scene/3d/audio_stream_player_3d.h
  31. 0 3
      scene/3d/bone_attachment_3d.h
  32. 0 1
      scene/3d/camera_3d.cpp
  33. 0 1
      scene/3d/cpu_particles_3d.cpp
  34. 2 0
      scene/3d/fog_volume.cpp
  35. 0 2
      scene/3d/fog_volume.h
  36. 0 1
      scene/3d/importer_mesh_instance_3d.h
  37. 0 1
      scene/3d/navigation_link_3d.cpp
  38. 2 0
      scene/3d/physical_bone_simulator_3d.cpp
  39. 0 2
      scene/3d/physical_bone_simulator_3d.h
  40. 0 1
      scene/3d/physics/collision_polygon_3d.h
  41. 0 1
      scene/3d/physics/collision_shape_3d.cpp
  42. 0 1
      scene/3d/physics/kinematic_collision_3d.cpp
  43. 0 3
      scene/3d/physics/kinematic_collision_3d.h
  44. 2 0
      scene/3d/physics/physical_bone_3d.cpp
  45. 1 1
      scene/3d/physics/physical_bone_3d.h
  46. 0 1
      scene/3d/physics/physics_body_3d.h
  47. 0 1
      scene/3d/physics/ray_cast_3d.cpp
  48. 2 1
      scene/3d/physics/rigid_body_3d.h
  49. 0 1
      scene/3d/physics/shape_cast_3d.cpp
  50. 0 2
      scene/3d/skeleton_3d.cpp
  51. 0 1
      scene/3d/skeleton_3d.h
  52. 0 1
      scene/3d/skeleton_modifier_3d.h
  53. 0 1
      scene/3d/soft_body_3d.h
  54. 2 0
      scene/3d/velocity_tracker_3d.cpp
  55. 1 1
      scene/3d/velocity_tracker_3d.h
  56. 0 2
      scene/3d/visible_on_screen_notifier_3d.h
  57. 1 1
      scene/3d/world_environment.cpp
  58. 0 1
      scene/3d/xr_body_modifier_3d.cpp
  59. 0 1
      scene/3d/xr_hand_modifier_3d.cpp
  60. 0 3
      scene/animation/animation_mixer.cpp
  61. 0 1
      scene/animation/animation_node_state_machine.cpp
  62. 0 1
      scene/animation/animation_player.h
  63. 0 1
      scene/animation/animation_tree.cpp
  64. 1 1
      scene/animation/root_motion_view.cpp
  65. 0 1
      scene/gui/base_button.cpp
  66. 0 1
      scene/gui/check_box.cpp
  67. 0 1
      scene/gui/check_button.cpp
  68. 0 1
      scene/gui/color_mode.cpp
  69. 0 1
      scene/gui/color_picker.cpp
  70. 0 3
      scene/gui/dialogs.cpp
  71. 0 1
      scene/gui/file_dialog.cpp
  72. 0 1
      scene/gui/graph_element.cpp
  73. 0 1
      scene/gui/graph_frame.cpp
  74. 0 1
      scene/gui/graph_node.cpp
  75. 0 3
      scene/gui/label.cpp
  76. 0 2
      scene/gui/line_edit.cpp
  77. 0 1
      scene/gui/link_button.cpp
  78. 0 1
      scene/gui/menu_bar.cpp
  79. 0 1
      scene/gui/menu_bar.h
  80. 0 1
      scene/gui/menu_button.cpp
  81. 0 2
      scene/gui/option_button.cpp
  82. 0 2
      scene/gui/popup.cpp
  83. 0 2
      scene/gui/popup_menu.cpp
  84. 0 1
      scene/gui/rich_text_label.cpp
  85. 0 3
      scene/gui/scroll_bar.cpp
  86. 0 1
      scene/gui/slider.cpp
  87. 1 3
      scene/gui/split_container.cpp
  88. 0 1
      scene/gui/tab_bar.cpp
  89. 0 2
      scene/gui/texture_button.cpp
  90. 0 2
      scene/gui/texture_progress_bar.cpp
  91. 0 2
      scene/gui/texture_rect.cpp
  92. 0 1
      scene/gui/video_stream_player.h
  93. 0 1
      scene/main/canvas_item.cpp
  94. 0 1
      scene/main/canvas_item.h
  95. 1 1
      scene/main/http_request.cpp
  96. 0 1
      scene/main/missing_node.h
  97. 0 8
      scene/main/multiplayer_api.cpp
  98. 0 1
      scene/main/node.h
  99. 0 10
      scene/main/scene_tree.cpp
  100. 0 1
      scene/main/viewport.cpp

+ 0 - 1
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"

+ 1 - 4
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"

+ 1 - 0
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"

+ 1 - 0
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"
 

+ 1 - 0
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) {

+ 1 - 0
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"

+ 1 - 0
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"

+ 2 - 0
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"

+ 1 - 0
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);

+ 1 - 1
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);

+ 2 - 0
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()) {

+ 0 - 1
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);

+ 1 - 1
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

+ 1 - 0
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"

+ 1 - 4
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.
 

+ 0 - 1
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);

+ 0 - 1
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);

+ 0 - 1
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"
 

+ 0 - 1
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) {

+ 0 - 2
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);
 

+ 0 - 1
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 {

+ 0 - 1
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"

+ 2 - 1
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);

+ 1 - 2
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) {

+ 1 - 1
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;
 

+ 1 - 1
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 {

+ 0 - 1
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) {                                 \

+ 0 - 4
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;

+ 1 - 1
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) {

+ 0 - 1
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 {

+ 0 - 3
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);

+ 0 - 1
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() {
 }

+ 0 - 1
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 {

+ 2 - 0
scene/3d/fog_volume.cpp

@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "fog_volume.h"
+
+#include "scene/main/viewport.h"
 #include "scene/resources/environment.h"
 
 ///////////////////////////

+ 0 - 2
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 {

+ 0 - 1
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;
 

+ 0 - 1
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

+ 2 - 0
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))) {

+ 0 - 2
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 {

+ 0 - 1
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 {

+ 0 - 1
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"

+ 0 - 1
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 {

+ 0 - 3
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);
 

+ 2 - 0
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

+ 1 - 1
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;
 

+ 0 - 1
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"

+ 0 - 1
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) {

+ 2 - 1
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);

+ 0 - 1
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"
 

+ 0 - 2
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

+ 0 - 1
scene/3d/skeleton_3d.h

@@ -38,7 +38,6 @@
 typedef int BoneId;
 
 class Skeleton3D;
-class SkeletonModifier3D;
 
 class SkinReference : public RefCounted {
 	GDCLASS(SkinReference, RefCounted)

+ 0 - 1
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);

+ 0 - 1
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;

+ 2 - 0
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;
 }

+ 1 - 1
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 {

+ 0 - 2
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);
 

+ 1 - 1
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) {

+ 0 - 1
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() {

+ 0 - 1
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() {

+ 0 - 3
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
 

+ 0 - 1
scene/animation/animation_node_state_machine.cpp

@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "animation_node_state_machine.h"
-#include "scene/main/window.h"
 
 /////////////////////////////////////////////////
 

+ 0 - 1
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 {

+ 0 - 1
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 {

+ 1 - 1
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) {

+ 0 - 1
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"
 

+ 0 - 1
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);

+ 0 - 1
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;

+ 0 - 1
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;

+ 0 - 1
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"

+ 0 - 3
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"
 

+ 0 - 1
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"

+ 0 - 1
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"
 

+ 0 - 1
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"

+ 0 - 1
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"

+ 0 - 3
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"

+ 0 - 2
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"

+ 0 - 1
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() {

+ 0 - 1
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"
 

+ 0 - 1
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 {

+ 0 - 1
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) {

+ 0 - 2
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;

+ 0 - 2
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"
 

+ 0 - 2
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"
 

+ 0 - 1
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"

+ 0 - 3
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"
 

+ 0 - 1
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 {

+ 1 - 3
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) {

+ 0 - 1
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"

+ 0 - 2
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();
 

+ 0 - 2
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);
 }

+ 0 - 2
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: {

+ 0 - 1
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);

+ 0 - 1
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"

+ 0 - 1
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;

+ 1 - 1
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() {

+ 0 - 1
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 {

+ 0 - 8
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) {

+ 0 - 1
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"

+ 0 - 10
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);

+ 0 - 1
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"

Some files were not shown because too many files changed in this diff