diff --git a/dumux/common/defaultusagemessage.hh b/dumux/common/defaultusagemessage.hh
index cc2989908e122b1f6b9834830c1453840a6b80f1..c2b7ba4bfec907b76e5fc49e90ea394a197915a7 100644
--- a/dumux/common/defaultusagemessage.hh
+++ b/dumux/common/defaultusagemessage.hh
@@ -23,6 +23,8 @@
 #ifndef DUMUX_DEFAULT_USAGE_MESSAGE_HH
 #define DUMUX_DEFAULT_USAGE_MESSAGE_HH
 
+#include <string>
+
 namespace Dumux
 {
 
diff --git a/dumux/linear/amgparallelhelpers.hh b/dumux/linear/amgparallelhelpers.hh
index 23a95661faf4584e61597042f576acd06aead2d5..691c56989cb57b202ec7a206e472a59ee9603d81 100644
--- a/dumux/linear/amgparallelhelpers.hh
+++ b/dumux/linear/amgparallelhelpers.hh
@@ -25,14 +25,20 @@
 #ifndef DUMUX_AMGPARALLELHELPERS_HH
 #define DUMUX_AMGPARALLELHELPERS_HH
 
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/properties.hh>
-#include <dumux/porousmediumflow/sequential/pressureproperties.hh>
-#include <dumux/linear/amgproperties.hh>
+#include <dune/istl/owneroverlapcopy.hh>
+#include <dune/istl/paamg/pinfo.hh>
+
+#include "linearsolverproperties.hh"
 
 namespace Dumux
 {
 
+namespace Properties
+{
+//! The type traits required for using the AMG backend
+NEW_PROP_TAG(AmgTraits);
+}
+
 /*!
  * \brief A parallel helper class providing a nonoverlapping
  *        decomposition of all degrees of freedom
diff --git a/dumux/material/binarycoefficients/h2o_air.hh b/dumux/material/binarycoefficients/h2o_air.hh
index 7f83054788429327deaa78451e9e438e3f78f78d..e171bc95a00455694ca10be1ba019c07266e3d0a 100644
--- a/dumux/material/binarycoefficients/h2o_air.hh
+++ b/dumux/material/binarycoefficients/h2o_air.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_BINARY_COEFF_H2O_AIR_HH
 #define DUMUX_BINARY_COEFF_H2O_AIR_HH
 
+#include <cmath>
+
 
 namespace Dumux
 {
diff --git a/dumux/material/components/iapws/region1.hh b/dumux/material/components/iapws/region1.hh
index 7d8e43e02bd6185c06a7d1253acf55f059e3c543..cb1e24050ef9400023ef68a1b070bbebd7fe3979 100644
--- a/dumux/material/components/iapws/region1.hh
+++ b/dumux/material/components/iapws/region1.hh
@@ -35,6 +35,7 @@
 #include <cmath>
 #include <iostream>
 #include <dune/common/deprecated.hh>
+#include <dumux/common/exceptions.hh>
 
 namespace Dumux
 {
diff --git a/dumux/material/components/iapws/region2.hh b/dumux/material/components/iapws/region2.hh
index 206b98ca67f5985541cad87a6bc05f62d8f4e213..5d64423016c87821cf6db897e4001f5284fdbbb1 100644
--- a/dumux/material/components/iapws/region2.hh
+++ b/dumux/material/components/iapws/region2.hh
@@ -36,6 +36,7 @@
 #include <cmath>
 #include <iostream>
 #include <dune/common/deprecated.hh>
+#include <dumux/common/exceptions.hh>
 
 namespace Dumux
 {
diff --git a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
index 370746e1c1212351641e718d7931a640b6897a4e..04c5b8e7a41fb0e68bde32e083f36b5326220a07 100644
--- a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
@@ -29,6 +29,7 @@
 #include "brookscoreyparams.hh"
 
 #include <algorithm>
+#include <cmath>
 
 namespace Dumux
 {
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
index 90ec0d581fee394f1157090c8344effd5f53fc29..a725a87b5a4711973a56154527db009a4a591320 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
@@ -25,6 +25,7 @@
 #define THERMALCONDUCTIVITY_SOMERTON_HH
 
 #include <algorithm>
+#include <cmath>
 
 namespace Dumux
 {
diff --git a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpfct.hh b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpfct.hh
index 81158e1fe5a2f11f43752e37de79c5afb1764358..9ce04bfc7e2584476209adc224ca89b2decd8166 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpfct.hh
+++ b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpfct.hh
@@ -30,7 +30,7 @@
 
 #include <algorithm>
 
-#include <math.h>
+#include <cmath>
 #include <assert.h>
 
 namespace Dumux
diff --git a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3.hh b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3.hh
index 2a15ee31efe1d1541a0ff25b2a7b8a54771bbcc2..afd1ec9780014a1d22f597b84dc535f0477adb38 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3.hh
+++ b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3.hh
@@ -30,7 +30,7 @@
 
 #include <algorithm>
 
-#include <math.h>
+#include <cmath>
 #include <assert.h>
 
 namespace Dumux
diff --git a/dumux/material/fluidmatrixinteractions/2pia/awnsurfacepolynomial2ndorder.hh b/dumux/material/fluidmatrixinteractions/2pia/awnsurfacepolynomial2ndorder.hh
index bb5ac86a1b94cc3ceb19409b1f2a1825ba657298..9c28be91937908aca780db09399ddd48b49a3db6 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/awnsurfacepolynomial2ndorder.hh
+++ b/dumux/material/fluidmatrixinteractions/2pia/awnsurfacepolynomial2ndorder.hh
@@ -31,7 +31,7 @@
 
 #include <algorithm>
 
-#include <math.h>
+#include <cmath>
 #include <assert.h>
 
 namespace Dumux
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkervangen3pparams.hh b/dumux/material/fluidmatrixinteractions/3p/parkervangen3pparams.hh
index 5359525dc69d6b9f6db008fc3529a174a0c9be44..40d02a4fa1fa72b32c76e9e6e7446c204f993136 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkervangen3pparams.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkervangen3pparams.hh
@@ -29,6 +29,7 @@
 #define PARKERVANGEN_PARAMS_3P_HH
 
 #include <dune/common/fvector.hh>
+#include <iostream>
 
 namespace Dumux
 {
diff --git a/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh b/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
index 615587275c3299ef172aa45aff49d21a37fb0928..edcd22b4a2d83cf92a4d9402f5e6331c54cbacd3 100644
--- a/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
@@ -25,6 +25,7 @@
 #define THERMALCONDUCTIVITY_SOMERTON_3P_HH
 
 #include <algorithm>
+#include <cmath>
 
 namespace Dumux
 {
diff --git a/dumux/material/fluidmatrixinteractions/diffusivityconstant.hh b/dumux/material/fluidmatrixinteractions/diffusivityconstant.hh
index c3f58a4d9f1249310d0749805ecd07e14ddf69e1..95cf8072b4484e12d4221c4b8676a716f4bc2c68 100644
--- a/dumux/material/fluidmatrixinteractions/diffusivityconstant.hh
+++ b/dumux/material/fluidmatrixinteractions/diffusivityconstant.hh
@@ -29,6 +29,12 @@
 
 namespace Dumux
 {
+
+namespace Properties
+{
+NEW_PROP_TAG(TauTortuosity);
+}
+
 /*!
  * \ingroup fluidmatrixinteractionslaws
  *
diff --git a/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh b/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh
index 29086bd30e72a96c571b2ef367350f9ccd1be666..305e8823ef0ae5638a62e596f7d9cb6a378133c2 100644
--- a/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh
+++ b/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh
@@ -25,6 +25,7 @@
 #define PERMEABILITYRUTQVISTSTANG_HH
 
 #include <algorithm>
+#include <cmath>
 
 namespace Dumux
 {
diff --git a/dumux/material/fluidsystems/2pliquidvapor.hh b/dumux/material/fluidsystems/2pliquidvapor.hh
index be319c91ef7965f5cc444e12ca7b212d6e88ccbc..869110fd324c1097c4592883cb40290e3c65c9f5 100644
--- a/dumux/material/fluidsystems/2pliquidvapor.hh
+++ b/dumux/material/fluidsystems/2pliquidvapor.hh
@@ -26,6 +26,7 @@
 
 #include <limits>
 #include <cassert>
+#include <iostream>
 
 #include <dumux/material/fluidsystems/liquidphase.hh>
 #include <dumux/material/fluidsystems/gasphase.hh>
diff --git a/dumux/porousmediumflow/2p/implicit/adaptionhelper.hh b/dumux/porousmediumflow/2p/implicit/adaptionhelper.hh
index 3c21b24524b410236e0309263e98e34c0f5bcd57..6ab242b8207958a46890affd4696de8733a5d77b 100644
--- a/dumux/porousmediumflow/2p/implicit/adaptionhelper.hh
+++ b/dumux/porousmediumflow/2p/implicit/adaptionhelper.hh
@@ -20,6 +20,7 @@
 #define DUMUX_TWOP_ADAPTIONHELPER_HH
 
 #include <dumux/implicit/adaptive/adaptionhelper.hh>
+#include "properties.hh"
 
 namespace Dumux {