diff --git a/dune/tectonic/globalnonlinearity.hh b/dune/tectonic/globalnonlinearity.hh
index c1224d6ef96516c8ed4912b9d2b84fa459d6771b..5a2f582666f3216a053b7e4e5f5983a0559b72fe 100644
--- a/dune/tectonic/globalnonlinearity.hh
+++ b/dune/tectonic/globalnonlinearity.hh
@@ -3,9 +3,9 @@
 #ifndef DUNE_TECTONIC_GLOBAL_NONLINEARITY_HH
 #define DUNE_TECTONIC_GLOBAL_NONLINEARITY_HH
 
-//#include <dune/common/bitsetvector.hh>
 #include <dune/common/fvector.hh>
-#include <dune/tectonic/localnonlinearity.hh>
+
+#include "localnonlinearity.hh"
 
 namespace Dune {
 template <int dim, class OuterFunctionType> class GlobalNonlinearity {
diff --git a/dune/tectonic/localnonlinearity.hh b/dune/tectonic/localnonlinearity.hh
index 7c7b3a5cf1ce4d1ce4040b717b6782f723a255ca..0f182ef21476a20dee4e2a3a380690562a30271d 100644
--- a/dune/tectonic/localnonlinearity.hh
+++ b/dune/tectonic/localnonlinearity.hh
@@ -3,13 +3,13 @@
 #ifndef DUNE_TECTONIC_LOCAL_NONLINEARITY_HH
 #define DUNE_TECTONIC_LOCAL_NONLINEARITY_HH
 
+#include <limits>
+
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
 
 #include <dune/fufem/interval.hh>
 
-#include <limits>
-
 #include "nicefunction.hh"
 
 namespace Dune {
diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index 7c3a9882b0cc066cc7d6da891c4f39a6f996d8f7..aba33a61fc86c2ef6343a3f7c812e0eb92a62ec8 100644
--- a/dune/tectonic/myblockproblem.hh
+++ b/dune/tectonic/myblockproblem.hh
@@ -3,7 +3,6 @@
 #ifndef MY_BLOCK_PROBLEM_HH
 #define MY_BLOCK_PROBLEM_HH
 
-// #include <dune/common/parametertree.hh>
 #include <dune/common/bitsetvector.hh>
 
 #include <dune/tnnmg/problem-classes/bisection.hh>
diff --git a/dune/tectonic/myconvexproblem.hh b/dune/tectonic/myconvexproblem.hh
index 7d7302f04396603923d4034b9a1c1cf24686c1af..27de143f2353c4fd484ea63367d6e601aa002b80 100644
--- a/dune/tectonic/myconvexproblem.hh
+++ b/dune/tectonic/myconvexproblem.hh
@@ -1,10 +1,10 @@
 // Based on dune/tnnmg/problem-classes/convexproblem.hh
 
-#include <dune/tectonic/globalnonlinearity.hh>
-
 #ifndef MY_CONVEX_PROBLEM_HH
 #define MY_CONVEX_PROBLEM_HH
 
+#include "globalnonlinearity.hh"
+
 /** \brief TODO
 
     \tparam MatrixTypeTEMPLATE The type used for the matrix of the quadratic
diff --git a/dune/tectonic/nicefunction.hh b/dune/tectonic/nicefunction.hh
index fecc7dd94f2c4c50fe7b8809a390ce8f1ee7eb77..81f3894c0193e5f4fc6df7c7e6db108753623528 100644
--- a/dune/tectonic/nicefunction.hh
+++ b/dune/tectonic/nicefunction.hh
@@ -3,10 +3,10 @@
 #ifndef NICE_FUNCTION_HH
 #define NICE_FUNCTION_HH
 
-#include <dune/common/function.hh>
-
 #include <cmath>
 
+#include <dune/common/function.hh>
+
 namespace Dune {
 class NiceFunction : public VirtualFunction<double, double> {
 public: