diff --git a/dumux/common/stringutilities.hh b/dumux/common/stringutilities.hh
index 60cd68f9902cf2f5d10a101620d6ca278dc3bdc6..74b7d6be40b25e0e69ad8d57e4e7c002445eb1c4 100644
--- a/dumux/common/stringutilities.hh
+++ b/dumux/common/stringutilities.hh
@@ -27,6 +27,7 @@
 #define DUMUX_COMMON_STRING_UTILITIES_HH
 
 #include <vector>
+#include <string>
 #include <string_view>
 #include <tuple>
 
diff --git a/dumux/discretization/fem/fegridgeometry.hh b/dumux/discretization/fem/fegridgeometry.hh
index 0f21e1c8f33aee11a7c422668691d226718eeca8..fff2242c474e9650a11f55a7e8ea632c2c6de92b 100644
--- a/dumux/discretization/fem/fegridgeometry.hh
+++ b/dumux/discretization/fem/fegridgeometry.hh
@@ -25,6 +25,8 @@
 #ifndef DUMUX_DISCRETIZATION_FE_GRID_GEOMETRY_HH
 #define DUMUX_DISCRETIZATION_FE_GRID_GEOMETRY_HH
 
+#include <unordered_map>
+
 #include <dumux/common/indextraits.hh>
 #include <dumux/common/defaultmappertraits.hh>
 
diff --git a/dumux/flux/porenetwork/advection.hh b/dumux/flux/porenetwork/advection.hh
index 1e9dc46b2ab3d7bcb0441b060801f4713029eabb..14dc8b0da376d6a50b853ed625f86c1d25f590a0 100644
--- a/dumux/flux/porenetwork/advection.hh
+++ b/dumux/flux/porenetwork/advection.hh
@@ -25,6 +25,9 @@
 #ifndef DUMUX_FLUX_PNM_ADVECTION_HH
 #define DUMUX_FLUX_PNM_ADVECTION_HH
 
