diff --git a/dune/xt/la/container.hh b/dune/xt/la/container.hh
index ef991803f18b6a402e7bb5616c689279d504319f..ca2f5376dac30b3c8e280aed412d18cf48bfa5f0 100644
--- a/dune/xt/la/container.hh
+++ b/dune/xt/la/container.hh
@@ -6,8 +6,8 @@
 //   Felix Schindler (2013 - 2014)
 //   Rene Milk       (2015)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_HH
-#define DUNE_STUFF_LA_CONTAINER_HH
+#ifndef DUNE_XT_LA_CONTAINER_HH
+#define DUNE_XT_LA_CONTAINER_HH
 
 #include "container/interfaces.hh"
 #include "container/common.hh"
@@ -89,4 +89,4 @@ void ensure_parallel_dof_consistency(VectorImp<typename Space::RangeFieldType>&
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_CONTAINER_HH
+#endif // DUNE_XT_LA_CONTAINER_HH
diff --git a/dune/xt/la/container/common.hh b/dune/xt/la/container/common.hh
index ab1d925e669d813817b60e2cc8609495c9283b7e..75e18c51fa7673c5eaf3ab460e102de676177de0 100644
--- a/dune/xt/la/container/common.hh
+++ b/dune/xt/la/container/common.hh
@@ -8,8 +8,8 @@
 //   Rene Milk        (2014 - 2015)
 //   Tobias Leibner   (2014)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_COMMON_HH
-#define DUNE_STUFF_LA_CONTAINER_COMMON_HH
+#ifndef DUNE_XT_LA_CONTAINER_COMMON_HH
+#define DUNE_XT_LA_CONTAINER_COMMON_HH
 
 #include <cmath>
 #include <initializer_list>
@@ -634,4 +634,4 @@ struct MatrixAbstraction<LA::CommonDenseMatrix<T>>
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_CONTAINER_COMMON_HH
+#endif // DUNE_XT_LA_CONTAINER_COMMON_HH
diff --git a/dune/xt/la/container/container-interface.hh b/dune/xt/la/container/container-interface.hh
index 75cf4e297238022bf4e34748b73e887d8842a9c2..d43b4323bb362a7ea92a17c233116fa41c3b13ef 100644
--- a/dune/xt/la/container/container-interface.hh
+++ b/dune/xt/la/container/container-interface.hh
@@ -7,8 +7,8 @@
 //   Rene Milk       (2014 - 2015)
 //   Tobias Leibner  (2014 - 2015)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_CONTAINER_INTERFACE_HH
-#define DUNE_STUFF_LA_CONTAINER_CONTAINER_INTERFACE_HH
+#ifndef DUNE_XT_LA_CONTAINER_CONTAINER_INTERFACE_HH
+#define DUNE_XT_LA_CONTAINER_CONTAINER_INTERFACE_HH
 
 #include <cmath>
 #include <limits>
@@ -273,4 +273,4 @@ public:
 } // namespace Stuff
 } // namespace Dune
 
-#endif // #ifndef DUNE_STUFF_LA_CONTAINER_CONTAINER_INTERFACE_HH
+#endif // #ifndef DUNE_XT_LA_CONTAINER_CONTAINER_INTERFACE_HH
diff --git a/dune/xt/la/container/eigen.hh b/dune/xt/la/container/eigen.hh
index b6d1295fa512b893e3f9450f2139c9fcc15651ce..2458675c02e528f0b724194321c6ce407a606954 100644
--- a/dune/xt/la/container/eigen.hh
+++ b/dune/xt/la/container/eigen.hh
@@ -8,10 +8,10 @@
 //   Sven Kaulmann   (2014)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_EIGEN_HH
-#define DUNE_STUFF_LA_CONTAINER_EIGEN_HH
+#ifndef DUNE_XT_LA_CONTAINER_EIGEN_HH
+#define DUNE_XT_LA_CONTAINER_EIGEN_HH
 
 #include "eigen/dense.hh"
 #include "eigen/sparse.hh"
 
-#endif // DUNE_STUFF_LA_CONTAINER_EIGEN_HH
+#endif // DUNE_XT_LA_CONTAINER_EIGEN_HH
diff --git a/dune/xt/la/container/eigen/base.hh b/dune/xt/la/container/eigen/base.hh
index a4413ad32d2c8824d993167ad691d940816b4ecf..94e31642907b1e89b3d5844d761e0e3a984fe90e 100644
--- a/dune/xt/la/container/eigen/base.hh
+++ b/dune/xt/la/container/eigen/base.hh
@@ -8,8 +8,8 @@
 //   Rene Milk        (2015)
 //   Tobias Leibner   (2014)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_EIGEN_BASE_HH
