8 files changed, 19 insertions, 13 deletions
diff --git a/modules/noise/editor/noise_editor_plugin.cpp b/modules/noise/editor/noise_editor_plugin.cpp
index 462cc50112..91e9f7d477 100644
--- a/modules/noise/editor/noise_editor_plugin.cpp
+++ b/modules/noise/editor/noise_editor_plugin.cpp
@@ -32,14 +32,14 @@
 
 #ifdef TOOLS_ENABLED
 
+#include "../noise.h"
+#include "../noise_texture_2d.h"
+
 #include "editor/editor_inspector.h"
 #include "editor/editor_scale.h"
 #include "scene/gui/button.h"
 #include "scene/gui/texture_rect.h"
 
-#include "modules/noise/noise.h"
-#include "modules/noise/noise_texture_2d.h"
-
 class NoisePreview : public Control {
 	GDCLASS(NoisePreview, Control)
 
diff --git a/modules/noise/fastnoise_lite.h b/modules/noise/fastnoise_lite.h
index 0e6a4606ac..c63f7d7d29 100644
--- a/modules/noise/fastnoise_lite.h
+++ b/modules/noise/fastnoise_lite.h
@@ -31,9 +31,10 @@
 #ifndef FASTNOISE_LITE_H
 #define FASTNOISE_LITE_H
 
+#include "noise.h"
+
 #include "core/io/image.h"
 #include "core/object/ref_counted.h"
-#include "noise.h"
 #include "scene/resources/gradient.h"
 
 #include <thirdparty/noise/FastNoiseLite.h>
diff --git a/modules/noise/noise_texture_2d.cpp b/modules/noise/noise_texture_2d.cpp
index e4b2e0b4ac..a7176e0816 100644
--- a/modules/noise/noise_texture_2d.cpp
+++ b/modules/noise/noise_texture_2d.cpp
@@ -30,9 +30,10 @@
 
 #include "noise_texture_2d.h"
 
-#include "core/core_string_names.h"
 #include "noise.h"
 
+#include "core/core_string_names.h"
+
 NoiseTexture2D::NoiseTexture2D() {
 	noise = Ref<Noise>();
 
diff --git a/modules/noise/noise_texture_3d.cpp b/modules/noise/noise_texture_3d.cpp
index 25d75b8ffb..f6c67b0f2d 100644
--- a/modules/noise/noise_texture_3d.cpp
+++ b/modules/noise/noise_texture_3d.cpp
@@ -30,9 +30,10 @@
 
 #include "noise_texture_3d.h"
 
-#include "core/core_string_names.h"
 #include "noise.h"
 
+#include "core/core_string_names.h"
+
 NoiseTexture3D::NoiseTexture3D() {
 	noise = Ref<Noise>();
 
diff --git a/modules/noise/register_types.cpp b/modules/noise/register_types.cpp
index f48d4e7e4d..29eb42522f 100644
--- a/modules/noise/register_types.cpp
+++ b/modules/noise/register_types.cpp
@@ -36,10 +36,13 @@
 #include "noise_texture_3d.h"
 
 #ifdef TOOLS_ENABLED
-#include "editor/editor_plugin.h"
 #include "editor/noise_editor_plugin.h"
 #endif
 
+#ifdef TOOLS_ENABLED
+#include "editor/editor_plugin.h"
+#endif
+
 void initialize_noise_module(ModuleInitializationLevel p_level) {
 	if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
 		GDREGISTER_CLASS(NoiseTexture3D);
diff --git a/modules/noise/tests/test_fastnoise_lite.h b/modules/noise/tests/test_fastnoise_lite.h
index 0a435c6a5c..6e2e263e03 100644
--- a/modules/noise/tests/test_fastnoise_lite.h
+++ b/modules/noise/tests/test_fastnoise_lite.h
@@ -31,9 +31,9 @@
 #ifndef TEST_FASTNOISE_LITE_H
 #define TEST_FASTNOISE_LITE_H
 
-#include "tests/test_macros.h"
+#include "../fastnoise_lite.h"
 
-#include "modules/noise/fastnoise_lite.h"
+#include "tests/test_macros.h"
 
 namespace TestFastNoiseLite {
 
diff --git a/modules/noise/tests/test_noise_texture_2d.h b/modules/noise/tests/test_noise_texture_2d.h
index 9e280b5d97..e2ec39ef48 100644
--- a/modules/noise/tests/test_noise_texture_2d.h
+++ b/modules/noise/tests/test_noise_texture_2d.h
@@ -31,9 +31,9 @@
 #ifndef TEST_NOISE_TEXTURE_2D_H
 #define TEST_NOISE_TEXTURE_2D_H
 
-#include "tests/test_macros.h"
+#include "../noise_texture_2d.h"
 
-#include "modules/noise/noise_texture_2d.h"
+#include "tests/test_macros.h"
 
 namespace TestNoiseTexture2D {
 
diff --git a/modules/noise/tests/test_noise_texture_3d.h b/modules/noise/tests/test_noise_texture_3d.h
index b46d386296..a612f2920a 100644
--- a/modules/noise/tests/test_noise_texture_3d.h
+++ b/modules/noise/tests/test_noise_texture_3d.h
@@ -31,9 +31,9 @@
 #ifndef TEST_NOISE_TEXTURE_3D_H
 #define TEST_NOISE_TEXTURE_3D_H
 
-#include "tests/test_macros.h"
+#include "../noise_texture_3d.h"
 
-#include "modules/noise/noise_texture_3d.h"
+#include "tests/test_macros.h"
 
 namespace TestNoiseTexture3D {