diff --git a/src/storm/environment/SubEnvironment.cpp b/src/storm/environment/SubEnvironment.cpp
index 91b4f66dc..2f8eeef8d 100644
--- a/src/storm/environment/SubEnvironment.cpp
+++ b/src/storm/environment/SubEnvironment.cpp
@@ -1,20 +1,9 @@
 #include <memory>
 
 #include "storm/environment/Environment.h"
-#include "storm/environment/modelchecker/MultiObjectiveModelCheckerEnvironment.h"
-#include "storm/environment/modelchecker/ModelCheckerEnvironment.h"
 
-#include "storm/environment/solver/SolverEnvironment.h"
-#include "storm/environment/solver/EigenSolverEnvironment.h"
-#include "storm/environment/solver/GameSolverEnvironment.h"
-#include "storm/environment/solver/GmmxxSolverEnvironment.h"
-#include "storm/environment/solver/NativeSolverEnvironment.h"
-#include "storm/environment/solver/LongRunAverageSolverEnvironment.h"
-#include "storm/environment/solver/TimeBoundedSolverEnvironment.h"
-#include "storm/environment/solver/MinMaxSolverEnvironment.h"
-#include "storm/environment/solver/MultiplierEnvironment.h"
-#include "storm/environment/solver/OviSolverEnvironment.h"
-#include "storm/environment/solver/TopologicalSolverEnvironment.h"
+#include "storm/environment/modelchecker/AllModelCheckerEnvironments.h"
+#include "storm/environment/solver/AllSolverEnvironments.h"
 
 namespace storm {
     
diff --git a/src/storm/environment/modelchecker/AllModelCheckerEnvironments.h b/src/storm/environment/modelchecker/AllModelCheckerEnvironments.h
new file mode 100644
index 000000000..f37921b60
--- /dev/null
+++ b/src/storm/environment/modelchecker/AllModelCheckerEnvironments.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#include "storm/environment/modelchecker/ModelCheckerEnvironment.h"
+#include "storm/environment/modelchecker/MultiObjectiveModelCheckerEnvironment.h"
\ No newline at end of file
diff --git a/src/storm/environment/solver/AllSolverEnvironments.h b/src/storm/environment/solver/AllSolverEnvironments.h
new file mode 100644
index 000000000..333041109
--- /dev/null
+++ b/src/storm/environment/solver/AllSolverEnvironments.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "storm/environment/solver/EigenSolverEnvironment.h"
+#include "storm/environment/solver/GameSolverEnvironment.h"
+#include "storm/environment/solver/GmmxxSolverEnvironment.h"
+#include "storm/environment/solver/LongRunAverageSolverEnvironment.h"
+#include "storm/environment/solver/MinMaxSolverEnvironment.h"
+#include "storm/environment/solver/MultiplierEnvironment.h"
+#include "storm/environment/solver/NativeSolverEnvironment.h"
+#include "storm/environment/solver/OviSolverEnvironment.h"
+#include "storm/environment/solver/TimeBoundedSolverEnvironment.h"
+#include "storm/environment/solver/TopologicalSolverEnvironment.h"
\ No newline at end of file
diff --git a/src/storm/environment/solver/SolverEnvironment.cpp b/src/storm/environment/solver/SolverEnvironment.cpp
index 6870d1632..01591b4ee 100644
--- a/src/storm/environment/solver/SolverEnvironment.cpp
+++ b/src/storm/environment/solver/SolverEnvironment.cpp
@@ -1,15 +1,6 @@
 #include "storm/environment/solver/SolverEnvironment.h"
 
-#include "storm/environment/solver/LongRunAverageSolverEnvironment.h"
-#include "storm/environment/solver/TimeBoundedSolverEnvironment.h"
-#include "storm/environment/solver/MinMaxSolverEnvironment.h"
-#include "storm/environment/solver/MultiplierEnvironment.h"
-#include "storm/environment/solver/EigenSolverEnvironment.h"
-#include "storm/environment/solver/GmmxxSolverEnvironment.h"
-#include "storm/environment/solver/NativeSolverEnvironment.h"
-#include "storm/environment/solver/GameSolverEnvironment.h"
-#include "storm/environment/solver/TopologicalSolverEnvironment.h"
-#include "storm/environment/solver/OviSolverEnvironment.h"
+#include "storm/environment/solver/AllSolverEnvironments.h"
 
 #include "storm/settings/SettingsManager.h"
 #include "storm/settings/modules/GeneralSettings.h"