diff --git a/opm/output/eclipse/WindowedArray.hpp b/opm/output/eclipse/WindowedArray.hpp
index 7db65dcf0..64dbaa5a9 100644
--- a/opm/output/eclipse/WindowedArray.hpp
+++ b/opm/output/eclipse/WindowedArray.hpp
@@ -21,7 +21,9 @@
 #define OPM_WINDOWED_ARRAY_HPP
 
 #include <cassert>
+#include <exception>
 #include <iterator>
+#include <stdexcept>
 #include <type_traits>
 #include <vector>
 
diff --git a/src/opm/output/eclipse/AggregateConnectionData.cpp b/src/opm/output/eclipse/AggregateConnectionData.cpp
index fd82da90b..0421cb97e 100755
--- a/src/opm/output/eclipse/AggregateConnectionData.cpp
+++ b/src/opm/output/eclipse/AggregateConnectionData.cpp
@@ -31,9 +31,11 @@
 #include <opm/parser/eclipse/Units/UnitSystem.hpp>
 
 #include <cassert>
-#include <cstddef>
-#include <iostream>
 #include <cmath>
+#include <cstddef>
+#include <exception>
+#include <iostream>
+#include <stdexcept>
 
 namespace VI = Opm::RestartIO::Helpers::VectorItems;
 
diff --git a/src/opm/output/eclipse/AggregateGroupData.cpp b/src/opm/output/eclipse/AggregateGroupData.cpp
index 58f9730cd..6e075e3fd 100644
--- a/src/opm/output/eclipse/AggregateGroupData.cpp
+++ b/src/opm/output/eclipse/AggregateGroupData.cpp
@@ -30,8 +30,10 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
-#include <string>
+#include <exception>
 #include <iostream>
+#include <string>
+#include <stdexcept>
 
 // #####################################################################
 // Class Opm::RestartIO::Helpers::AggregateGroupData
diff --git a/src/opm/output/eclipse/AggregateMSWData.cpp b/src/opm/output/eclipse/AggregateMSWData.cpp
index b8b33dc56..a344c32b8 100644
--- a/src/opm/output/eclipse/AggregateMSWData.cpp
+++ b/src/opm/output/eclipse/AggregateMSWData.cpp
@@ -33,9 +33,11 @@
 #include <cmath>
 #include <cstddef>
 #include <cstring>
-#include <string>
+#include <exception>
 #include <iostream>
 #include <limits>
+#include <stdexcept>
+#include <string>
 
 // #####################################################################
 // Class Opm::RestartIO::Helpers::AggregateMSWData
diff --git a/src/opm/output/eclipse/AggregateWellData.cpp b/src/opm/output/eclipse/AggregateWellData.cpp
index 47dca396f..210c4a501 100644
--- a/src/opm/output/eclipse/AggregateWellData.cpp
+++ b/src/opm/output/eclipse/AggregateWellData.cpp
@@ -37,11 +37,11 @@
 #include <cassert>
 #include <cstddef>
 #include <cstring>
+#include <exception>
 #include <iterator>
+#include <stdexcept>
 #include <string>
 
-
-
 namespace VI = Opm::RestartIO::Helpers::VectorItems;
 
 // #####################################################################