diff --git a/dune/xt/grid/boundaryinfo.hh b/dune/xt/grid/boundaryinfo.hh
index 62d6e1a141fe64a636b081a05419ed639eddf999..198a15a1b7d8d481f6007c9bdd18df4c52a78441 100644
--- a/dune/xt/grid/boundaryinfo.hh
+++ b/dune/xt/grid/boundaryinfo.hh
@@ -8,8 +8,8 @@
 //   Sven Kaulmann   (2013 - 2014)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_BOUNDARYINFO_HH
-#define DUNE_STUFF_GRID_BOUNDARYINFO_HH
+#ifndef DUNE_XT_GRID_BOUNDARYINFO_HH
+#define DUNE_XT_GRID_BOUNDARYINFO_HH
 
 #include <map>
 #include <set>
@@ -801,4 +801,4 @@ public:
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_GRID_BOUNDARYINFO_HH
+#endif // DUNE_XT_GRID_BOUNDARYINFO_HH
diff --git a/dune/xt/grid/entity.hh b/dune/xt/grid/entity.hh
index f55c4a369e80dc5fb44d83ef68643671cb668126..8f62aae4d951721549dd3c70c8edd54764162d8b 100644
--- a/dune/xt/grid/entity.hh
+++ b/dune/xt/grid/entity.hh
@@ -8,8 +8,8 @@
 //   Sven Kaulmann   (2014)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_ENTITY_HH
-#define DUNE_STUFF_GRID_ENTITY_HH
+#ifndef DUNE_XT_GRID_ENTITY_HH
+#define DUNE_XT_GRID_ENTITY_HH
 
 #include <dune/geometry/referenceelements.hh>
 
@@ -112,4 +112,4 @@ auto reference_element(const Dune::Geometry<mydim, cdim, GridImp, GeometryImp>&
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_GRID_ENTITY_HH
+#endif // DUNE_XT_GRID_ENTITY_HH
diff --git a/dune/xt/grid/information.hh b/dune/xt/grid/information.hh
index cca8b4447e4065f15e7290249af6a4beb784720f..931b9c184634c54bb10b5eba457952dd28c64619 100644
--- a/dune/xt/grid/information.hh
+++ b/dune/xt/grid/information.hh
@@ -8,8 +8,8 @@
 //   Sven Kaulmann   (2014)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_INFORMATION_HH
-#define DUNE_STUFF_GRID_INFORMATION_HH
+#ifndef DUNE_XT_GRID_INFORMATION_HH
+#define DUNE_XT_GRID_INFORMATION_HH
 
 #include <ostream>
 
@@ -198,4 +198,4 @@ inline std::ostream& operator<<(std::ostream& s, const DSG::Dimensions<T>& d)
 
 #endif // HAVE_DUNE_GRID
 
-#endif // DUNE_STUFF_GRID_INFORMATION_HH
+#endif // DUNE_XT_GRID_INFORMATION_HH
diff --git a/dune/xt/grid/intersection.hh b/dune/xt/grid/intersection.hh
index 884345d17aa86dd55d27225c25acabdfddc28a56..4fde0f4d493ca1204732e4ff7ab8afc5c836fd52 100644
--- a/dune/xt/grid/intersection.hh
+++ b/dune/xt/grid/intersection.hh
@@ -9,8 +9,8 @@
 //   Sven Kaulmann   (2013)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_INTERSECTION_HH
-#define DUNE_STUFF_GRID_INTERSECTION_HH
+#ifndef DUNE_XT_GRID_INTERSECTION_HH
+#define DUNE_XT_GRID_INTERSECTION_HH
 
 #include <dune/common/deprecated.hh>
 #include <dune/common/fvector.hh>
@@ -149,4 +149,4 @@ bool intersectionContains(const IntersectionType& intersection, const Dune::Fiel
 } // end of namespace Stuff
 } // end namespace Dune
 
-#endif // DUNE_STUFF_GRID_INTERSECTION_HH
+#endif // DUNE_XT_GRID_INTERSECTION_HH
diff --git a/dune/xt/grid/layers.hh b/dune/xt/grid/layers.hh
index f60a03b2ba04d141a9d8a05e3e07a223f17cec8a..e6b3a4a8c85eab08e0c6902c568eb373cd974eaa 100644
--- a/dune/xt/grid/layers.hh
+++ b/dune/xt/grid/layers.hh
@@ -7,8 +7,8 @@
 //   Felix Schindler (2014 - 2015)
 //   Rene Milk       (2014 - 2015)
 
