diff --git a/modules/gdscript/SCsub b/modules/gdscript/SCsub
index 13870170a5a..73f09f16593 100644
--- a/modules/gdscript/SCsub
+++ b/modules/gdscript/SCsub
@@ -7,4 +7,7 @@ env_gdscript = env_modules.Clone()
 
 env_gdscript.add_source_files(env.modules_sources, "*.cpp")
 
+if env['tools']:
+	env_gdscript.add_source_files(env.modules_sources, "./editor/*.cpp")
+
 Export('env')
diff --git a/modules/gdscript/gdscript_highlighter.cpp b/modules/gdscript/editor/gdscript_highlighter.cpp
similarity index 100%
rename from modules/gdscript/gdscript_highlighter.cpp
rename to modules/gdscript/editor/gdscript_highlighter.cpp
diff --git a/modules/gdscript/gdscript_highlighter.h b/modules/gdscript/editor/gdscript_highlighter.h
similarity index 100%
rename from modules/gdscript/gdscript_highlighter.h
rename to modules/gdscript/editor/gdscript_highlighter.h
diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp
index 85c94c35969..422223370b1 100644
--- a/modules/gdscript/register_types.cpp
+++ b/modules/gdscript/register_types.cpp
@@ -30,8 +30,8 @@
 
 #include "register_types.h"
 
+#include "editor/gdscript_highlighter.h"
 #include "gdscript.h"
-#include "gdscript_highlighter.h"
 #include "gdscript_tokenizer.h"
 #include "io/file_access_encrypted.h"
 #include "io/resource_loader.h"