diff --git a/flowexperimental/comp/EmptyModel.hpp b/flowexperimental/comp/EmptyModel.hpp
index 61729b0f0..25145ed9c 100644
--- a/flowexperimental/comp/EmptyModel.hpp
+++ b/flowexperimental/comp/EmptyModel.hpp
@@ -22,6 +22,7 @@
 // it is use for the development when some facility class are not ready
 
 #include <opm/output/data/Aquifer.hpp>
+#include <opm/output/data/Groups.hpp>
 #include <opm/output/data/Wells.hpp>
 
 #include <opm/models/discretization/common/baseauxiliarymodule.hh>
diff --git a/opm/simulators/linalg/fixpointcriterion.hh b/opm/simulators/linalg/fixpointcriterion.hh
index 110afa4db..901f0363a 100644
--- a/opm/simulators/linalg/fixpointcriterion.hh
+++ b/opm/simulators/linalg/fixpointcriterion.hh
@@ -29,8 +29,6 @@
 
 #include "convergencecriterion.hh"
 
-#include <opm/material/common/Unused.hpp>
-
 namespace Opm {
 namespace Linear {
 
diff --git a/opm/simulators/linalg/gpubridge/opencl/openclCPR.hpp b/opm/simulators/linalg/gpubridge/opencl/openclCPR.hpp
index 663f3d43f..ee9b12b6c 100644
--- a/opm/simulators/linalg/gpubridge/opencl/openclCPR.hpp
+++ b/opm/simulators/linalg/gpubridge/opencl/openclCPR.hpp
@@ -32,8 +32,6 @@
 
 #include <opm/simulators/linalg/gpubridge/opencl/openclSolverBackend.hpp>
 
-#include <type_traits>
-
 namespace Opm::Accelerator {
 
 template<class Scalar> class BlockedMatrix;
diff --git a/opm/simulators/linalg/linearsolverreport.hh b/opm/simulators/linalg/linearsolverreport.hh
index 1d7f34a54..a2c1e8acd 100644
--- a/opm/simulators/linalg/linearsolverreport.hh
+++ b/opm/simulators/linalg/linearsolverreport.hh
@@ -27,8 +27,6 @@
 #ifndef EWOMS_LINEAR_SOLVER_REPORT_HH
 #define EWOMS_LINEAR_SOLVER_REPORT_HH
 
-#include "convergencecriterion.hh"
-
 #include <opm/models/utils/timer.hpp>
 #include <opm/models/utils/timerguard.hh>
 
diff --git a/opm/simulators/wells/MultisegmentWellGeneric.hpp b/opm/simulators/wells/MultisegmentWellGeneric.hpp
index d594ec6e8..49065ceef 100644
--- a/opm/simulators/wells/MultisegmentWellGeneric.hpp
+++ b/opm/simulators/wells/MultisegmentWellGeneric.hpp
@@ -22,10 +22,7 @@
 #ifndef OPM_MULTISEGMENTWELL_GENERIC_HEADER_INCLUDED
 #define OPM_MULTISEGMENTWELL_GENERIC_HEADER_INCLUDED
 
-#include <functional>
-#include <optional>
 #include <vector>
-#include <array>
 
 namespace Opm
 {