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 069bf43759f6b1e2ec075c20ddde419a40957315..7775afd943b94984c5fb973858f7b7ebacabb3ad 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 a5d3758c67d4b9dc8e8b059a4515af02faf6dd0e..5365896f56cc69cf6ba5bdcdf3008f9d47caa1e7 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 50c51920c58cdd44717f21c0d64a63ef34d59017..30bcdad5d5b19b40e36aca9d6b6982dcecc1b535 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 7bf686d534fecd793d3f4f0f997879e5dee04edc..08eb9c6ca5f811ceb8719cb10d53707d75215c9e 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 35ef237461161dfd0b1580abac1d8af113e58f1e..0654f08b0b6e377665b6fbd00abf3196e89d8eb2 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 6c350b9e939d6fcd674825afcfd0542eeaeb9260..99ff4a0205cec0d5d128e5ba537c1c1936a7e98a 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 cbde4ec2ff0d0e288ed4b70d4da41947de604450..31772f480bb6f708cc3844f6a8395619dc2ea307 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 363c5eaf3cebbf92899f7da6b6909fd114b2e30f..a515ee0961c573ba2924fd4db8edb5ef4cca193e 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 03d1fad2abe8663cecefd7f8ad290e00efcc0c3a..d98959920ed0c24279c3506cc4237fdf9e424956 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 ccf29e6188172c355094d917b2b4791f28969ea6..651032a86e8e24fa4e013570ec11db0b20ac5a4d 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 fbd5a5221773e257e0bda1a2811f179978b4b4e1..c551822496676994eb4d43a6e9f092539a606d25 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 a494b9a1838dc6cc0b1c9ed06183e506991393d4..40663e15edfb8e2e54e63162d693e98599a0811c 100644
--- a/dumux/porousmediumflow/2p/implicit/adaptionhelper.hh
+++ b/dumux/porousmediumflow/2p/implicit/adaptionhelper.hh
@@ -26,6 +26,7 @@
 #define DUMUX_TWOP_ADAPTIONHELPER_HH
 
 #include <dumux/implicit/adaptive/adaptionhelper.hh>
+#include "properties.hh"
 
 namespace Dumux {