diff --git a/opm/output/eclipse/EclipseIO.hpp b/opm/output/eclipse/EclipseIO.hpp
index 7767d07be..e43974288 100644
--- a/opm/output/eclipse/EclipseIO.hpp
+++ b/opm/output/eclipse/EclipseIO.hpp
@@ -33,7 +33,6 @@
 #include <opm/output/data/Cells.hpp>
 #include <opm/output/data/Solution.hpp>
 #include <opm/output/data/Wells.hpp>
-#include <opm/output/eclipse/RestartValue.hpp>
 
 namespace Opm { namespace out {
     class Summary;
@@ -42,6 +41,8 @@ namespace Opm { namespace out {
 namespace Opm {
 
 class EclipseState;
+class RestartKey;
+class RestartValue;
 class Schedule;
 class SummaryConfig;
 class SummaryState;
diff --git a/opm/output/eclipse/RestartIO.hpp b/opm/output/eclipse/RestartIO.hpp
index d6d16c640..08ca8568a 100644
--- a/opm/output/eclipse/RestartIO.hpp
+++ b/opm/output/eclipse/RestartIO.hpp
@@ -24,8 +24,6 @@
 #ifndef RESTART_IO_HPP
 #define RESTART_IO_HPP
 
-#include <opm/output/eclipse/RestartValue.hpp>
-
 #include <opm/output/eclipse/AggregateAquiferData.hpp>
 
 #include <optional>
@@ -37,6 +35,8 @@ namespace Opm {
 
     class EclipseGrid;
     class EclipseState;
+    class RestartKey;
+    class RestartValue;
     class Schedule;
     class UDQState;
     class SummaryState;
diff --git a/src/opm/output/eclipse/EclipseIO.cpp b/src/opm/output/eclipse/EclipseIO.cpp
index 86bea2e5d..f82f496b5 100644
--- a/src/opm/output/eclipse/EclipseIO.cpp
+++ b/src/opm/output/eclipse/EclipseIO.cpp
@@ -41,6 +41,7 @@
 
 #include <opm/output/eclipse/AggregateAquiferData.hpp>
 #include <opm/output/eclipse/RestartIO.hpp>
+#include <opm/output/eclipse/RestartValue.hpp>
 #include <opm/output/eclipse/Summary.hpp>
 #include <opm/output/eclipse/WriteInit.hpp>
 #include <opm/output/eclipse/WriteRFT.hpp>
diff --git a/src/opm/output/eclipse/RestartIO.cpp b/src/opm/output/eclipse/RestartIO.cpp
index e7adf6e6e..d3e6ab2c0 100644
--- a/src/opm/output/eclipse/RestartIO.cpp
+++ b/src/opm/output/eclipse/RestartIO.cpp
@@ -33,6 +33,7 @@
 #include <opm/output/eclipse/AggregateMSWData.hpp>
 #include <opm/output/eclipse/AggregateUDQData.hpp>
 #include <opm/output/eclipse/AggregateActionxData.hpp>
+#include <opm/output/eclipse/RestartValue.hpp>
 #include <opm/input/eclipse/EclipseState/TracerConfig.hpp>
 
 #include <opm/output/eclipse/WriteRestartHelpers.hpp>
diff --git a/tests/test_EclipseIO.cpp b/tests/test_EclipseIO.cpp
index 7106cf849..1c1652e60 100644
--- a/tests/test_EclipseIO.cpp
+++ b/tests/test_EclipseIO.cpp
@@ -22,6 +22,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <opm/output/eclipse/EclipseIO.hpp>
+#include <opm/output/eclipse/RestartValue.hpp>
 #include <opm/output/data/Cells.hpp>
 
 #include <opm/input/eclipse/Python/Python.hpp>
diff --git a/tests/test_RFT.cpp b/tests/test_RFT.cpp
index 4ee90e7bd..a7cfa78ac 100644
--- a/tests/test_RFT.cpp
+++ b/tests/test_RFT.cpp
@@ -30,6 +30,7 @@
 #include <opm/output/data/Wells.hpp>
 #include <opm/output/eclipse/EclipseIO.hpp>
 #include <opm/output/eclipse/InteHEAD.hpp>
+#include <opm/output/eclipse/RestartValue.hpp>
 #include <opm/output/eclipse/WriteRFT.hpp>
 
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
diff --git a/tests/test_restartwellinfo.cpp b/tests/test_restartwellinfo.cpp
index 8a735631c..a6ee566bc 100644
--- a/tests/test_restartwellinfo.cpp
+++ b/tests/test_restartwellinfo.cpp
@@ -26,6 +26,7 @@
 
 #include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/output/eclipse/EclipseIO.hpp>
+#include <opm/output/eclipse/RestartValue.hpp>
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/input/eclipse/Schedule/Schedule.hpp>