diff --git a/dumux/discretization/box/effectivestresslaw.hh b/dumux/discretization/box/effectivestresslaw.hh
index c39c6a9b10b40cb32708ec1d42a7262abd33dcd2..583e59c594d18ac5891c69671ad5bf2c5945559d 100644
--- a/dumux/discretization/box/effectivestresslaw.hh
+++ b/dumux/discretization/box/effectivestresslaw.hh
@@ -29,6 +29,10 @@
 
 namespace Dumux {
 
+// forward declaration
+template<class StressType, class FVGridGeometry, DiscretizationMethod discMethod>
+class EffectiveStressLaw;
+
 /*!
  * \ingroup BoxDiscretization
  * \brief Effective stress law for box scheme
diff --git a/dumux/discretization/box/hookeslaw.hh b/dumux/discretization/box/hookeslaw.hh
index 135864257790c6e40d4f5b2647774ddb5a5643ae..2e139b64793c55bc5f7569215490737ce5aeb20e 100644
--- a/dumux/discretization/box/hookeslaw.hh
+++ b/dumux/discretization/box/hookeslaw.hh
@@ -32,6 +32,10 @@
 
 namespace Dumux {
 
+// forward declaration
+template<class StressType, class FVGridGeometry, DiscretizationMethod discMethod>
+class HookesLaw;
+
 /*!
  * \ingroup BoxDiscretization
  * \brief Hooke's law for box scheme
diff --git a/dumux/geomechanics/elastic/localresidual.hh b/dumux/geomechanics/elastic/localresidual.hh
index e0a49dca3ad49a199f7bc01467af27cd7efda9a1..a4351fe553aed5ae066bdcb417e9b0480cf4b287 100644
--- a/dumux/geomechanics/elastic/localresidual.hh
+++ b/dumux/geomechanics/elastic/localresidual.hh
@@ -26,6 +26,7 @@
 #ifndef DUMUX_GEOMECHANICS_ELASTIC_LOCAL_RESIDUAL_HH
 #define DUMUX_GEOMECHANICS_ELASTIC_LOCAL_RESIDUAL_HH
 
+#include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 
diff --git a/dumux/geomechanics/elastic/volumevariables.hh b/dumux/geomechanics/elastic/volumevariables.hh
index 2f7423fe504f41ccd9bebde7641b4264468017db..254d70e6eb898537d974be5289419f57907df9d5 100644
--- a/dumux/geomechanics/elastic/volumevariables.hh
+++ b/dumux/geomechanics/elastic/volumevariables.hh
@@ -26,7 +26,9 @@
 #define DUMUX_ELASTIC_VOLUME_VARIABLES_HH
 
 #include <type_traits>
+
 #include <dune/common/exceptions.hh>
+
 #include <dumux/material/solidstates/updatesolidvolumefractions.hh>
 
 namespace Dumux {
diff --git a/dumux/material/fluidsystems/steamn2cao2h2.hh b/dumux/material/fluidsystems/steamn2cao2h2.hh
index 9b997c28e3d635f5e4373f9b8dd73a93d17e7c89..5da078bd50fe491437b82ad0ee40fb9c311483f6 100644
--- a/dumux/material/fluidsystems/steamn2cao2h2.hh
+++ b/dumux/material/fluidsystems/steamn2cao2h2.hh
@@ -32,6 +32,8 @@
 
 #include <dumux/material/idealgas.hh>
 #include <dumux/material/fluidsystems/base.hh>
+#include <dumux/material/components/cao.hh>
+#include <dumux/material/components/cao2h2.hh>
 #include <dumux/material/components/n2.hh>
 #include <dumux/material/components/h2o.hh>
 #include <dumux/material/components/cao.hh>
diff --git a/dumux/material/spatialparams/fv1p.hh b/dumux/material/spatialparams/fv1p.hh
index 0889919d48603f3bb634d35ed0da42b8aec07783..27949b8a050f90951a9106d345f90dbd519d2c70 100644
--- a/dumux/material/spatialparams/fv1p.hh
+++ b/dumux/material/spatialparams/fv1p.hh
@@ -26,12 +26,13 @@
 #define DUMUX_FV_SPATIAL_PARAMS_ONE_P_HH
 
 #include <dune/common/exceptions.hh>
+#include <dune/common/fmatrix.hh>
+
 #include <dumux/common/parameters.hh>
+#include <dumux/common/properties.hh>
 #include <dumux/common/math.hh>
 #include <dumux/common/typetraits/isvalid.hh>
 
-#include <dune/common/fmatrix.hh>
-
 namespace Dumux {
 
 #ifndef DOXYGEN
diff --git a/dumux/porousmediumflow/richardsnc/volumevariables.hh b/dumux/porousmediumflow/richardsnc/volumevariables.hh
index f96a162fd7fc68d2a28f05c985189183d88eac05..9546150af0aa95d0651b5fe1ff9d8d5c4964cf36 100644
--- a/dumux/porousmediumflow/richardsnc/volumevariables.hh
+++ b/dumux/porousmediumflow/richardsnc/volumevariables.hh
@@ -25,6 +25,7 @@
 #ifndef DUMUX_RICHARDSNC_VOLUME_VARIABLES_HH
 #define DUMUX_RICHARDSNC_VOLUME_VARIABLES_HH
 
+#include <algorithm>
 #include <array>
 
 #include <dumux/porousmediumflow/volumevariables.hh>
diff --git a/test/freeflow/navierstokes/stokeschannel3dproblem.hh b/test/freeflow/navierstokes/stokeschannel3dproblem.hh
index f9d7440d57682d9ba7c3105c4f2962ac8be9a8b6..b757d830a90254237b6f211ae8614a18b293bcbf 100644
--- a/test/freeflow/navierstokes/stokeschannel3dproblem.hh
+++ b/test/freeflow/navierstokes/stokeschannel3dproblem.hh
@@ -36,6 +36,10 @@
 #include <dumux/freeflow/navierstokes/model.hh>
 #include <dune/common/float_cmp.hh>
 
+#ifndef DIM_3D
+#define DIM_3D 0
+#endif
+
 namespace Dumux
 {
 
diff --git a/tutorial/solution/ex3/mycompressiblecomponent.hh b/tutorial/solution/ex3/mycompressiblecomponent.hh
index 7ee4c509590918f78414eb37760c9fbc4b2a52ea..a416fd2b24c3459f83a00301fe80f13dbca93e3f 100644
--- a/tutorial/solution/ex3/mycompressiblecomponent.hh
+++ b/tutorial/solution/ex3/mycompressiblecomponent.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_MYCOMPRESSIBLECOMPONENT_HH
 #define DUMUX_MYCOMPRESSIBLECOMPONENT_HH
 
+#ifndef HEADERCHECK
+
 #include <dumux/material/idealgas.hh>
 
 #include <dumux/material/components/base.hh>
@@ -111,3 +113,4 @@ public:
 } // end namespace
 
 #endif
+#endif