diff --git a/dumux/boxmodels/1p/1pproblem.hh b/dumux/boxmodels/1p/1pproblem.hh
index 04356603c6b77e37354e2e873f09c6f75d8633fb..2e5799632a5ecd70bbc076926713cc37939e0b1f 100644
--- a/dumux/boxmodels/1p/1pproblem.hh
+++ b/dumux/boxmodels/1p/1pproblem.hh
@@ -29,6 +29,7 @@
 #define DUMUX_1P_PROBLEM_HH
 
 #include <dumux/boxmodels/common/boxproblem.hh>
+#include "1pproperties.hh"
 
 namespace Dumux
 {
diff --git a/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh b/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh
index 85db3b24627da2629e8e7da8e00c69e7453bb32c..08bbcf1fd680ee8098fc1d26acf8c276ef1f5517 100644
--- a/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh
@@ -33,6 +33,7 @@
 #define DUMUX_1P2C_BOUNDARY_VARIABLES_HH
 
 #include <dumux/common/math.hh>
+#include "1p2cproperties.hh"
 
 namespace Dumux
 {
diff --git a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
index e4aa7f93a5fc0ca79cba53c196b99f64850033ec..c522639507d6cd11e9201bbdda0ab1f1407ddf7d 100644
--- a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
@@ -37,6 +37,7 @@
 #include "1p2cproperties.hh"
 
 #include <dumux/common/math.hh>
+#include <dumux/common/valgrind.hh>
 
 namespace Dumux
 {
diff --git a/dumux/boxmodels/1p2c/1p2cproblem.hh b/dumux/boxmodels/1p2c/1p2cproblem.hh
index a1b16d488fd5dbca91957c93516669ac0c2f378e..306b383b16d0d266fd5720b969116b226456b6f5 100644
--- a/dumux/boxmodels/1p2c/1p2cproblem.hh
+++ b/dumux/boxmodels/1p2c/1p2cproblem.hh
@@ -31,6 +31,7 @@
 #define DUMUX_1P2C_PROBLEM_HH
 
 #include <dumux/boxmodels/common/boxproblem.hh>
+#include "1p2cproperties.hh"
 
 namespace Dumux
 {
diff --git a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
index 27f9d210251b53df5f3de46babd7b164d2f00262..b304e3c770deb938f9b0ac3397ffc3f0978a8ab3 100644
--- a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
@@ -30,9 +30,10 @@
 #define DUMUX_1P2C_VOLUME_VARIABLES_HH
 
 #include <dumux/boxmodels/common/boxvolumevariables.hh>
-
 #include <dumux/material/fluidstates/compositionalfluidstate.hh>
 
+#include "1p2cproperties.hh"
+
 namespace Dumux
 {
 
diff --git a/dumux/boxmodels/2p2c/2p2cboundaryvariables.hh b/dumux/boxmodels/2p2c/2p2cboundaryvariables.hh
index 0b1bd90a3ed1a4eeccd824a8ba3234c3828a52eb..1ad19467531d6afa3ef85a6668fdc68492d73ee4 100644
--- a/dumux/boxmodels/2p2c/2p2cboundaryvariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cboundaryvariables.hh
@@ -34,6 +34,8 @@
 
 #include <dumux/common/math.hh>
 
+#include "2p2cproperties.hh"
+
 namespace Dumux
 {
 
diff --git a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
index e4f02f69ee7bbba6a7e66aa80847c39cf974002c..0d9386be3b46f2f411bdd30674cd720ca4eefd43 100644
--- a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
@@ -34,6 +34,8 @@
 #include <dumux/common/math.hh>
 #include <dumux/common/spline.hh>
 
+#include "2p2cproperties.hh"
+
 namespace Dumux
 {
 
diff --git a/dumux/boxmodels/2p2c/2p2cindices.hh b/dumux/boxmodels/2p2c/2p2cindices.hh
index 1c1b26a7bf8047f2b62d44795d4bd4fc25b3a8f5..65feb762dd40b93ab56fc16690ff819df5b6e882 100644
--- a/dumux/boxmodels/2p2c/2p2cindices.hh
+++ b/dumux/boxmodels/2p2c/2p2cindices.hh
@@ -28,6 +28,8 @@
 #ifndef DUMUX_2P2C_INDICES_HH
 #define DUMUX_2P2C_INDICES_HH
 
+#include "2p2cproperties.hh"
+
 namespace Dumux
 {
 // \{
diff --git a/dumux/boxmodels/2p2c/2p2cproblem.hh b/dumux/boxmodels/2p2c/2p2cproblem.hh
index b670d8a8555607f7f46dbf29830533ea539c84e0..bc8305b68d300033a8a97312f8e788d345cb4fa9 100644
--- a/dumux/boxmodels/2p2c/2p2cproblem.hh
+++ b/dumux/boxmodels/2p2c/2p2cproblem.hh
@@ -30,6 +30,8 @@
 
 #include <dumux/boxmodels/common/boxproblem.hh>
 
+#include "2p2cproperties.hh"
+
 namespace Dumux
 {
 /*!
diff --git a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
index c03bc278c93d9d31fb6ad0d9f82fa39e06a70971..e741564acf99a74cd102b5b2c6ba3aa6596f8492 100644
--- a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
@@ -35,6 +35,7 @@
 #define DUMUX_2P2CNI_FLUX_VARIABLES_HH
 
 #include <dumux/common/math.hh>
+#include <dumux/boxmodels/2p2c/2p2cfluxvariables.hh>
 
 namespace Dumux
 {
diff --git a/dumux/boxmodels/2pni/2pnifluxvariables.hh b/dumux/boxmodels/2pni/2pnifluxvariables.hh
index dbb1a9388a24393d860a7a55be644c2b012e861c..22811ed1d1928484284458e7290e29c9cb3096ce 100644
--- a/dumux/boxmodels/2pni/2pnifluxvariables.hh
+++ b/dumux/boxmodels/2pni/2pnifluxvariables.hh
@@ -35,6 +35,7 @@
 #define DUMUX_2PNI_FLUX_VARIABLES_HH
 
 #include <dumux/common/math.hh>
+#include <dumux/boxmodels/2p/2pfluxvariables.hh>
 
 namespace Dumux
 {
diff --git a/dumux/boxmodels/2pni/2pniindices.hh b/dumux/boxmodels/2pni/2pniindices.hh
index fe6631304a007b9e81ed017ef6c5a6f7c37956d3..b41bf743bfc22d03b65d1e52e986d48214a6427b 100644
--- a/dumux/boxmodels/2pni/2pniindices.hh
+++ b/dumux/boxmodels/2pni/2pniindices.hh
@@ -29,6 +29,8 @@
 #ifndef DUMUX_2PNI_INDICES_HH
 #define DUMUX_2PNI_INDICES_HH
 
+#include <dumux/boxmodels/2p/2pindices.hh>
+
 namespace Dumux
 {
 // \{
diff --git a/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh b/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh
index 0ca66ab20e3addb57c90164a8daa9145db40e583..4c21f5224e55cd461a71b4fcd894e53689dff707 100644
--- a/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh
+++ b/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh
@@ -30,6 +30,8 @@
 #ifndef DUMUX_MPNC_VOLUME_VARIABLES_IA_HH
 #define DUMUX_MPNC_VOLUME_VARIABLES_IA_HH
 
+#include <dumux/boxmodels/MpNc/MpNcproperties.hh>
+
 namespace Dumux
 {
 
diff --git a/dumux/boxmodels/MpNc/diffusion/volumevariables.hh b/dumux/boxmodels/MpNc/diffusion/volumevariables.hh
index 2ca52ae0288b42dfc58caf84e20e1f2879de065a..87be47db800aeff251911575f0b2861099432823 100644
--- a/dumux/boxmodels/MpNc/diffusion/volumevariables.hh
+++ b/dumux/boxmodels/MpNc/diffusion/volumevariables.hh
@@ -28,6 +28,9 @@
 #ifndef DUMUX_MPNC_DIFFUSION_VOLUME_VARIABLES_HH
 #define DUMUX_MPNC_DIFFUSION_VOLUME_VARIABLES_HH
 
+#include <dumux/common/valgrind.hh>
+#include <dumux/boxmodels/MpNc/MpNcproperties.hh>
+
 namespace Dumux {
 
 template<class TypeTag, bool enableDiffusion>
diff --git a/dumux/boxmodels/common/boxassembler.hh b/dumux/boxmodels/common/boxassembler.hh
index 01984abd420567387c90235d934cf971a4b95e8c..1366fdadb6791f84c63b4470eb5c1109fcb17f59 100644
--- a/dumux/boxmodels/common/boxassembler.hh
+++ b/dumux/boxmodels/common/boxassembler.hh
@@ -28,10 +28,11 @@
 #ifndef DUMUX_BOX_ASSEMBLER_HH
 #define DUMUX_BOX_ASSEMBLER_HH
 
-//#include "overlapmatrix.hh"
+#include <dune/grid/common/gridenums.hh>
+
+#include <dumux/boxmodels/common/boxproperties.hh>
 #include <dumux/linear/vertexborderlistfromgrid.hh>
 #include <dumux/linear/foreignoverlapfrombcrsmatrix.hh>
-
 #include <dumux/parallel/vertexhandles.hh>
 
 namespace Dumux {
diff --git a/dumux/boxmodels/common/boxlocaljacobian.hh b/dumux/boxmodels/common/boxlocaljacobian.hh
index a9c74008f43888b69b7d74dabccd1ed208ac46da..e9618466c73b42ad4206254161df5a2a8359f051 100644
--- a/dumux/boxmodels/common/boxlocaljacobian.hh
+++ b/dumux/boxmodels/common/boxlocaljacobian.hh
@@ -29,6 +29,7 @@
 
 #include <dune/istl/matrix.hh>
 
+#include <dumux/common/math.hh>
 #include "boxelementboundarytypes.hh"
 
 namespace Dumux
diff --git a/dumux/boxmodels/richards/richardsfluxvariables.hh b/dumux/boxmodels/richards/richardsfluxvariables.hh
index a3308e71b06a6f3bf98059844a6a2c096deac645..641db57d7e0cdc09592741b9f57f7a3ea4db539f 100644
--- a/dumux/boxmodels/richards/richardsfluxvariables.hh
+++ b/dumux/boxmodels/richards/richardsfluxvariables.hh
@@ -30,6 +30,7 @@
 #define DUMUX_RICHARDS_FLUX_VARIABLES_HH
 
 #include <dumux/common/math.hh>
+#include "richardsproperties.hh"
 
 namespace Dumux
 {
diff --git a/dumux/boxmodels/richards/richardsproblem.hh b/dumux/boxmodels/richards/richardsproblem.hh
index 57f639f92db3480786c032b5219b58e02fd21102..4dfd54f93a064702957fef2d5a2c5c4e4b7dab81 100644
--- a/dumux/boxmodels/richards/richardsproblem.hh
+++ b/dumux/boxmodels/richards/richardsproblem.hh
@@ -28,6 +28,8 @@
 
 #include <dumux/boxmodels/common/boxproblem.hh>
 
+#include "richardsproperties.hh"
+
 namespace Dumux
 {
 /*!
diff --git a/dumux/boxmodels/richards/richardsvolumevariables.hh b/dumux/boxmodels/richards/richardsvolumevariables.hh
index ea2dc0c7329cc80e5613d2d6b9845b80cfab2240..ecf0f1d3187af707bc08bd7d697d19dc4cee89bb 100644
--- a/dumux/boxmodels/richards/richardsvolumevariables.hh
+++ b/dumux/boxmodels/richards/richardsvolumevariables.hh
@@ -31,6 +31,7 @@
 #include "richardsproperties.hh"
 
 #include <dumux/material/fluidstates/immisciblefluidstate.hh>
+#include <dumux/boxmodels/common/boxvolumevariables.hh>
 
 namespace Dumux
 {
diff --git a/dumux/linear/boxlinearsolver.hh b/dumux/linear/boxlinearsolver.hh
index a18f5e0184d7c418305161e3d5f2e5049867d37c..3497e0ff3c82a6b2b16da12e781cf6b2627ef44e 100644
--- a/dumux/linear/boxlinearsolver.hh
+++ b/dumux/linear/boxlinearsolver.hh
@@ -33,7 +33,6 @@
 #include <dune/istl/superlu.hh>
 
 #include <dumux/linear/seqsolverbackend.hh>
-
 #include <dumux/linear/linearsolverproperties.hh>
 #include <dumux/linear/vertexborderlistfromgrid.hh>
 #include <dumux/linear/overlappingbcrsmatrix.hh>
@@ -41,6 +40,7 @@
 #include <dumux/linear/overlappingpreconditioner.hh>
 #include <dumux/linear/overlappingscalarproduct.hh>
 #include <dumux/linear/overlappingoperator.hh>
+#include <dumux/boxmodels/common/boxproperties.hh>
 
 namespace Dumux
 {
diff --git a/dumux/linear/seqsolverbackend.hh b/dumux/linear/seqsolverbackend.hh
index 1169e96a8f92a8b5de54273f439211d14140cc67..74e3367cf5ca486a65ed058b89d8f0d6fce9d7f3 100644
--- a/dumux/linear/seqsolverbackend.hh
+++ b/dumux/linear/seqsolverbackend.hh
@@ -31,6 +31,7 @@
 #include <dune/istl/solvers.hh>
 #include <dune/istl/superlu.hh>
 
+#include <dumux/common/parameters.hh>
 #include <dumux/linear/linearsolverproperties.hh>
 
 namespace Dumux
diff --git a/dumux/nonlinear/newtoncontroller.hh b/dumux/nonlinear/newtoncontroller.hh
index 4fbc381705de334ff31ce98fd9234dbb184b8339..f69503409b49e890790d6d5e26d1580680a854d4 100644
--- a/dumux/nonlinear/newtoncontroller.hh
+++ b/dumux/nonlinear/newtoncontroller.hh
@@ -29,6 +29,7 @@
 #ifndef DUMUX_NEWTON_CONTROLLER_HH
 #define DUMUX_NEWTON_CONTROLLER_HH
 
+#include <dumux/common/propertysystem.hh>
 #include <dumux/io/vtkmultiwriter.hh>
 #include <dumux/common/exceptions.hh>
 #include <dumux/common/math.hh>