diff --git a/dune/tectonic/body.hh b/dune/tectonic/body.hh
index cee4dbf13515ecd36a663698035b3e61e8d54ac1..f98d50685822aa209f8256404efb7e5b48c7aabc 100644
--- a/dune/tectonic/body.hh
+++ b/dune/tectonic/body.hh
@@ -1,5 +1,5 @@
-#ifndef BODY_HH
-#define BODY_HH
+#ifndef DUNE_TECTONIC_BODY_HH
+#define DUNE_TECTONIC_BODY_HH
 
 template <int dimension> struct Body {
   using ScalarFunction = Dune::VirtualFunction<
@@ -18,5 +18,4 @@ template <int dimension> struct Body {
   ScalarFunction virtual const &getDensityField() const = 0;
   VectorField virtual const &getGravityField() const = 0;
 };
-
 #endif
diff --git a/dune/tectonic/ellipticenergy.hh b/dune/tectonic/ellipticenergy.hh
index 75b9985f5d84f253426655d8668a447b3ae19785..e3405a1c6c2dbbd37db87bbb3a77f8df7cc2354f 100644
--- a/dune/tectonic/ellipticenergy.hh
+++ b/dune/tectonic/ellipticenergy.hh
@@ -1,5 +1,5 @@
-#ifndef ELLIPTIC_ENERGY_HH
-#define ELLIPTIC_ENERGY_HH
+#ifndef DUNE_TECTONIC_ELLIPTICENERGY_HH
+#define DUNE_TECTONIC_ELLIPTICENERGY_HH
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
diff --git a/dune/tectonic/frictiondata.hh b/dune/tectonic/frictiondata.hh
index ee4bde11c654536cd83a36895ce4b564bd30e37f..96b8a651e35aab92f367632f53c4f8376430f853 100644
--- a/dune/tectonic/frictiondata.hh
+++ b/dune/tectonic/frictiondata.hh
@@ -1,5 +1,6 @@
-#ifndef FRICTIONDATA_HH
-#define FRICTIONDATA_HH
+#ifndef DUNE_TECTONIC_FRICTIONDATA_HH
+#define DUNE_TECTONIC_FRICTIONDATA_HH
+
 #include <dune/common/parametertree.hh>
 
 struct FrictionData {
diff --git a/dune/tectonic/frictionpotential.hh b/dune/tectonic/frictionpotential.hh
index e9fe0d5161bf2039604ad83f423c5d744097a09f..042ef2b3a5b061f85b57fa2610cf46f72a8ad836 100644
--- a/dune/tectonic/frictionpotential.hh
+++ b/dune/tectonic/frictionpotential.hh
@@ -1,5 +1,5 @@
-#ifndef NICE_FUNCTION_HH
-#define NICE_FUNCTION_HH
+#ifndef DUNE_TECTONIC_FRICTIONPOTENTIAL_HH
+#define DUNE_TECTONIC_FRICTIONPOTENTIAL_HH
 
 #include <algorithm>
 #include <cassert>
diff --git a/dune/tectonic/globalfrictiondata.hh b/dune/tectonic/globalfrictiondata.hh
index 1b2a5bf1b24631e0327f6a1bec95616e8b0766a5..4482e8f601f5e30e253b90b6b692b66a7c8b9400 100644
--- a/dune/tectonic/globalfrictiondata.hh
+++ b/dune/tectonic/globalfrictiondata.hh
@@ -1,5 +1,5 @@
-#ifndef GLOBAL_FRICTION_DATA_HH
-#define GLOBAL_FRICTION_DATA_HH
+#ifndef DUNE_TECTONIC_GLOBALFRICTIONDATA_HH
+#define DUNE_TECTONIC_GLOBALFRICTIONDATA_HH
 
 #include <dune/common/function.hh>
 #include <dune/common/fvector.hh>
@@ -33,5 +33,4 @@ template <int dimension> class GlobalFrictionData {
   VirtualFunction virtual const &b() const = 0;
   double virtual const &mu0() const = 0;
 };
-
 #endif
diff --git a/dune/tectonic/globalnonlinearity.hh b/dune/tectonic/globalnonlinearity.hh
index 0a899a56db4cd7d81d3472920c06f9a4ff1b25e9..2f00da1b4091585baf39065dadd988e21d28aa93 100644
--- a/dune/tectonic/globalnonlinearity.hh
+++ b/dune/tectonic/globalnonlinearity.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_GLOBAL_NONLINEARITY_HH
-#define DUNE_TECTONIC_GLOBAL_NONLINEARITY_HH
+#ifndef DUNE_TECTONIC_GLOBALNONLINEARITY_HH
+#define DUNE_TECTONIC_GLOBALNONLINEARITY_HH
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
diff --git a/dune/tectonic/globalruinanonlinearity.hh b/dune/tectonic/globalruinanonlinearity.hh
index 4dc996d805c8aa7d9c78dbe7c5faf81728bc9ed3..4c82a517e057cc22d779293c3d301ff844d5935b 100644
--- a/dune/tectonic/globalruinanonlinearity.hh
+++ b/dune/tectonic/globalruinanonlinearity.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_GLOBAL_RUINA_NONLINEARITY_HH
-#define DUNE_TECTONIC_GLOBAL_RUINA_NONLINEARITY_HH
+#ifndef DUNE_TECTONIC_GLOBALRUINANONLINEARITY_HH
+#define DUNE_TECTONIC_GLOBALRUINANONLINEARITY_HH
 
 #include <vector>
 
diff --git a/dune/tectonic/gravity.hh b/dune/tectonic/gravity.hh
index 9af62f17d86248d6deeddec1f4b0eb7f3cf65afc..d91f6850d29088dd4afb1c48743ca2b45620d59c 100644
--- a/dune/tectonic/gravity.hh
+++ b/dune/tectonic/gravity.hh
@@ -1,5 +1,5 @@
-#ifndef GRAVITY_HH
-#define GRAVITY_HH
+#ifndef DUNE_TECTONIC_GRAVITY_HH
+#define DUNE_TECTONIC_GRAVITY_HH
 
 #include <dune/common/function.hh>
 #include <dune/common/fvector.hh>
diff --git a/dune/tectonic/localfriction.hh b/dune/tectonic/localfriction.hh
index a202e7f224b46bb27a76e630eb18488779684bf9..eaea43c4f0f5850e23c96acee0a7d840ace61ed8 100644
--- a/dune/tectonic/localfriction.hh
+++ b/dune/tectonic/localfriction.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_LOCAL_FRICTION_HH
-#define DUNE_TECTONIC_LOCAL_FRICTION_HH
+#ifndef DUNE_TECTONIC_LOCALFRICTION_HH
+#define DUNE_TECTONIC_LOCALFRICTION_HH
 
 #include <cmath>
 #include <limits>
diff --git a/dune/tectonic/minimisation.hh b/dune/tectonic/minimisation.hh
index a7ad57bc8eaf4c3a9182c9aac41f4b3c8a906220..3ae1464a6c9a9af2feaa751afa86df979b76f3c3 100644
--- a/dune/tectonic/minimisation.hh
+++ b/dune/tectonic/minimisation.hh
@@ -1,5 +1,5 @@
-#ifndef MINIMISATION_HH
-#define MINIMISATION_HH
+#ifndef DUNE_TECTONIC_MINIMISATION_HH
+#define DUNE_TECTONIC_MINIMISATION_HH
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index 6d11407c8dbe2cd88254052c581ff0c468794b2e..dea7dd1b8755de4dc09fe593d215e745577a383a 100644
--- a/dune/tectonic/myblockproblem.hh
+++ b/dune/tectonic/myblockproblem.hh
@@ -1,7 +1,7 @@
-// Based on dune/tnnmg/problem-classes/blocknonlineartnnmgproblem.hh
+#ifndef DUNE_TECTONIC_MYBLOCKPROBLEM_HH
+#define DUNE_TECTONIC_MYBLOCKPROBLEM_HH
 
-#ifndef MY_BLOCK_PROBLEM_HH
-#define MY_BLOCK_PROBLEM_HH
+// Based on dune/tnnmg/problem-classes/blocknonlineartnnmgproblem.hh
 
 #include <dune/common/bitsetvector.hh>
 #include <dune/common/nullptr.hh>
@@ -271,5 +271,4 @@ class MyBlockProblem<ConvexProblem>::IterateObject {
 
   size_t const localsteps;
 };
-
 #endif
diff --git a/dune/tectonic/mydirectionalconvexfunction.hh b/dune/tectonic/mydirectionalconvexfunction.hh
index 83cd3b40522969ee8f68d1a852cc7e879a283bed..e815fa48e817d0b6bfecbaccb43b6a05765f1a2f 100644
--- a/dune/tectonic/mydirectionalconvexfunction.hh
+++ b/dune/tectonic/mydirectionalconvexfunction.hh
@@ -1,9 +1,9 @@
+#ifndef DUNE_TECTONIC_MYDIRECTIONALCONVEXFUNCTION_HH
+#define DUNE_TECTONIC_MYDIRECTIONALCONVEXFUNCTION_HH
+
 // Copied from dune/tnnmg/problem-classes/directionalconvexfunction.hh
 // Allows phi to be const
 
-#ifndef MY_DIRECTIONAL_CONVEX_FUNCTION_HH
-#define MY_DIRECTIONAL_CONVEX_FUNCTION_HH
-
 #include <dune/fufem/arithmetic.hh>
 #include <dune/solvers/common/interval.hh>
 
@@ -64,5 +64,4 @@ template <class Nonlinearity> class MyDirectionalConvexFunction {
 
   Dune::Solvers::Interval<double> dom;
 };
-
 #endif
diff --git a/dune/tectonic/tectonic.hh b/dune/tectonic/tectonic.hh
index 7fd374f9a58e4ba79fbb28f5aa8fc3e54c037f2d..bd921f8f7bdcf36d5cdc187e95f5660edeb4dcd0 100644
--- a/dune/tectonic/tectonic.hh
+++ b/dune/tectonic/tectonic.hh
@@ -1,6 +1,5 @@
-#ifndef DUNE_tectonic.hh
-#define DUNE_tectonic .hh
+#ifndef DUNE_TECTONIC_TECTONIC_HH
+#define DUNE_TECTONIC_TECTONIC_HH
 
 // add your classes here
-
-#endif // DUNE_tectonic.hh
+#endif
diff --git a/src/assemblers.hh b/src/assemblers.hh
index 1705b7a55b3254315642c7accca6f873bb4074dc..96f983415f96a6b18046f221023a4f0c3ec549a7 100644
--- a/src/assemblers.hh
+++ b/src/assemblers.hh
@@ -1,5 +1,5 @@
-#ifndef ASSEMBLERS_HH
-#define ASSEMBLERS_HH
+#ifndef SRC_ASSEMBLERS_HH
+#define SRC_ASSEMBLERS_HH
 
 #include <dune/common/bitsetvector.hh>
 #include <dune/common/function.hh>
@@ -84,5 +84,4 @@ template <class GridView, int dimension> class MyAssembler {
   void assembleVonMisesStress(double youngModulus, double poissonRatio,
                               Vector const &u, ScalarVector &stress);
 };
-
 #endif
diff --git a/src/boundary_writer.hh b/src/boundary_writer.hh
index 5e4b0085f95f452e6f2642efa321686d62087238..32033a7c9629b2b7430cdce23f8cc1a2a1f3c65c 100644
--- a/src/boundary_writer.hh
+++ b/src/boundary_writer.hh
@@ -1,5 +1,5 @@
-#ifndef BOUNDARY_WRITER_HH
-#define BOUNDARY_WRITER_HH
+#ifndef SRC_BOUNDARY_WRITER_HH
+#define SRC_BOUNDARY_WRITER_HH
 
 #include <fstream>
 #include <string>
diff --git a/src/enums.hh b/src/enums.hh
index 5d829afd3474f90362882eafa59fc9d29c80e414..681c1ee2eaa7b37054a9f27cbee9e48f56bed5e2 100644
--- a/src/enums.hh
+++ b/src/enums.hh
@@ -1,5 +1,5 @@
-#ifndef ENUMS_HH
-#define ENUMS_HH
+#ifndef SRC_ENUMS_HH
+#define SRC_ENUMS_HH
 
 struct Config {
   enum stateModel {
@@ -11,4 +11,5 @@ struct Config {
     BackwardEuler
   };
 };
+
 #endif
diff --git a/src/explicitgrid.hh b/src/explicitgrid.hh
index 9100b3d3e831fa0a857cba08fb9206698c83ae73..bf50999496ddaf87e0e03ac1d35339be169948f0 100644
--- a/src/explicitgrid.hh
+++ b/src/explicitgrid.hh
@@ -1,3 +1,6 @@
+#ifndef SRC_EXPLICITGRID_HH
+#define SRC_EXPLICITGRID_HH
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wignored-qualifiers"
 #include <dune/grid/alugrid.hh>
@@ -5,3 +8,4 @@
 
 using Grid = Dune::ALUGrid<DIM, DIM, Dune::simplex, Dune::nonconforming>;
 using GridView = Grid::LeafGridView;
+#endif
diff --git a/src/explicitvectors.hh b/src/explicitvectors.hh
index 28271cc30f67fe7f72f5ab21bec123cd2c13b14d..832888e123cb12a5de2453321a2a43c921336ed1 100644
--- a/src/explicitvectors.hh
+++ b/src/explicitvectors.hh
@@ -1,3 +1,6 @@
+#ifndef SRC_EXPLICITVECTORS_HH
+#define SRC_EXPLICITVECTORS_HH
+
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
 #include <dune/istl/bcrsmatrix.hh>
@@ -8,3 +11,4 @@ using LocalMatrix = Dune::FieldMatrix<double, DIM, DIM>;
 using Vector = Dune::BlockVector<LocalVector>;
 using Matrix = Dune::BCRSMatrix<LocalMatrix>;
 using ScalarVector = Dune::BlockVector<Dune::FieldVector<double, 1>>;
+#endif
diff --git a/src/friction_writer.hh b/src/friction_writer.hh
index dc78e05763108b94e42725bec941a2dc91a4ff58..e884d4d696a1328faf72f00f2eb7bedd08db1158 100644
--- a/src/friction_writer.hh
+++ b/src/friction_writer.hh
@@ -1,5 +1,5 @@
-#ifndef FRICTION_WRITER_HH
-#define FRICTION_WRITER_HH
+#ifndef SRC_FRICTION_WRITER_HH
+#define SRC_FRICTION_WRITER_HH
 
 #include <fstream>
 #include <string>
@@ -26,4 +26,5 @@ class FrictionWriter : public BoundaryWriter<ScalarVector, Vector> {
   std::fstream stateWriter;
   using BW::boundaryNodes;
 };
+
 #endif
diff --git a/src/sand-wedge-data/mygeometry.hh b/src/sand-wedge-data/mygeometry.hh
index d9955b2c4d0c5039306da116eeaf0aa50ce1224a..0800e1141d3a97b176ca959ad341bb9401becb55 100644
--- a/src/sand-wedge-data/mygeometry.hh
+++ b/src/sand-wedge-data/mygeometry.hh
@@ -1,5 +1,5 @@
-#ifndef MY_GEOMETRY_HH
-#define MY_GEOMETRY_HH
+#ifndef SRC_SAND_WEDGE_DATA_MYGEOMETRY_HH
+#define SRC_SAND_WEDGE_DATA_MYGEOMETRY_HH
 
 #include <dune/common/fassign.hh>
 #include <dune/common/fvector.hh>
diff --git a/src/sand-wedge-data/special_writer.hh b/src/sand-wedge-data/special_writer.hh
index a9f3adedd8a671f24716dfefe45d5d3daee743da..dfaa2243d93295b91e81ecb745fa8d6fefdab31f 100644
--- a/src/sand-wedge-data/special_writer.hh
+++ b/src/sand-wedge-data/special_writer.hh
@@ -1,5 +1,5 @@
-#ifndef SPECIAL_WRITER_HH
-#define SPECIAL_WRITER_HH
+#ifndef SRC_SPECIAL_WRITER_HH
+#define SRC_SPECIAL_WRITER_HH
 
 #include <fstream>
 #include <utility>
@@ -80,5 +80,4 @@ template <class GridView, int dimension> class SpecialWriter {
     writer_ << std::endl;
   }
 };
-
 #endif
diff --git a/src/solverfactory.hh b/src/solverfactory.hh
index 75cc3954d1e41fee4a18f80898d931b83d264f76..93188af419bc08e89d8a423ff866a703aa4d2dd5 100644
--- a/src/solverfactory.hh
+++ b/src/solverfactory.hh
@@ -1,5 +1,5 @@
-#ifndef SOLVER_FACTORY_HH
-#define SOLVER_FACTORY_HH
+#ifndef SRC_SOLVERFACTORY_HH
+#define SRC_SOLVERFACTORY_HH
 
 #include <dune/common/bitsetvector.hh>
 #include <dune/common/parametertree.hh>
@@ -48,5 +48,4 @@ class SolverFactory {
   NonlinearSmoother nonlinearSmoother;
   Solver *multigridStep;
 };
-
 #endif
diff --git a/src/state.hh b/src/state.hh
index 779640d0a0ff102441e4c653c4dd28a38fd57339..9d752b651a2dc9eebec20b85eea41fbbc048a886 100644
--- a/src/state.hh
+++ b/src/state.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_STATE_HH
-#define DUNE_TECTONIC_STATE_HH
+#ifndef SRC_STATE_HH
+#define SRC_STATE_HH
 
 #include <dune/common/bitsetvector.hh>
 
diff --git a/src/timestepping.hh b/src/timestepping.hh
index 258327637a1057e1132d5bbcc07d66ff69d298d5..b95dff8457b9fbb659c4cf8c6173c18f2a76dd25 100644
--- a/src/timestepping.hh
+++ b/src/timestepping.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_TIMESTEPPING_HH
-#define DUNE_TECTONIC_TIMESTEPPING_HH
+#ifndef SRC_TIMESTEPPING_HH
+#define SRC_TIMESTEPPING_HH
 
 #include "enums.hh"
 #include <dune/common/bitsetvector.hh>
@@ -47,5 +47,4 @@ initTimeStepper(Config::scheme scheme,
       assert(false);
   }
 }
-
 #endif
diff --git a/src/timestepping/backward_euler.hh b/src/timestepping/backward_euler.hh
index 657b57b5669bd2b0c599454ccd9c901bc0999be0..e6291fd69e9d08a50c2d518cc0d517faea87010e 100644
--- a/src/timestepping/backward_euler.hh
+++ b/src/timestepping/backward_euler.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_TIMESTEPPING_BACKWARD_EULER_HH
-#define DUNE_TECTONIC_TIMESTEPPING_BACKWARD_EULER_HH
+#ifndef SRC_TIMESTEPPING_BACKWARD_EULER_HH
+#define SRC_TIMESTEPPING_BACKWARD_EULER_HH
 
 template <class Vector, class Matrix, class Function, size_t dim>
 class BackwardEuler : public TimeSteppingScheme<Vector, Matrix, Function, dim> {
diff --git a/src/timestepping/newmark.hh b/src/timestepping/newmark.hh
index a9a6e1b2e877baa03bd3cc9b134c7f37226dfc4c..bfae966491ab556ea6df287f846ea7cb2c0612ad 100644
--- a/src/timestepping/newmark.hh
+++ b/src/timestepping/newmark.hh
@@ -1,5 +1,5 @@
-#ifndef DUNE_TECTONIC_TIMESTEPPING_NEWMARK_HH
-#define DUNE_TECTONIC_TIMESTEPPING_NEWMARK_HH
+#ifndef SRC_TIMESTEPPING_NEWMARK_HH
+#define SRC_TIMESTEPPING_NEWMARK_HH
 
 template <class Vector, class Matrix, class Function, size_t dim>
 class Newmark : public TimeSteppingScheme<Vector, Matrix, Function, dim> {
diff --git a/src/tobool.hh b/src/tobool.hh
index d561225dd3d4615c2d3fc31648a9f20abad9977e..da60e905cc36e8e9a92255ce1b68ca3653ced6b9 100644
--- a/src/tobool.hh
+++ b/src/tobool.hh
@@ -1,9 +1,8 @@
-#ifndef TO_BOOL_HH
-#define TO_BOOL_HH
+#ifndef SRC_TOBOOL_HH
+#define SRC_TOBOOL_HH
 
 template <class Alloc>
 bool toBool(Dune::BitSetVectorConstReference<1, Alloc> x) {
   return x[0];
 }
-
 #endif
diff --git a/src/vtk.hh b/src/vtk.hh
index ffa89983fed1916c9aaba6cd6a823541801683af..c851514c88b164fd0311663c427c3e96576477e2 100644
--- a/src/vtk.hh
+++ b/src/vtk.hh
@@ -1,5 +1,5 @@
-#ifndef VTK_HH
-#define VTK_HH
+#ifndef SRC_VTK_HH
+#define SRC_VTK_HH
 
 #include <string>
 
@@ -16,5 +16,4 @@ template <class VertexBasis, class CellBasis> class MyVTKWriter {
   void write(size_t record, Vector const &u, Vector const &v,
              ScalarVector const &alpha, ScalarVector const &stress) const;
 };
-
 #endif