6 files changed, 6 insertions, 6 deletions
diff --git a/modules/gdnative/gdnative_library_editor_plugin.cpp b/modules/gdnative/gdnative_library_editor_plugin.cpp
index 2440ef392e..66c8ab7b37 100644
--- a/modules/gdnative/gdnative_library_editor_plugin.cpp
+++ b/modules/gdnative/gdnative_library_editor_plugin.cpp
@@ -29,7 +29,9 @@
 /*************************************************************************/
 
 #ifdef TOOLS_ENABLED
+
 #include "gdnative_library_editor_plugin.h"
+
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
diff --git a/modules/gdnative/gdnative_library_editor_plugin.h b/modules/gdnative/gdnative_library_editor_plugin.h
index 2e4b483ea7..797695366c 100644
--- a/modules/gdnative/gdnative_library_editor_plugin.h
+++ b/modules/gdnative/gdnative_library_editor_plugin.h
@@ -39,7 +39,6 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/tree.h"
 
-class EditorNode;
 class EditorFileDialog;
 
 class GDNativeLibraryEditor : public Control {
@@ -114,5 +113,7 @@ public:
 
 	GDNativeLibraryEditorPlugin();
 };
-#endif
+
+#endif // TOOLS_ENABLED
+
 #endif // GDNATIVE_LIBRARY_EDITOR_PLUGIN_H
diff --git a/modules/gridmap/grid_map_editor_plugin.h b/modules/gridmap/grid_map_editor_plugin.h
index 10e466f096..a25f14becd 100644
--- a/modules/gridmap/grid_map_editor_plugin.h
+++ b/modules/gridmap/grid_map_editor_plugin.h
@@ -37,7 +37,6 @@
 #include "scene/gui/slider.h"
 #include "scene/gui/spin_box.h"
 
-class EditorNode;
 class Node3DEditorPlugin;
 
 class GridMapEditor : public VBoxContainer {
diff --git a/modules/mono/godotsharp_dirs.cpp b/modules/mono/godotsharp_dirs.cpp
index c0cd18e29d..7c2cb2e260 100644
--- a/modules/mono/godotsharp_dirs.cpp
+++ b/modules/mono/godotsharp_dirs.cpp
@@ -36,7 +36,7 @@
 
 #ifdef TOOLS_ENABLED
 #include "core/version.h"
-#include "editor/editor_settings.h"
+#include "editor/editor_paths.h"
 #endif
 
 #ifdef ANDROID_ENABLED
diff --git a/modules/navigation/navigation_mesh_generator.cpp b/modules/navigation/navigation_mesh_generator.cpp
index 52d5379e8b..61c3cefc7a 100644
--- a/modules/navigation/navigation_mesh_generator.cpp
+++ b/modules/navigation/navigation_mesh_generator.cpp
@@ -50,7 +50,6 @@
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_node.h"
-#include "editor/editor_settings.h"
 #endif
 
 #include "modules/modules_enabled.gen.h" // For csg, gridmap.
diff --git a/modules/visual_script/editor/visual_script_property_selector.cpp b/modules/visual_script/editor/visual_script_property_selector.cpp
index cf0111ee7c..563c12eec4 100644
--- a/modules/visual_script/editor/visual_script_property_selector.cpp
+++ b/modules/visual_script/editor/visual_script_property_selector.cpp
@@ -38,7 +38,6 @@
 #include "core/os/keyboard.h"
 #include "editor/doc_tools.h"
 #include "editor/editor_feature_profile.h"
-#include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "scene/main/node.h"
 #include "scene/main/window.h"