-#define DUNE_STUFF_LA_CONTAINER_EIGEN_BASE_HH
+#ifndef DUNE_XT_LA_CONTAINER_EIGEN_BASE_HH
+#define DUNE_XT_LA_CONTAINER_EIGEN_BASE_HH
 
 #include <memory>
 #include <type_traits>
@@ -315,4 +315,4 @@ class EigenBaseVector
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_CONTAINER_EIGEN_BASE_HH
+#endif // DUNE_XT_LA_CONTAINER_EIGEN_BASE_HH
diff --git a/dune/xt/la/container/eigen/dense.hh b/dune/xt/la/container/eigen/dense.hh
index 238705c7726e5e315637b103bc86bc8872d8385d..f95d3a58643a0b0788de522d5aafabe0a6871bfb 100644
--- a/dune/xt/la/container/eigen/dense.hh
+++ b/dune/xt/la/container/eigen/dense.hh
@@ -8,8 +8,8 @@
 //   Rene Milk        (2014 - 2015)
 //   Tobias Leibner   (2014)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_EIGEN_DENSE_HH
-#define DUNE_STUFF_LA_CONTAINER_EIGEN_DENSE_HH
+#ifndef DUNE_XT_LA_CONTAINER_EIGEN_DENSE_HH
+#define DUNE_XT_LA_CONTAINER_EIGEN_DENSE_HH
 
 #include <memory>
 #include <type_traits>
@@ -688,4 +688,4 @@ struct MatrixAbstraction<LA::EigenDenseMatrix<T>> : public LA::internal::MatrixA
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_CONTAINER_EIGEN_DENSE_HH
+#endif // DUNE_XT_LA_CONTAINER_EIGEN_DENSE_HH
diff --git a/dune/xt/la/container/eigen/sparse.hh b/dune/xt/la/container/eigen/sparse.hh
index ee6ca3870a38df015a1e47b202f4ba00b9e1695f..aeccb7723b3d874d6071f7d1aa34b81890441189 100644
--- a/dune/xt/la/container/eigen/sparse.hh
+++ b/dune/xt/la/container/eigen/sparse.hh
@@ -8,8 +8,8 @@
 //   Rene Milk        (2014 - 2015)
 //   Tobias Leibner   (2014 - 2015)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_EIGEN_SPARSE_HH
-#define DUNE_STUFF_LA_CONTAINER_EIGEN_SPARSE_HH
+#ifndef DUNE_XT_LA_CONTAINER_EIGEN_SPARSE_HH
+#define DUNE_XT_LA_CONTAINER_EIGEN_SPARSE_HH
 
 #include <memory>
 #include <type_traits>
@@ -472,4 +472,4 @@ struct MatrixAbstraction<LA::EigenRowMajorSparseMatrix<T>>
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_CONTAINER_EIGEN_SPARSE_HH
+#endif // DUNE_XT_LA_CONTAINER_EIGEN_SPARSE_HH
diff --git a/dune/xt/la/container/interfaces.hh b/dune/xt/la/container/interfaces.hh
index cca6befde0442b950e9e00d638e2c97c9dc9f092..666ea4b0a88e2c9babbfe93c6cb1708d5407c0b6 100644
--- a/dune/xt/la/container/interfaces.hh
+++ b/dune/xt/la/container/interfaces.hh
@@ -7,11 +7,11 @@
 //   Rene Milk       (2013 - 2015)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_INTERFACES_HH
-#define DUNE_STUFF_LA_CONTAINER_INTERFACES_HH
+#ifndef DUNE_XT_LA_CONTAINER_INTERFACES_HH
+#define DUNE_XT_LA_CONTAINER_INTERFACES_HH
 
 #include "container-interface.hh"
 #include "vector-interface.hh"
 #include "matrix-interface.hh"
 
-#endif // DUNE_STUFF_LA_CONTAINER_INTERFACES_HH
+#endif // DUNE_XT_LA_CONTAINER_INTERFACES_HH
diff --git a/dune/xt/la/container/istl.hh b/dune/xt/la/container/istl.hh
index 0004253c958692d3eeb4125fcdbd4a1972be98e0..4bbf6b8b5b628b35b98d992e971091e02c3a568f 100644
--- a/dune/xt/la/container/istl.hh
+++ b/dune/xt/la/container/istl.hh
@@ -9,8 +9,8 @@
 //   Rene Milk        (2014 - 2015)
 //   Tobias Leibner   (2014)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_ISTL_HH
-#define DUNE_STUFF_LA_CONTAINER_ISTL_HH
+#ifndef DUNE_XT_LA_CONTAINER_ISTL_HH
+#define DUNE_XT_LA_CONTAINER_ISTL_HH
 
 #include <vector>
 #include <initializer_list>
@@ -804,4 +804,4 @@ struct MatrixAbstraction<LA::IstlRowMajorSparseMatrix<T>>
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_CONTAINER_ISTL_HH
+#endif // DUNE_XT_LA_CONTAINER_ISTL_HH
diff --git a/dune/xt/la/container/matrix-interface.hh b/dune/xt/la/container/matrix-interface.hh
index 366c9634dbc730e5ed83c249bb2f0e11e22dfa48..4ce71c6ed1f0ec2587d795069015c4a64e723928 100644
--- a/dune/xt/la/container/matrix-interface.hh
+++ b/dune/xt/la/container/matrix-interface.hh
@@ -8,8 +8,8 @@
 //   Rene Milk        (2015)
 //   Tobias Leibner   (2014)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_MATRIX_INTERFACE_HH
-#define DUNE_STUFF_LA_CONTAINER_MATRIX_INTERFACE_HH
+#ifndef DUNE_XT_LA_CONTAINER_MATRIX_INTERFACE_HH
+#define DUNE_XT_LA_CONTAINER_MATRIX_INTERFACE_HH
 
 #include <cmath>
 #include <limits>
@@ -391,4 +391,4 @@ struct MatrixAbstractionBase
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_CONTAINER_MATRIX_INTERFACE_HH
+#endif // DUNE_XT_LA_CONTAINER_MATRIX_INTERFACE_HH
diff --git a/dune/xt/la/container/pattern.hh b/dune/xt/la/container/pattern.hh
index 56075f7296a745e36e14a42f4e4316dbfd9fa14d..3f47f9d54739ec8e696499c699b6eca02b72a1b1 100644
--- a/dune/xt/la/container/pattern.hh
+++ b/dune/xt/la/container/pattern.hh
@@ -7,8 +7,8 @@
 //   Rene Milk       (2013 - 2015)
 //   Sven Kaulmann   (2014)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_PATTERN_HH
-#define DUNE_STUFF_LA_CONTAINER_PATTERN_HH
+#ifndef DUNE_XT_LA_CONTAINER_PATTERN_HH
+#define DUNE_XT_LA_CONTAINER_PATTERN_HH
 
 #include <cstddef>
 #include <vector>
@@ -57,4 +57,4 @@ private:
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_CONTAINER_PATTERN_HH
+#endif // DUNE_XT_LA_CONTAINER_PATTERN_HH
diff --git a/dune/xt/la/container/vector-interface-internal.hh b/dune/xt/la/container/vector-interface-internal.hh
index 4109be0d3b13b85de6fe440492dbd9731073838f..af1e44e32d76a1f3aa095be3147d1d3e241f16c0 100644
--- a/dune/xt/la/container/vector-interface-internal.hh
+++ b/dune/xt/la/container/vector-interface-internal.hh
@@ -7,8 +7,8 @@
 //   Rene Milk       (2014 - 2015)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_VECTOR_INTERFACE_INTERNAL_HH
-#define DUNE_STUFF_LA_CONTAINER_VECTOR_INTERFACE_INTERNAL_HH
+#ifndef DUNE_XT_LA_CONTAINER_VECTOR_INTERFACE_INTERNAL_HH
+#define DUNE_XT_LA_CONTAINER_VECTOR_INTERFACE_INTERNAL_HH
 
 #include <iterator>
 #include <type_traits>
@@ -136,4 +136,4 @@ private:
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_CONTAINER_VECTOR_INTERFACE_INTERNAL_HH
+#endif // DUNE_XT_LA_CONTAINER_VECTOR_INTERFACE_INTERNAL_HH
diff --git a/dune/xt/la/container/vector-interface.hh b/dune/xt/la/container/vector-interface.hh
index 7a685ed30265d61909852538f764a180a217c9a1..55e0ced07a6bd5ec38c01c794ee9510ac8efa023 100644
--- a/dune/xt/la/container/vector-interface.hh
+++ b/dune/xt/la/container/vector-interface.hh
@@ -8,8 +8,8 @@
 //   Rene Milk        (2013 - 2015)
 //   Tobias Leibner   (2014)
 
-#ifndef DUNE_STUFF_LA_CONTAINER_VECTOR_INTERFACE_HH
-#define DUNE_STUFF_LA_CONTAINER_VECTOR_INTERFACE_HH
+#ifndef DUNE_XT_LA_CONTAINER_VECTOR_INTERFACE_HH
+#define DUNE_XT_LA_CONTAINER_VECTOR_INTERFACE_HH
 
 #include <cmath>
 #include <limits>
@@ -699,4 +699,4 @@ std::ostream& operator<<(std::ostream& out, const VectorInterface<T, S>& vector)
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_CONTAINER_VECTOR_INTERFACE_HH
+#endif // DUNE_XT_LA_CONTAINER_VECTOR_INTERFACE_HH
diff --git a/dune/xt/la/solver.hh b/dune/xt/la/solver.hh
index 4a276af4301fe006d146dc87fec790ea48655fa6..8cde2be1e90b791342b9ad647ae2645c4d150aa3 100644
--- a/dune/xt/la/solver.hh
+++ b/dune/xt/la/solver.hh
@@ -7,8 +7,8 @@
 //   Rene Milk       (2013, 2015)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_LA_SOLVER_HH
-#define DUNE_STUFF_LA_SOLVER_HH
+#ifndef DUNE_XT_LA_SOLVER_HH
+#define DUNE_XT_LA_SOLVER_HH
 
 #include <string>
 #include <vector>
@@ -139,4 +139,4 @@ public:
 #include "solver/eigen.hh"
 #include "solver/istl.hh"
 
-#endif // DUNE_STUFF_LA_SOLVER_HH
+#endif // DUNE_XT_LA_SOLVER_HH
diff --git a/dune/xt/la/solver/common.hh b/dune/xt/la/solver/common.hh
index d54e3fda841507b314ab3bcce4947f1139148977..398e4fc9967104162ff7bed3b9b7a3838a0b6442 100644
--- a/dune/xt/la/solver/common.hh
+++ b/dune/xt/la/solver/common.hh
@@ -8,8 +8,8 @@
 //   Rene Milk        (2015)
 //   Tobias Leibner   (2014)
 
-#ifndef DUNE_STUFF_LA_SOLVER_COMMON_HH
-#define DUNE_STUFF_LA_SOLVER_COMMON_HH
+#ifndef DUNE_XT_LA_SOLVER_COMMON_HH
+#define DUNE_XT_LA_SOLVER_COMMON_HH
 
 #include <string>
 #include <vector>
@@ -114,4 +114,4 @@ private:
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_SOLVER_COMMON_HH
+#endif // DUNE_XT_LA_SOLVER_COMMON_HH
diff --git a/dune/xt/la/solver/eigen.hh b/dune/xt/la/solver/eigen.hh
index 9369f5b7ddcd8d69e1ada381c40c30a4504f6198..1336e5d79cbd0773554ed4b9d81cd6661ff409ff 100644
--- a/dune/xt/la/solver/eigen.hh
+++ b/dune/xt/la/solver/eigen.hh
@@ -8,8 +8,8 @@
 //   Rene Milk        (2012 - 2013, 2015)
 //   Tobias Leibner   (2014)
 
-#ifndef DUNE_STUFF_LA_SOLVER_EIGEN_HH
-#define DUNE_STUFF_LA_SOLVER_EIGEN_HH
+#ifndef DUNE_XT_LA_SOLVER_EIGEN_HH
+#define DUNE_XT_LA_SOLVER_EIGEN_HH
 
 #include <string>
 #include <vector>
@@ -599,4 +599,4 @@ class Solver<EigenRowMajorSparseMatrix<S>>
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_SOLVER_EIGEN_HH
+#endif // DUNE_XT_LA_SOLVER_EIGEN_HH
diff --git a/dune/xt/la/solver/fasp.hh b/dune/xt/la/solver/fasp.hh
index fff950a8a45a6fc84a08c5d455a64c184aad2778..7632c47024d32edbc7d48ed36ada039aeee1a131 100644
--- a/dune/xt/la/solver/fasp.hh
+++ b/dune/xt/la/solver/fasp.hh
@@ -6,8 +6,8 @@
 //   Felix Schindler (2013 - 2014)
 //   Rene Milk       (2013, 2015)
 