+#include <array>
+#include <dumux/common/parameters.hh>
+
 namespace Dumux::PoreNetwork::Detail {
 
 template<class... TransmissibilityLawTypes>
diff --git a/dumux/flux/shallowwaterviscousflux.hh b/dumux/flux/shallowwaterviscousflux.hh
index 3e8d84ac5a2b684a564dfc419b5e6fec4dd81aba..ce0ce087f8ded89e8c903c5eff2a6ecb36b4e81b 100644
--- a/dumux/flux/shallowwaterviscousflux.hh
+++ b/dumux/flux/shallowwaterviscousflux.hh
@@ -27,7 +27,11 @@
 #include <cmath>
 #include <algorithm>
 #include <utility>
+#include <type_traits>
+
+#include <dumux/common/parameters.hh>
 #include <dumux/flux/fluxvariablescaching.hh>
+#include <dumux/flux/shallowwater/fluxlimiterlet.hh>
 
 namespace Dumux {
 
@@ -37,7 +41,8 @@ namespace Dumux {
  *        by adding all surrounding shear stresses.
  *        For now implemented strictly for 2D depth-averaged models (i.e. 3 equations)
  */
-template<class PrimaryVariables, class NumEqVector, typename std::enable_if_t<NumEqVector::size() == 3, int> = 0>
+template<class PrimaryVariables, class NumEqVector,
+         typename std::enable_if_t<NumEqVector::size() == 3, int> = 0>
 class ShallowWaterViscousFlux
 {
 
@@ -112,10 +117,10 @@ public:
         const Scalar turbViscosity = [&,gradU=gradU,gradV=gradV]()
         {
             // The (constant) background turbulent viscosity
-            static const auto turbBGViscosity = getParam<Scalar>("ShallowWater.TurbulentViscosity", 1.0e-6);
+            static const auto turbBGViscosity = getParamFromGroup<Scalar>(problem.paramGroup(), "ShallowWater.TurbulentViscosity", 1.0e-6);
 
             // Check whether the mixing-length turbulence model is used
-            static const auto useMixingLengthTurbulenceModel = getParam<bool>("ShallowWater.UseMixingLengthTurbulenceModel", false);
+            static const auto useMixingLengthTurbulenceModel = getParamFromGroup<bool>(problem.paramGroup(), "ShallowWater.UseMixingLengthTurbulenceModel", false);
 
             // constant eddy viscosity equal to the prescribed background eddy viscosity
             if (!useMixingLengthTurbulenceModel)
@@ -124,8 +129,8 @@ public:
             // turbulence model based on mixing length
             // Compute the turbulent viscosity using a combined horizonal/vertical mixing length approach
             // Turbulence coefficients: vertical (Elder like) and horizontal (Smagorinsky like)
-            static const auto turbConstV = getParam<Scalar>("ShallowWater.VerticalCoefficientOfMixingLengthModel", 1.0);
-            static const auto turbConstH = getParam<Scalar>("ShallowWater.HorizontalCoefficientOfMixingLengthModel", 0.1);
+            static const auto turbConstV = getParamFromGroup<Scalar>(problem.paramGroup(), "ShallowWater.VerticalCoefficientOfMixingLengthModel", 1.0);
+            static const auto turbConstH = getParamFromGroup<Scalar>(problem.paramGroup(), "ShallowWater.HorizontalCoefficientOfMixingLengthModel", 0.1);
 
             /** The vertical (Elder-like) contribution to the turbulent viscosity scales with water depth \f[ h \f] and shear velocity \f[ u_{*} \f] :
             *
@@ -193,8 +198,8 @@ public:
         const auto vViscousFlux = turbViscosity * averageDepth * gradV;
 
         // compute the mobility of the flux with the fluxlimiter
-        static const auto upperWaterDepthFluxLimiting = getParam<double>("FluxLimiterLET.UpperWaterDepth", 1e-3);
-        static const auto lowerWaterDepthFluxLimiting = getParam<double>("FluxLimiterLET.LowerWaterDepth", 1e-5);
+        static const auto upperWaterDepthFluxLimiting = getParamFromGroup<double>(problem.paramGroup(), "FluxLimiterLET.UpperWaterDepth", 1e-3);
+        static const auto lowerWaterDepthFluxLimiting = getParamFromGroup<double>(problem.paramGroup(), "FluxLimiterLET.LowerWaterDepth", 1e-5);
 
         const auto limitingDepth = (waterDepthLeft + waterDepthRight) * 0.5;
         const auto mobility = ShallowWater::fluxLimiterLET(limitingDepth,
diff --git a/dumux/freeflow/shallowwater/localresidual.hh b/dumux/freeflow/shallowwater/localresidual.hh
index bfcc6d193e8d9f2ae5324e9fe8264cbdd721652c..1c00928c848d297dca2be331f147368074ef71b7 100644
--- a/dumux/freeflow/shallowwater/localresidual.hh
+++ b/dumux/freeflow/shallowwater/localresidual.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_FREEFLOW_SHALLOW_WATER_LOCAL_RESIDUAL_HH
 #define DUMUX_FREEFLOW_SHALLOW_WATER_LOCAL_RESIDUAL_HH
 
+#include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
 
 namespace Dumux{
@@ -99,7 +100,7 @@ public:
         flux += fluxVars.advectiveFlux(problem, element, fvGeometry, elemVolVars, scvf);
 
         // Compute viscous momentum flux contribution if required
-        static const bool enableViscousFlux = getParam<bool>("ShallowWater.EnableViscousFlux", false);
+        static const bool enableViscousFlux = getParamFromGroup<bool>(problem.paramGroup(), "ShallowWater.EnableViscousFlux", false);
         if (enableViscousFlux)
             flux += fluxVars.viscousFlux(problem, element, fvGeometry, elemVolVars, scvf);
         return flux;
diff --git a/dumux/io/grid/porenetwork/dgfwriter.hh b/dumux/io/grid/porenetwork/dgfwriter.hh
index 303ebdf33156bae77cdd59a6153e1c84e5eae01c..488079aadb7b8e3e33bcde5d872e61022246e543 100644
--- a/dumux/io/grid/porenetwork/dgfwriter.hh
+++ b/dumux/io/grid/porenetwork/dgfwriter.hh
@@ -26,6 +26,7 @@
 
 #include <string>
 #include <iostream>
+#include <fstream>
 
 namespace Dumux::PoreNetwork {
 
diff --git a/dumux/io/grid/porenetwork/griddata.hh b/dumux/io/grid/porenetwork/griddata.hh
index b99115d7908899dd32f426a46c5fdba82ab3ea2d..f9a967f84f75f39d39b038757e32101ad6a8369a 100644
--- a/dumux/io/grid/porenetwork/griddata.hh
+++ b/dumux/io/grid/porenetwork/griddata.hh
@@ -34,6 +34,8 @@
 #include <dune/common/exceptions.hh>
 #include <dune/grid/common/gridfactory.hh>
 #include <dune/grid/common/mcmgmapper.hh>
+#include <dune/grid/io/file/dgfparser/gridptr.hh>
+#include <dune/grid/io/file/dgfparser/parser.hh>
 #include <dune/grid/utility/persistentcontainer.hh>
 #include <dune/geometry/axisalignedcubegeometry.hh>
 
diff --git a/dumux/io/grid/porenetwork/parametersforgeneratedgrid.hh b/dumux/io/grid/porenetwork/parametersforgeneratedgrid.hh
index 86475b0b8d5990ed3bac0f614372619e09e57c48..0f4fb7b9fcf2b20f6fb5be5bb04a2f16f321a3de 100644
--- a/dumux/io/grid/porenetwork/parametersforgeneratedgrid.hh
+++ b/dumux/io/grid/porenetwork/parametersforgeneratedgrid.hh
@@ -32,6 +32,9 @@
 #include <vector>
 
 #include <dune/common/exceptions.hh>
+#include <dune/grid/common/exceptions.hh>
+#include <dune/geometry/axisalignedcubegeometry.hh>
+
 #include <dumux/common/parameters.hh>
 #include <dumux/common/random.hh>
 #include <dumux/geometry/intersectspointgeometry.hh>
diff --git a/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh b/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh
index 9c8e331be207a8f746c3ae216a37613d3365ddef..0684361782c477246da9408229ec591d3678a38d 100644
--- a/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh
+++ b/dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh
@@ -25,6 +25,7 @@
 #define DUMUX_MATERIAL_DIFFUSIVITY_MILLINGTON_QUIRK_HH
 
 #include <cmath>
+#include <algorithm>
 
 namespace Dumux {
 
diff --git a/dumux/material/spatialparams/porenetwork/porenetworkbase.hh b/dumux/material/spatialparams/porenetwork/porenetworkbase.hh
index e08d3e91b6b8b8173fa000fc617a45a63b3e7eb7..5e0e08a3832c7c24bf64cdebaafd80300b40fe0e 100644
--- a/dumux/material/spatialparams/porenetwork/porenetworkbase.hh
+++ b/dumux/material/spatialparams/porenetwork/porenetworkbase.hh
@@ -25,8 +25,13 @@
 #ifndef DUMUX_PNM_SPATIAL_PARAMS_BASE_HH
 #define DUMUX_PNM_SPATIAL_PARAMS_BASE_HH
 
+#include <type_traits>
+#include <memory>
+
 #include <dune/common/fvector.hh>
 
+#include <dumux/common/parameters.hh>
+
 namespace Dumux::PoreNetwork {
 
 #ifndef DOXYGEN
diff --git a/dumux/multidomain/embedded/couplingmanager1d3d_average.hh b/dumux/multidomain/embedded/couplingmanager1d3d_average.hh
index 823a394d265ae4e329d6e7e4939935aca5e051f1..aa405034e2ed7e844d03b77af9f0f241e199b168 100644
--- a/dumux/multidomain/embedded/couplingmanager1d3d_average.hh
+++ b/dumux/multidomain/embedded/couplingmanager1d3d_average.hh
@@ -46,15 +46,6 @@ namespace Dumux {
 namespace Embedded1d3dCouplingMode {
 struct Average : public Utility::Tag<Average> {
     static std::string name() { return "average"; }
-
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator==(Average, EmbeddedCouplingMode m) { return m == EmbeddedCouplingMode::average; }
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator==(EmbeddedCouplingMode m, Average) { return m == EmbeddedCouplingMode::average; }
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator!=(Average, EmbeddedCouplingMode m) { return m != EmbeddedCouplingMode::average; }
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator!=(EmbeddedCouplingMode m, Average) { return m != EmbeddedCouplingMode::average; }
 };
 
 inline constexpr Average average{};
diff --git a/dumux/multidomain/embedded/couplingmanager1d3d_kernel.hh b/dumux/multidomain/embedded/couplingmanager1d3d_kernel.hh
index d0706a822473a11310f7d9506873d97ff752763f..bbc33fde6de9b612c9ec6aa1ec32635900f33aa2 100644
--- a/dumux/multidomain/embedded/couplingmanager1d3d_kernel.hh
+++ b/dumux/multidomain/embedded/couplingmanager1d3d_kernel.hh
@@ -29,6 +29,7 @@
 
 #include <dune/common/timer.hh>
 #include <dune/geometry/quadraturerules.hh>
+#include <dune/grid/common/capabilities.hh>
 
 #include <dumux/common/tag.hh>
 #include <dumux/common/properties.hh>
@@ -44,15 +45,6 @@ namespace Dumux {
 namespace Embedded1d3dCouplingMode {
 struct Kernel : public Utility::Tag<Kernel> {
     static std::string name() { return "kernel"; }
-
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator==(Kernel, EmbeddedCouplingMode m) { return m == EmbeddedCouplingMode::kernel; }
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator==(EmbeddedCouplingMode m, Kernel) { return m == EmbeddedCouplingMode::kernel; }
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator!=(Kernel, EmbeddedCouplingMode m) { return m != EmbeddedCouplingMode::kernel; }
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator!=(EmbeddedCouplingMode m, Kernel) { return m != EmbeddedCouplingMode::kernel; }
 };
 
 inline constexpr Kernel kernel{};
diff --git a/dumux/multidomain/embedded/couplingmanager1d3d_line.hh b/dumux/multidomain/embedded/couplingmanager1d3d_line.hh
index 85eccfd71f2cce36b57da412a49c417ce93ccd7b..6b666c617b19c1f4d32735ab4c4ab9ed19e1da8a 100644
--- a/dumux/multidomain/embedded/couplingmanager1d3d_line.hh
+++ b/dumux/multidomain/embedded/couplingmanager1d3d_line.hh
@@ -38,15 +38,6 @@ namespace Dumux {
 namespace Embedded1d3dCouplingMode {
 struct Line : public Utility::Tag<Line> {
     static std::string name() { return "line"; }
-
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator==(Line, EmbeddedCouplingMode m) { return m == EmbeddedCouplingMode::line; }
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator==(EmbeddedCouplingMode m, Line) { return m == EmbeddedCouplingMode::line; }
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator!=(Line, EmbeddedCouplingMode m) { return m != EmbeddedCouplingMode::line; }
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator!=(EmbeddedCouplingMode m, Line) { return m != EmbeddedCouplingMode::line; }
 };
 
 inline constexpr Line line{};
diff --git a/dumux/multidomain/embedded/couplingmanager1d3d_surface.hh b/dumux/multidomain/embedded/couplingmanager1d3d_surface.hh
index ddafc463ef29ddad07f6dc4eb20a463dddd44303..886ef74b23b44db30ec7d034b9f71542b1ddad00 100644
--- a/dumux/multidomain/embedded/couplingmanager1d3d_surface.hh
+++ b/dumux/multidomain/embedded/couplingmanager1d3d_surface.hh
@@ -37,21 +37,13 @@
 #include <dumux/multidomain/embedded/couplingmanagerbase.hh>
 #include <dumux/multidomain/embedded/circlepoints.hh>
 #include <dumux/multidomain/embedded/circleaveragepointsourcetraits.hh>
+#include <dumux/multidomain/embedded/extendedsourcestencil.hh>
 
 namespace Dumux {
 
 namespace Embedded1d3dCouplingMode {
 struct Surface : public Utility::Tag<Surface> {
     static std::string name() { return "surface"; }
-
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator==(Surface, EmbeddedCouplingMode m) { return m == EmbeddedCouplingMode::cylindersources; }
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator==(EmbeddedCouplingMode m, Surface) { return m == EmbeddedCouplingMode::cylindersources; }
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator!=(Surface, EmbeddedCouplingMode m) { return m != EmbeddedCouplingMode::cylindersources; }
-    [[deprecated("Comparison with enum is deprecated. Removed after 3.3. Use tags.")]]
-    friend constexpr bool operator!=(EmbeddedCouplingMode m, Surface) { return m != EmbeddedCouplingMode::cylindersources; }
 };
 
 inline constexpr Surface surface{};
diff --git a/dumux/porenetwork/2p/invasionstate.hh b/dumux/porenetwork/2p/invasionstate.hh
index 8b6e1eb9167405aac768a35f2723bc55d7fe51ce..e6fce845b847e3f6482120d1682d872156fba694 100644
--- a/dumux/porenetwork/2p/invasionstate.hh
+++ b/dumux/porenetwork/2p/invasionstate.hh
@@ -28,6 +28,7 @@
 #include <type_traits>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/typetraits/isvalid.hh>
+#include <dumux/porenetwork/common/labels.hh>
 
 namespace Dumux::PoreNetwork {
 
diff --git a/dumux/porenetwork/2p/newtonconsistencychecks.hh b/dumux/porenetwork/2p/newtonconsistencychecks.hh
index 9e05c8cd8940ade57372eb2300e42673be6d0ad2..3a84b2e0396645e13ae32e4a1ec89566cab730dd 100644
--- a/dumux/porenetwork/2p/newtonconsistencychecks.hh
+++ b/dumux/porenetwork/2p/newtonconsistencychecks.hh
@@ -27,6 +27,7 @@
 #include <vector>
 #include <iostream>
 #include <dune/common/exceptions.hh>
+#include <dumux/common/exceptions.hh>
 #include <dumux/discretization/localview.hh>
 
 namespace Dumux::PoreNetwork {
diff --git a/dumux/porenetwork/2p/volumevariables.hh b/dumux/porenetwork/2p/volumevariables.hh
index d570fccee71e8a5a1423eaddd698144bff6ec0b0..dcb859bc171e433df525b08a19c4986b4a98e5f8 100644
--- a/dumux/porenetwork/2p/volumevariables.hh
+++ b/dumux/porenetwork/2p/volumevariables.hh
@@ -25,6 +25,7 @@
 #ifndef DUMUX_PNM_2P_VOLUME_VARIABLES_HH
 #define DUMUX_PNM_2P_VOLUME_VARIABLES_HH
 
+#include <dumux/common/parameters.hh>
 #include <dumux/porousmediumflow/2p/volumevariables.hh>
 
 namespace Dumux::PoreNetwork {
diff --git a/dumux/porenetwork/common/boundaryflux.hh b/dumux/porenetwork/common/boundaryflux.hh
index 484c236d3cb86c5488abca1889f096bb54e11e93..b5e1687b6410db4f2ff0c6752d7729f9f7abf1ae 100644
--- a/dumux/porenetwork/common/boundaryflux.hh
+++ b/dumux/porenetwork/common/boundaryflux.hh
@@ -25,7 +25,14 @@
 #define DUMUX_PNM_BOUNDARYFLUX_HH
 
 #include <algorithm>
+#include <numeric>
 #include <vector>
+#include <type_traits>
+#include <unordered_map>
+#include <string>
+#include <iostream>
+
+#include <dune/common/exceptions.hh>
 #include <dumux/common/typetraits/problem.hh>
 #include <dumux/discretization/box/elementboundarytypes.hh>
 
diff --git a/examples/porenetwork_upscaling/properties.hh b/examples/porenetwork_upscaling/properties.hh
index a17e5908decac59bfb8004f3f6cbc68beac326f2..a111a5e8d3dbb32fb4a844cb0dbee09ebcde417b 100644
--- a/examples/porenetwork_upscaling/properties.hh
+++ b/examples/porenetwork_upscaling/properties.hh
@@ -26,8 +26,7 @@
 // [[content]]
 // ### Includes
 // [[details]] includes
-#include <dune/grid/yaspgrid.hh> // for `Dune::YaspGrid`
-
+#include <dune/foamgrid/foamgrid.hh> // for `Dune::FoamGrid`
 
 // The `OneP` type tag specializes most of the `properties` required for single-
 // phase flow simulations in DuMu<sup>x</sup>. We will use this in the following to inherit the
diff --git a/examples/porenetwork_upscaling/upscalinghelper.hh b/examples/porenetwork_upscaling/upscalinghelper.hh
index 80faaf73d9a372c94f3847e7c5368ccf92d98329..0b428222294515b2861c2db4e6d4215c3bede2cf 100644
--- a/examples/porenetwork_upscaling/upscalinghelper.hh
+++ b/examples/porenetwork_upscaling/upscalinghelper.hh
@@ -25,6 +25,11 @@
 // This file contains the __upscaling helper struct__ which considers the volume flux leaving
 // the pore network in flow direction in order to find the upscaled Darcy permeability.
 // [[content]]
+#include <iostream>
+#include <ostream>
+#include <iomanip>
+#include <numeric>
+#include <functional>
 
 namespace Dumux {
 
diff --git a/test/freeflow/shallowwater/poiseuilleflow/properties.hh b/test/freeflow/shallowwater/poiseuilleflow/properties.hh
index 7a1312806db3f73387c050b11cdf0a10f45eb37b..75ac8c8e18c04568ccc8bc4e4b20cf76e94145d9 100644
--- a/test/freeflow/shallowwater/poiseuilleflow/properties.hh
+++ b/test/freeflow/shallowwater/poiseuilleflow/properties.hh
@@ -23,11 +23,13 @@
 #include <dumux/common/properties.hh>
 #include <dumux/freeflow/shallowwater/model.hh>
 #include <dumux/discretization/cctpfa.hh>
-
+#include <dune/grid/yaspgrid.hh>
 #if HAVE_UG
 #include <dune/grid/uggrid.hh>
-#else
-#include <dune/grid/yaspgrid.hh>
+#endif
+
+#ifndef GRIDTYPE
+#define GRIDTYPE Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<double, 2>>
 #endif
 
 #include "problem.hh"
diff --git a/test/porousmediumflow/3p/infiltration/spatialparams.hh b/test/porousmediumflow/3p/infiltration/spatialparams.hh
index bc0b79e05a9f1a3dd1e39af2ecd619b0ce18bbc2..56fb53c00149d0a7a4fcd46525199e89d57624dd 100644
--- a/test/porousmediumflow/3p/infiltration/spatialparams.hh
+++ b/test/porousmediumflow/3p/infiltration/spatialparams.hh
@@ -97,7 +97,7 @@ public:
         auto krw = swRange;
         auto krn = swRange;
         auto krg = swRange;
-        for (const auto& [i, sw] : enumerate(swRange))
+        for (const auto [i, sw] : enumerate(swRange))
         {
             const Scalar sn = 1.0 - sg - sw;
             krw[i] = pcKrSwCurve_.krw(sw, sn);
diff --git a/test/porousmediumflow/richards/benchmarks/problem.hh b/test/porousmediumflow/richards/benchmarks/problem.hh
index 473730805914b350d0a05cde3f1e0b414e92f51a..097cbb10aa0fcd423c1b95cbbe5e83cfbe71384e 100644
--- a/test/porousmediumflow/richards/benchmarks/problem.hh
+++ b/test/porousmediumflow/richards/benchmarks/problem.hh
@@ -36,6 +36,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/io/format.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/components/simpleh2o.hh>