-#ifndef DUNE_STUFF_GRID_LAYERS_HH
-#define DUNE_STUFF_GRID_LAYERS_HH
+#ifndef DUNE_XT_GRID_LAYERS_HH
+#define DUNE_XT_GRID_LAYERS_HH
 
 #include <memory>
 #include <cassert>
@@ -426,4 +426,4 @@ struct LeafPartView
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_GRID_LAYERS_HH
+#endif // DUNE_XT_GRID_LAYERS_HH
diff --git a/dune/xt/grid/output/entity_visualization.hh b/dune/xt/grid/output/entity_visualization.hh
index fc4769e63f983e003a4bb28714ef9054ab3e29d3..5f06a6d505ce2b978dca16961fedf0b4c98aa836 100644
--- a/dune/xt/grid/output/entity_visualization.hh
+++ b/dune/xt/grid/output/entity_visualization.hh
@@ -8,8 +8,8 @@
 //   Sven Kaulmann   (2013)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_ENTITY_VISUALIZATION_HH
-#define DUNE_STUFF_GRID_ENTITY_VISUALIZATION_HH
+#ifndef DUNE_XT_GRID_OUTPUT_ENTITY_VISUALIZATION_HH
+#define DUNE_XT_GRID_OUTPUT_ENTITY_VISUALIZATION_HH
 
 #include <boost/io/ios_state.hpp>
 
@@ -241,4 +241,4 @@ struct ElementVisualization
 
 #endif // HAVE_DUNE_GRID
 
-#endif // DUNE_STUFF_GRID_ENTITY_VISUALIZATION_HH
+#endif // DUNE_XT_GRID_OUTPUT_ENTITY_VISUALIZATION_HH
diff --git a/dune/xt/grid/output/pgf.hh b/dune/xt/grid/output/pgf.hh
index 49f7c6d3b83705a99f69c70b3710d6b6c634630f..671f58f45ed70a371b4fd8eff37a989a3862a694 100644
--- a/dune/xt/grid/output/pgf.hh
+++ b/dune/xt/grid/output/pgf.hh
@@ -8,8 +8,8 @@
 //   Rene Milk       (2012 - 2013, 2015)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_OUTPUT_PGF_HH
-#define DUNE_STUFF_GRID_OUTPUT_PGF_HH
+#ifndef DUNE_XT_GRID_OUTPUT_PGF_HH
+#define DUNE_XT_GRID_OUTPUT_PGF_HH
 
 // nothing here will compile w/o grid present
 #if HAVE_DUNE_GRID
@@ -373,4 +373,4 @@ private:
 
 #endif // HAVE_DUNE_GRID
 
-#endif // DUNE_GRID_IO_LATEX_PGF_HH
+#endif // DUNE_XT_GRID_OUTPUT_PGF_HH
diff --git a/dune/xt/grid/periodicview.hh b/dune/xt/grid/periodicview.hh
index 354f1d5102fbc458ebaa79f0df80fd4c576f1faf..0ee6d4ef62d4c6350fceef27de90cbde1fd6077c 100644
--- a/dune/xt/grid/periodicview.hh
+++ b/dune/xt/grid/periodicview.hh
@@ -7,8 +7,8 @@
 //   Rene Milk       (2015)
 //   Tobias Leibner  (2015)
 
-#ifndef DUNE_STUFF_GRID_PERIODICVIEW_HH
-#define DUNE_STUFF_GRID_PERIODICVIEW_HH
+#ifndef DUNE_XT_GRID_PERIODICVIEW_HH
+#define DUNE_XT_GRID_PERIODICVIEW_HH
 
 #include <bitset>
 #include <map>
@@ -467,4 +467,4 @@ class PeriodicGridView
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_GRID_PERIODICVIEW_HH
+#endif // DUNE_XT_GRID_PERIODICVIEW_HH
diff --git a/dune/xt/grid/provider.hh b/dune/xt/grid/provider.hh
index 02d1ba2470268fe3d7b5b3c4190270a826f7cc08..c6f3583df39a0fede8470356ab1ab920044a8990 100644
--- a/dune/xt/grid/provider.hh
+++ b/dune/xt/grid/provider.hh
@@ -8,8 +8,8 @@
 //   Rene Milk       (2013 - 2015)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_PROVIDER_HH
