An another set of header include cleanups for the classes in the engine directory.

editor/editor_profiler.h

@@ -32,14 +32,6 @@
 
 #include "scene/gui/box_container.h"
 
-#include "scene/gui/button.h"
-#include "scene/gui/label.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
-
 #include "core/color.h"
 #include "core/map.h"
 #include "core/object.h"

editor/editor_properties.h

@@ -32,14 +32,6 @@
 
 #include "editor/editor_inspector.h"
 
-#include "editor/create_dialog.h"
-#include "editor/editor_resource_picker.h"
-#include "editor/editor_spin_slider.h"
-#include "editor/property_selector.h"
-#include "editor/scene_tree_editor.h"
-#include "scene/gui/color_picker.h"
-#include "scene/gui/line_edit.h"
-
 #include "core/color.h"
 #include "core/math/vector2.h"
 #include "core/node_path.h"

editor/editor_properties_array_dict.h

@@ -33,10 +33,6 @@
 #include "editor/editor_inspector.h"
 #include "core/reference.h"
 
-#include "editor/editor_spin_slider.h"
-#include "editor/filesystem_dock.h"
-#include "scene/gui/button.h"
-
 #include "core/dictionary.h"
 #include "core/math/vector2.h"
 #include "core/object.h"

editor/editor_resource_picker.h

@@ -32,12 +32,6 @@
 
 #include "scene/gui/box_container.h"
 
-#include "editor_file_dialog.h"
-#include "quick_open.h"
-#include "scene/gui/button.h"
-#include "scene/gui/popup_menu.h"
-#include "scene/gui/texture_rect.h"
-
 #include "core/hash_map.h"
 #include "core/list.h"
 #include "core/math/vector2.h"

editor/editor_run.h

@@ -32,8 +32,6 @@
 
 #include "core/os/os.h"
 
-#include "scene/main/node.h"
-
 #include "core/error_list.h"
 #include "core/list.h"
 #include "core/ustring.h"

editor/editor_run_native.h

@@ -32,8 +32,6 @@
 
 #include "scene/gui/box_container.h"
 
-#include "scene/gui/menu_button.h"
-
 #include "core/map.h"
 #include "core/object.h"
 

editor/editor_run_script.h

@@ -32,8 +32,6 @@
 
 #include "core/reference.h"
 
-#include "editor_plugin.h"
-
 #include "core/object.h"
 
 class EditorNode;

editor/editor_sectioned_inspector.h

@@ -32,9 +32,6 @@
 
 #include "scene/gui/split_container.h"
 
-#include "editor/editor_inspector.h"
-#include "scene/gui/tree.h"
-
 #include "core/map.h"
 #include "core/object.h"
 #include "core/object_id.h"

editor/editor_spin_slider.h

@@ -32,9 +32,6 @@
 
 #include "scene/gui/range.h"
 
-#include "scene/gui/line_edit.h"
-#include "scene/gui/texture_rect.h"
-
 #include "core/color.h"
 #include "core/math/vector2.h"
 #include "core/object.h"

editor/editor_sub_scene.h

@@ -32,9 +32,6 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "editor/editor_file_dialog.h"
-#include "scene/gui/tree.h"
-
 #include "core/list.h"
 #include "core/object.h"
 #include "core/ustring.h"

editor/export_template_manager.h

@@ -32,13 +32,6 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "editor/editor_settings.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/progress_bar.h"
-#include "scene/gui/scroll_container.h"
-#include "scene/main/http_request.h"
-
 #include "core/error_list.h"
 #include "core/object.h"
 #include "core/ustring.h"

editor/filesystem_dock.h

@@ -32,22 +32,7 @@
 
 #include "scene/gui/box_container.h"
 
-#include "scene/gui/control.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/item_list.h"
-#include "scene/gui/label.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/progress_bar.h"
 #include "scene/gui/split_container.h"
-#include "scene/gui/tool_button.h"
-#include "scene/gui/tree.h"
-#include "scene/main/timer.h"
-#include "create_dialog.h"
-#include "dependency_editor.h"
-#include "editor_dir_dialog.h"
-#include "editor_file_system.h"
-#include "script_create_dialog.h"
 
 #include "core/os/dir_access.h"
 #include "core/os/thread.h"

editor/groups_editor.h

@@ -33,19 +33,9 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/dialogs.h"
 
-#include "core/undo_redo.h"
-#include "editor/scene_tree_editor.h"
-#include "scene/gui/button.h"
-#include "scene/gui/item_list.h"
-#include "scene/gui/line_edit.h"
-#include "scene/gui/popup.h"
-#include "scene/gui/tool_button.h"
-#include "scene/gui/tree.h"
-
 #include "core/object.h"
 #include "core/ustring.h"
 
-
 class Button;
 class Label;
 class LineEdit;

editor/import_defaults_editor.h

@@ -32,14 +32,6 @@
 
 #include "scene/gui/box_container.h"
 
