diff --git a/modules/csg/SCsub b/modules/csg/SCsub
index 857bc10b2..63bfa265c 100644
--- a/modules/csg/SCsub
+++ b/modules/csg/SCsub
@@ -9,3 +9,6 @@ env_csg = env_modules.Clone()
 
 env_csg.add_source_files(env.modules_sources, "*.cpp")
 env_csg.add_source_files(env.modules_sources, "geometry_parser/*.cpp")
+
+if env["tools"]:
+    env_csg.add_source_files(env.modules_sources, "editor/*.cpp")
\ No newline at end of file
diff --git a/modules/csg/csg_gizmos.cpp b/modules/csg/editor/csg_gizmos.cpp
similarity index 100%
rename from modules/csg/csg_gizmos.cpp
rename to modules/csg/editor/csg_gizmos.cpp
diff --git a/modules/csg/csg_gizmos.h b/modules/csg/editor/csg_gizmos.h
similarity index 99%
rename from modules/csg/csg_gizmos.h
rename to modules/csg/editor/csg_gizmos.h
index 927603ee0..547ff5c27 100644
--- a/modules/csg/csg_gizmos.h
+++ b/modules/csg/editor/csg_gizmos.h
@@ -31,7 +31,7 @@
 #ifndef CSG_GIZMOS_H
 #define CSG_GIZMOS_H
 
-#include "csg_shape.h"
+#include "../csg_shape.h"
 #include "editor/editor_plugin.h"
 #include "editor/spatial_editor_gizmos.h"
 
diff --git a/modules/csg/register_types.cpp b/modules/csg/register_types.cpp
index 28f8746d8..d1dc95991 100644
--- a/modules/csg/register_types.cpp
+++ b/modules/csg/register_types.cpp
@@ -30,7 +30,10 @@
 
 #include "register_types.h"
 
-#include "csg_gizmos.h"
+#ifdef TOOLS_ENABLED
+#include "./editor/csg_gizmos.h"
+#endif
+
 #include "csg_shape.h"
 
 #include "modules/csg/geometry_parser/csgshape3d_navigation_geometry_parser_3d.h"