-#define DUNE_STUFF_GRID_PROVIDER_HH
+#ifndef DUNE_XT_GRID_PROVIDER_HH
+#define DUNE_XT_GRID_PROVIDER_HH
 
 #include <memory>
 
@@ -88,4 +88,4 @@ class GridProviders
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_GRID_PROVIDER_HH
+#endif // DUNE_XT_GRID_PROVIDER_HH
diff --git a/dune/xt/grid/provider/cube.hh b/dune/xt/grid/provider/cube.hh
index eda4d302d861147eb3e40de154c47a62e6ff5650..851434c764f977ce82d12b75ceb278981db90b59 100644
--- a/dune/xt/grid/provider/cube.hh
+++ b/dune/xt/grid/provider/cube.hh
@@ -10,8 +10,8 @@
 //   Rene Milk        (2012 - 2015)
 //   Tobias Leibner   (2014)
 
-#ifndef DUNE_STUFF_GRIDS_PROVIDER_CUBE_HH
-#define DUNE_STUFF_GRIDS_PROVIDER_CUBE_HH
+#ifndef DUNE_XT_GRID_PROVIDER_CUBE_HH
+#define DUNE_XT_GRID_PROVIDER_CUBE_HH
 
 #include <memory>
 #include <sstream>
@@ -299,4 +299,4 @@ class Cube
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_GRIDS_PROVIDER_CUBE_HH
+#endif // DUNE_XT_GRID_PROVIDER_CUBE_HH
diff --git a/dune/xt/grid/provider/default.hh b/dune/xt/grid/provider/default.hh
index 6d8f15a452516ac4f5fcfa5c0e3a84b6656e437d..c97402b08773d51c544626105c3a3a7cf6a6d252 100644
--- a/dune/xt/grid/provider/default.hh
+++ b/dune/xt/grid/provider/default.hh
@@ -8,8 +8,8 @@
 //   Sven Kaulmann   (2014)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_PROVIDER_DEFAULT_HH
-#define DUNE_STUFF_GRID_PROVIDER_DEFAULT_HH
+#ifndef DUNE_XT_GRID_PROVIDER_DEFAULT_HH
+#define DUNE_XT_GRID_PROVIDER_DEFAULT_HH
 
 #include <memory>
 
@@ -91,4 +91,4 @@ class Default
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_GRID_PROVIDER_DEFAULT_HH
+#endif // DUNE_XT_GRID_PROVIDER_DEFAULT_HH
diff --git a/dune/xt/grid/provider/dgf.hh b/dune/xt/grid/provider/dgf.hh
index 5cd60e94ac68213cb1388ad6edfacf8ddacea7e0..c89afae03d2dd21060ec20aa611a552ff9949d92 100644
--- a/dune/xt/grid/provider/dgf.hh
+++ b/dune/xt/grid/provider/dgf.hh
@@ -9,8 +9,8 @@
 //   Rene Milk       (2012 - 2013, 2015)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_PROVIDER_DGF_HH
-#define DUNE_STUFF_GRID_PROVIDER_DGF_HH
+#ifndef DUNE_XT_GRID_PROVIDER_DGF_HH
+#define DUNE_XT_GRID_PROVIDER_DGF_HH
 
 #include <memory>
 
@@ -126,4 +126,4 @@ class DGF
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_GRID_PROVIDER_DGF_HH
+#endif // DUNE_XT_GRID_PROVIDER_DGF_HH
diff --git a/dune/xt/grid/provider/eoc.hh b/dune/xt/grid/provider/eoc.hh
index 3fc0ad6e4edb2213edcfeb4062ebc92e2dd767a0..ec760ca84612d5be6ec5c7a19c2e1a4686de9baa 100644
--- a/dune/xt/grid/provider/eoc.hh
+++ b/dune/xt/grid/provider/eoc.hh
@@ -6,8 +6,8 @@
 //   Felix Schindler (2015)
 //   Rene Milk       (2015)
 
