From 068bff1ebc98a86fb8bf5d338ed13533cd4d3f94 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Tue, 26 Jul 2022 17:15:11 +0200
Subject: [PATCH] clean up stream includes

---
 examples/wellgraph.cpp                            | 1 +
 opm/common/OpmLog/StreamLog.hpp                   | 1 -
 opm/common/utility/numeric/UniformTableLinear.hpp | 2 +-
 opm/input/eclipse/Deck/Deck.hpp                   | 2 +-
 opm/input/eclipse/Deck/DeckItem.hpp               | 2 +-
 opm/input/eclipse/Deck/DeckOutput.hpp             | 2 +-
 opm/input/eclipse/Deck/DeckRecord.hpp             | 2 +-
 opm/input/eclipse/Deck/FileDeck.hpp               | 2 +-
 opm/input/eclipse/Schedule/ScheduleDeck.hpp       | 2 +-
 opm/io/eclipse/EGrid.hpp                          | 3 ---
 opm/io/eclipse/ESmry.hpp                          | 2 +-
 opm/io/eclipse/EclOutput.hpp                      | 1 -
 opm/io/eclipse/ExtESmry.hpp                       | 1 -
 opm/output/eclipse/EclipseIOUtil.hpp              | 2 --
 opm/output/eclipse/WriteRPT.hpp                   | 2 +-
 opm/utility/EModel.hpp                            | 2 --
 src/opm/input/eclipse/Deck/FileDeck.cpp           | 2 ++
 src/opm/input/eclipse/Parser/ParserRecord.cpp     | 2 ++
 src/opm/io/eclipse/EGrid.cpp                      | 1 +
 src/opm/output/eclipse/WriteRPT.cpp               | 1 +
 test_util/EclRegressionTest.cpp                   | 1 +
 tests/test_EclipseIO.cpp                          | 1 +
 22 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/examples/wellgraph.cpp b/examples/wellgraph.cpp
index 4798bc416..63b99c6f4 100644
--- a/examples/wellgraph.cpp
+++ b/examples/wellgraph.cpp
@@ -20,6 +20,7 @@
 #include <filesystem>
 #include <fstream>
 #include <iomanip>
+#include <iostream>
 #include <chrono>
 #include <sstream>
 
diff --git a/opm/common/OpmLog/StreamLog.hpp b/opm/common/OpmLog/StreamLog.hpp
index fe50d3494..63c5405a7 100644
--- a/opm/common/OpmLog/StreamLog.hpp
+++ b/opm/common/OpmLog/StreamLog.hpp
@@ -21,7 +21,6 @@
 #define STREAMLOG_H
 
 #include <fstream>
-#include <iostream>
 #include <cstdint>
 
 #include <opm/common/OpmLog/LogBackend.hpp>
diff --git a/opm/common/utility/numeric/UniformTableLinear.hpp b/opm/common/utility/numeric/UniformTableLinear.hpp
index dc7f75e2a..c17dae98f 100644
--- a/opm/common/utility/numeric/UniformTableLinear.hpp
+++ b/opm/common/utility/numeric/UniformTableLinear.hpp
@@ -24,7 +24,7 @@
 #include <exception>
 #include <vector>
 #include <utility>
-#include <iostream>
+#include <ostream>
 
 #include <opm/common/ErrorMacros.hpp>
 
diff --git a/opm/input/eclipse/Deck/Deck.hpp b/opm/input/eclipse/Deck/Deck.hpp
index a71b75a86..f438d361f 100644
--- a/opm/input/eclipse/Deck/Deck.hpp
+++ b/opm/input/eclipse/Deck/Deck.hpp
@@ -21,9 +21,9 @@
 #define DECK_HPP
 
 #include <functional>
+#include <iosfwd>
 #include <map>
 #include <memory>
-#include <ostream>
 #include <optional>
 #include <vector>
 #include <string>
diff --git a/opm/input/eclipse/Deck/DeckItem.hpp b/opm/input/eclipse/Deck/DeckItem.hpp
index fb78e4ecf..a1c186b35 100644
--- a/opm/input/eclipse/Deck/DeckItem.hpp
+++ b/opm/input/eclipse/Deck/DeckItem.hpp
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include <ostream>
+#include <iosfwd>
 
 #include <opm/input/eclipse/Units/Dimension.hpp>
 #include <opm/input/eclipse/Utility/Typetools.hpp>
