diff --git a/.gitsuper b/.gitsuper
index 397055c0c546232e6a1661577e47be26603f8c6e..71aacbba4d8f4f1acf29785ef9b10f8b61b304d4 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -17,7 +17,7 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
 	+09c52571e22adcb29ff5370d5c482521f139cb5c dune-xt-data (heads/compatible_with_2.6_clang-formatted)
 	+08a67a827a02a83463691370d5d1a186a18dd43b dune-xt-functions (heads/clang_format_6)
 	+5ed09938e46a7e5b42570bb285042fa9356ce0ce dune-xt-grid (heads/compatible_with_2.6_clang-formatted)
-	+ae10a1f5a3388ba486f25e516717ce1f781a6797 dune-xt-la (heads/clang_format_6)
+	+c0d4fd0f38949c61b8819af50d7565a082ab5c25 dune-xt-la (heads/clang_format_6)
 	 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (remotes/origin/HEAD)
 commit = a211a5c7ba4c103fc0da57add321c5bdef7b07b5
 
@@ -108,8 +108,8 @@ commit = 5ed09938e46a7e5b42570bb285042fa9356ce0ce
 
 [submodule.dune-xt-la]
 remote = git@github.com:dune-community/dune-xt-la.git
-status = +c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = ae10a1f5a3388ba486f25e516717ce1f781a6797
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
+commit = c0d4fd0f38949c61b8819af50d7565a082ab5c25
 
 [submodule.scripts]
 remote = https://github.com/wwu-numerik/scripts.git
diff --git a/dune/xt/la/container/eigen/base.hh b/dune/xt/la/container/eigen/base.hh
index 684854ed74c7f719a241d6965fe8e668052639eb..9a3d83512a4e55dc684a83f91fb300464d1faf6c 100644
--- a/dune/xt/la/container/eigen/base.hh
+++ b/dune/xt/la/container/eigen/base.hh
@@ -20,9 +20,9 @@
 #include <mutex>
 
 #if HAVE_EIGEN
-#include <dune/xt/common/disable_warnings.hh>
-#include <Eigen/Core>
-#include <dune/xt/common/reenable_warnings.hh>
+#  include <dune/xt/common/disable_warnings.hh>
+#  include <Eigen/Core>
+#  include <dune/xt/common/reenable_warnings.hh>
 #endif
 
 #include <dune/common/typetraits.hh>
@@ -279,10 +279,10 @@ public:
   using InterfaceType::as_imp;
 
 private:
-#ifndef NDEBUG
+#  ifndef NDEBUG
   //! disambiguation necessary since it exists in multiple bases
   using InterfaceType::crtp_mutex_;
-#endif
+#  endif
 
   friend class VectorInterface<Traits, ScalarType>;
   friend class EigenDenseMatrix<ScalarType>;
diff --git a/dune/xt/la/container/eigen/dense.cc b/dune/xt/la/container/eigen/dense.cc
index a5c6053677aa2821d84c64aab1c59fc808e17f7b..fa8e7018baca3acdc01a9582dff48fadf98d25e0 100644
--- a/dune/xt/la/container/eigen/dense.cc
+++ b/dune/xt/la/container/eigen/dense.cc
@@ -13,7 +13,7 @@
 
 #if HAVE_EIGEN
 
-#include "dense.hh"
+#  include "dense.hh"
 
 
 template class Dune::XT::LA::EigenDenseVector<double>;
diff --git a/dune/xt/la/container/eigen/dense.hh b/dune/xt/la/container/eigen/dense.hh
index 88f076fe6ce41294e263143c8de74243f3dc231f..dcc9e9628981822352e06c99c1c38d690e3c2f1d 100644
--- a/dune/xt/la/container/eigen/dense.hh
+++ b/dune/xt/la/container/eigen/dense.hh
@@ -23,9 +23,9 @@
 #include <boost/numeric/conversion/cast.hpp>
 
 #if HAVE_EIGEN
