diff --git a/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index 9d8d4e3d309b746df6603025dda23b397931c4ac..41f39a21671bc5ff635b23c4d6650b9d802d2349 100644
--- a/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -285,4 +285,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_STOKES_SUBPROBLEM_HH
+#endif
diff --git a/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
index f7d7b2b13c5511bc3bbfa4d2218c1ebabbc78c78..03aaac1ba9bf1b63dfa118ed2615b4442a03650f 100644
--- a/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
@@ -215,4 +215,4 @@ private:
 
 } //end namespace Dumux
 
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/exercises/exercise-coupling-ff-pm/interface/properties.hh b/exercises/exercise-coupling-ff-pm/interface/properties.hh
index c18e541b650e9435c47289cf6f7c87bbb400f183..f4286b93db5eacdde1dbf4af67bac34d5f66b945 100644
--- a/exercises/exercise-coupling-ff-pm/interface/properties.hh
+++ b/exercises/exercise-coupling-ff-pm/interface/properties.hh
@@ -136,4 +136,4 @@ struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesOneP> { static conste
 
 } //end namespace Dumux::Properties
 
-#endif // DUMUX_EXERCISE_COUPLED_INTERFACE_PROPERTIES_HH
+#endif
diff --git a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index 08465b8918520e55956705439d39529fa5557199..4d7cd3fb4781094e2769e6e60a7b68d833fdbb70 100644
--- a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -305,4 +305,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_STOKES1P2C_SUBPROBLEM_HH
+#endif
diff --git a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 4d3f7ebb264385ed53978394114ab243e880bce5..6c1372d3aaa7c7fc44990724663c46cf189e6b38 100644
--- a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -369,4 +369,4 @@ private:
 
 } //end namespace Dumux
 
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/exercises/exercise-coupling-ff-pm/models/properties.hh b/exercises/exercise-coupling-ff-pm/models/properties.hh
index fee538b70c515bc6dbbe468d7e3ab702e778096d..954869d048ab98f9ba1ae835f92f0ca28e4899ee 100644
--- a/exercises/exercise-coupling-ff-pm/models/properties.hh
+++ b/exercises/exercise-coupling-ff-pm/models/properties.hh
@@ -138,4 +138,4 @@ struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesNC> { static constexp
 
 } // end namespace Dumux::Properties
 
-#endif //DUMUX_EXERCISE_COUPLED_MODELS_PROPERTIES_HH
+#endif
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index 6367854e9a940848c2022d9fdf0038ee32e25f92..b7cc8cba50dc03e6fa0f58e65db5d9c628b138db 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -353,4 +353,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
+#endif
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index f4ecbabf80969ab3f07b1353c64f1dd85f2dfa58..8ef5fee50c734d430739e03792f5793b470dbd8d 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -291,4 +291,4 @@ private:
 
 } //end namespace dUMUX
 
-#endif //DUMUX_DARCY2P2C_SUBPROBLEM_HH
+#endif
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/properties.hh b/exercises/exercise-coupling-ff-pm/turbulence/properties.hh
index f7c79ed58ae738042eb26ae89ae1b164e0b68730..505b1d56519c7a63bfec7dbb3e4cf4626229c167 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/properties.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/properties.hh
@@ -125,4 +125,4 @@ struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesZeroEq> { static cons
 
 } // end namespace Dumux::Properties
 
-#endif // DUMUX_EXERCISE_COUPLED_TURBULENCE_PROPERTIES_HH
+#endif
diff --git a/exercises/exercise-fractures/properties.hh b/exercises/exercise-fractures/properties.hh
index 9a118b70da7b0ad6e1e5bfbaad9e5ebaa9c69034..bae6bc4e30d2301144e9f0f9750c62c2a4d3324b 100644
--- a/exercises/exercise-fractures/properties.hh
+++ b/exercises/exercise-fractures/properties.hh
@@ -107,4 +107,4 @@ struct FluidSystem<TypeTag, TTag::FractureProblem>
 
 } // end namespace Dumux::Properties
 
