diff --git a/dumux/freeflow/properties.hh b/dumux/freeflow/properties.hh
index 4dac51a72dbda8956c8b2aaf4e9f80db6b7f0684..e73a4e28d865fdbf0928563a331390f1137eb82f 100644
--- a/dumux/freeflow/properties.hh
+++ b/dumux/freeflow/properties.hh
@@ -26,6 +26,7 @@
 #ifndef DUMUX_FREE_FLOW_PROPERTIES_HH
 #define DUMUX_FREE_FLOW_PROPERTIES_HH
 
+#include <dumux/common/properties.hh>
 #include <dumux/common/properties/basic.hh>
 #include <dumux/discretization/staggered/freeflow/facevariables.hh>
 #include <dumux/implicit/staggered/primaryvariables.hh>
diff --git a/dumux/freeflow/staggered/boundarytypes.hh b/dumux/freeflow/staggered/boundarytypes.hh
index 88b0de7d10a3c62768cb925ad1ce296675b3425e..b2336f2bbbf9ac70e466f4c22a328b20940a5aa3 100644
--- a/dumux/freeflow/staggered/boundarytypes.hh
+++ b/dumux/freeflow/staggered/boundarytypes.hh
@@ -23,6 +23,7 @@
 #ifndef STAGGERED_FREEFLOW_BOUNDARY_TYPES_HH
 #define STAGGERED_FREEFLOW_BOUNDARY_TYPES_HH
 
+#include <dumux/common/properties.hh>
 #include <dumux/common/boundarytypes.hh>
 
 namespace Dumux
diff --git a/dumux/freeflow/staggered/fluxvariables.hh b/dumux/freeflow/staggered/fluxvariables.hh
index a85555cdc4279fbe4201b78ae96dbff8f178247b..3f239c5e07f756d6eeb195adbb7d2d75890855c3 100644
--- a/dumux/freeflow/staggered/fluxvariables.hh
+++ b/dumux/freeflow/staggered/fluxvariables.hh
@@ -23,7 +23,7 @@
 #ifndef DUMUX_FREELOW_IMPLICIT_FLUXVARIABLES_HH
 #define DUMUX_FREELOW_IMPLICIT_FLUXVARIABLES_HH
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 #include <dumux/discretization/fluxvariablesbase.hh>
 
 namespace Dumux
diff --git a/dumux/freeflow/staggered/fluxvariablescache.hh b/dumux/freeflow/staggered/fluxvariablescache.hh
index 10a568425b87c1889ae6b5617eca65425824af3c..f57119f4abc563fa725fc8ac90a9d874254f6879 100644
--- a/dumux/freeflow/staggered/fluxvariablescache.hh
+++ b/dumux/freeflow/staggered/fluxvariablescache.hh
@@ -23,8 +23,8 @@
 #ifndef DUMUX_FREEFLOW_IMPLICIT_FLUXVARIABLESCACHE_HH
 #define DUMUX_FREEFLOW_IMPLICIT_FLUXVARIABLESCACHE_HH
 
-#include <dumux/common/basicproperties.hh>
 #include <dune/localfunctions/lagrange/pqkfactory.hh>
+#include <dumux/common/properties.hh>
 #include <dumux/discretization/methods.hh>
 
 namespace Dumux
diff --git a/dumux/freeflow/staggered/indices.hh b/dumux/freeflow/staggered/indices.hh
index 704590dac4c5db4a160bf7a1ea16c0bd31838cb7..39fec61a10890d5abe2edf389f0d23438d252f70 100644
--- a/dumux/freeflow/staggered/indices.hh
+++ b/dumux/freeflow/staggered/indices.hh
@@ -23,6 +23,8 @@
 #ifndef DUMUX_NAVIERSTOKES_COMMON_INDICES_HH
 #define DUMUX_NAVIERSTOKES_COMMON_INDICES_HH
 