-#include <dune/xt/common/disable_warnings.hh>
-#include <Eigen/Core>
-#include <dune/xt/common/reenable_warnings.hh>
+#  include <dune/xt/common/disable_warnings.hh>
+#  include <Eigen/Core>
+#  include <dune/xt/common/reenable_warnings.hh>
 #endif
 
 #include <dune/common/typetraits.hh>
diff --git a/dune/xt/la/container/eigen/sparse.cc b/dune/xt/la/container/eigen/sparse.cc
index a27a4369c1c6fd9236d2a4e746451c2c4447d68f..05fcf775ba644cbac340293b5cc08e44b155a05e 100644
--- a/dune/xt/la/container/eigen/sparse.cc
+++ b/dune/xt/la/container/eigen/sparse.cc
@@ -13,7 +13,7 @@
 
 #if HAVE_EIGEN
 
-#include "sparse.hh"
+#  include "sparse.hh"
 
 
 template class Dune::XT::LA::EigenRowMajorSparseMatrix<double>;
diff --git a/dune/xt/la/container/eigen/sparse.hh b/dune/xt/la/container/eigen/sparse.hh
index 24218cc41c3206512368361d03cc1af897dbe1d8..c172e2dd819a3f96350087f2de52ba5e3671b0ef 100644
--- a/dune/xt/la/container/eigen/sparse.hh
+++ b/dune/xt/la/container/eigen/sparse.hh
@@ -22,9 +22,9 @@
 #include <boost/numeric/conversion/cast.hpp>
 
 #if HAVE_EIGEN
-#include <dune/xt/common/disable_warnings.hh>
-#include <Eigen/SparseCore>
-#include <dune/xt/common/reenable_warnings.hh>
+#  include <dune/xt/common/disable_warnings.hh>
+#  include <Eigen/SparseCore>
+#  include <dune/xt/common/reenable_warnings.hh>
 #endif
 
 #include <dune/common/typetraits.hh>
@@ -120,12 +120,12 @@ public:
         backend_->startVec(Common::numeric_cast<EIGEN_size_t>(row));
         const auto& columns = pattern_in.inner(row);
         for (auto& column : columns) {
-#ifndef NDEBUG
+#  ifndef NDEBUG
           if (column >= cc)
             DUNE_THROW(Common::Exceptions::shapes_do_not_match,
                        "The size of row " << row << " of the pattern does not match the number of columns of this ("
                                           << cc << ")!");
-#endif // NDEBUG
+#  endif // NDEBUG
           backend_->insertBackByOuterInner(Common::numeric_cast<EIGEN_size_t>(row),
                                            Common::numeric_cast<EIGEN_size_t>(column));
         }
diff --git a/dune/xt/la/eigen-solver/eigen.hh b/dune/xt/la/eigen-solver/eigen.hh
index 5850e2ca334e39cd9121fecad68894807413c54e..8f468fc3e744e2511aee3d90a3aed8047f43816d 100644
--- a/dune/xt/la/eigen-solver/eigen.hh
+++ b/dune/xt/la/eigen-solver/eigen.hh
@@ -95,7 +95,7 @@ protected:
       else if (compute_eigenvectors)
         eigenvectors_ = std::make_unique<EigenDenseMatrix<XT::Common::complex_t<S>>>(
             internal::compute_right_eigenvectors_using_eigen(matrix_.backend()));