-#endif // DUMUX_COURSE_FRACTURESEXERCISE_PROPERTIES_HH
+#endif
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index 48c8929e3d85e299481ada46ba0ad9569919a03d..e2f31fc21d21f50b13c9fe5833eda77a1e91b0bc 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -310,4 +310,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_STOKES_SUBPROBLEM_HH
+#endif
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
index 1637f00bf1d50f13341487ccef779b10da98cb47..dcba507d5117bb1d190a93ba3c766bfc95599efd 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
@@ -210,4 +210,4 @@ private:
 
 } //end namespace Dumux
 
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh b/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
index 3574bd07550e59c472512a6681731810b5596196..e062663aa57b789db2ef34bbb444f21a503bfa7a 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
@@ -134,4 +134,4 @@ struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesOneP> { static conste
 
 } // end namespace Dumux::Properties
 
-#endif // DUMUX_EXERCISE_COUPLED_INTERFACE_PROPERTIES_HH
+#endif
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index 70ca05e3d21a18bf5616a1d3b6866a782c72a6bb..5de565277f000aa6ab9265875cfa3f5a579c2c79 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -308,4 +308,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_STOKES1P2C_SUBPROBLEM_HH
+#endif
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 537126e07e9044f2d24f46d822eb62eb09f3eea1..69f140fcb40170a61cf5c4a049394e3f3f68661b 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -398,4 +398,4 @@ private:
 
 } //end namespace Dumux
 
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/properties.hh b/exercises/solution/exercise-coupling-ff-pm/models/properties.hh
index f33c30055ce27c1edd19a1ee6f8b736eec8ad473..0d18bb09487126cad33e07d7afa7eea951316753 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/properties.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/properties.hh
@@ -155,4 +155,4 @@ struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesNC> { static constexp
 
 } //end namespace Dumux::Properties
 
-#endif // DUMUX_EXERCISE_COUPLED_MODELS_PROPERTIES_HH
+#endif
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index 4a0b9a1162d97e4de48a37efc229f3730c8b15ba..cfa3224f1858ac8c5a051622d489c17e5492ab46 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -371,4 +371,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
+#endif
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index 92c91a982215a62cb43562f5957bd741d694d38d..ee8f686d90016a9dfb5217093b8c5abeb12f8c21 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -290,4 +290,4 @@ private:
 };
 } //end namespace Dumux
 
-#endif //DUMUX_DARCY2P2C_SUBPROBLEM_HH
+#endif
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
index d025a97412c4dbd95ddad611a45a7872fd27d7c1..dc4d3dc05c24fbd3b02668c7324ced359c7943bd 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
@@ -129,4 +129,4 @@ struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesZeroEq> { static cons
 
 } //end namespace Dumux::Properties
 
-#endif // DUMUX_EXERCISE_COUPLING_TURBULENCE_PROPERTIES_HH
+#endif
diff --git a/exercises/solution/exercise-fractures/fractureproblem.hh b/exercises/solution/exercise-fractures/fractureproblem.hh
index 9bfe4312e3531fc94833db310a4297f254ba5b8d..41720e961c255f4a6c9ae18cb340da8c1259c035 100644
--- a/exercises/solution/exercise-fractures/fractureproblem.hh
+++ b/exercises/solution/exercise-fractures/fractureproblem.hh
@@ -168,4 +168,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_COURSE_FRACTURESEXERCISE_FRACTURE_PROBLEM_HH
+#endif
diff --git a/exercises/solution/exercise-fractures/matrixproblem.hh b/exercises/solution/exercise-fractures/matrixproblem.hh
index f667626238bc600816c996cd52868022d289dba9..2bbf3cf5a9a6e46ffddd3aa936fdaeec23d41d1f 100644
--- a/exercises/solution/exercise-fractures/matrixproblem.hh
+++ b/exercises/solution/exercise-fractures/matrixproblem.hh
@@ -231,4 +231,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_COURSE_FRACTURESEXERCISE_MATRIX_PROBLEM_HH
+#endif
diff --git a/exercises/solution/exercise-fractures/properties.hh b/exercises/solution/exercise-fractures/properties.hh
index 515b0a7a49f018ba30a8f320034ff44f7d5c3872..d6b8164a083398883e1c62cdd01788dcf7502839 100644
--- a/exercises/solution/exercise-fractures/properties.hh
+++ b/exercises/solution/exercise-fractures/properties.hh
@@ -108,4 +108,4 @@ struct FluidSystem<TypeTag, TTag::FractureProblem>
 
 } // end namespace Dumux::Properties
 
-#endif // DUMUX_COURSE_FRACTURESEXERCISE_PROPERTIES_HH
+#endif