+#include <dumux/common/properties.hh>
+
 namespace Dumux
 {
 // \{
diff --git a/dumux/freeflow/staggered/localresidual.hh b/dumux/freeflow/staggered/localresidual.hh
index 62933ed306af9a0d00eeea2bf23e136575eeae82..a586b85ba81a98ec67d2a1c21d9435915b04803a 100644
--- a/dumux/freeflow/staggered/localresidual.hh
+++ b/dumux/freeflow/staggered/localresidual.hh
@@ -23,6 +23,7 @@
 #ifndef DUMUX_STAGGERED_NAVIERSTOKES_LOCAL_RESIDUAL_HH
 #define DUMUX_STAGGERED_NAVIERSTOKES_LOCAL_RESIDUAL_HH
 
+#include <dumux/common/properties.hh>
 
 namespace Dumux
 {
diff --git a/dumux/freeflow/staggered/problem.hh b/dumux/freeflow/staggered/problem.hh
index 8f57dbdd367cccbf9aba73a9c565526b974b54aa..910f052f69c243fada2bf8ef6ffdbad8f4121254 100644
--- a/dumux/freeflow/staggered/problem.hh
+++ b/dumux/freeflow/staggered/problem.hh
@@ -23,9 +23,9 @@
 #ifndef DUMUX_NAVIERSTOKES_PROBLEM_HH
 #define DUMUX_NAVIERSTOKES_PROBLEM_HH
 
-#include <dumux/common/basicproperties.hh>
-#include "properties.hh"
+#include <dumux/common/properties.hh>
 #include <dumux/common/staggeredfvproblem.hh>
+#include "properties.hh"
 
 namespace Dumux
 {
diff --git a/dumux/freeflow/staggered/properties.hh b/dumux/freeflow/staggered/properties.hh
index 992345c10d629473301518ee26be3bb7940fd35d..336ddcac10fbc50358786fcdc5a604ac1702cfa5 100644
--- a/dumux/freeflow/staggered/properties.hh
+++ b/dumux/freeflow/staggered/properties.hh
@@ -27,8 +27,6 @@
 #ifndef DUMUX_NAVIERSTOKES_PROPERTIES_HH
 #define DUMUX_NAVIERSTOKES_PROPERTIES_HH
 
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
 #include <dumux/freeflow/properties.hh>
 
 #include <dumux/implicit/staggered/localresidual.hh>
@@ -48,6 +46,7 @@
 #include <dumux/material/components/nullcomponent.hh>
 #include <dumux/material/fluidsystems/1p.hh>
 
+#include <dumux/common/properties.hh>
 
 namespace Dumux
 {
@@ -62,7 +61,7 @@ namespace Properties {
 //////////////////////////////////////////////////////////////////
 
 //! The type tags for the implicit single-phase problems
-NEW_TYPE_TAG(NavierStokes, INHERITS_FROM(LinearSolverTypeTag, NumericModel, FreeFlow));
+NEW_TYPE_TAG(NavierStokes, INHERITS_FROM(FreeFlow));
 
 //! The type tags for the corresponding non-isothermal problems
 NEW_TYPE_TAG(NavierStokesNI, INHERITS_FROM(NavierStokes, NavierStokesNonIsothermal));
diff --git a/dumux/freeflow/staggered/velocityoutput.hh b/dumux/freeflow/staggered/velocityoutput.hh
index 5270d2753b73127bec47105d748ed835ba4a7748..1394934d2185a5a9fed0a980962614a5aae3f5d9 100644
--- a/dumux/freeflow/staggered/velocityoutput.hh
+++ b/dumux/freeflow/staggered/velocityoutput.hh
@@ -28,7 +28,7 @@
 #include <dune/istl/bvector.hh>
 #include <dune/geometry/referenceelements.hh>
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 #include <dumux/discretization/methods.hh>
 
 namespace Dumux
diff --git a/dumux/freeflow/staggered/volumevariables.hh b/dumux/freeflow/staggered/volumevariables.hh
index 244e7a918fdf4d358ead6fec00a0b79e8d021687..34457a97e218eefc8a8174c1805dfd77b04ac10d 100644
--- a/dumux/freeflow/staggered/volumevariables.hh
+++ b/dumux/freeflow/staggered/volumevariables.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_NAVIERSTOKES_VOLUME_VARIABLES_HH
 #define DUMUX_NAVIERSTOKES_VOLUME_VARIABLES_HH
 
+#include <dumux/common/properties.hh>
+
 #include "properties.hh"
 #include <dumux/discretization/volumevariables.hh>
 
diff --git a/dumux/freeflow/staggerednc/localresidual.hh b/dumux/freeflow/staggerednc/localresidual.hh
index 6edb9805f33ba6d24492498964491645db94cf30..c426ed8aee44f13d30c3e40c1ef498502f268f38 100644
--- a/dumux/freeflow/staggerednc/localresidual.hh
+++ b/dumux/freeflow/staggerednc/localresidual.hh
@@ -23,7 +23,7 @@
 #ifndef DUMUX_STAGGERED_NAVIERSTOKES_NC_LOCAL_RESIDUAL_HH
 #define DUMUX_STAGGERED_NAVIERSTOKES_NC_LOCAL_RESIDUAL_HH
 
-
+#include <dumux/common/properties.hh>
 #include <dumux/common/valgrind.hh>
 #include <dumux/implicit/staggered/localresidual.hh>
 
diff --git a/dumux/freeflow/staggerednc/properties.hh b/dumux/freeflow/staggerednc/properties.hh
index ef483a6cb65a7f4217c93843ae377005b5781669..e3cf94efcb7243d0bbfa3fba594f84f97a9f1f2c 100644
--- a/dumux/freeflow/staggerednc/properties.hh
+++ b/dumux/freeflow/staggerednc/properties.hh
@@ -27,9 +27,6 @@
 #ifndef DUMUX_NAVIERSTOKES_NC_PROPERTIES_HH
 #define DUMUX_NAVIERSTOKES_NC_PROPERTIES_HH
 
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
-
 #include <dumux/freeflow/staggered/properties.hh>
 #include <dumux/freeflow/staggeredni/properties.hh>
 #include <dumux/discretization/fickslaw.hh>
@@ -59,7 +56,7 @@ namespace Properties {
 //////////////////////////////////////////////////////////////////
 
 //! The type tags for the implicit single-phase problems
-NEW_TYPE_TAG(NavierStokesNC, INHERITS_FROM(NavierStokes, NumericModel, LinearSolverTypeTag));
+NEW_TYPE_TAG(NavierStokesNC, INHERITS_FROM(NavierStokes));
 NEW_TYPE_TAG(NavierStokesNCNI, INHERITS_FROM(NavierStokesNC, NavierStokesNonIsothermal));
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/dumux/freeflow/staggerednc/volumevariables.hh b/dumux/freeflow/staggerednc/volumevariables.hh
index 02bcf0567ab31604212ca9e7907900366e837f0e..463bad3ab26346e5cc5958f9e2c161e40416174a 100644
--- a/dumux/freeflow/staggerednc/volumevariables.hh
+++ b/dumux/freeflow/staggerednc/volumevariables.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_NAVIER_STOKES_NC_VOLUMEVARIABLES_HH
 #define DUMUX_NAVIER_STOKES_NC_VOLUMEVARIABLES_HH
 
+#include <dumux/common/properties.hh>
 #include "properties.hh"
 
 #include "../staggered/volumevariables.hh"
diff --git a/dumux/freeflow/staggeredni/fluxvariables.hh b/dumux/freeflow/staggeredni/fluxvariables.hh
index 028f37129637114fd6186e50f69c2c60c4f32350..6e5f77a33b9a434b0eddbd434d5163f8e8f0dd0a 100644
--- a/dumux/freeflow/staggeredni/fluxvariables.hh
+++ b/dumux/freeflow/staggeredni/fluxvariables.hh
@@ -23,7 +23,7 @@
 #ifndef DUMUX_FREELOW_IMPLICIT_NI_FLUXVARIABLES_HH
 #define DUMUX_FREELOW_IMPLICIT_NI_FLUXVARIABLES_HH
 
-#include <dumux/common/basicproperties.hh>
+#include <dumux/common/properties.hh>
 
 namespace Dumux
 {
diff --git a/dumux/freeflow/staggeredni/localresidual.hh b/dumux/freeflow/staggeredni/localresidual.hh
index b6517c21ac64c4422f937f2e0e078c979d415594..a067af392191002588be6f2f0f2cfcaa91966775 100644
--- a/dumux/freeflow/staggeredni/localresidual.hh
+++ b/dumux/freeflow/staggeredni/localresidual.hh
@@ -25,7 +25,7 @@
 #ifndef DUMUX_FREE_FLOW_ENERGY_LOCAL_RESIDUAL_HH
 #define DUMUX_FREE_FLOW_ENERGY_LOCAL_RESIDUAL_HH
 
-// #include <dumux/implicit/properties.hh>
+#include <dumux/common/properties.hh>
 
 namespace Dumux
 {
diff --git a/dumux/freeflow/staggeredni/properties.hh b/dumux/freeflow/staggeredni/properties.hh
index 8aab152173bf3256515b5c15f71428087abd02cd..f7752d75e799eecb81e7fb21ac83d785f44b3d57 100644
--- a/dumux/freeflow/staggeredni/properties.hh
+++ b/dumux/freeflow/staggeredni/properties.hh
@@ -27,6 +27,7 @@
 #ifndef DUMUX_NAVIER_STOKES_NI_PROPERTIES_HH
 #define DUMUX_NAVIER_STOKES_NI_PROPERTIES_HH
 
+#include <dumux/common/properties.hh>
 #include "fluxvariables.hh"
 #include "indices.hh"
 #include "localresidual.hh"