-#ifndef DUNE_STUFF_LA_SOLVER_FASP_HH
-#define DUNE_STUFF_LA_SOLVER_FASP_HH
+#ifndef DUNE_XT_LA_SOLVER_FASP_HH
+#define DUNE_XT_LA_SOLVER_FASP_HH
 
 #if HAVE_FASP
 #if HAVE_EIGEN
@@ -366,4 +366,4 @@ private:
 #endif // HAVE_EIGEN
 #endif // HAVE_FASP
 
-#endif // DUNE_STUFF_LA_SOLVER_FASP_HH
+#endif // DUNE_XT_LA_SOLVER_FASP_HH
diff --git a/dune/xt/la/solver/istl.hh b/dune/xt/la/solver/istl.hh
index 0c9d35e12fe57954b6adeb7f7166d5ccf4cad756..92203d823701efb32c79d57a9bf3ccd4a140197d 100644
--- a/dune/xt/la/solver/istl.hh
+++ b/dune/xt/la/solver/istl.hh
@@ -8,8 +8,8 @@
 //   Rene Milk        (2014 - 2015)
 //   Tobias Leibner   (2014 - 2015)
 
-#ifndef DUNE_STUFF_LA_SOLVER_ISTL_HH
-#define DUNE_STUFF_LA_SOLVER_ISTL_HH
+#ifndef DUNE_XT_LA_SOLVER_ISTL_HH
+#define DUNE_XT_LA_SOLVER_ISTL_HH
 
 #include <type_traits>
 #include <cmath>
@@ -320,4 +320,4 @@ class Solver<IstlRowMajorSparseMatrix<S>, CommunicatorType>
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_SOLVER_ISTL_HH
+#endif // DUNE_XT_LA_SOLVER_ISTL_HH
diff --git a/dune/xt/la/solver/istl/amg.hh b/dune/xt/la/solver/istl/amg.hh
index 6372f369b471bc69920e1a7f123550d8dbe05726..cc02c3b8f64fabf1416e1b5da534746e20f7ca30 100644
--- a/dune/xt/la/solver/istl/amg.hh
+++ b/dune/xt/la/solver/istl/amg.hh
@@ -8,8 +8,8 @@
 //   Rene Milk        (2014 - 2015)
 //   Tobias Leibner   (2014)
 
-#ifndef DUNE_STUFF_LA_SOLVER_ISTL_AMG_HH
-#define DUNE_STUFF_LA_SOLVER_ISTL_AMG_HH
+#ifndef DUNE_XT_LA_SOLVER_ISTL_AMG_HH
+#define DUNE_XT_LA_SOLVER_ISTL_AMG_HH
 
 #include <type_traits>
 #include <cmath>
@@ -271,4 +271,4 @@ class AmgApplicator
 } // namespace Stuff
 } // namespace Dune
 
-#endif // DUNE_STUFF_LA_SOLVER_ISTL_AMG_HH
+#endif // DUNE_XT_LA_SOLVER_ISTL_AMG_HH
diff --git a/dune/xt/la/test/container.hh b/dune/xt/la/test/container.hh
index 82d175828576e8e51815771bacf22a2a6637bf19..409cd912081524d44069861aa7360abadab2ca27 100644
--- a/dune/xt/la/test/container.hh
+++ b/dune/xt/la/test/container.hh
@@ -7,8 +7,8 @@
 //   Rene Milk       (2014 - 2015)
 //   Tobias Leibner  (2014)
 
-#ifndef DUNE_STUFF_TEST_LA_CONTAINER_HH
-#define DUNE_STUFF_TEST_LA_CONTAINER_HH
+#ifndef DUNE_XT_TEST_LA_CONTAINER_HH
+#define DUNE_XT_TEST_LA_CONTAINER_HH
 
 #include <complex>
 #include <memory>
@@ -140,4 +140,4 @@ public:
     EXPECT_DOUBLE_EQ(0, std::imag(actual));                                                                            \
   }
 
-#endif // DUNE_STUFF_TEST_LA_CONTAINER_HH
+#endif // DUNE_XT_TEST_LA_CONTAINER_HH