diff --git a/dumux/assembly/CMakeLists.txt b/dumux/assembly/CMakeLists.txt
index cc5de8c508eaa8614ce2da1a504d3de235099148..f7ea8bb601bd42ca26054537cdfdf28f24bcaf70 100644
--- a/dumux/assembly/CMakeLists.txt
+++ b/dumux/assembly/CMakeLists.txt
@@ -9,4 +9,5 @@ fvassembler.hh
 fvlocalresidual.hh
 staggeredfvassembler.hh
 staggeredlocalassembler.hh
+staggeredlocalresidual.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/assembly)
diff --git a/dumux/assembly/staggeredfvassembler.hh b/dumux/assembly/staggeredfvassembler.hh
index 96999afe5a3e2b0738a4cc1cf11c7641d0bea59f..2d803bfd9af4fc61c860aafd221ddf62fd88e533 100644
--- a/dumux/assembly/staggeredfvassembler.hh
+++ b/dumux/assembly/staggeredfvassembler.hh
@@ -30,11 +30,11 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/timeloop.hh>
-#include <dumux/implicit/staggered/localresidual.hh>
 #include <dumux/discretization/methods.hh>
 
 #include "diffmethod.hh"
 #include "staggeredlocalassembler.hh"
+#include "staggeredlocalresidual.hh"
 
 namespace Dumux {
 
diff --git a/dumux/implicit/staggered/localresidual.hh b/dumux/assembly/staggeredlocalresidual.hh
similarity index 100%
rename from dumux/implicit/staggered/localresidual.hh
rename to dumux/assembly/staggeredlocalresidual.hh
diff --git a/dumux/discretization/staggered/properties.hh b/dumux/discretization/staggered/properties.hh
index 3388f00788e2b620f9bfb78e66a689ca54bc7265..d76d2506a638dbb536e0a082c34a2a289e456ab9 100644
--- a/dumux/discretization/staggered/properties.hh
+++ b/dumux/discretization/staggered/properties.hh
@@ -32,7 +32,7 @@
 #include <dumux/discretization/fvproperties.hh>
 
 #include <dumux/implicit/cellcentered/elementboundarytypes.hh>
-#include <dumux/implicit/staggered/localresidual.hh>
+#include <dumux/assembly/staggeredlocalresidual.hh>
 #include <dumux/implicit/staggered/primaryvariables.hh>
 #include <dumux/implicit/staggered/gridvariables.hh>
 
diff --git a/dumux/freeflow/navierstokes/staggered/localresidual.hh b/dumux/freeflow/navierstokes/staggered/localresidual.hh
index 6dcd354f0b0a2bb9016afe76189e2f1dd3043418..75024913c3895c96b62ccd9aa9d164c3151e0a32 100644
--- a/dumux/freeflow/navierstokes/staggered/localresidual.hh
+++ b/dumux/freeflow/navierstokes/staggered/localresidual.hh
@@ -25,7 +25,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/discretization/methods.hh>
-#include <dumux/implicit/staggered/localresidual.hh>
+#include <dumux/assembly/staggeredlocalresidual.hh>
 #include <dune/common/hybridutilities.hh>
 
 namespace Dumux
@@ -52,7 +52,8 @@ NEW_PROP_TAG(ElementFaceVariables);
 
 
 template<class TypeTag>
-class NavierStokesResidualImpl<TypeTag, DiscretizationMethods::Staggered> : public Dumux::StaggeredLocalResidual<TypeTag>
+class NavierStokesResidualImpl<TypeTag, DiscretizationMethods::Staggered>
+: public StaggeredLocalResidual<TypeTag>
 {
     using ParentType = StaggeredLocalResidual<TypeTag>;
     friend class StaggeredLocalResidual<TypeTag>;
diff --git a/dumux/freeflow/navierstokesnc/model.hh b/dumux/freeflow/navierstokesnc/model.hh
index 3542b1bf1e755ce8735337814eed1598092295f9..6ead117b845f925143272d587bb7cec8a207201a 100644
--- a/dumux/freeflow/navierstokesnc/model.hh
+++ b/dumux/freeflow/navierstokesnc/model.hh
@@ -39,7 +39,7 @@
 #include "fluxvariables.hh"
 #include "vtkoutputfields.hh"
 
-#include <dumux/implicit/staggered/localresidual.hh>
+#include <dumux/assembly/staggeredlocalresidual.hh>
 #include <dumux/material/fluidsystems/gasphase.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>