From 36142f588c591b5f9b8ba9d051fbb940b2f3a8ee Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Thu, 5 Sep 2024 08:33:41 +0200
Subject: [PATCH] ParameterSystem: cleanup includes

---
 .../discretization/common/fvbaseproblem.hh     |  1 +
 opm/models/utils/parametersystem.cpp           | 11 +++++++++++
 opm/models/utils/parametersystem.hpp           | 18 +-----------------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/opm/models/discretization/common/fvbaseproblem.hh b/opm/models/discretization/common/fvbaseproblem.hh
index 98ab65703..d11f6a3bb 100644
--- a/opm/models/discretization/common/fvbaseproblem.hh
+++ b/opm/models/discretization/common/fvbaseproblem.hh
@@ -43,6 +43,7 @@
 #include <string>
 
 #include <sys/stat.h>
+#include <unistd.h>
 
 namespace Opm::Properties {
 
diff --git a/opm/models/utils/parametersystem.cpp b/opm/models/utils/parametersystem.cpp
index 9af377750..dd6c71fed 100644
--- a/opm/models/utils/parametersystem.cpp
+++ b/opm/models/utils/parametersystem.cpp
@@ -29,13 +29,24 @@
  * Dune::ParameterTree with the default value taken from the parameter
  * definition.
  */
+
 #include <config.h>
 #include <opm/models/utils/parametersystem.hpp>
 
+#include <dune/common/parametertree.hh>
+
 #if HAVE_QUAD
 #include <opm/material/common/quad.hpp>
 #endif
 
+#include <charconv>
+#include <fstream>
+#include <list>
+#include <memory>
+#include <stdexcept>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
 namespace {
 
 struct ParamInfo
diff --git a/opm/models/utils/parametersystem.hpp b/opm/models/utils/parametersystem.hpp
index b8eb9f3d2..483ba7e6c 100644
--- a/opm/models/utils/parametersystem.hpp
+++ b/opm/models/utils/parametersystem.hpp
@@ -32,32 +32,16 @@
 #ifndef OPM_PARAMETER_SYSTEM_HPP
 #define OPM_PARAMETER_SYSTEM_HPP
 
-#if HAVE_QUAD
-#include <opm/material/common/quad.hpp>
-#endif // HAVE_QUAD
-
 #include <dune/common/classname.hh>
-#include <dune/common/parametertree.hh>
 
-#include <charconv>
-#include <cstdlib>
+#include <cstring>
 #include <functional>
-#include <fstream>
-#include <iostream>
-#include <list>
-#include <map>
 #include <set>
 #include <sstream>
-#include <stdexcept>
 #include <string>
-#include <utility>
-#include <tuple>
 #include <type_traits>
 #include <vector>
 
-#include <unistd.h>
-#include <sys/ioctl.h>
-
 namespace Opm::Parameters {
 
 namespace detail {