diff --git a/dumux/discretization/staggered/connectivitymap.hh b/dumux/discretization/staggered/connectivitymap.hh
index c71587679a5aa483b30114db32352ed029a7cb98..584eddecb23d4ac2304eb7f31f38c9895a511ea1 100644
--- a/dumux/discretization/staggered/connectivitymap.hh
+++ b/dumux/discretization/staggered/connectivitymap.hh
@@ -26,7 +26,7 @@
 #define DUMUX_STAGGERED_CONNECTIVITY_MAP_HH
 
 #include <vector>
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 
 namespace Dumux
 {
diff --git a/dumux/discretization/staggered/elementfacevariables.hh b/dumux/discretization/staggered/elementfacevariables.hh
index b9ab9e87f191d906fdb7a6a6063c4d335c54a1c9..e080d5e7e7732db41b4ab08722d9ea20348f2e0f 100644
--- a/dumux/discretization/staggered/elementfacevariables.hh
+++ b/dumux/discretization/staggered/elementfacevariables.hh
@@ -23,7 +23,7 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_ELEMENTFACEVARIABLES_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_ELEMENTFACEVARIABLES_HH
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 
 namespace Dumux
 {
diff --git a/dumux/discretization/staggered/elementfluxvariablescache.hh b/dumux/discretization/staggered/elementfluxvariablescache.hh
index adf2e895cefcf40fee06d28c5d556ee3f1ca30c3..ec130afada36d4d9290dd29c3b520f17a57efc73 100644
--- a/dumux/discretization/staggered/elementfluxvariablescache.hh
+++ b/dumux/discretization/staggered/elementfluxvariablescache.hh
@@ -23,7 +23,7 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_ELEMENT_FLUXVARSCACHE_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_ELEMENT_FLUXVARSCACHE_HH
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 
 namespace Dumux
 {
diff --git a/dumux/discretization/staggered/elementvolumevariables.hh b/dumux/discretization/staggered/elementvolumevariables.hh
index 9e2cc021ceed2da95fcc04fa9cc5385fa7c8c1ea..876bf70563126c400d7906fd3ba8d1de277d4684 100644
--- a/dumux/discretization/staggered/elementvolumevariables.hh
+++ b/dumux/discretization/staggered/elementvolumevariables.hh
@@ -23,7 +23,7 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_ELEMENT_VOLUMEVARIABLES_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_ELEMENT_VOLUMEVARIABLES_HH
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 
 namespace Dumux
 {
diff --git a/dumux/discretization/staggered/facesolution.hh b/dumux/discretization/staggered/facesolution.hh
index d36ea605aa5dd38704e9f01a6c16e3e82e6f8ccd..7a866a335012dd925a9670d4c5168e626f70b417 100644
--- a/dumux/discretization/staggered/facesolution.hh
+++ b/dumux/discretization/staggered/facesolution.hh
@@ -23,7 +23,7 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_FACE_SOLUTION_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_FACE_SOLUTION_HH
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 #include <dumux/discretization/staggered/elementvolumevariables.hh>
 
 namespace Dumux
diff --git a/dumux/discretization/staggered/freeflow/facevariables.hh b/dumux/discretization/staggered/freeflow/facevariables.hh
index 337b6e419d801d6615d80ff09232be05117b7f4b..dc09d3d43fff90e03ce5a56a23fc85893c0da2c2 100644
--- a/dumux/discretization/staggered/freeflow/facevariables.hh
+++ b/dumux/discretization/staggered/freeflow/facevariables.hh
@@ -24,7 +24,7 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_FREEFLOW_FACEVARIABLES_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_FREEFLOW_FACEVARIABLES_HH
 
-#include <dumux/common/basicproperties.hh>
+#include<dumux/common/properties.hh>
 
 namespace Dumux
 {
diff --git a/dumux/discretization/staggered/freeflow/fickslaw.hh b/dumux/discretization/staggered/freeflow/fickslaw.hh
index f82f3a600e152ab4c9c8b3a7e5a2b4beaaf3194d..1ab86e43b825327b23c9b1a1cff2ac37a4a90a9c 100644
--- a/dumux/discretization/staggered/freeflow/fickslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fickslaw.hh
@@ -26,8 +26,9 @@
 
 #include <dune/common/float_cmp.hh>
 
-#include <dumux/common/math.hh>
+#include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
+#include <dumux/common/math.hh>
 
 #include <dumux/discretization/methods.hh>
 #include <dumux/discretization/fluxvariablescaching.hh>
diff --git a/dumux/discretization/staggered/freeflow/fourierslaw.hh b/dumux/discretization/staggered/freeflow/fourierslaw.hh
index cb4f1588ff6f7c03a9b8c09308d3942227f91739..2c654e726e0452c6ad1f628e37de3e73292669ad 100644
--- a/dumux/discretization/staggered/freeflow/fourierslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fourierslaw.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_FOURIERS_LAW_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_FOURIERS_LAW_HH
 
+#include <dumux/common/properties.hh>
 #include <dumux/common/math.hh>
 
 #include <dumux/discretization/methods.hh>
diff --git a/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh b/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh
index 2d6e85f09df1e3b3ad0d49ba181ec567db0fad80..4ce20faabf5644af61b8535ce9c114c0401e8cec 100644
--- a/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh
+++ b/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh
@@ -27,6 +27,7 @@
 #include <dune/geometry/multilineargeometry.hh>
 #include <dune/geometry/referenceelements.hh>
 
+#include <dumux/common/properties.hh>
 #include <dumux/common/math.hh>
 #include <type_traits>
 #include <algorithm>
diff --git a/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh b/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
index d4a27f09208b59742e31f03583e1ac2129bbef8d..6758f99b616ccc628c46c82d8e5fdbca7628b7aa 100644
--- a/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
+++ b/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
@@ -25,8 +25,11 @@
 
 #include <utility>
 #include <dune/common/fvector.hh>
+
 #include <dumux/discretization/subcontrolvolumefacebase.hh>
 #include <dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh>
+#include <dumux/common/properties.hh>
+#include <dumux/common/optional.hh>
 
 #include <typeinfo>
 
diff --git a/dumux/discretization/staggered/fvelementgeometry.hh b/dumux/discretization/staggered/fvelementgeometry.hh
index ef34bf41c2da24b92ad7bb0891fc67ad7db5afb5..c35f61ae7d920c5c26d143e6752ef8d9913bd119 100644
--- a/dumux/discretization/staggered/fvelementgeometry.hh
+++ b/dumux/discretization/staggered/fvelementgeometry.hh
@@ -27,6 +27,7 @@
 
 #include <dune/common/iteratorrange.hh>
 
+#include <dumux/common/properties.hh>
 #include <dumux/discretization/scvandscvfiterators.hh>
 
 namespace Dumux
diff --git a/dumux/discretization/staggered/fvgridgeometry.hh b/dumux/discretization/staggered/fvgridgeometry.hh
index 5dce791e7350f3791322887ed8071b0b15658762..d18c28c6bdc339a6a580aa5a94ff79a2f3564b89 100644
--- a/dumux/discretization/staggered/fvgridgeometry.hh
+++ b/dumux/discretization/staggered/fvgridgeometry.hh
@@ -25,6 +25,7 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_FVGEOMETRY_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_FVGEOMETRY_HH
 
+#include <dumux/common/properties.hh>
 #include <dumux/common/elementmap.hh>
 #include <dumux/discretization/basefvgridgeometry.hh>
 #include <dumux/common/boundingboxtree.hh>
diff --git a/dumux/discretization/staggered/globalfacevariables.hh b/dumux/discretization/staggered/globalfacevariables.hh
index f368f250da120fc90bad067e4be0eea2fba402e6..6ad4360c7be0874522e323fe3a855129ea705aa6 100644
--- a/dumux/discretization/staggered/globalfacevariables.hh
+++ b/dumux/discretization/staggered/globalfacevariables.hh
@@ -23,7 +23,7 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_FACEVARIABLES_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_FACEVARIABLES_HH
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 #include <dumux/discretization/staggered/facesolution.hh>
 
 namespace Dumux
diff --git a/dumux/discretization/staggered/globalfluxvariablescache.hh b/dumux/discretization/staggered/globalfluxvariablescache.hh
index 432b148255209f516fe418e4dc5eca446a5dbffb..5f5b305bc6af955341483e341eb7b61f51dfdb87 100644
--- a/dumux/discretization/staggered/globalfluxvariablescache.hh
+++ b/dumux/discretization/staggered/globalfluxvariablescache.hh
@@ -23,7 +23,7 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_FLUXVARSCACHE_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_FLUXVARSCACHE_HH
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 #include <dumux/discretization/staggered/elementfluxvariablescache.hh>
 
 namespace Dumux
diff --git a/dumux/discretization/staggered/properties.hh b/dumux/discretization/staggered/properties.hh
index 5c8d51ff77c255697e7d1e57ff7ff76043c01ff5..133de5d16eb8776c8825b624d62cea56bc7d9d38 100644
--- a/dumux/discretization/staggered/properties.hh
+++ b/dumux/discretization/staggered/properties.hh
@@ -53,7 +53,6 @@
 #include <dune/istl/multitypeblockvector.hh>
 #include <dune/istl/multitypeblockmatrix.hh>
 
-#include <dumux/linear/linearsolverproperties.hh>
 
 namespace Dumux
 {