diff --git a/opm/input/eclipse/Deck/DeckOutput.hpp b/opm/input/eclipse/Deck/DeckOutput.hpp
index 4704450fa..67474bab7 100644
--- a/opm/input/eclipse/Deck/DeckOutput.hpp
+++ b/opm/input/eclipse/Deck/DeckOutput.hpp
@@ -20,7 +20,7 @@
 #ifndef DECK_OUTPUT_HPP
 #define DECK_OUTPUT_HPP
 
-#include <ostream>
+#include <iosfwd>
 #include <string>
 #include <cstddef>
 
diff --git a/opm/input/eclipse/Deck/DeckRecord.hpp b/opm/input/eclipse/Deck/DeckRecord.hpp
index 58abcc57f..184c85807 100644
--- a/opm/input/eclipse/Deck/DeckRecord.hpp
+++ b/opm/input/eclipse/Deck/DeckRecord.hpp
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include <ostream>
+#include <iosfwd>
 
 #include <opm/input/eclipse/Deck/DeckItem.hpp>
 
diff --git a/opm/input/eclipse/Deck/FileDeck.hpp b/opm/input/eclipse/Deck/FileDeck.hpp
index a3a960864..05835fb6e 100644
--- a/opm/input/eclipse/Deck/FileDeck.hpp
+++ b/opm/input/eclipse/Deck/FileDeck.hpp
@@ -25,7 +25,7 @@
 #include <unordered_set>
 #include <filesystem>
 #include <fstream>
-#include <iostream>
+#include <iosfwd>
 #include <fmt/format.h>
 
 #include <opm/input/eclipse/Deck/DeckKeyword.hpp>
diff --git a/opm/input/eclipse/Schedule/ScheduleDeck.hpp b/opm/input/eclipse/Schedule/ScheduleDeck.hpp
index f0322bc36..e4b9274c9 100644
--- a/opm/input/eclipse/Schedule/ScheduleDeck.hpp
+++ b/opm/input/eclipse/Schedule/ScheduleDeck.hpp
@@ -22,7 +22,7 @@
 #include <chrono>
 #include <cstddef>
 #include <optional>
-#include <ostream>
+#include <iosfwd>
 #include <vector>
 
 #include <opm/common/OpmLog/KeywordLocation.hpp>
diff --git a/opm/io/eclipse/EGrid.hpp b/opm/io/eclipse/EGrid.hpp
index ed93d362c..c340c62df 100644
--- a/opm/io/eclipse/EGrid.hpp
+++ b/opm/io/eclipse/EGrid.hpp
@@ -23,11 +23,8 @@
 
 #include <array>
 #include <filesystem>
-#include <iostream>
 #include <string>
-#include <fstream>
 #include <vector>