-#ifndef DUNE_STUFF_GRID_PROVIDER_EOC_HH
-#define DUNE_STUFF_GRID_PROVIDER_EOC_HH
+#ifndef DUNE_XT_GRID_PROVIDER_EOC_HH
+#define DUNE_XT_GRID_PROVIDER_EOC_HH
 
 // silence sgrid deprecation warning temporarily
 #if HAVE_DUNE_GRID
@@ -116,4 +116,4 @@ class EOC
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_GRID_PROVIDER_EOC_HH
+#endif // DUNE_XT_GRID_PROVIDER_EOC_HH
diff --git a/dune/xt/grid/provider/gmsh.hh b/dune/xt/grid/provider/gmsh.hh
index e7179e50b9bc11e142bbc67e2b9004e45d798fc6..40eded469685fdd4efbf249bfbfa1009ad9234c0 100644
--- a/dune/xt/grid/provider/gmsh.hh
+++ b/dune/xt/grid/provider/gmsh.hh
@@ -9,8 +9,8 @@
 //   Rene Milk       (2012 - 2013, 2015)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_PROVIDER_GMSH_HH
-#define DUNE_STUFF_GRID_PROVIDER_GMSH_HH
+#ifndef DUNE_XT_GRID_PROVIDER_GMSH_HH
+#define DUNE_XT_GRID_PROVIDER_GMSH_HH
 
 #if HAVE_DUNE_GRID
 
@@ -125,4 +125,4 @@ private:
 
 #endif // HAVE_DUNE_GRID
 
-#endif // DUNE_STUFF_GRID_PROVIDER_GMSH_HH
+#endif // DUNE_XT_GRID_PROVIDER_GMSH_HH
diff --git a/dune/xt/grid/provider/interface.hh b/dune/xt/grid/provider/interface.hh
index 3234925efb6780f0a9fe47650ac48ad1ccc2df02..3893c88f43dbcbb867583f475969cc7871a5cd7a 100644
--- a/dune/xt/grid/provider/interface.hh
+++ b/dune/xt/grid/provider/interface.hh
@@ -10,8 +10,8 @@
 //   Sven Kaulmann   (2014)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_PROVIDER_INTERFACE_HH
-#define DUNE_STUFF_GRID_PROVIDER_INTERFACE_HH
+#ifndef DUNE_XT_GRID_PROVIDER_INTERFACE_HH
+#define DUNE_XT_GRID_PROVIDER_INTERFACE_HH
 
 #include <memory>
 
@@ -354,4 +354,4 @@ class ProviderInterface
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_GRID_PROVIDER_INTERFACE_HH
+#endif // DUNE_XT_GRID_PROVIDER_INTERFACE_HH
diff --git a/dune/xt/grid/provider/starcd.hh b/dune/xt/grid/provider/starcd.hh
index 79e78f4e2172116a88b0962dad4a66bf6a119232..960d01439e91d6f646c892b0119b11b53c83d8b7 100644
--- a/dune/xt/grid/provider/starcd.hh
+++ b/dune/xt/grid/provider/starcd.hh
@@ -8,8 +8,8 @@
 //   Rene Milk       (2012 - 2015)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_PROVIDER_STARCD_HH
-#define DUNE_STUFF_GRID_PROVIDER_STARCD_HH
+#ifndef DUNE_XT_GRID_PROVIDER_STARCD_HH
+#define DUNE_XT_GRID_PROVIDER_STARCD_HH
 
 #if HAVE_DUNE_GRID
 
@@ -236,4 +236,4 @@ private:
 
 #endif // HAVE_DUNE_GRID
 
-#endif // DUNE_STUFF_GRID_PROVIDER_STARCD_HH
+#endif // DUNE_XT_GRID_PROVIDER_STARCD_HH
diff --git a/dune/xt/grid/search.hh b/dune/xt/grid/search.hh
index d937f7d5995ea40d751e75b06004d93cc41c0b93..eee6410571754d4e3598b9d5f50c53415db2ffb4 100644
--- a/dune/xt/grid/search.hh
+++ b/dune/xt/grid/search.hh
@@ -7,8 +7,8 @@
 //   Rene Milk       (2013 - 2015)
 //   Tobias Leibner  (2014 - 2015)
 
-#ifndef DUNE_STUFF_GRID_SEARCH_HH
-#define DUNE_STUFF_GRID_SEARCH_HH
+#ifndef DUNE_XT_GRID_SEARCH_HH
+#define DUNE_XT_GRID_SEARCH_HH
 
 #if HAVE_DUNE_GRID
 