-#if HAVE_LAPACKE || HAVE_MKL
+#  if HAVE_LAPACKE || HAVE_MKL
     } else if (type == "lapack") {
       if (!compute_eigenvectors)
         eigenvalues_ = std::make_unique<std::vector<XT::Common::complex_t<RealType>>>(
@@ -105,7 +105,7 @@ protected:
         eigenvectors_ = std::make_unique<EigenDenseMatrix<XT::Common::complex_t<S>>>(N, N);
         internal::compute_eigenvalues_and_right_eigenvectors_using_lapack(matrix_, *eigenvalues_, *eigenvectors_);
       }
-#endif // HAVE_LAPACKE || HAVE_MKL
+#  endif // HAVE_LAPACKE || HAVE_MKL
     } else if (type == "shifted_qr") {
       if (!compute_eigenvectors) {
         eigenvalues_ = std::make_unique<std::vector<XT::Common::complex_t<RealType>>>(N);
diff --git a/dune/xt/la/eigen-solver/internal/eigen.hh b/dune/xt/la/eigen-solver/internal/eigen.hh
index c59e180336520086fb5dfed3cf8f952ab084a3c4..2bf0e5df20775c5360178947885035d2329ef4e8 100644
--- a/dune/xt/la/eigen-solver/internal/eigen.hh
+++ b/dune/xt/la/eigen-solver/internal/eigen.hh
@@ -15,10 +15,10 @@
 #include <vector>
 
 #if HAVE_EIGEN
-#include <dune/xt/common/disable_warnings.hh>
-#include <Eigen/Core>
-#include <Eigen/Eigenvalues>
-#include <dune/xt/common/reenable_warnings.hh>
+#  include <dune/xt/common/disable_warnings.hh>
+#  include <Eigen/Core>
+#  include <Eigen/Eigenvalues>
+#  include <dune/xt/common/reenable_warnings.hh>
 #endif
 
 #include <dune/common/typetraits.hh>
diff --git a/dune/xt/la/matrix-inverter.hh b/dune/xt/la/matrix-inverter.hh
index 80276d643a2a4fb75164ca65303a26e6893bc58d..52118d8d8bae024714475bc23333f56cdd382cb5 100644
--- a/dune/xt/la/matrix-inverter.hh
+++ b/dune/xt/la/matrix-inverter.hh
@@ -126,9 +126,9 @@ invert_matrix(const M& matrix, const Common::Configuration& inversion_options)
 }
 
 
-} // namespace Dune
-} // namespace XT
 } // namespace LA
+} // namespace XT
+} // namespace Dune
 
 #include "matrix-inverter/default.hh"
 #include "matrix-inverter/eigen.hh"
diff --git a/dune/xt/la/matrix-inverter/default.hh b/dune/xt/la/matrix-inverter/default.hh
index c396e8ed0083f9c158c53f591ef95910857b5c06..7701034a882318663910928f5d29371d757b81f1 100644
--- a/dune/xt/la/matrix-inverter/default.hh
+++ b/dune/xt/la/matrix-inverter/default.hh
@@ -88,9 +88,9 @@ protected:
 }; // class MatrixInverter<MatrixType, true>
 
 
-} // namespace Dune
-} // namespace XT
 } // namespace LA
+} // namespace XT
+} // namespace Dune
 
 
 #endif // DUNE_XT_LA_MATRIX_INVERTER_DEFAULT_HH
diff --git a/dune/xt/la/matrix-inverter/eigen.hh b/dune/xt/la/matrix-inverter/eigen.hh
index e656f0e5ee35114c19197e43ee73c469528a76da..7b53920e165de9ee51c2819d996157c9342df0fe 100644
--- a/dune/xt/la/matrix-inverter/eigen.hh
+++ b/dune/xt/la/matrix-inverter/eigen.hh
@@ -115,9 +115,9 @@ class MatrixInverter<EigenDenseMatrix<S>, true>
 
 #endif // HAVE_EIGEN
 
-} // namespace Dune
-} // namespace XT
 } // namespace LA
+} // namespace XT
+} // namespace Dune
 
 
 #endif // DUNE_XT_LA_MATRIX_INVERTER_EIGEN_HH
diff --git a/dune/xt/la/matrix-inverter/fmatrix.hh b/dune/xt/la/matrix-inverter/fmatrix.hh
index e140e26f385de60f4d6c6a9c62f7d61d76f6d2fb..f90a37478bf73493ebc8c8a2d62d14a2daf8f4de 100644
--- a/dune/xt/la/matrix-inverter/fmatrix.hh
+++ b/dune/xt/la/matrix-inverter/fmatrix.hh
@@ -130,9 +130,9 @@ public:
 };
 
 
