diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp
index c6538caaf..7d47f28af 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp
@@ -29,8 +29,6 @@
 #include <vector>
 #include <optional>
 
-#include <opm/parser/eclipse/Parser/ParseContext.hpp>
-
 namespace Opm {
 
 namespace RestartIO {
diff --git a/src/opm/output/eclipse/EclipseIO.cpp b/src/opm/output/eclipse/EclipseIO.cpp
index 77c86dc05..9749a366c 100644
--- a/src/opm/output/eclipse/EclipseIO.cpp
+++ b/src/opm/output/eclipse/EclipseIO.cpp
@@ -24,6 +24,8 @@
 
 #include <opm/output/eclipse/EclipseIO.hpp>
 
+#include <opm/common/OpmLog/OpmLog.hpp>
+
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp
index ea9bb7931..2c70cffce 100644
--- a/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp
+++ b/src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp
@@ -24,6 +24,7 @@
 #include <fmt/format.h>
 
 #include <opm/parser/eclipse/Parser/ParserKeywords/C.hpp>
+#include <opm/parser/eclipse/Parser/ParseContext.hpp>
 
 #include <opm/parser/eclipse/Deck/DeckItem.hpp>
 #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp
index 64ad50aa3..b6f9f3fc4 100644
--- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp
+++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp
@@ -21,6 +21,7 @@
 #include <string>
 #include <vector>
 
+#include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/parser/eclipse/Deck/DeckItem.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 #include <opm/parser/eclipse/Deck/UDAValue.hpp>
diff --git a/tests/parser/integration/TransMultIntegrationTests.cpp b/tests/parser/integration/TransMultIntegrationTests.cpp
index 2758ab848..281df3bb9 100644
--- a/tests/parser/integration/TransMultIntegrationTests.cpp
+++ b/tests/parser/integration/TransMultIntegrationTests.cpp
@@ -21,6 +21,7 @@
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
+#include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 #include <opm/parser/eclipse/Python/Python.hpp>
diff --git a/tests/test_ActiveGridCells.cpp b/tests/test_ActiveGridCells.cpp
index dd2430d6e..74972fbed 100644
--- a/tests/test_ActiveGridCells.cpp
+++ b/tests/test_ActiveGridCells.cpp
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#include <set>
+
 #define BOOST_TEST_MODULE ActiveGridCells
 #include <boost/test/unit_test.hpp>