@@ -187,4 +187,4 @@ EntityHierarchicSearch<GV> make_entity_hierarchic_search(const GV& grid_view)
 
 #endif // HAVE_DUNE_GRID
 
-#endif // DUNE_STUFF_GRID_SEARCH_HH
+#endif // DUNE_XT_GRID_SEARCH_HH
diff --git a/dune/xt/grid/structuredgridfactory.hh b/dune/xt/grid/structuredgridfactory.hh
index 108819259c721b8b917b10bef532cbc8d472baf7..362f443a5cf0fc5d97f327749ce8376b86cf246e 100644
--- a/dune/xt/grid/structuredgridfactory.hh
+++ b/dune/xt/grid/structuredgridfactory.hh
@@ -8,8 +8,8 @@
 //   Sven Kaulmann   (2014)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_STRUCTURED_GRID_FACTORY_HH
-#define DUNE_STUFF_GRID_STRUCTURED_GRID_FACTORY_HH
+#ifndef DUNE_XT_GRID_STRUCTUREDGRIDFACTORY_HH
+#define DUNE_XT_GRID_STRUCTUREDGRIDFACTORY_HH
 
 #include <memory>
 
@@ -189,4 +189,4 @@ public:
 
 #endif // HAVE_DUNE_GRID
 
-#endif // DUNE_STUFF_GRID_STRUCTURED_GRID_FACTORY_HH
+#endif // DUNE_XT_GRID_STRUCTUREDGRIDFACTORY_HH
diff --git a/dune/xt/grid/walk_functors.hh b/dune/xt/grid/walk_functors.hh
index b8bff1838221ff085e4fb69ca7e2aed02eb45601..487129ff278c5cc5cb23967b55ccdbed49cd39fc 100644
--- a/dune/xt/grid/walk_functors.hh
+++ b/dune/xt/grid/walk_functors.hh
@@ -6,8 +6,8 @@
 //   Felix Schindler (2012, 2014 - 2015)
 //   Rene Milk       (2012, 2015)
 
-#ifndef DUNE_STUFF_WALK_FUNCTORS_HH
-#define DUNE_STUFF_WALK_FUNCTORS_HH
+#ifndef DUNE_XT_WALK_FUNCTORS_HH
+#define DUNE_XT_WALK_FUNCTORS_HH
 
 // nothing here will compile w/o grid present
 #if HAVE_DUNE_GRID
@@ -103,4 +103,4 @@ struct MinMaxCoordinateFunctor : public Functor::Codim0<GridViewType>
 
 #endif // HAVE_DUNE_GRID
 
-#endif // DUNE_STUFF_WALK_FUNCTORS_HH
+#endif // DUNE_XT_WALK_FUNCTORS_HH
diff --git a/dune/xt/grid/walker.hh b/dune/xt/grid/walker.hh
index 4f62c5fec934756ea04a3aea82b3654ff5fc46c0..ab525874d5ad3107a4398db512d9e47f5107a8cb 100644
--- a/dune/xt/grid/walker.hh
+++ b/dune/xt/grid/walker.hh
@@ -7,8 +7,8 @@
 //   Rene Milk       (2014 - 2015)
 //   Tobias Leibner  (2014 - 2015)
 
-#ifndef DUNE_STUFF_GRID_WALKER_HH
-#define DUNE_STUFF_GRID_WALKER_HH
+#ifndef DUNE_XT_GRID_WALKER_HH
+#define DUNE_XT_GRID_WALKER_HH
 
 // nothing here will compile w/o grid present
 #if HAVE_DUNE_GRID
@@ -361,4 +361,4 @@ protected:
 
 #endif // HAVE_DUNE_GRID
 
-#endif // DUNE_STUFF_GRID_WALKER_HH
+#endif // DUNE_XT_GRID_WALKER_HH
diff --git a/dune/xt/grid/walker/apply-on.hh b/dune/xt/grid/walker/apply-on.hh
index 7224e30b67ee0fc89b75e1fa31d38ae8b08b262a..a708316fc3ebf4730bd765335de99cd875db04b7 100644
--- a/dune/xt/grid/walker/apply-on.hh
+++ b/dune/xt/grid/walker/apply-on.hh
@@ -7,8 +7,8 @@
 //   Rene Milk       (2014 - 2015)
 //   Tobias Leibner  (2015)
 
