diff --git a/editor/editor_node.h b/editor/editor_node.h
index c0b678f65..7905712c2 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -41,6 +41,7 @@
 #include "scene/gui/split_container.h"
 #include "scene/gui/menu_button.h"
 
+#include "editor/editor_data.h"
 #include "core/dictionary.h"
 #include "core/error_list.h"
 #include "core/list.h"
diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp
index 957c99959..41b5664f9 100644
--- a/editor/editor_plugin.cpp
+++ b/editor/editor_plugin.cpp
@@ -73,6 +73,7 @@
 #include "scene/gui/tab_container.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/texture.h"
+#include "editor/script_create_dialog.h"
 
 class ConfigFile;
 class ScriptCreateDialog;
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp
index 7a48ce6e5..29290d888 100644
--- a/editor/import/resource_importer_scene.cpp
+++ b/editor/import/resource_importer_scene.cpp
@@ -50,6 +50,7 @@
 #include "scene/resources/animation.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/shape.h"
+#include "core/os/dir_access.h"
 
 uint32_t EditorSceneImporter::get_import_flags() const {
 	if (get_script_instance()) {
diff --git a/editor/multi_node_edit.h b/editor/multi_node_edit.h
index a79ef61bc..6e0a5bda8 100644
--- a/editor/multi_node_edit.h
+++ b/editor/multi_node_edit.h
@@ -32,11 +32,6 @@
 
 #include "core/reference.h"
 
-#include "scene/main/node.h"
-#include "core/list.h"
-#include "core/node_path.h"
-#include "core/object.h"
-
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
diff --git a/editor/node_dock.h b/editor/node_dock.h
index 88ea681cc..b47b759d8 100644
--- a/editor/node_dock.h
+++ b/editor/node_dock.h
@@ -32,10 +32,6 @@
 
 #include "scene/gui/box_container.h"
 
-#include "connections_dialog.h"
-#include "groups_editor.h"
-#include "core/object.h"
-
 class ConnectionsDock;
 class GroupsEditor;
 class Label;
diff --git a/editor/plugin_config_dialog.h b/editor/plugin_config_dialog.h
index 85799f272..0fbb2be8b 100644
--- a/editor/plugin_config_dialog.h
+++ b/editor/plugin_config_dialog.h
@@ -32,12 +32,6 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "scene/gui/check_box.h"
-#include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/text_edit.h"
-#include "core/object.h"
-
 #include "core/ustring.h"
 
 class CheckBox;
diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h
index 1f745b8dd..e116e3ba1 100644
--- a/editor/plugins/material_editor_plugin.h
+++ b/editor/plugins/material_editor_plugin.h
@@ -31,6 +31,7 @@
 /*************************************************************************/
 
 #include "editor/editor_inspector.h"
+#include "editor/editor_plugin.h"
 #include "scene/gui/control.h"
 #include "editor/property_editor.h"
 
diff --git a/editor/progress_dialog.h b/editor/progress_dialog.h
index 199b9959e..419f07617 100644
--- a/editor/progress_dialog.h
+++ b/editor/progress_dialog.h
@@ -33,11 +33,6 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/popup.h"
 
-#include "scene/gui/button.h"
-#include "scene/gui/label.h"
-#include "scene/gui/progress_bar.h"
-#include "core/object.h"
-
 #include "core/map.h"
 #include "core/os/thread_safe.h"
 #include "core/ustring.h"
diff --git a/editor/project_export.h b/editor/project_export.h
index 670fb6a0b..3fe4e884e 100644
--- a/editor/project_export.h
+++ b/editor/project_export.h
@@ -32,26 +32,6 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "editor/editor_export.h"
-#include "editor/editor_file_dialog.h"
-#include "editor/editor_file_system.h"
-#include "editor/editor_inspector.h"
-#include "editor/editor_properties.h"
-#include "scene/gui/button.h"
-#include "scene/gui/check_button.h"
-#include "scene/gui/control.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/label.h"
-#include "scene/gui/link_button.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/rich_text_label.h"
-#include "scene/gui/slider.h"
-#include "scene/gui/tab_container.h"
-#include "scene/gui/tree.h"
-#include "scene/main/timer.h"
-#include "core/object.h"
-
 #include "core/os/dir_access.h"
 #include "core/os/thread.h"
 #include "core/math/vector2.h"
diff --git a/editor/project_manager.h b/editor/project_manager.h
index f4100f74b..fb8e6702f 100644
--- a/editor/project_manager.h
+++ b/editor/project_manager.h
@@ -33,14 +33,6 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
 
-#include "editor/editor_about.h"
-#include "scene/gui/check_box.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/scroll_container.h"
-#include "scene/gui/tool_button.h"
-#include "scene/gui/tree.h"
-
 #include "core/list.h"
 #include "core/object.h"
 #include "core/reference.h"
diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h
index 91abfb56c..fff9d427a 100644
--- a/editor/project_settings_editor.h
+++ b/editor/project_settings_editor.h
@@ -32,15 +32,6 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "core/undo_redo.h"
-#include "editor/editor_autoload_settings.h"
-#include "editor/editor_data.h"
-#include "editor/editor_plugin_settings.h"
-#include "editor/editor_sectioned_inspector.h"
-#include "editor/import_defaults_editor.h"
-#include "scene/gui/tab_container.h"
-#include "core/object.h"
-
 #include "core/math/vector2.h"
 #include "core/os/input_event.h"
 #include "core/reference.h"
diff --git a/editor/property_editor.h b/editor/property_editor.h
index 847323a65..aaded9ace 100644
--- a/editor/property_editor.h
+++ b/editor/property_editor.h
@@ -33,21 +33,6 @@
 #include "core/reference.h"
 #include "scene/gui/popup.h"
 
-#include "scene/gui/dialogs.h"
-#include "editor/editor_file_dialog.h"
-#include "editor/scene_tree_editor.h"
-#include "scene/gui/button.h"
-#include "scene/gui/check_box.h"
-#include "scene/gui/check_button.h"
-#include "scene/gui/color_picker.h"
-#include "scene/gui/grid_container.h"
-#include "scene/gui/label.h"
-#include "scene/gui/menu_button.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/text_edit.h"
-#include "scene/gui/texture_rect.h"
-#include "scene/gui/tree.h"
-
 #include "core/list.h"
 #include "core/math/math_defs.h"
 #include "core/node_path.h"
@@ -55,7 +40,6 @@
 #include "core/variant.h"
 #include "core/vector.h"
 
-
 class PropertyValueEvaluator;
 class CreateDialog;
 class PropertySelector;
diff --git a/editor/property_selector.h b/editor/property_selector.h
index 9fa2f4263..fc74f1c59 100644
--- a/editor/property_selector.h
+++ b/editor/property_selector.h
@@ -32,11 +32,6 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "editor/property_editor.h"
-#include "editor_help.h"
-#include "scene/gui/rich_text_label.h"
-#include "core/object.h"
-
 #include "core/object_id.h"
 #include "core/reference.h"
 #include "core/ustring.h"
diff --git a/editor/quick_open.h b/editor/quick_open.h
index 61e601a7f..d716ecf08 100644
--- a/editor/quick_open.h
+++ b/editor/quick_open.h
@@ -32,10 +32,6 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "editor_file_system.h"
-#include "scene/gui/tree.h"
-#include "core/object.h"
-
 #include "core/pair.h"
 #include "core/reference.h"
 #include "core/string_name.h"
diff --git a/editor/rename_dialog.h b/editor/rename_dialog.h
index 08e016df5..f434e6b30 100644
--- a/editor/rename_dialog.h
+++ b/editor/rename_dialog.h
@@ -43,12 +43,6 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "scene/gui/check_box.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/spin_box.h"
-#include "core/undo_redo.h"
-#include "editor/scene_tree_editor.h"
-
 class CheckButton;
 class Array;
 class Button;
diff --git a/editor/reparent_dialog.h b/editor/reparent_dialog.h
index d253bea4a..84811aff4 100644
--- a/editor/reparent_dialog.h
+++ b/editor/reparent_dialog.h
@@ -32,13 +32,6 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "editor/scene_tree_editor.h"
-#include "scene/gui/button.h"
-#include "scene/gui/check_box.h"
-#include "scene/gui/check_button.h"
-#include "scene/gui/line_edit.h"
-#include "core/object.h"
-
 #include "core/set.h"
 
 class CheckBox;
diff --git a/editor/run_settings_dialog.h b/editor/run_settings_dialog.h
index 651996d52..643d936b4 100644
--- a/editor/run_settings_dialog.h
+++ b/editor/run_settings_dialog.h
@@ -32,11 +32,6 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "scene/gui/check_button.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/line_edit.h"
-#include "core/object.h"
-
 #include "core/ustring.h"
 
 class LineEdit;
diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h
index be93acedd..d6e88b5a3 100644
--- a/editor/scene_tree_dock.h
+++ b/editor/scene_tree_dock.h
@@ -32,25 +32,6 @@
 
 #include "scene/gui/box_container.h"
 
-#include "editor/connections_dialog.h"
-#include "editor/create_dialog.h"
-#include "editor/editor_data.h"
-#include "editor/editor_sub_scene.h"
-#include "editor/groups_editor.h"
-#include "editor/quick_open.h"
-#include "editor/rename_dialog.h"
-#include "editor/reparent_dialog.h"
-#include "editor/script_create_dialog.h"
-#include "scene/animation/animation_player.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 "scene/gui/tree.h"
-#include "scene_tree_editor.h"
-#include "core/object.h"
-
 #include "core/hash_map.h"
 #include "core/list.h"
 #include "core/map.h"
diff --git a/editor/scene_tree_editor.h b/editor/scene_tree_editor.h
index 52742a3b0..720f24497 100644
--- a/editor/scene_tree_editor.h
+++ b/editor/scene_tree_editor.h
@@ -33,13 +33,6 @@
 #include "scene/gui/control.h"
 #include "scene/gui/dialogs.h"
 
-#include "core/undo_redo.h"
-#include "editor_data.h"
-#include "editor_settings.h"
-#include "scene/gui/button.h"
-#include "scene/gui/tree.h"
-#include "core/object.h"
-
 #include "core/list.h"
 #include "core/math/vector2.h"
 #include "core/node_path.h"
diff --git a/editor/script_create_dialog.h b/editor/script_create_dialog.h
index c59b9edcc..b52675d3e 100644
--- a/editor/script_create_dialog.h
+++ b/editor/script_create_dialog.h
@@ -32,14 +32,6 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "editor/editor_file_dialog.h"
-#include "editor/editor_settings.h"
-#include "scene/gui/check_box.h"
-#include "scene/gui/grid_container.h"
-#include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/panel_container.h"
-
 #include "core/map.h"
 #include "core/object.h"
 #include "core/ustring.h"
diff --git a/editor/script_editor_debugger.h b/editor/script_editor_debugger.h
index 3715f7ba5..bd02dae7d 100644
--- a/editor/script_editor_debugger.h
+++ b/editor/script_editor_debugger.h
@@ -32,14 +32,6 @@
 
 #include "scene/gui/margin_container.h"
 
-#include "core/io/packet_peer.h"
-#include "core/io/tcp_server.h"
-#include "editor/editor_inspector.h"
-#include "editor/property_editor.h"
-#include "scene/3d/camera.h"
-#include "scene/gui/box_container.h"
-#include "scene/gui/button.h"
-
 #include "core/array.h"
 #include "core/hash_map.h"
 #include "core/list.h"
diff --git a/editor/settings_config_dialog.h b/editor/settings_config_dialog.h
index e718ac3c5..2b0a89b7d 100644
--- a/editor/settings_config_dialog.h
+++ b/editor/settings_config_dialog.h
@@ -32,14 +32,6 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "editor/editor_sectioned_inspector.h"
-#include "editor_inspector.h"
-#include "scene/gui/panel_container.h"
-#include "scene/gui/rich_text_label.h"
-#include "scene/gui/tab_container.h"
-#include "scene/gui/texture_rect.h"
-#include "scene/gui/tool_button.h"
-
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
diff --git a/editor/spatial_editor_gizmos.h b/editor/spatial_editor_gizmos.h
index 160e48fb5..cfe5da488 100644
--- a/editor/spatial_editor_gizmos.h
+++ b/editor/spatial_editor_gizmos.h
@@ -32,8 +32,6 @@
 
 #include "editor/plugins/spatial_editor_plugin.h"
 
-#include "scene/3d/camera.h"
-
 #include "core/color.h"
 #include "core/math/basis.h"
 #include "core/math/math_defs.h"
diff --git a/modules/navigation/navigation_mesh_editor_plugin.cpp b/modules/navigation/navigation_mesh_editor_plugin.cpp
index d1f52843c..8fe34a669 100644
--- a/modules/navigation/navigation_mesh_editor_plugin.cpp
+++ b/modules/navigation/navigation_mesh_editor_plugin.cpp
@@ -38,6 +38,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/navigation_mesh.h"
+#include "scene/gui/label.h"
 
 void NavigationMeshEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {
diff --git a/modules/props/editor/prop_editor_plugin.cpp b/modules/props/editor/prop_editor_plugin.cpp
index 6a8029d2d..b88ca24ba 100644
--- a/modules/props/editor/prop_editor_plugin.cpp
+++ b/modules/props/editor/prop_editor_plugin.cpp
@@ -28,6 +28,9 @@ SOFTWARE.
 
 #include "core/os/input.h"
 
+#include "scene/gui/separator.h"
+#include "editor/editor_settings.h"
+
 void PropEditorPlugin::convert_active_scene_to_prop_data() {
 	SceneTree *st = SceneTree::get_singleton();
 
diff --git a/modules/props_2d/editor/prop_2d_editor_plugin.cpp b/modules/props_2d/editor/prop_2d_editor_plugin.cpp
index ebc00d9b9..c0370008e 100644
--- a/modules/props_2d/editor/prop_2d_editor_plugin.cpp
+++ b/modules/props_2d/editor/prop_2d_editor_plugin.cpp
@@ -25,7 +25,7 @@ SOFTWARE.
 #include "../props/prop_2d_data.h"
 #include "../singleton/prop_2d_utils.h"
 #include "core/os/keyboard.h"
-
+#include "editor/editor_settings.h"
 #include "core/os/input.h"
 
 void Prop2DEditorPlugin::convert_active_scene_to_prop_data() {
diff --git a/modules/rtile_map/tile_map_editor_plugin.cpp b/modules/rtile_map/tile_map_editor_plugin.cpp
index 7a1aa7a3d..9514e62f4 100644
--- a/modules/rtile_map/tile_map_editor_plugin.cpp
+++ b/modules/rtile_map/tile_map_editor_plugin.cpp
@@ -38,6 +38,9 @@
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/slider.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/item_list.h"
+#include "scene/gui/separator.h"
 
 void RTileMapEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {
diff --git a/modules/rtile_map/tile_map_editor_plugin.h b/modules/rtile_map/tile_map_editor_plugin.h
index 3c85415c6..c4a5dbab4 100644
--- a/modules/rtile_map/tile_map_editor_plugin.h
+++ b/modules/rtile_map/tile_map_editor_plugin.h
@@ -40,6 +40,11 @@
 #include "scene/gui/tool_button.h"
 #include "tile_map.h"
 
+class HSlider;
+class PopupMenu;
+class ItemList;
+class VSeparator;
+
 class RTileMapEditor : public VBoxContainer {
 	GDCLASS(RTileMapEditor, VBoxContainer);
 
diff --git a/modules/rtile_map/tile_set_editor_plugin.cpp b/modules/rtile_map/tile_set_editor_plugin.cpp
index 264cd777a..f11f2e5f1 100644
--- a/modules/rtile_map/tile_set_editor_plugin.cpp
+++ b/modules/rtile_map/tile_set_editor_plugin.cpp
@@ -38,6 +38,15 @@
 #include "scene/2d/sprite.h"
 #include "scene/gui/scroll_container.h"
 #include "editor/editor_inspector.h"
+#include "editor/editor_file_system.h"
+#include "scene/gui/spin_box.h"
+#include "scene/gui/item_list.h"
+#include "scene/gui/label.h"
+#include "scene/gui/separator.h"
+#include "editor/editor_file_dialog.h"
+#include "scene/gui/dialogs.h"
+#include "editor/editor_settings.h"
+#include "scene/gui/popup_menu.h"
 
 void RTileSetEditor::edit(const Ref<RTileSet> &p_tileset) {
 	tileset = p_tileset;
diff --git a/modules/rtile_map/tile_set_editor_plugin.h b/modules/rtile_map/tile_set_editor_plugin.h
index 93105ee91..0119749c7 100644
--- a/modules/rtile_map/tile_set_editor_plugin.h
+++ b/modules/rtile_map/tile_set_editor_plugin.h
@@ -37,8 +37,18 @@
 #include "tile_set.h"
 
 #define WORKSPACE_MARGIN Vector2(10, 10)
+
 class RTilesetEditorContext;
 class ScrollContainer;
+class SpinBox;
+class Label;
+class HSeparator;
+class VSeparator;
+class ConfirmationDialog;
+class AcceptDialog;
+class EditorFileDialog;
+class ItemList;
+class PopupMenu;
 
 class RTileSetEditor : public HSplitContainer {
 	friend class RTileSetEditorPlugin;
diff --git a/modules/skeleton_editor/skeleton_editor_plugin.cpp b/modules/skeleton_editor/skeleton_editor_plugin.cpp
index f25070175..04d821715 100644
--- a/modules/skeleton_editor/skeleton_editor_plugin.cpp
+++ b/modules/skeleton_editor/skeleton_editor_plugin.cpp
@@ -48,6 +48,13 @@
 #include "editor/editor_inspector.h"
 #include "editor/editor_spin_slider.h"
 #include "editor/animation_track_editor.h"
+#include "scene/gui/grid_container.h"
+#include "scene/gui/tree.h"
+#include "scene/gui/label.h"
+#include "scene/gui/popup_menu.h"
+#include "scene/gui/check_box.h"
+#include "editor/editor_settings.h"
+#include "scene/gui/separator.h"
 
 #define DISTANCE_DEFAULT 4
 
diff --git a/modules/skeleton_editor/skeleton_editor_plugin.h b/modules/skeleton_editor/skeleton_editor_plugin.h
index 97053349f..f101b4d87 100644
--- a/modules/skeleton_editor/skeleton_editor_plugin.h
+++ b/modules/skeleton_editor/skeleton_editor_plugin.h
@@ -47,6 +47,12 @@ class Button;
 class CheckBox;
 class EditorSpinSlider;
 class EditorInspectorSection;
+class GridContainer;
+class Tree;
+class Label;
+class PopupMenu;
+class CheckBox;
+class VSeparator;
 
 class ModuleBoneTransformEditor : public VBoxContainer {
 	GDCLASS(ModuleBoneTransformEditor, VBoxContainer);
diff --git a/modules/terraman/world/terrain_world_editor.h b/modules/terraman/world/terrain_world_editor.h
index ceb5c744d..a07aa6b8e 100644
--- a/modules/terraman/world/terrain_world_editor.h
+++ b/modules/terraman/world/terrain_world_editor.h
@@ -27,6 +27,7 @@ SOFTWARE.
 
 class TerrainWorld;
 class SpatialEditorPlugin;
+class HSlider;
 
 class TerrainWorldEditor : public PanelContainer {
 	GDCLASS(TerrainWorldEditor, PanelContainer);
diff --git a/modules/terraman_2d/world/terrain_2d_world_editor.cpp b/modules/terraman_2d/world/terrain_2d_world_editor.cpp
index f080b36c8..bc4ecdcdb 100644
--- a/modules/terraman_2d/world/terrain_2d_world_editor.cpp
+++ b/modules/terraman_2d/world/terrain_2d_world_editor.cpp
@@ -41,6 +41,7 @@ SOFTWARE.
 #include "scene/3d/camera.h"
 #include "scene/gui/slider.h"
 #include "scene/gui/scroll_container.h"
+#include "scene/gui/slider.h"
 
 bool Terrain2DWorldEditor::forward_spatial_input_event(Camera *p_camera, const Ref<InputEvent> &p_event) {
 	if (!_world || !_world->get_editable()) {
diff --git a/modules/terraman_2d/world/terrain_2d_world_editor.h b/modules/terraman_2d/world/terrain_2d_world_editor.h
index d25d017ed..bf5ad21bc 100644
--- a/modules/terraman_2d/world/terrain_2d_world_editor.h
+++ b/modules/terraman_2d/world/terrain_2d_world_editor.h
@@ -29,6 +29,7 @@ SOFTWARE.
 
 class Terrain2DWorld;
 class SpatialEditorPlugin;
+class HSlider;
 
 class Terrain2DWorldEditor : public PanelContainer {
 	GDCLASS(Terrain2DWorldEditor, PanelContainer);
diff --git a/modules/ui_extensions/input_map_editor.cpp b/modules/ui_extensions/input_map_editor.cpp
index f0b18de95..07ca118f6 100644
--- a/modules/ui_extensions/input_map_editor.cpp
+++ b/modules/ui_extensions/input_map_editor.cpp
@@ -41,6 +41,7 @@
 #include "editor/editor_scale.h"
 #include "scene/gui/margin_container.h"
 
+#include "scene/gui/label.h"
 #include "core/input_map.h"
 
 static const char *_button_names[JOY_BUTTON_MAX] = {
diff --git a/modules/ui_extensions/input_map_editor.h b/modules/ui_extensions/input_map_editor.h
index 5915d363f..9d61129f5 100644
--- a/modules/ui_extensions/input_map_editor.h
+++ b/modules/ui_extensions/input_map_editor.h
@@ -39,6 +39,8 @@
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/tree.h"
 
+class Label;
+
 class InputMapEditor : public MarginContainer {
 	GDCLASS(InputMapEditor, MarginContainer);
 
diff --git a/modules/voxelman/world/voxel_world_editor.h b/modules/voxelman/world/voxel_world_editor.h
index 4104b96b2..f56ac07f6 100644
--- a/modules/voxelman/world/voxel_world_editor.h
+++ b/modules/voxelman/world/voxel_world_editor.h
@@ -29,6 +29,7 @@ SOFTWARE.
 
 class VoxelWorld;
 class SpatialEditorPlugin;
+class HSlider;
 
 class VoxelWorldEditor : public PanelContainer {
 	GDCLASS(VoxelWorldEditor, PanelContainer);
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp
index d19b53b25..c2a0211cf 100644
--- a/platform/javascript/export/export.cpp
+++ b/platform/javascript/export/export.cpp
@@ -42,6 +42,7 @@
 #include "platform/javascript/run_icon.gen.h"
 
 #include "core/project_settings.h"
+#include "editor/editor_settings.h"
 
 class EditorHTTPServer : public Reference {
 private: