diff --git a/src/enum_scheme.cc b/src/enum_scheme.cc
index 0327b5419c15b64b890adfa5133cdfb482fc94ae..bcf550596f87f2434aa34e0ec8325b116eec76c3 100644
--- a/src/enum_scheme.cc
+++ b/src/enum_scheme.cc
@@ -1,5 +1,7 @@
 #include <dune/common/exceptions.hh>
 
+#include "enums.hh"
+
 template <> struct StringToEnum<Config::scheme> {
   static Config::scheme convert(std::string const &s) {
     if (s == "newmark")
diff --git a/src/enum_state_model.cc b/src/enum_state_model.cc
index 7195a01658fd475f699d145122e8174756adbc56..eb0627714bb01d5481e286a6150366f990ebb729 100644
--- a/src/enum_state_model.cc
+++ b/src/enum_state_model.cc
@@ -1,5 +1,7 @@
 #include <dune/common/exceptions.hh>
 
+#include "enums.hh"
+
 template <> struct StringToEnum<Config::stateModel> {
   static Config::stateModel convert(std::string const &s) {
     if (s == "Dieterich")
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 5ff08fd5d5dc04fea7fd299dfd70d5fffc79b563..aa21696f2946d9f9481b80bddff0db7345f54609 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -74,18 +74,16 @@
 #include <dune/tectonic/globalnonlinearity.hh>
 
 #include "assemblers.hh"
-#include "friction_writer.hh"
-#include "solverfactory.hh"
-#include "vtk.hh"
-
-#include "enums.hh"
 #include "enum_parser.cc"
-#include "enum_state_model.cc"
 #include "enum_scheme.cc"
+#include "enum_state_model.cc"
 #include "enum_verbosity.cc"
-
+#include "enums.hh"
+#include "friction_writer.hh"
+#include "solverfactory.hh"
 #include "state.hh"
 #include "timestepping.hh"
+#include "vtk.hh"
 
 size_t const dims = DIM;
 
diff --git a/src/vtk.cc b/src/vtk.cc
index c01d97a62fa778ff5fe9f831bff9d99da19248d8..7383dfc092124fdc825238e031af06b8dfab4e12 100644
--- a/src/vtk.cc
+++ b/src/vtk.cc
@@ -2,6 +2,10 @@
 #include "config.h"
 #endif
 
+#include <dune/grid/io/file/vtk/vtkwriter.hh>
+
+#include <dune/fufem/functions/vtkbasisgridfunction.hh>
+
 #include "vtk.hh"
 
 template <class VertexBasis, class CellBasis, class Vector, class ScalarVector>
diff --git a/src/vtk.hh b/src/vtk.hh
index dfa3665ad48f7f50df35969f885300abb2b1bbf3..5b06cd0aa691acfc6d60488228307f667e393e32 100644
--- a/src/vtk.hh
+++ b/src/vtk.hh
@@ -1,10 +1,6 @@
 #ifndef VTK_HH
 #define VTK_HH
 
-#include <dune/grid/io/file/vtk/vtkwriter.hh>
-
-#include <dune/fufem/functions/vtkbasisgridfunction.hh>
-
 template <class VertexBasis, class CellBasis, class Vector, class ScalarVector>
 void writeVtk(VertexBasis const &vertexBasis, Vector const &displacement,
               ScalarVector const &logState, CellBasis const &cellBasis,