-#ifndef DUNE_STUFF_GRID_WALKER_APPLY_ON_HH
-#define DUNE_STUFF_GRID_WALKER_APPLY_ON_HH
+#ifndef DUNE_XT_GRID_WALKER_APPLY_ON_HH
+#define DUNE_XT_GRID_WALKER_APPLY_ON_HH
 
 // nothing here will compile w/o grid present
 #if HAVE_DUNE_GRID
@@ -314,4 +314,4 @@ private:
 
 #endif // HAVE_DUNE_GRID
 
-#endif // DUNE_STUFF_GRID_WALKER_APPLY_ON_HH
+#endif // DUNE_XT_GRID_WALKER_APPLY_ON_HH
diff --git a/dune/xt/grid/walker/functors.hh b/dune/xt/grid/walker/functors.hh
index 5fe08f25684652b988a75ec9cad5d2b71f012445..74f3b529b726f5190809577c4f4ee91af9b09893 100644
--- a/dune/xt/grid/walker/functors.hh
+++ b/dune/xt/grid/walker/functors.hh
@@ -6,8 +6,8 @@
 //   Felix Schindler (2014)
 //   Rene Milk       (2014 - 2015)
 
-#ifndef DUNE_STUFF_GRID_WALKER_FUNCTORS_HH
-#define DUNE_STUFF_GRID_WALKER_FUNCTORS_HH
+#ifndef DUNE_XT_GRID_WALKER_FUNCTORS_HH
+#define DUNE_XT_GRID_WALKER_FUNCTORS_HH
 
 // nothing here will compile w/o grid present
 #if HAVE_DUNE_GRID
@@ -137,4 +137,4 @@ private:
 
 #endif // HAVE_DUNE_GRID
 
-#endif // DUNE_STUFF_GRID_WALKER_FUNCTORS_HH
+#endif // DUNE_XT_GRID_WALKER_FUNCTORS_HH
diff --git a/dune/xt/grid/walker/wrapper.hh b/dune/xt/grid/walker/wrapper.hh
index 22b2beea8316f5b992e2849825b19bbde56e8506..5767e9393bb82566dd9acdd8171d06f72b636e4b 100644
--- a/dune/xt/grid/walker/wrapper.hh
+++ b/dune/xt/grid/walker/wrapper.hh
@@ -7,8 +7,8 @@
 //   Rene Milk       (2014 - 2015)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_GRID_WALKER_WRAPPER_HH
-#define DUNE_STUFF_GRID_WALKER_WRAPPER_HH
+#ifndef DUNE_XT_GRID_WALKER_WRAPPER_HH
+#define DUNE_XT_GRID_WALKER_WRAPPER_HH
 
 // nothing here will compile w/o grid present
 #if HAVE_DUNE_GRID
@@ -270,4 +270,4 @@ private:
 
 #endif // HAVE_DUNE_GRID
 
-#endif // DUNE_STUFF_GRID_WALKER_WRAPPER_HH
+#endif // DUNE_XT_GRID_WALKER_WRAPPER_HH
diff --git a/dune/xt/test/grid_provider.hh b/dune/xt/test/grid_provider.hh
index bbbedbafaa2d31e2e9aa7c32f8196bfb2b6840a9..3e32ff6d8669e4fcda90467467cadf377cbd180c 100644
--- a/dune/xt/test/grid_provider.hh
+++ b/dune/xt/test/grid_provider.hh
@@ -7,8 +7,8 @@
 //   Rene Milk       (2012 - 2015)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_TEST_GRID_PROVIDER_HH
-#define DUNE_STUFF_TEST_GRID_PROVIDER_HH
+#ifndef DUNE_XT_TEST_GRID_PROVIDER_HH
+#define DUNE_XT_TEST_GRID_PROVIDER_HH
 
 #if HAVE_DUNE_GRID
 #if HAVE_ALUGRID
@@ -160,4 +160,4 @@ public:
 }; // class GridProviderBase
 
 #endif // HAVE_DUNE_GRID
-#endif // DUNE_STUFF_TEST_GRID_PROVIDER_HH
+#endif // DUNE_XT_TEST_GRID_PROVIDER_HH