diff --git a/src/celengine/CMakeLists.txt b/src/celengine/CMakeLists.txt
index 271044ea..498b3b30 100644
--- a/src/celengine/CMakeLists.txt
+++ b/src/celengine/CMakeLists.txt
@@ -33,7 +33,6 @@ set(CELENGINE_SOURCES
   dsoname.h
   dsooctree.cpp
   dsooctree.h
-  execenv.h
   frame.cpp
   frame.h
   frametree.cpp
diff --git a/src/celscript/legacy/CMakeLists.txt b/src/celscript/legacy/CMakeLists.txt
index 95fc74d0..9db7b9f1 100644
--- a/src/celscript/legacy/CMakeLists.txt
+++ b/src/celscript/legacy/CMakeLists.txt
@@ -3,6 +3,7 @@ set(LEGACY_SOURCES
   cmdparser.h
   command.cpp
   command.h
+  execenv.h
   execution.cpp
   execution.h
 )
diff --git a/src/celscript/legacy/command.h b/src/celscript/legacy/command.h
index c5dbbc29..ac63433e 100644
--- a/src/celscript/legacy/command.h
+++ b/src/celscript/legacy/command.h
@@ -14,9 +14,9 @@
 
 #include <array>
 #include <iostream>
-#include <celengine/execenv.h>
 #include <celengine/astro.h>
 #include <celutil/color.h>
+#include "execenv.h"
 
 
 class Command
diff --git a/src/celengine/execenv.h b/src/celscript/legacy/execenv.h
similarity index 99%
rename from src/celengine/execenv.h
rename to src/celscript/legacy/execenv.h
index 0c72f6e1..1ab1f725 100644
--- a/src/celengine/execenv.h
+++ b/src/celscript/legacy/execenv.h
@@ -33,4 +33,3 @@ class ExecutionEnvironment
 };
 
 #endif // _EXECENV_H_
-
diff --git a/src/celscript/legacy/execution.h b/src/celscript/legacy/execution.h
index a68243a3..cfed981e 100644
--- a/src/celscript/legacy/execution.h
+++ b/src/celscript/legacy/execution.h
@@ -10,7 +10,7 @@
 #ifndef _EXECUTION_H_
 #define _EXECUTION_H_
 
-#include <celengine/execenv.h>
+#include "execenv.h"
 #include "command.h"
 
 
diff --git a/src/celscript/lua/celx.cpp b/src/celscript/lua/celx.cpp
index 8d279716..3113c4fe 100644
--- a/src/celscript/lua/celx.cpp
+++ b/src/celscript/lua/celx.cpp
@@ -19,7 +19,6 @@
 #include <celengine/astro.h>
 #include <celengine/asterism.h>
 #include <celscript/legacy/cmdparser.h>
-#include <celengine/execenv.h>
 #include <celscript/legacy/execution.h>
 #include <celengine/timeline.h>
 #include <celengine/timelinephase.h>
diff --git a/src/celscript/lua/celx_misc.cpp b/src/celscript/lua/celx_misc.cpp
index b1f9fbf4..2cda350d 100644
--- a/src/celscript/lua/celx_misc.cpp
+++ b/src/celscript/lua/celx_misc.cpp
@@ -3,7 +3,6 @@
 #include "celx_misc.h"
 #include "celx_internal.h"
 #include <celscript/legacy/cmdparser.h>
-#include <celengine/execenv.h>
 #include <celscript/legacy/execution.h>
 #include <celestia/celestiacore.h>