diff --git a/examples/compute_eikonal_from_files.cpp b/examples/compute_eikonal_from_files.cpp
index 5574556a8..49346a5a7 100644
--- a/examples/compute_eikonal_from_files.cpp
+++ b/examples/compute_eikonal_from_files.cpp
@@ -34,6 +34,7 @@
 #include <memory>
 #include <algorithm>
 #include <iostream>
+#include <fstream>
 #include <vector>
 #include <numeric>
 #include <iterator>
diff --git a/opm/core/props/IncompPropertiesSinglePhase.cpp b/opm/core/props/IncompPropertiesSinglePhase.cpp
index a0a284bf4..4790f7f2f 100644
--- a/opm/core/props/IncompPropertiesSinglePhase.cpp
+++ b/opm/core/props/IncompPropertiesSinglePhase.cpp
@@ -24,7 +24,8 @@
 #include <opm/core/grid.h>
 #include <opm/core/utility/Units.hpp>
 #include <opm/common/ErrorMacros.hpp>
-// #include <iostream>
+
+#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 
 namespace Opm
 {
diff --git a/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp b/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
index 906b7b773..3ebe16fbb 100644
--- a/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
+++ b/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
@@ -24,6 +24,7 @@
 #include <opm/core/utility/Units.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 
 
 namespace Opm
diff --git a/opm/core/props/pvt/ThermalGasPvtWrapper.hpp b/opm/core/props/pvt/ThermalGasPvtWrapper.hpp
index d84d87508..7129cd146 100644
--- a/opm/core/props/pvt/ThermalGasPvtWrapper.hpp
+++ b/opm/core/props/pvt/ThermalGasPvtWrapper.hpp
@@ -23,6 +23,7 @@
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/EclipseState/Tables/GasvisctTable.hpp>
 
 #include <vector>
 
diff --git a/opm/core/props/pvt/ThermalOilPvtWrapper.hpp b/opm/core/props/pvt/ThermalOilPvtWrapper.hpp
index efb376222..3dee98d87 100644
--- a/opm/core/props/pvt/ThermalOilPvtWrapper.hpp
+++ b/opm/core/props/pvt/ThermalOilPvtWrapper.hpp
@@ -24,6 +24,7 @@
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp>
 
 #include <vector>
 
diff --git a/opm/core/props/pvt/ThermalWaterPvtWrapper.hpp b/opm/core/props/pvt/ThermalWaterPvtWrapper.hpp
index ffc9108b5..b19a4fd04 100644
--- a/opm/core/props/pvt/ThermalWaterPvtWrapper.hpp
+++ b/opm/core/props/pvt/ThermalWaterPvtWrapper.hpp
@@ -24,6 +24,7 @@
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp>
 
 #include <vector>
 
diff --git a/opm/core/props/rock/RockCompressibility.cpp b/opm/core/props/rock/RockCompressibility.cpp
index 8ee859d6d..2f38d5002 100644
--- a/opm/core/props/rock/RockCompressibility.cpp
+++ b/opm/core/props/rock/RockCompressibility.cpp
@@ -24,6 +24,8 @@
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/linearInterpolation.hpp>
 
+#include <opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp>
+#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
 
 #include <iostream>
 
diff --git a/opm/core/props/satfunc/RelpermDiagnostics.cpp b/opm/core/props/satfunc/RelpermDiagnostics.cpp
index 073bd7bc8..521ce7f72 100644
--- a/opm/core/props/satfunc/RelpermDiagnostics.cpp
+++ b/opm/core/props/satfunc/RelpermDiagnostics.cpp
@@ -19,6 +19,8 @@
 
 #include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
 #include <opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp>
+#include <opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp>
+#include <opm/parser/eclipse/EclipseState/Tables/SgwfnTable.hpp>
 
 namespace Opm{
 
diff --git a/opm/core/props/satfunc/RelpermDiagnostics.hpp b/opm/core/props/satfunc/RelpermDiagnostics.hpp
index e0975a5ba..25b0b89e2 100644
--- a/opm/core/props/satfunc/RelpermDiagnostics.hpp
+++ b/opm/core/props/satfunc/RelpermDiagnostics.hpp
@@ -40,6 +40,9 @@
 
 namespace Opm {
 
+    class Sof2Table;
+    class SgwfnTable;
+
     ///This class is intend to be a relpmer diganostics, to detect
     ///wrong input of relperm table and endpoints.
     class RelpermDiagnostics 
diff --git a/opm/core/simulator/initStateEquil.hpp b/opm/core/simulator/initStateEquil.hpp
index e439d0805..0a0c2f6ef 100644
--- a/opm/core/simulator/initStateEquil.hpp
+++ b/opm/core/simulator/initStateEquil.hpp
@@ -31,6 +31,9 @@
 #include <opm/core/utility/Units.hpp>
 #include <opm/parser/eclipse/Utility/EquilWrapper.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
+#include <opm/parser/eclipse/EclipseState/Tables/RsvdTable.hpp>
+#include <opm/parser/eclipse/EclipseState/Tables/RvvdTable.hpp>
 
 #include <array>
 #include <cassert>
diff --git a/opm/core/wells/WellsManager.hpp b/opm/core/wells/WellsManager.hpp
index 02aacc1ba..f098f797b 100644
--- a/opm/core/wells/WellsManager.hpp
+++ b/opm/core/wells/WellsManager.hpp
@@ -35,6 +35,9 @@ struct UnstructuredGrid;
 
 namespace Opm
 {
+
+    class Schedule;
+
     struct WellData
     {
         WellType type;
@@ -175,7 +178,7 @@ namespace Opm
                                    const NTG& ntg,
                                    std::vector<int>& wells_on_proc);
 
-        void addChildGroups(GroupTreeNodeConstPtr parentNode, ScheduleConstPtr schedule, size_t timeStep, const PhaseUsage& phaseUsage);
+        void addChildGroups(GroupTreeNodeConstPtr parentNode, std::shared_ptr< const Schedule > schedule, size_t timeStep, const PhaseUsage& phaseUsage);
         void setupGuideRates(std::vector<WellConstPtr>& wells, const size_t timeStep, std::vector<WellData>& well_data, std::map<std::string, int>& well_names_to_index);
 
 
diff --git a/opm/core/wells/WellsManager_impl.hpp b/opm/core/wells/WellsManager_impl.hpp
index a9e9b907f..a411c593e 100644
--- a/opm/core/wells/WellsManager_impl.hpp
+++ b/opm/core/wells/WellsManager_impl.hpp
@@ -3,6 +3,8 @@
 
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/core/utility/compressedToCartesian.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/CompletionSet.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 
 #include <algorithm>
 #include <array>
@@ -141,7 +143,7 @@ void WellsManager::createWellsFromSpecs(std::vector<WellConstPtr>& wells, size_t
         }
 
         {   // COMPDAT handling
-            CompletionSetConstPtr completionSet = well->getCompletions(timeStep);
+            auto completionSet = well->getCompletions(timeStep);
             // shut completions and open ones stored in this process will have 1 others 0.
             std::vector<std::size_t> completion_on_proc(completionSet->size(), 1);
             std::size_t shut_completions_number = 0;
@@ -372,7 +374,7 @@ WellsManager::init(const Opm::EclipseStateConstPtr eclipseState,
     // For easy lookup:
     std::map<std::string, int> well_names_to_index;
 
-    ScheduleConstPtr          schedule = eclipseState->getSchedule();
+    auto schedule = eclipseState->getSchedule();
     std::vector<WellConstPtr> wells    = schedule->getWells(timeStep);
     std::vector<int>          wells_on_proc;
 
diff --git a/tests/test_norne_pvt.cpp b/tests/test_norne_pvt.cpp
index 3bc92bddf..39a9c868a 100644
--- a/tests/test_norne_pvt.cpp
+++ b/tests/test_norne_pvt.cpp
@@ -37,6 +37,7 @@
 #include <opm/parser/eclipse/Parser/ParseMode.hpp>
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
+#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
 
 #include <opm/core/props/pvt/PvtLiveOil.hpp>
 
diff --git a/tests/test_pinchprocessor.cpp b/tests/test_pinchprocessor.cpp
index 64deaabfb..96163299e 100644
--- a/tests/test_pinchprocessor.cpp
+++ b/tests/test_pinchprocessor.cpp
@@ -40,6 +40,7 @@
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
+#include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
 #include <opm/core/pressure/tpfa/TransTpfa.hpp>
 #include <opm/core/grid/PinchProcessor.hpp>
 #include <opm/core/props/rock/RockFromDeck.hpp>
diff --git a/tests/test_wellcollection.cpp b/tests/test_wellcollection.cpp
index d94d19b1f..76697655d 100644
--- a/tests/test_wellcollection.cpp
+++ b/tests/test_wellcollection.cpp
@@ -33,8 +33,9 @@
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Group.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/GroupTreeNode.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/GroupTree.hpp>
 
 using namespace Opm;
 
diff --git a/tests/test_wellsgroup.cpp b/tests/test_wellsgroup.cpp
index ece1a5356..deb7c632b 100644
--- a/tests/test_wellsgroup.cpp
+++ b/tests/test_wellsgroup.cpp
@@ -39,8 +39,9 @@
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseMode.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Group.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/GroupTreeNode.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/GroupTree.hpp>
 
+#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>