-} // namespace Dune
-} // namespace XT
 } // namespace LA
+} // namespace XT
+} // namespace Dune
 
 
 #endif // DUNE_XT_LA_MATRIX_INVERTER_FMATRIX_HH
diff --git a/dune/xt/la/matrix-inverter/internal/base.hh b/dune/xt/la/matrix-inverter/internal/base.hh
index 1fe18a46fb8cb1f4185c9ef4094e264ee4c44ef9..a8b3df975471941defcc1f8b57353234e1fb0b36 100644
--- a/dune/xt/la/matrix-inverter/internal/base.hh
+++ b/dune/xt/la/matrix-inverter/internal/base.hh
@@ -248,9 +248,9 @@ protected:
 
 
 } // namespace internal
-} // namespace Dune
-} // namespace XT
 } // namespace LA
+} // namespace XT
+} // namespace Dune
 
 
 #endif // DUNE_XT_LA_MATRIX_INVERTER_BASE_HH
diff --git a/dune/xt/la/matrix-inverter/internal/eigen.hh b/dune/xt/la/matrix-inverter/internal/eigen.hh
index 0ca7b09628aa0212150915636af18c6512b91fe8..51f975f200a480541ea28ccf7a158ad191286491 100644
--- a/dune/xt/la/matrix-inverter/internal/eigen.hh
+++ b/dune/xt/la/matrix-inverter/internal/eigen.hh
@@ -15,12 +15,12 @@
 #include <limits>
 
 #if HAVE_EIGEN
-#include <dune/xt/common/disable_warnings.hh>
-#include <Eigen/Core>
-#include <Eigen/SVD>
+#  include <dune/xt/common/disable_warnings.hh>
+#  include <Eigen/Core>
+#  include <Eigen/SVD>
 // needed for the inverse method of Eigen::Matrix, see http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1089
-#include <Eigen/LU>
-#include <dune/xt/common/reenable_warnings.hh>
+#  include <Eigen/LU>
+#  include <dune/xt/common/reenable_warnings.hh>
 #endif
 
 #include <dune/common/typetraits.hh>
diff --git a/dune/xt/la/solver/eigen.cc b/dune/xt/la/solver/eigen.cc
index 0587cf77f3cab38adf33dadb50b9c33a4b7ca6bc..726000168376ff6d7a078ab9d83fa62b069828d0 100644
--- a/dune/xt/la/solver/eigen.cc
+++ b/dune/xt/la/solver/eigen.cc
@@ -13,7 +13,7 @@
 
 #if HAVE_EIGEN
 
-#include "eigen.hh"
+#  include "eigen.hh"
 
 
 template class Dune::XT::LA::Solver<Dune::XT::LA::EigenDenseMatrix<double>>;
diff --git a/dune/xt/la/solver/eigen.hh b/dune/xt/la/solver/eigen.hh
index 760482d20db22a2a87a2512b39f1063ab826e897..db67a013f8573e7833121bc63f6c0ad2730d7afd 100644
--- a/dune/xt/la/solver/eigen.hh
+++ b/dune/xt/la/solver/eigen.hh
@@ -21,13 +21,13 @@
 #include <complex>
 
 #if HAVE_EIGEN
-#include <dune/xt/common/disable_warnings.hh>
-#include <Eigen/Dense>
-#include <Eigen/SparseCore>
-#include <Eigen/IterativeLinearSolvers>
-#include <Eigen/SparseCholesky>
-#include <Eigen/SparseLU>
-#include <Eigen/SparseQR>
+#  include <dune/xt/common/disable_warnings.hh>
+#  include <Eigen/Dense>
+#  include <Eigen/SparseCore>
+#  include <Eigen/IterativeLinearSolvers>
+#  include <Eigen/SparseCholesky>
+#  include <Eigen/SparseLU>
+#  include <Eigen/SparseQR>
 //#   if HAVE_UMFPACK
 //#     include <Eigen/UmfPackSupport>
 //#   endif
@@ -36,7 +36,7 @@
 //#   if HAVE_SUPERLU
 //#     include <Eigen/SuperLUSupport>
 //#   endif
-#include <dune/xt/common/reenable_warnings.hh>
+#  include <dune/xt/common/reenable_warnings.hh>
 #endif // HAVE_EIGEN
 
 #include <dune/xt/common/exceptions.hh>
diff --git a/dune/xt/la/solver/fasp.hh b/dune/xt/la/solver/fasp.hh
index d7703dda17ae77693b2b11f976356f0de3880092..0e576d935bdfc6164bafd14477acb0af56ca1832 100644
--- a/dune/xt/la/solver/fasp.hh
+++ b/dune/xt/la/solver/fasp.hh
@@ -13,16 +13,16 @@
 #define DUNE_XT_LA_SOLVER_FASP_HH
 
 #if HAVE_FASP
-#if HAVE_EIGEN
+#  if HAVE_EIGEN
 
 extern "C"
 {
-#include "fasp_functs.h"
+#    include "fasp_functs.h"
 }
 
-#include <dune/xt/la/container/eigen.hh>
+#    include <dune/xt/la/container/eigen.hh>
 
-#include "interface.hh"
+#    include "interface.hh"
 
 namespace Dune {
 namespace XT {
@@ -372,7 +372,7 @@ private:
 } // namespace XT
 } // namespace Dune
 
-#endif // HAVE_EIGEN
+#  endif // HAVE_EIGEN
 #endif // HAVE_FASP
 
 #endif // DUNE_XT_LA_SOLVER_FASP_HH
diff --git a/dune/xt/la/solver/istl/amg.hh b/dune/xt/la/solver/istl/amg.hh
index 175e50cf72c8095bcdfd51fcd5e14fea282a0285..b504ad2d74f4fdf22135af0f151758518e0fb25f 100644
--- a/dune/xt/la/solver/istl/amg.hh
+++ b/dune/xt/la/solver/istl/amg.hh
@@ -17,10 +17,10 @@
 #include <cmath>
 
 #if HAVE_DUNE_ISTL
-#include <dune/istl/operators.hh>
-#include <dune/istl/solvers.hh>
-#include <dune/istl/paamg/amg.hh>
-#include <dune/istl/preconditioners.hh>
+#  include <dune/istl/operators.hh>
+#  include <dune/istl/solvers.hh>
+#  include <dune/istl/paamg/amg.hh>
+#  include <dune/istl/preconditioners.hh>
 #endif // HAVE_DUNE_ISTL
 
 #include <dune/xt/common/exceptions.hh>
@@ -135,11 +135,11 @@ public:
           preconditioner,
           opts.get("precision", default_opts.get<S>("precision")),
           opts.get("max_iter", default_opts.get<size_t>("max_iter")),
-#if HAVE_MPI
+#  if HAVE_MPI
           (communicator_.communicator().rank() == 0) ? opts.get("verbose", default_opts.get<int>("verbose")) : 0
-#else // HAVE_MPI
+#  else // HAVE_MPI
           opts.get("verbose", default_opts.get<int>("verbose"))
-#endif
+#  endif
       );
 
       InverseOperatorResult stats;
@@ -156,11 +156,11 @@ public:
           preconditioner,
           opts.get("precision", default_opts.get<S>("precision")),
           opts.get("max_iter", default_opts.get<size_t>("max_iter")),
-#if HAVE_MPI
+#  if HAVE_MPI
           (communicator_.communicator().rank() == 0) ? opts.get("verbose", default_opts.get<int>("verbose")) : 0
-#else // HAVE_MPI
+#  else // HAVE_MPI
           opts.get("verbose", default_opts.get<int>("verbose"))
-#endif
+#  endif
       );
 
       InverseOperatorResult stats;