diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabsdefaultpolicy.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabsdefaultpolicy.hh
index c0af48e267bc868a5014d97509e28c8553f8006a..fa1d87890a9e8302190022e22c38c0426a0ef345 100644
--- a/dumux/material/fluidmatrixinteractions/2p/efftoabsdefaultpolicy.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/efftoabsdefaultpolicy.hh
@@ -26,6 +26,9 @@
 #ifndef DUMUX_MATERIAL_FLUIDMATRIX_TWOP_EFF_TO_ABS_DEFAULT_POLICY_HH
 #define DUMUX_MATERIAL_FLUIDMATRIX_TWOP_EFF_TO_ABS_DEFAULT_POLICY_HH
 
+#include <dune/common/float_cmp.hh>
+#include <dumux/common/parameters.hh>
+
 namespace Dumux::FluidMatrix {
 
 /*!
diff --git a/dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh b/dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh
index 43a96a6170754b17cc21d909f5c0075b177fa2fb..001ea496d4bde1b20ebdef9cda0bdab868f6620c 100644
--- a/dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/heatpipelaw.hh
@@ -174,6 +174,7 @@ private:
 
 #include <dumux/common/parameters.hh>
 #include <dumux/common/spline.hh>
+#include <dumux/material/fluidmatrixinteractions/fluidmatrixinteraction.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabsdefaultpolicy.hh>
 
 namespace Dumux::FluidMatrix {
diff --git a/dumux/material/fluidmatrixinteractions/2p/interfacialarea/interfacialarea.hh b/dumux/material/fluidmatrixinteractions/2p/interfacialarea/interfacialarea.hh
index afd05170b72dd288eb1642e0e931c6d1528b123e..27aa1911ba13fccbdd7a6ef0dd2298fd5e503d17 100644
--- a/dumux/material/fluidmatrixinteractions/2p/interfacialarea/interfacialarea.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/interfacialarea/interfacialarea.hh
@@ -25,6 +25,7 @@
 #define DUMUX_MATERIAL_FLUIDMATRIX_TWO_P_INTERFACIAL_AREA_HH
 
 #include <dumux/common/parameters.hh>
+#include <dumux/material/fluidmatrixinteractions/fluidmatrixinteraction.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/efftoabsdefaultpolicy.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/noregularization.hh>
 
diff --git a/dumux/material/fluidmatrixinteractions/3p/napladsorption.hh b/dumux/material/fluidmatrixinteractions/3p/napladsorption.hh
index 689ceb4f675fbb4b150fd7247beefb9381263fd2..2c69b50c39fd55012c4530e8ae9101a9d55674f2 100644
--- a/dumux/material/fluidmatrixinteractions/3p/napladsorption.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/napladsorption.hh
@@ -26,6 +26,8 @@
 
 #include <algorithm>
 #include <dune/common/float_cmp.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/material/fluidmatrixinteractions/fluidmatrixinteraction.hh>
 
 namespace Dumux::FluidMatrix {
 
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkervangenuchten.hh b/dumux/material/fluidmatrixinteractions/3p/parkervangenuchten.hh
index 7b8a49a76ef269b4f42b8fb55247d03df1f39543..40dc3a00ed3ef226469e01a2dfbebf0fc7511001 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkervangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkervangenuchten.hh
@@ -25,10 +25,11 @@
 #define PARKER_VANGENUCHTEN_3P_HH
 
 #include <algorithm>
-#include <dumux/material/fluidmatrixinteractions/fluidmatrixinteraction.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/noregularization.hh>
 #include <dumux/common/optionalscalar.hh>
+#include <dumux/common/parameters.hh>
 #include <dumux/common/spline.hh>
+#include <dumux/material/fluidmatrixinteractions/fluidmatrixinteraction.hh>
+#include <dumux/material/fluidmatrixinteractions/2p/noregularization.hh>
 
 namespace Dumux::FluidMatrix {
 
diff --git a/dumux/python/common/fvproblem.hh b/dumux/python/common/fvproblem.hh
index bf8aaba7bf0d6af994d1c539594a730d3afed192..9e5dcef349b72b8427786ab313e6728782722050 100644
--- a/dumux/python/common/fvproblem.hh
+++ b/dumux/python/common/fvproblem.hh
@@ -33,6 +33,7 @@
 #include <dune/python/pybind11/pybind11.h>
 
 #include <dumux/common/boundarytypes.hh>
+#include <dumux/discretization/method.hh>
 #include <dumux/python/common/boundarytypes.hh>
 
 namespace Dumux::Python {
diff --git a/test/freeflow/navierstokes/channel/3d/problem.hh b/test/freeflow/navierstokes/channel/3d/problem.hh
index eded38ba4cf985a6754800457acf225aded961f8..a00293bd2609fdb1d87333c996f5f142d108586a 100644
--- a/test/freeflow/navierstokes/channel/3d/problem.hh
+++ b/test/freeflow/navierstokes/channel/3d/problem.hh
@@ -31,6 +31,10 @@
 #include <dune/common/float_cmp.hh>
 #include <dune/grid/yaspgrid.hh>
 
+#ifndef GRID_DIM
+#define GRID_DIM 3
+#endif
+
 #if HAVE_DUNE_SUBGRID && GRID_DIM == 3
 #include <dune/subgrid/subgrid.hh>
 #endif
diff --git a/test/freeflow/rans/problem.hh b/test/freeflow/rans/problem.hh
index 2f1b519f7ad1c66c4331f905c307a7fe92e9891e..70fd9bfba8a55d1c748bd2b0b366ca13a10beb0e 100644
--- a/test/freeflow/rans/problem.hh
+++ b/test/freeflow/rans/problem.hh
@@ -28,8 +28,10 @@
 #define DUMUX_PIPE_LAUFER_PROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/freeflow/navierstokes/boundarytypes.hh>
 #include <dumux/freeflow/rans/problem.hh>
 #include <dumux/freeflow/turbulencemodel.hh>
+#include <dumux/freeflow/turbulenceproperties.hh>
 
 namespace Dumux {
 
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
index 1a1c91a9fcb958a4003d17a20697919a1e8e618a..3f9517dba0152da7ad03f08f681244c2d64d32a6 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
@@ -36,6 +36,8 @@
 #include <dumux/material/fluidsystems/1padapter.hh>
 #include <dumux/material/fluidsystems/h2oair.hh>
 
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
+
 namespace Dumux {
 template <class TypeTag>
 class StokesSubProblem;
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
index b371fc02d8953681dbebcc2fecfc08f51fe799fa..9743512dcaafba1cf6ff2a51ef347d7dfa353e34 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
@@ -33,6 +33,8 @@
 #include <dumux/freeflow/navierstokes/boundarytypes.hh>
 #include <dumux/freeflow/navierstokes/problem.hh>
 
+#include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
+
 #include <dumux/flux/maxwellstefanslaw.hh>
 
 #include "h2n2co2fluidsystem.hh"
diff --git a/test/porousmediumflow/1p/implicit/periodicbc/problem.hh b/test/porousmediumflow/1p/implicit/periodicbc/problem.hh
index 3b96153915be01c677ced0d8ccb5ee99105c37cc..c2a434613d026fbbb8ba860a4e9b59aed560cff8 100644
--- a/test/porousmediumflow/1p/implicit/periodicbc/problem.hh
+++ b/test/porousmediumflow/1p/implicit/periodicbc/problem.hh
@@ -28,9 +28,6 @@
 #if HAVE_DUNE_SPGRID
 #include <dune/grid/spgrid.hh>
 #endif
-#if HAVE_DUNE_ALUGRID
-#include <dune/alugrid/grid.hh>
-#endif
 
 #include <dumux/common/boundarytypes.hh>
 
@@ -66,9 +63,10 @@ struct OnePIncompressibleBox { using InheritsFrom = std::tuple<OnePIncompressibl
 } // end namespace TTag
 
 // Set the grid type
+#if HAVE_DUNE_SPGRID
 template<class TypeTag>
 struct Grid<TypeTag, TTag::OnePIncompressible> { using type = Dune::SPGrid<double, 2>; };
-// struct Grid<TypeTag, TTag::OnePIncompressible> { using type = Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>; };
+#endif
 
 // Set the problem type
 template<class TypeTag>