-#include <ctime>
 #include <map>
 
 namespace Opm { namespace EclIO {
diff --git a/opm/io/eclipse/ESmry.hpp b/opm/io/eclipse/ESmry.hpp
index c97826098..c45a68209 100644
--- a/opm/io/eclipse/ESmry.hpp
+++ b/opm/io/eclipse/ESmry.hpp
@@ -21,7 +21,7 @@
 
 #include <chrono>
 #include <filesystem>
-#include <ostream>
+#include <iosfwd>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/opm/io/eclipse/EclOutput.hpp b/opm/io/eclipse/EclOutput.hpp
index a20c4d0dd..988dda725 100644
--- a/opm/io/eclipse/EclOutput.hpp
+++ b/opm/io/eclipse/EclOutput.hpp
@@ -26,7 +26,6 @@
 
 #include <opm/io/eclipse/EclIOdata.hpp>
 #include <opm/io/eclipse/PaddedOutputString.hpp>
-#include <iostream>
 
 namespace Opm { namespace EclIO { namespace OutputStream {
     class Restart;
diff --git a/opm/io/eclipse/ExtESmry.hpp b/opm/io/eclipse/ExtESmry.hpp
index c0e6a0d7d..c03223c14 100644
--- a/opm/io/eclipse/ExtESmry.hpp
+++ b/opm/io/eclipse/ExtESmry.hpp
@@ -21,7 +21,6 @@
 
 #include <chrono>
 #include <filesystem>
-#include <ostream>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/opm/output/eclipse/EclipseIOUtil.hpp b/opm/output/eclipse/EclipseIOUtil.hpp
index 8f07d159b..5572a297a 100644
--- a/opm/output/eclipse/EclipseIOUtil.hpp
+++ b/opm/output/eclipse/EclipseIOUtil.hpp
@@ -2,8 +2,6 @@
 #define ECLIPSE_IO_UTIL_HPP
 
 #include <vector>
-#include <string>
-#include <iostream>
 
 
 namespace Opm
diff --git a/opm/output/eclipse/WriteRPT.hpp b/opm/output/eclipse/WriteRPT.hpp
index d98913342..8f62f70c4 100644
--- a/opm/output/eclipse/WriteRPT.hpp
+++ b/opm/output/eclipse/WriteRPT.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_WRITE_RPT_HPP
 #define OPM_WRITE_RPT_HPP
 
-#include <ostream>
+#include <iosfwd>
 
 namespace Opm {
 
diff --git a/opm/utility/EModel.hpp b/opm/utility/EModel.hpp
index 222cc7ac2..5184a5eda 100644
--- a/opm/utility/EModel.hpp
+++ b/opm/utility/EModel.hpp
@@ -25,9 +25,7 @@
 
 #include <opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 
-#include <iostream>
 #include <string>
-#include <fstream>
 #include <vector>
 #include <ctime>
 #include <map>
diff --git a/src/opm/input/eclipse/Deck/FileDeck.cpp b/src/opm/input/eclipse/Deck/FileDeck.cpp
index 61d2dc489..0df0d80a7 100644
--- a/src/opm/input/eclipse/Deck/FileDeck.cpp
+++ b/src/opm/input/eclipse/Deck/FileDeck.cpp
@@ -27,6 +27,8 @@
 #include <opm/input/eclipse/Parser/ParserKeywords/S.hpp>
 #include <opm/input/eclipse/Parser/ParserKeywords/T.hpp>
 
+#include <iostream>
+
 namespace fs = std::filesystem;
 
 namespace Opm {
diff --git a/src/opm/input/eclipse/Parser/ParserRecord.cpp b/src/opm/input/eclipse/Parser/ParserRecord.cpp
index 2f37b2c75..640cfdb3b 100644
--- a/src/opm/input/eclipse/Parser/ParserRecord.cpp
+++ b/src/opm/input/eclipse/Parser/ParserRecord.cpp
@@ -30,6 +30,8 @@
 
 #include "raw/RawRecord.hpp"
 
+#include <ostream>
+
 namespace Opm {
 
 namespace {
diff --git a/src/opm/io/eclipse/EGrid.cpp b/src/opm/io/eclipse/EGrid.cpp
index 16cd2f60a..eb4b995c9 100644
--- a/src/opm/io/eclipse/EGrid.cpp
+++ b/src/opm/io/eclipse/EGrid.cpp
@@ -25,6 +25,7 @@
 #include <algorithm>
 #include <cstring>
 #include <filesystem>
+#include <fstream>
 #include <iterator>
 #include <iomanip>
 #include <numeric>
diff --git a/src/opm/output/eclipse/WriteRPT.cpp b/src/opm/output/eclipse/WriteRPT.cpp
index d568d7407..ec505e459 100644
--- a/src/opm/output/eclipse/WriteRPT.cpp
+++ b/src/opm/output/eclipse/WriteRPT.cpp
@@ -20,6 +20,7 @@
 #include <opm/output/eclipse/WriteRPT.hpp>
 
 #include <functional>
+#include <string>
 #include <unordered_map>
 
 namespace Opm::RptIO {
diff --git a/test_util/EclRegressionTest.cpp b/test_util/EclRegressionTest.cpp
index 3b4fdb1f6..18f8fb034 100644
--- a/test_util/EclRegressionTest.cpp
+++ b/test_util/EclRegressionTest.cpp
@@ -37,6 +37,7 @@
 #include <chrono>
 #include <cmath>
 #include <filesystem>
+#include <fstream>
 #include <iomanip>
 #include <iostream>
 #include <set>
diff --git a/tests/test_EclipseIO.cpp b/tests/test_EclipseIO.cpp
index 949b3fc48..b161005b2 100644
--- a/tests/test_EclipseIO.cpp
+++ b/tests/test_EclipseIO.cpp
@@ -46,6 +46,7 @@
 #include <opm/common/utility/TimeService.hpp>
 
 #include <algorithm>
+#include <fstream>
 #include <map>
 #include <numeric>
 #include <string>