-#include "core/undo_redo.h"
-#include "editor/editor_data.h"
-#include "editor/editor_plugin_settings.h"
-#include "editor/editor_sectioned_inspector.h"
-#include "editor_autoload_settings.h"
-#include "scene/gui/center_container.h"
-#include "scene/gui/option_button.h"
-
 #include "core/object.h"
 
 

editor/import_dock.h

@@ -32,16 +32,7 @@
 
 #include "scene/gui/box_container.h"
 
-
-#include "editor/editor_file_system.h"
-#include "editor/editor_inspector.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/popup_menu.h"
 #include "core/io/config_file.h"
-#include "core/io/resource_importer.h"
-
 #include "core/list.h"
 #include "core/map.h"
 #include "core/object.h"

editor/inspector_dock.h

@@ -32,18 +32,6 @@
 
 #include "scene/gui/box_container.h"
 
-#include "editor/animation_track_editor.h"
-#include "editor/connections_dialog.h"
-#include "editor/create_dialog.h"
-#include "editor/editor_data.h"
-#include "editor/editor_inspector.h"
-#include "editor/editor_path.h"
-#include "scene/gui/button.h"
-#include "scene/gui/control.h"
-#include "scene/gui/label.h"
-#include "scene/gui/popup_menu.h"
-#include "scene/gui/tool_button.h"
-
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/resource.h"

modules/rtile_map/tile_map_editor_plugin.cpp

@@ -37,6 +37,7 @@
 #include "editor/editor_settings.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "scene/gui/split_container.h"
+#include "scene/gui/slider.h"
 
 void RTileMapEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {

modules/rtile_map/tile_set_editor_plugin.cpp

@@ -36,6 +36,8 @@
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "scene/2d/physics_body_2d.h"
 #include "scene/2d/sprite.h"
+#include "scene/gui/scroll_container.h"
+#include "editor/editor_inspector.h"
 
 void RTileSetEditor::edit(const Ref<RTileSet> &p_tileset) {
 	tileset = p_tileset;

modules/rtile_map/tile_set_editor_plugin.h

@@ -38,6 +38,7 @@
 
 #define WORKSPACE_MARGIN Vector2(10, 10)
 class RTilesetEditorContext;
+class ScrollContainer;
 
 class RTileSetEditor : public HSplitContainer {
 	friend class RTileSetEditorPlugin;

modules/skeleton_editor/skeleton_editor_plugin.cpp

@@ -43,6 +43,11 @@
 #include "scene/main/viewport.h"
 #include "scene/resources/capsule_shape.h"
 #include "scene/resources/sphere_shape.h"
+#include "editor/editor_spin_slider.h"
+#include "scene/gui/texture_rect.h"
+#include "editor/editor_inspector.h"
+#include "editor/editor_spin_slider.h"
+#include "editor/animation_track_editor.h"
 
 #define DISTANCE_DEFAULT 4
 

modules/skeleton_editor/skeleton_editor_plugin.h

@@ -37,6 +37,7 @@
 #include "scene/3d/camera.h"
 #include "scene/3d/mesh_instance.h"
 #include "scene/3d/skeleton.h"
+#include "editor/editor_inspector.h"
 
 class ModuleEditorInspectorPluginSkeleton;
 class Joint;
@@ -44,6 +45,8 @@ class PhysicalBone;
 class ModuleSkeletonEditorPlugin;
 class Button;
 class CheckBox;
+class EditorSpinSlider;
+class EditorInspectorSection;
 
 class ModuleBoneTransformEditor : public VBoxContainer {
 	GDCLASS(ModuleBoneTransformEditor, VBoxContainer);

modules/terraman/world/terrain_world_editor.cpp

@@ -41,6 +41,8 @@ SOFTWARE.
 #include "core/os/input.h"
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/camera.h"
+#include "scene/gui/slider.h"
+#include "scene/gui/scroll_container.h"
 
 bool TerrainWorldEditor::forward_spatial_input_event(Camera *p_camera, const Ref<InputEvent> &p_event) {
 	if (!_world || !_world->get_editable()) {

modules/terraman_2d/world/terrain_2d_world_editor.cpp

@@ -39,6 +39,8 @@ SOFTWARE.
 #include "core/os/input.h"
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/camera.h"
+#include "scene/gui/slider.h"
+#include "scene/gui/scroll_container.h"
 
 bool Terrain2DWorldEditor::forward_spatial_input_event(Camera *p_camera, const Ref<InputEvent> &p_event) {
 	if (!_world || !_world->get_editable()) {

modules/voxelman/world/voxel_world_editor.cpp

@@ -41,6 +41,8 @@ SOFTWARE.
 #include "core/os/input.h"
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/camera.h"
+#include "scene/gui/slider.h"
+#include "scene/gui/scroll_container.h"
 
 bool VoxelWorldEditor::forward_spatial_input_event(Camera *p_camera, const Ref<InputEvent> &p_event) {
 	if (!_world || !_world->get_editable()) {