diff --git a/.gitsuper b/.gitsuper
index 3945f65afc5f21e24f61f97e93be32ce828495b4..82c14f4994c5a6baef991dc08e1cd5228038a5a1 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -15,8 +15,8 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
 	 8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9 dune-uggrid (v2.5.2-1-g8fe883e9)
 	+3f396a59b80174a990fcbf19cd08d52e7156e603 dune-xt-common (heads/master)
 	+09c52571e22adcb29ff5370d5c482521f139cb5c dune-xt-data (heads/compatible_with_2.6_clang-formatted)
-	+7c63ab32cd753275840fdad066e28659b6225ed2 dune-xt-functions (heads/clang_format_6)
-	+dae7cb3f4edc13eb2fe3a0f6224913e1bf6fad62 dune-xt-grid (heads/master)
+	+95217b784136608413a86e475d8fa76ceaf8c8b0 dune-xt-functions (heads/clang_format_6)
+	+560bf595fb0641dc8fee8e9fbb4db615f6727362 dune-xt-grid (heads/master)
 	+a7b535e1289c88579c4d7e0a0b24af5415e6ba23 dune-xt-la (heads/master)
 	 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (remotes/origin/HEAD)
 commit = a211a5c7ba4c103fc0da57add321c5bdef7b07b5
@@ -99,12 +99,12 @@ commit = 09c52571e22adcb29ff5370d5c482521f139cb5c
 [submodule.dune-xt-functions]
 remote = git@github.com:dune-community/dune-xt-functions.git
 status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 7c63ab32cd753275840fdad066e28659b6225ed2
+commit = 95217b784136608413a86e475d8fa76ceaf8c8b0
 
 [submodule.dune-xt-grid]
 remote = git@github.com:dune-community/dune-xt-grid.git
-status = +bd037dab8299b4622dcaa632b4445e70584f81b1 .vcsetup (heads/master)
-commit = dae7cb3f4edc13eb2fe3a0f6224913e1bf6fad62
+status = +c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
+commit = 560bf595fb0641dc8fee8e9fbb4db615f6727362
 
 [submodule.dune-xt-la]
 remote = git@github.com:dune-community/dune-xt-la.git
diff --git a/dune/xt/functions/ESV2007.hh b/dune/xt/functions/ESV2007.hh
index 171403a0d848c4335c69752e11cbeff58e2c0c37..d3ab8fdf6e54add81fc5d0d4c90090848f213b2a 100644
--- a/dune/xt/functions/ESV2007.hh
+++ b/dune/xt/functions/ESV2007.hh
@@ -18,9 +18,9 @@
 #include <dune/geometry/quadraturerules.hh>
 
 #if HAVE_EIGEN
-#include <dune/xt/common/disable_warnings.hh>
-#include <Eigen/Eigenvalues>
-#include <dune/xt/common/reenable_warnings.hh>
+#  include <dune/xt/common/disable_warnings.hh>
+#  include <Eigen/Eigenvalues>
+#  include <dune/xt/common/reenable_warnings.hh>
 #endif
 
 #include <dune/xt/common/configuration.hh>
diff --git a/dune/xt/functions/expression/base.hh b/dune/xt/functions/expression/base.hh
index 470125d587807ad3f26abe4843f9b8f6812d9dc6..1b9acaec30214f0a990985abfa897d1785d9dd46 100644
--- a/dune/xt/functions/expression/base.hh
+++ b/dune/xt/functions/expression/base.hh
@@ -29,7 +29,7 @@
 #include "mathexpr.hh"
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_BASE_MAX_DYNAMIC_SIZE
-#define DUNE_XT_FUNCTIONS_EXPRESSION_BASE_MAX_DYNAMIC_SIZE 64
+#  define DUNE_XT_FUNCTIONS_EXPRESSION_BASE_MAX_DYNAMIC_SIZE 64
 #endif
 
 
diff --git a/dune/xt/functions/expression/default.hh b/dune/xt/functions/expression/default.hh
index 6e80fd820641a0cfc9d564ca1c8664f445a36ef0..f637ccb4298267c4630861ccbe51f0ea81a3197c 100644
--- a/dune/xt/functions/expression/default.hh
+++ b/dune/xt/functions/expression/default.hh
@@ -194,7 +194,7 @@ public:
   {
     size_t range = value.size();
 #ifndef NDEBUG
-#ifndef DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
+#  ifndef DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
     bool failure = false;
     std::string error_type;
     for (size_t rr = 0; rr < range; ++rr) {
@@ -220,7 +220,7 @@ public:
                        << "The result was:                       " << value[rr] << "\n\n"
                        << "You can disable this check by defining DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS\n");
     } // check_value(...)
-#endif // DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
+#  endif // DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
 #endif // NDEBUG
   }
 
@@ -379,7 +379,7 @@ private:
   {
     size_t range = value.size();
 #ifndef NDEBUG
-#ifndef DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
+#  ifndef DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
     bool failure = false;
     std::string error_type;
     for (size_t rr = 0; rr < range; ++rr) {
@@ -405,7 +405,7 @@ private:
                        << "The result was:                       " << value[rr] << "\n\n"
                        << "You can disable this check by defining DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS\n");
     } // check_value(...)
-#endif // DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
+#  endif // DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
 #endif // NDEBUG
   }
 
diff --git a/dune/xt/functions/expression/parametric.hh b/dune/xt/functions/expression/parametric.hh
index 44acf05d42d94f20ef2e9d1b5976c9b0dcfe62ba..83b4e02aaaef834f0642cd69a914ec8de3595bf3 100644
--- a/dune/xt/functions/expression/parametric.hh
+++ b/dune/xt/functions/expression/parametric.hh
@@ -136,7 +136,7 @@ public:
     function_->evaluate(args, ret);
 
 #ifndef NDEBUG
-#ifndef DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
+#  ifndef DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
     bool failure = false;
     std::string error_type;
     for (size_t rr = 0; rr < range_dim; ++rr) {
@@ -162,7 +162,7 @@ public:
                        << "The result was:                       " << ret[rr] << "\n\n"
                        << "You can disable this check by defining DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS\n");
     }
-#endif // DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
+#  endif // DUNE_XT_FUNCTIONS_EXPRESSION_DISABLE_CHECKS
 #endif // NDEBUG
     return ret;
   } // ... evaluate(...)