diff --git a/setup/moduledependency/dependencyexpression.class.inc.php b/setup/moduledependency/dependencyexpression.class.inc.php
index f1792479c..33f593cd0 100644
--- a/setup/moduledependency/dependencyexpression.class.inc.php
+++ b/setup/moduledependency/dependencyexpression.class.inc.php
@@ -2,11 +2,9 @@
 
 namespace Combodo\iTop\Setup\ModuleDependency;
 
-require_once(APPROOT.'/setup/runtimeenv.class.inc.php');
-
 use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator;
+use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReader;
 use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReaderException;
-use RunTimeEnvironment;
 
 /**
  * Class that handles a module dependency
@@ -64,7 +62,7 @@ class DependencyExpression
 	public static function GetPhpExpressionEvaluator(): PhpExpressionEvaluator
 	{
 		if (!isset(self::$oPhpExpressionEvaluator)) {
-			self::$oPhpExpressionEvaluator = new PhpExpressionEvaluator([], RunTimeEnvironment::STATIC_CALL_AUTOSELECT_WHITELIST);
+			self::$oPhpExpressionEvaluator = new PhpExpressionEvaluator([], ModuleFileReader::STATIC_CALL_AUTOSELECT_WHITELIST);
 		}
 
 		return self::$oPhpExpressionEvaluator;
diff --git a/setup/modulediscovery/ModuleFileReader.php b/setup/modulediscovery/ModuleFileReader.php
index 6b9064914..9fbcd634c 100644
--- a/setup/modulediscovery/ModuleFileReader.php
+++ b/setup/modulediscovery/ModuleFileReader.php
@@ -42,6 +42,10 @@ class ModuleFileReader
 		"utils::GetItopVersionWikiSyntax",
 	];
 
+	public const STATIC_CALL_AUTOSELECT_WHITELIST = [
+		"SetupInfo::ModuleIsSelected",
+	];
+
 	protected function __construct()
 	{
 		$this->oPhpExpressionEvaluator = new PhpExpressionEvaluator(static::FUNC_CALL_WHITELIST, static::STATIC_CALLWHITELIST);
diff --git a/setup/moduleinstaller.class.inc.php b/setup/moduleinstaller.class.inc.php
index fdaa84eee..cdfb8a8cb 100644
--- a/setup/moduleinstaller.class.inc.php
+++ b/setup/moduleinstaller.class.inc.php
@@ -17,8 +17,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-//require_once(APPROOT.'setup/setuppage.class.inc.php');
-
 /**
  * Class ModuleInstaller
  * Defines the API to implement module specific actions during the setup
diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php
index c159aad36..adac11f1b 100644
--- a/setup/runtimeenv.class.inc.php
+++ b/setup/runtimeenv.class.inc.php
@@ -46,10 +46,6 @@ define('DATAMODEL_MODULE', 'datamodel'); // Convention to store the version of t
 
 class RunTimeEnvironment
 {
-	public const STATIC_CALL_AUTOSELECT_WHITELIST = [
-		"SetupInfo::ModuleIsSelected",
-	];
-
 	private static bool $bMetamodelStarted = false;
 
 	/**
@@ -513,7 +509,7 @@ class RunTimeEnvironment
 			}
 		}
 
-		$oPhpExpressionEvaluator = new PhpExpressionEvaluator([], RunTimeEnvironment::STATIC_CALL_AUTOSELECT_WHITELIST);
+		$oPhpExpressionEvaluator = new PhpExpressionEvaluator([], ModuleFileReader::STATIC_CALL_AUTOSELECT_WHITELIST);
 
 		// Now process the 'AutoSelect' modules
 		do {
diff --git a/setup/unattended-install/InstallationFileService.php b/setup/unattended-install/InstallationFileService.php
index 7eea61c3a..1b05151cf 100644
--- a/setup/unattended-install/InstallationFileService.php
+++ b/setup/unattended-install/InstallationFileService.php
@@ -1,6 +1,7 @@
 <?php
 
 use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator;
+use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReader;
 use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReaderException;
 
 require_once(APPROOT.'/application/utils.inc.php');
@@ -286,7 +287,7 @@ class InstallationFileService
 
 	public function ProcessAutoSelectModules(): void
 	{
-		$oPhpExpressionEvaluator = new PhpExpressionEvaluator([], RunTimeEnvironment::STATIC_CALL_AUTOSELECT_WHITELIST);
+		$oPhpExpressionEvaluator = new PhpExpressionEvaluator([], ModuleFileReader::STATIC_CALL_AUTOSELECT_WHITELIST);
 
 		foreach ($this->GetAutoSelectModules() as $sModuleId => $aModule) {
 			try {
diff --git a/setup/wizardsteps/WizStepModulesChoice.php b/setup/wizardsteps/WizStepModulesChoice.php
index 46ee8febb..c38c1c767 100644
--- a/setup/wizardsteps/WizStepModulesChoice.php
+++ b/setup/wizardsteps/WizStepModulesChoice.php
@@ -20,6 +20,7 @@
 
 use Combodo\iTop\Application\WebPage\WebPage;
 use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator;
+use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReader;
 use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReaderException;
 
 /**
@@ -466,7 +467,7 @@ EOF
 	private function GetPhpExpressionEvaluator(): PhpExpressionEvaluator
 	{
 		if (!isset($this->oPhpExpressionEvaluator)) {
-			$this->oPhpExpressionEvaluator = new PhpExpressionEvaluator([], RunTimeEnvironment::STATIC_CALL_AUTOSELECT_WHITELIST);
+			$this->oPhpExpressionEvaluator = new PhpExpressionEvaluator([], ModuleFileReader::STATIC_CALL_AUTOSELECT_WHITELIST);
 		}
 
 		return $this->oPhpExpressionEvaluator;