diff --git a/ebos/eclbasevanguard.hh b/ebos/eclbasevanguard.hh
index 691b18383..36c1b7706 100644
--- a/ebos/eclbasevanguard.hh
+++ b/ebos/eclbasevanguard.hh
@@ -46,7 +46,6 @@
 
 #include <array>
 #include <cstddef>
-#include <optional>
 #include <unordered_map>
 #include <vector>
 
diff --git a/opm/simulators/linalg/ISTLSolverEbosBda.hpp b/opm/simulators/linalg/ISTLSolverEbosBda.hpp
index 9551ed11e..11e35367c 100644
--- a/opm/simulators/linalg/ISTLSolverEbosBda.hpp
+++ b/opm/simulators/linalg/ISTLSolverEbosBda.hpp
@@ -25,6 +25,10 @@
 #include <opm/simulators/linalg/ISTLSolverEbos.hpp>
 
 #include <cstddef>
+#include <memory>
+#include <set>
+#include <string>
+#include <vector>
 
 namespace Opm {
 
diff --git a/tests/test_equil.cc b/tests/test_equil.cc
index 2917ca523..d7ef3e4e0 100644
--- a/tests/test_equil.cc
+++ b/tests/test_equil.cc
@@ -49,18 +49,13 @@
 #endif
 
 #include <array>
-#include <cmath>
 #include <cstdlib>
-#include <exception>
+#include <cstring>
 #include <iostream>
-#include <limits>
 #include <memory>
 #include <numeric>
-#include <sstream>
-#include <stdexcept>
 #include <string>
 #include <vector>
-#include <string.h>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/version.hpp>
diff --git a/tests/test_wellmodel.cpp b/tests/test_wellmodel.cpp
index 795588977..e53b0738e 100644
--- a/tests/test_wellmodel.cpp
+++ b/tests/test_wellmodel.cpp
@@ -23,8 +23,6 @@
 
 #define BOOST_TEST_MODULE WellModelTest
 
-#include <chrono>
-
 #include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <opm/common/utility/platform_dependent/reenable_warnings.h>