diff --git a/opm/simulators/aquifers/AquiferAnalytical.hpp b/opm/simulators/aquifers/AquiferAnalytical.hpp
index 5da227166..8ec079c99 100644
--- a/opm/simulators/aquifers/AquiferAnalytical.hpp
+++ b/opm/simulators/aquifers/AquiferAnalytical.hpp
@@ -23,7 +23,6 @@
 #define OPM_AQUIFERANALYTICAL_HEADER_INCLUDED
 
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/common/utility/numeric/linearInterpolation.hpp>
 
 #include <opm/input/eclipse/EclipseState/Aquifer/Aquancon.hpp>
 
@@ -46,7 +45,6 @@
 #include <limits>
 #include <numeric>
 #include <optional>
-#include <unordered_map>
 #include <vector>
 
 namespace Opm
diff --git a/opm/simulators/aquifers/AquiferCarterTracy.hpp b/opm/simulators/aquifers/AquiferCarterTracy.hpp
index 5464ddae4..e72b05b76 100644
--- a/opm/simulators/aquifers/AquiferCarterTracy.hpp
+++ b/opm/simulators/aquifers/AquiferCarterTracy.hpp
@@ -21,16 +21,18 @@
 #ifndef OPM_AQUIFERCT_HEADER_INCLUDED
 #define OPM_AQUIFERCT_HEADER_INCLUDED
 
-#include <opm/simulators/aquifers/AquiferAnalytical.hpp>
+#include <opm/common/utility/numeric/linearInterpolation.hpp>
 
 #include <opm/input/eclipse/EclipseState/Aquifer/AquiferCT.hpp>
 
 #include <opm/output/data/Aquifer.hpp>
 
-#include <exception>
-#include <memory>
+#include <opm/simulators/aquifers/AquiferAnalytical.hpp>
+
+#include <cstddef>
 #include <stdexcept>
 #include <utility>
+#include <vector>
 
 namespace Opm
 {
diff --git a/opm/simulators/aquifers/AquiferConstantFlux.hpp b/opm/simulators/aquifers/AquiferConstantFlux.hpp
index 90aa8acdd..08f666a3e 100644
--- a/opm/simulators/aquifers/AquiferConstantFlux.hpp
+++ b/opm/simulators/aquifers/AquiferConstantFlux.hpp
@@ -24,17 +24,12 @@
 
 #include <opm/input/eclipse/EclipseState/Aquifer/Aquancon.hpp>
 #include <opm/input/eclipse/EclipseState/Aquifer/AquiferFlux.hpp>
-#include <opm/input/eclipse/EclipseState/Grid/FaceDir.hpp>
-
-#include <opm/common/ErrorMacros.hpp>
 
 #include <opm/material/common/MathToolbox.hpp>
 #include <opm/material/densead/Evaluation.hpp>
 
-#include <algorithm>
 #include <cassert>
 #include <numeric>
-#include <stdexcept>
 #include <vector>
 
 namespace Opm {
diff --git a/opm/simulators/aquifers/AquiferFetkovich.hpp b/opm/simulators/aquifers/AquiferFetkovich.hpp
index a21a8c5b7..1e53e791d 100644
--- a/opm/simulators/aquifers/AquiferFetkovich.hpp
+++ b/opm/simulators/aquifers/AquiferFetkovich.hpp
@@ -27,9 +27,8 @@ along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <opm/output/data/Aquifer.hpp>
 
-#include <exception>
 #include <stdexcept>
-#include <utility>
+#include <vector>
 
 namespace Opm
 {
diff --git a/opm/simulators/aquifers/AquiferNumerical.hpp b/opm/simulators/aquifers/AquiferNumerical.hpp
index 7cca1176a..dde1d633d 100644
--- a/opm/simulators/aquifers/AquiferNumerical.hpp
+++ b/opm/simulators/aquifers/AquiferNumerical.hpp
@@ -34,8 +34,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
-#include <unordered_map>
-#include <utility>
 #include <vector>
 
 namespace Opm