diff --git a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp b/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
index 77e822ea2..89255f90c 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
@@ -24,45 +24,39 @@
 #include <optional>
 #include <unordered_set>
 
-#include <opm/parser/eclipse/Deck/DeckSection.hpp>
-#include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/Python/Python.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/GasLiftOpt.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp>
-#include <opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp>
 #include <opm/parser/eclipse/EclipseState/Runspec.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/PAvg.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Well/PAvgCalculatorCollection.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellMatcher.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/ScheduleDeck.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/ScheduleState.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/RPTConfig.hpp>
-#include <opm/common/utility/TimeService.hpp>
-
-#include <opm/common/utility/ActiveGridCells.hpp>
-#include <opm/io/eclipse/rst/state.hpp>
 
 
 
 namespace Opm
 {
+    class ActiveGridCells;
     class Deck;
     class DeckKeyword;
     class DeckRecord;
     class EclipseGrid;
     class EclipseState;
     class FieldPropsManager;
-    class Runspec;
+    class ParseContext;
     class SCHEDULESection;
     class SummaryState;
     class ErrorGuard;
     class UDQConfig;
+    namespace RestartIO { class RstState; }
 
 
     struct ScheduleStatic {
@@ -87,17 +81,7 @@ namespace Opm
                        const Runspec& runspec,
                        const std::optional<int>& output_interval_,
                        const ParseContext& parseContext,
-                       ErrorGuard& errors):
-            m_python_handle(python_handle),
-            m_input_path(deck.getInputPath()),
-            m_restart_info(restart_info),
-            m_deck_message_limits( deck ),
-            m_unit_system( deck.getActiveUnitSystem() ),
-            m_runspec( runspec ),
-            rst_config( SOLUTIONSection(deck), parseContext, errors ),
-            output_interval(output_interval_)
-        {
-        }
+                       ErrorGuard& errors);
 
         template<class Serializer>
         void serializeOp(Serializer& serializer)
diff --git a/python/cxx/eclipse_config.cpp b/python/cxx/eclipse_config.cpp
index 7ffe7806f..c81d4912c 100644
--- a/python/cxx/eclipse_config.cpp
+++ b/python/cxx/eclipse_config.cpp
@@ -1,4 +1,5 @@
 #include <vector>
+#include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
index a68b3c1bd..7437f05fa 100644
--- a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
+++ b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
@@ -37,6 +37,8 @@
 #include <opm/common/utility/String.hpp>
 #include <opm/common/utility/OpmInputError.hpp>
 
+#include <opm/io/eclipse/rst/state.hpp>
+
 #include <opm/parser/eclipse/Python/Python.hpp>
 #include <opm/parser/eclipse/Deck/DeckItem.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
@@ -99,6 +101,24 @@ namespace {
     }
 }
 
+    ScheduleStatic::ScheduleStatic(std::shared_ptr<const Python> python_handle,
+                                   const std::pair<std::time_t, std::size_t>& restart_info,
+                                   const Deck& deck,
+                                   const Runspec& runspec,
+                                   const std::optional<int>& output_interval_,
+                                   const ParseContext& parseContext,
+                                   ErrorGuard& errors) :
+        m_python_handle(python_handle),
+        m_input_path(deck.getInputPath()),
+        m_restart_info(restart_info),
+        m_deck_message_limits( deck ),
+        m_unit_system( deck.getActiveUnitSystem() ),
+        m_runspec( runspec ),
+        rst_config( SOLUTIONSection(deck), parseContext, errors ),
+        output_interval(output_interval_)
+    {
+    }
+
     Schedule::Schedule( const Deck& deck,
                         const EclipseGrid& grid,
                         const FieldPropsManager& fp,
diff --git a/tests/msim/test_msim.cpp b/tests/msim/test_msim.cpp
index 68a9f9b8f..c8e4cedac 100644
--- a/tests/msim/test_msim.cpp
+++ b/tests/msim/test_msim.cpp
@@ -31,6 +31,7 @@
 #include <opm/io/eclipse/ERst.hpp>
 #include <opm/io/eclipse/ESmry.hpp>
 #include <opm/io/eclipse/ERsm.hpp>
+#include <opm/io/eclipse/rst/state.hpp>
 
 #include <opm/output/data/Wells.hpp>
 #include <opm/output/eclipse/EclipseIO.hpp>
diff --git a/tests/parser/MultisegmentWellTests.cpp b/tests/parser/MultisegmentWellTests.cpp
index 5f434dd1d..5d6ad5912 100644
--- a/tests/parser/MultisegmentWellTests.cpp
+++ b/tests/parser/MultisegmentWellTests.cpp
@@ -29,6 +29,7 @@
 #include <string>
 
 #include <opm/common/utility/OpmInputError.hpp>
+#include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Deck/DeckItem.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
diff --git a/tests/parser/NetworkTests.cpp b/tests/parser/NetworkTests.cpp
index 466ab3a58..d31e9e93e 100644
--- a/tests/parser/NetworkTests.cpp
+++ b/tests/parser/NetworkTests.cpp
@@ -23,6 +23,7 @@
 
 #include <algorithm>
 
+#include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Network/Node.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Network/Branch.hpp>
diff --git a/tests/parser/ScheduleTests.cpp b/tests/parser/ScheduleTests.cpp
index a60e71d99..b5c782d8b 100644
--- a/tests/parser/ScheduleTests.cpp
+++ b/tests/parser/ScheduleTests.cpp
@@ -27,9 +27,13 @@
 
 #include <boost/test/unit_test.hpp>
 
+#include <opm/common/utility/ActiveGridCells.hpp>
 #include <opm/common/utility/TimeService.hpp>
 #include <opm/common/utility/OpmInputError.hpp>
 
+#include <opm/io/eclipse/ERst.hpp>
+#include <opm/io/eclipse/rst/state.hpp>
+
 #include <opm/parser/eclipse/Python/Python.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
diff --git a/tests/parser/integration/ParseKEYWORD.cpp b/tests/parser/integration/ParseKEYWORD.cpp
index dc21fee02..6b82978d9 100644
--- a/tests/parser/integration/ParseKEYWORD.cpp
+++ b/tests/parser/integration/ParseKEYWORD.cpp
@@ -21,11 +21,13 @@
 #include <boost/test/unit_test.hpp>
 
 #include <opm/common/utility/OpmInputError.hpp>
+#include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Python/Python.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
 #include <opm/parser/eclipse/EclipseState/Runspec.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/SgofTable.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/SlgofTable.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/SwofTable.hpp>
diff --git a/tests/test_restartwellinfo.cpp b/tests/test_restartwellinfo.cpp
index af0a0f7f4..64308b69c 100644
--- a/tests/test_restartwellinfo.cpp
+++ b/tests/test_restartwellinfo.cpp
@@ -24,9 +24,11 @@
 #include <boost/test/unit_test.hpp>
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>
 
+#include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/output/eclipse/EclipseIO.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
 #include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp>