diff --git a/src/sand-wedge.cc b/src/sand-wedge.cc
index 3c23e5d2a4fe4917df454a739807dc3ee7574231..d529e770f7daf2737c0fc0917fd46239b37bc212 100644
--- a/src/sand-wedge.cc
+++ b/src/sand-wedge.cc
@@ -43,8 +43,6 @@
 #include <dune/fufem/functions/basisgridfunction.hh>
 #include <dune/fufem/sharedpointermap.hh>
 #include <dune/solvers/norms/energynorm.hh>
-#include <dune/solvers/norms/sumnorm.hh>
-#include <dune/solvers/norms/twonorm.hh>
 #include <dune/solvers/solvers/loopsolver.hh>
 #include <dune/solvers/solvers/solver.hh>
 #include <dune/tnnmg/nonlinearities/zerononlinearity.hh>
@@ -56,12 +54,9 @@
 
 #include "adaptivetimestepper.hh" // FIXME
 #include "assemblers.hh"
-#include "tobool.hh"
-#include "coupledtimestepper.hh"
 #include "distances.hh"
 #include "enumparser.hh"
 #include "enums.hh"
-#include "fixedpointiterator.hh"
 #include "friction_writer.hh"
 #include "gridselector.hh"
 #include "sand-wedge-data/mybody.hh"
diff --git a/src/state/ageinglawstateupdater.cc b/src/state/ageinglawstateupdater.cc
index 51a916267a30859d64cd477c8e1744a9dc2f5b79..f9e48e258bbbc78a8aca6425f8bc26ea4e6bbe62 100644
--- a/src/state/ageinglawstateupdater.cc
+++ b/src/state/ageinglawstateupdater.cc
@@ -1,4 +1,5 @@
 #include "ageinglawstateupdater.hh"
+#include "../tobool.hh"
 
 template <class ScalarVector, class Vector>
 AgeingLawStateUpdater<ScalarVector, Vector>::AgeingLawStateUpdater(
diff --git a/src/state/ageinglawstateupdater.hh b/src/state/ageinglawstateupdater.hh
index 67ebab25ee7548916ecaddb6c1de3799f3f1604f..56ee758296fe1ac36e1632ff34e01dec7256333e 100644
--- a/src/state/ageinglawstateupdater.hh
+++ b/src/state/ageinglawstateupdater.hh
@@ -1,7 +1,6 @@
 #ifndef SRC_STATE_AGEINGLAWSTATEUPDATER_HH
 #define SRC_STATE_AGEINGLAWSTATEUPDATER_HH
 
-#include "../tobool.hh"
 #include "stateupdater.hh"
 
 template <class ScalarVector, class Vector>
diff --git a/src/state/sliplawstateupdater.cc b/src/state/sliplawstateupdater.cc
index acffc6f217fbf2cb8bbd1cea7e16b41ff58acb86..7afe306520743c3ed814084f8b189d7fc7d7b1fd 100644
--- a/src/state/sliplawstateupdater.cc
+++ b/src/state/sliplawstateupdater.cc
@@ -1,4 +1,5 @@
 #include "sliplawstateupdater.hh"
+#include "../tobool.hh"
 
 template <class ScalarVector, class Vector>
 SlipLawStateUpdater<ScalarVector, Vector>::SlipLawStateUpdater(
diff --git a/src/state/sliplawstateupdater.hh b/src/state/sliplawstateupdater.hh
index 28838aec28f128f97770734b1b2fceff9464b927..851829cab573551eb60e1c25cc402c5a44e250d5 100644
--- a/src/state/sliplawstateupdater.hh
+++ b/src/state/sliplawstateupdater.hh
@@ -1,7 +1,6 @@
 #ifndef SRC_STATE_SLIPLAWSTATEUPDATER_HH
 #define SRC_STATE_SLIPLAWSTATEUPDATER_HH
 
-#include "../tobool.hh"
 #include "stateupdater.hh"
 
 template <class ScalarVector, class Vector>
diff --git a/src/timestepping.cc b/src/timestepping.cc
index af9edb2a07ea6e2b0df86024c6da1ab563f5c253..56346038307a353216c49f9b47660275f3b33d72 100644
--- a/src/timestepping.cc
+++ b/src/timestepping.cc
@@ -2,8 +2,6 @@
 #include "config.h"
 #endif
 
-#include <dune/istl/matrixindexset.hh>
-
 #include "timestepping.hh"
 
 #include "timestepping/backward_euler.cc"
diff --git a/src/timestepping.hh b/src/timestepping.hh
index 5ee20dce1ba8b98177b90781c39beeabe97861e0..524e76997c2ad92582e5c7dd370d751b5673079b 100644
--- a/src/timestepping.hh
+++ b/src/timestepping.hh
@@ -3,9 +3,10 @@
 
 #include <memory>
 
-#include "enums.hh"
 #include <dune/common/bitsetvector.hh>
 
+#include "enums.hh"
+
 template <class Vector, class Matrix, class Function, size_t dim>
 class TimeSteppingScheme {
 public: