diff --git a/bin/util/remove_clutter_after_last_endif.py b/bin/util/remove_clutter_after_last_endif.py
index 8cbdd81e6556e4cb3b871b8f017aa7520d98eaaf..afeeed8fec2709ebbc01f5e7139d2eafe89aff9f 100644
--- a/bin/util/remove_clutter_after_last_endif.py
+++ b/bin/util/remove_clutter_after_last_endif.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 import os
 
 # replace everything after last #endif with new line
diff --git a/dumux/adaptive/adapt.hh b/dumux/adaptive/adapt.hh
index ce28cb3a20f1e627ec00164e82b01685cb2b6908..b5cc28e80f3761f2a032d96b4a600db7a3794ce3 100644
--- a/dumux/adaptive/adapt.hh
+++ b/dumux/adaptive/adapt.hh
@@ -60,4 +60,4 @@ bool adapt(Grid& grid, GridDataTransfer& dataTransfer)
 
 } // end namespace Dumux
 
-#endif /* DUMUX_ADAPTIVE_ADAPT_HH */
+#endif
diff --git a/dumux/adaptive/griddatatransfer.hh b/dumux/adaptive/griddatatransfer.hh
index b14ae2b314764a91fbc944a0bb0f0f81d52ef23c..043b3686f45e4d5ec20448ece3fba42e3b84ac41 100644
--- a/dumux/adaptive/griddatatransfer.hh
+++ b/dumux/adaptive/griddatatransfer.hh
@@ -45,4 +45,4 @@ public:
 
 } // end namespace Dumux
 
-#endif /* DUMUX_ADAPTIVE_GRIDDATATRANSFER_HH */
+#endif
diff --git a/dumux/adaptive/markelements.hh b/dumux/adaptive/markelements.hh
index 195d74656d79aa0ef9a71b557f46f2c7996fa422..a33b417aee624417fb75573c9176a9d6c3a8370c 100644
--- a/dumux/adaptive/markelements.hh
+++ b/dumux/adaptive/markelements.hh
@@ -71,4 +71,4 @@ bool markElements(Grid& grid, const Indicator& indicator, bool verbose = true)
 
 } //end namespace Dumux
 
-#endif /* DUMUX_ADAPTIVE_MARKELEMENTS_HH */
+#endif
diff --git a/dumux/assembly/staggeredlocalresidual.hh b/dumux/assembly/staggeredlocalresidual.hh
index 0ee69271b9ccb4c71a0c48e4031dd30e8bfb0f18..927f01d14412c382d718aa5b7dd31f13ea7d5fff 100644
--- a/dumux/assembly/staggeredlocalresidual.hh
+++ b/dumux/assembly/staggeredlocalresidual.hh
@@ -335,4 +335,4 @@ private:
 
 } // end namespace Dumux
 
-#endif   // DUMUX_CC_LOCAL_RESIDUAL_HH
+#endif
diff --git a/dumux/common/dimensionlessnumbers.hh b/dumux/common/dimensionlessnumbers.hh
index f61b11a6ad26bcac56220359dbee7cb59a496928..b13b71f8147f36357db15a81ff0494d672726790 100644
--- a/dumux/common/dimensionlessnumbers.hh
+++ b/dumux/common/dimensionlessnumbers.hh
@@ -300,4 +300,4 @@ static Scalar thermalDiffusivity(const Scalar & thermalConductivity ,
 
 } // end namespace Dumux
 
-#endif // DIMENSIONLESS_NUMBERS_HH
+#endif
diff --git a/dumux/common/doubleexpintegrationconstants.hh b/dumux/common/doubleexpintegrationconstants.hh
index be4b5f8f582253d8ba416880beacaf50e5296638..eb969e4845c30c2d64731b6e4fcff4153759d524 100644
--- a/dumux/common/doubleexpintegrationconstants.hh
+++ b/dumux/common/doubleexpintegrationconstants.hh
@@ -499,4 +499,4 @@ constexpr double doubleExponentialIntegrationWeights[] =
 
 } // end namespace Dumux
 
-#endif // include guard
+#endif
diff --git a/dumux/common/indextraits.hh b/dumux/common/indextraits.hh
index 604a1d3f6e5093fffe54f6d91de0f420fa565db5..dedb1214b50d9317be52264a65a0db1ccb794fc5 100644
--- a/dumux/common/indextraits.hh
+++ b/dumux/common/indextraits.hh
@@ -43,4 +43,4 @@ struct IndexTraits
 
 } // namespace Dumux
 
-#endif // DUMUX_COMMON_INDEX_TRAITS_HH
+#endif
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index 90f7b1ff16b96ff2a20a42dd8c5220134287a001..764efe89467ea42141e292863494a8eb3c954dec 100644
--- a/dumux/common/properties.hh
+++ b/dumux/common/properties.hh
@@ -292,4 +292,4 @@ struct TimeManager { using type = UndefinedProperty; };
 } // end namespace Properties
 } // end namespace Dumux
 
-#endif // DUMUX_PROPERTIES_HH
+#endif
diff --git a/dumux/common/reorderingdofmapper.hh b/dumux/common/reorderingdofmapper.hh
index f8454f01241eb7287995d1cbbe768b7b3b74115b..ff4c87a5233f61c7aebf160c1b0d2bf648d6068e 100644
--- a/dumux/common/reorderingdofmapper.hh
+++ b/dumux/common/reorderingdofmapper.hh
@@ -192,4 +192,4 @@ using ReorderingDofMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
 } // end namespace Dumux
 
 #endif // HAVE_PTSCOTCH
-#endif // DUMUX_COMMON_REORDERING_DOF_MAPPER_HH
+#endif
diff --git a/dumux/common/valgrind.hh b/dumux/common/valgrind.hh
index d10ac3a79613e78747d5efe87c285bcdae22f21e..9a1d2ee1b09b1f3b417d67cd9d120c2c947150b1 100644
--- a/dumux/common/valgrind.hh
+++ b/dumux/common/valgrind.hh
@@ -167,4 +167,4 @@ inline void SetNoAccess(const T *value, int n)
 
 #endif // HAVE_VALGRIND
 
-#endif // DUMUX_VALGRIND_HH
+#endif
diff --git a/dumux/discretization/functionspacebasis.hh b/dumux/discretization/functionspacebasis.hh
index ec371baecfaed0fd9052b2d531459c23b31cd13d..dc7cad7fb970d9a1123d61d1ec69b98d11b5bbfe 100644
--- a/dumux/discretization/functionspacebasis.hh
+++ b/dumux/discretization/functionspacebasis.hh
@@ -91,4 +91,4 @@ struct FunctionSpaceBasisTraits<GridGeometry, DiscretizationMethod::fem>
 } // end namespace Dumux
 
 #endif // HAVE_DUNE_FUNCTIONS
-#endif // DUMUX_FUNCTION_SPACE_BASIS_HH
+#endif
diff --git a/dumux/discretization/projection/projector.hh b/dumux/discretization/projection/projector.hh
index 6125cd66a00f8b5a762f6997eccaf2e6aea215b9..74d878244ac71e543e07eb4730def3f6073abf76 100644
--- a/dumux/discretization/projection/projector.hh
+++ b/dumux/discretization/projection/projector.hh
@@ -683,4 +683,4 @@ auto makeProjectionMatrices(const FEBasisDomain& feBasisDomain,
 
 } // end namespace Dumux
 
-#endif // DUMUX_PROJECTOR_HH
+#endif
diff --git a/dumux/discretization/staggered/freeflow/connectivitymap.hh b/dumux/discretization/staggered/freeflow/connectivitymap.hh
index c9a06874f9698f2768596a176af684b53f20b062..648462b8bb7eaad2c13f6bb9bc8f3887402895c0 100644
--- a/dumux/discretization/staggered/freeflow/connectivitymap.hh
+++ b/dumux/discretization/staggered/freeflow/connectivitymap.hh
@@ -194,4 +194,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_STAGGERED_FREEFLOW_CONNECTIVITY_MAP_HH
+#endif
diff --git a/dumux/flux/traits.hh b/dumux/flux/traits.hh
index 831a0a2527246294d57b14f19409306d2e5c0414..3d1948d7cb9d113868a0ddb525ea7e3e56f227a4 100644
--- a/dumux/flux/traits.hh
+++ b/dumux/flux/traits.hh
@@ -50,4 +50,4 @@ struct FluxTraits
 
 } // namespace Dumux
 
-#endif // DUMUX_FLUX_TRAITS_HH
+#endif
diff --git a/dumux/freeflow/compositional/kepsilonncmodel.hh b/dumux/freeflow/compositional/kepsilonncmodel.hh
index b66f570c888c4df2fda36b12df689aedf02f1ac6..e718f40eea85594efe6ec9fe4e0c813417754878 100644
--- a/dumux/freeflow/compositional/kepsilonncmodel.hh
+++ b/dumux/freeflow/compositional/kepsilonncmodel.hh
@@ -223,4 +223,4 @@ public:
 } // end namespace Properties
 } // end namespace Dumux
 
-#endif // DUMUX_KEPSILON_NC_MODEL_HH
+#endif
diff --git a/dumux/freeflow/compositional/komegancmodel.hh b/dumux/freeflow/compositional/komegancmodel.hh
index 0aa09c71ae97ef479166d7a480c2f5065c3b2472..1c63e37ea111c2465682e482cda9959803beee72 100644
--- a/dumux/freeflow/compositional/komegancmodel.hh
+++ b/dumux/freeflow/compositional/komegancmodel.hh
@@ -228,4 +228,4 @@ public:
 } // end namespace Properties
 } // end namespace Dumux
 
-#endif // DUMUX_KOMEGA_NC_MODEL_HH
+#endif
diff --git a/dumux/freeflow/compositional/lowrekepsilonncmodel.hh b/dumux/freeflow/compositional/lowrekepsilonncmodel.hh
index 1c78eb69a8bed995b82097784a827d5b31efcc31..4997e145b2aaa3521b9032de8280d6093caeedaf 100644
--- a/dumux/freeflow/compositional/lowrekepsilonncmodel.hh
+++ b/dumux/freeflow/compositional/lowrekepsilonncmodel.hh
@@ -228,4 +228,4 @@ public:
 } // end namespace Properties
 } // end namespace Dumux
 
-#endif // DUMUX_LOWREKEPSILON_NC_MODEL_HH
+#endif
diff --git a/dumux/freeflow/compositional/navierstokesncmodel.hh b/dumux/freeflow/compositional/navierstokesncmodel.hh
index 63a26feb04ed2fd87132fd8269988008c393cf50..6063306a1016c4532b0c7bd087d26ff11b45222f 100644
--- a/dumux/freeflow/compositional/navierstokesncmodel.hh
+++ b/dumux/freeflow/compositional/navierstokesncmodel.hh
@@ -249,4 +249,4 @@ struct HeatConductionType<TypeTag, TTag::NavierStokesNCNI> { using type = Fourie
 } // end namespace Properties
 } // end namespace Dumux
 
-#endif // DUMUX_FREEFLOW_NC_MODEL_HH
+#endif
diff --git a/dumux/freeflow/compositional/oneeqncmodel.hh b/dumux/freeflow/compositional/oneeqncmodel.hh
index 01a96fcb406b2172c7010fe4da674bb803f343e8..ef4c6cd5ccf9cd88e11ec10a9cd447df5e91a867 100644
--- a/dumux/freeflow/compositional/oneeqncmodel.hh
+++ b/dumux/freeflow/compositional/oneeqncmodel.hh
@@ -228,4 +228,4 @@ public:
 } // end namespace Properties
 } // end namespace Dumux
 
-#endif // DUMUX_ONEEQ_NC_MODEL_HH
+#endif
diff --git a/dumux/freeflow/compositional/zeroeqncmodel.hh b/dumux/freeflow/compositional/zeroeqncmodel.hh
index 8d0ee38b41fc7d0f30860f72e81a38095c07490b..d4d0875d52b68a7093c3e818aee52ee5724acd26 100644
--- a/dumux/freeflow/compositional/zeroeqncmodel.hh
+++ b/dumux/freeflow/compositional/zeroeqncmodel.hh
@@ -177,4 +177,4 @@ public:
 } // end namespace Properties
 } // end namespace Dumux
 
-#endif // DUMUX_ZEROEQ_NC_MODEL_HH
+#endif
diff --git a/dumux/freeflow/navierstokes/localresidual.hh b/dumux/freeflow/navierstokes/localresidual.hh
index de1cf4900dc5b105a0d8d0052c14cbb2914ef816..f8305acca18ae4e6653c69d5dd1b79b68709064b 100644
--- a/dumux/freeflow/navierstokes/localresidual.hh
+++ b/dumux/freeflow/navierstokes/localresidual.hh
@@ -46,4 +46,4 @@ using NavierStokesResidual = NavierStokesResidualImpl<TypeTag, GetPropType<TypeT
 
 } // end namespace Dumux
 
-#endif   // DUMUX_NAVIERSTOKES_LOCAL_RESIDUAL_HH
+#endif
diff --git a/dumux/freeflow/navierstokes/model.hh b/dumux/freeflow/navierstokes/model.hh
index 39059a1bfe04ff7387fbb366d91cdfb0cf7d045a..d55348b45267f756e76fdd7d31bf5018ec9847a9 100644
--- a/dumux/freeflow/navierstokes/model.hh
+++ b/dumux/freeflow/navierstokes/model.hh
@@ -236,4 +236,4 @@ struct IOFields<TypeTag, TTag::NavierStokesNI> { using type = FreeflowNonIsother
 
 } // end namespace
 
-#endif // DUMUX_NAVIERSTOKES_MODEL_HH
+#endif
diff --git a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
index 4acfc7496a77bbfc51c4eed0cf687b4dbd5eb69e..8552a186708a773ed3c1173250f18cef641b436c 100644
--- a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
+++ b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
@@ -697,4 +697,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_NAVIERSTOKES_STAGGERED_FLUXVARIABLES_HH
+#endif
diff --git a/dumux/freeflow/navierstokes/staggered/localresidual.hh b/dumux/freeflow/navierstokes/staggered/localresidual.hh
index b797a4b64ac916e63abff9b273b2c4ced633e7f3..69d2835e7c7eaaa1c8f1980a281cc9dbc6cff262 100644
--- a/dumux/freeflow/navierstokes/staggered/localresidual.hh
+++ b/dumux/freeflow/navierstokes/staggered/localresidual.hh
@@ -379,4 +379,4 @@ private:
 
 } // end namespace Dumux
 
-#endif   // DUMUX_STAGGERED_NAVIERSTOKES_LOCAL_RESIDUAL_HH
+#endif
diff --git a/dumux/freeflow/navierstokes/staggered/velocitygradients.hh b/dumux/freeflow/navierstokes/staggered/velocitygradients.hh
index 932e1687ac51f5c570d811791e917ff63b539c11..d3c2c3d34054f428e84972f76d8fc8acfde59b64 100644
--- a/dumux/freeflow/navierstokes/staggered/velocitygradients.hh
+++ b/dumux/freeflow/navierstokes/staggered/velocitygradients.hh
@@ -386,4 +386,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_NAVIERSTOKES_STAGGERED_VELOCITYGRADIENTS_HH
+#endif
diff --git a/dumux/freeflow/navierstokes/volumevariables.hh b/dumux/freeflow/navierstokes/volumevariables.hh
index 4def704e9332fde25042f3a79caa2ce3503e176b..f651e2d5f2318b8f71e4ccc5b0f5c82bd85b856d 100644
--- a/dumux/freeflow/navierstokes/volumevariables.hh
+++ b/dumux/freeflow/navierstokes/volumevariables.hh
@@ -161,4 +161,4 @@ protected:
 
 } // end namespace Dumux
 
-#endif // DUMUX_NAVIERSTOKES_VOLUME_VARIABLES_HH
+#endif
diff --git a/dumux/freeflow/nonisothermal/indices.hh b/dumux/freeflow/nonisothermal/indices.hh
index e4286e5dab740d1d58ec105e19712cf4332ebe00..daf27f2e8326f7585477a0c9813b990c7b6fdbaa 100644
--- a/dumux/freeflow/nonisothermal/indices.hh
+++ b/dumux/freeflow/nonisothermal/indices.hh
@@ -43,4 +43,4 @@ public:
 
 } // end namespace Dumux
 
-#endif // DUMUX_NAVIERSTOKES_NI_INDICES_HH
+#endif
diff --git a/dumux/freeflow/rans/model.hh b/dumux/freeflow/rans/model.hh
index b6d81591754777f4541985ce39439267a578929f..11e8850209b9dc306de1554a6db876b0e56cec8d 100644
--- a/dumux/freeflow/rans/model.hh
+++ b/dumux/freeflow/rans/model.hh
@@ -125,4 +125,4 @@ struct HeatConductionType<TypeTag, TTag::RANSNI> { using type = FouriersLaw<Type
 } // end namespace Properties
 } // end namespace Dumux
 
-#endif // DUMUX_RANS_MODEL_HH
+#endif
diff --git a/dumux/freeflow/rans/oneeq/model.hh b/dumux/freeflow/rans/oneeq/model.hh
index 34bd92a79e3382c70b587638df44da2e8f7ab080..52eff461acc9e924bf49778b5a50e27a210902aa 100644
--- a/dumux/freeflow/rans/oneeq/model.hh
+++ b/dumux/freeflow/rans/oneeq/model.hh
@@ -234,4 +234,4 @@ struct IOFields<TypeTag, TTag::OneEqNI> { using type = FreeflowNonIsothermalIOFi
 
 } // end namespace Dumux::Properties
 
-#endif // DUMUX_ONEEQ_MODEL_HH
+#endif
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/model.hh b/dumux/freeflow/rans/twoeq/kepsilon/model.hh
index e0340dc4b16e7b34063e4c4e40d5608595b6c8e5..6d87a2f9fc090997987666568d910f76f2bd6f68 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/model.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/model.hh
@@ -221,4 +221,4 @@ struct IOFields<TypeTag, TTag::KEpsilonNI> { using type = FreeflowNonIsothermalI
 } // end properties
 } // end namespace
 
-#endif // DUMUX_KEPSILON_MODEL_HH
+#endif
diff --git a/dumux/freeflow/rans/twoeq/komega/model.hh b/dumux/freeflow/rans/twoeq/komega/model.hh
index 9c9e75f0ac485c3fdae1c39f5d5569a2a3aa1eba..eb404167da8534de373b7f4d481ad8a603f7b67e 100644
--- a/dumux/freeflow/rans/twoeq/komega/model.hh
+++ b/dumux/freeflow/rans/twoeq/komega/model.hh
@@ -227,4 +227,4 @@ struct IOFields<TypeTag, TTag::KOmegaNI> { using type = FreeflowNonIsothermalIOF
 } // end properties
 } // end namespace
 
-#endif // DUMUX_KOMEGA_MODEL_HH
+#endif
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh
index a42cde2e7335dba4e596a86e03bda5a5e3fbc76b..6045d5b57610a68cb8fac2d1745c7880a46ecd99 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/model.hh
@@ -234,4 +234,4 @@ struct IOFields<TypeTag, TTag::LowReKEpsilonNI> { using type = FreeflowNonIsothe
 } // end properties
 } // end namespace
 
-#endif // DUMUX_LOWREKEPSILON_MODEL_HH
+#endif
diff --git a/dumux/freeflow/rans/zeroeq/model.hh b/dumux/freeflow/rans/zeroeq/model.hh
index 88140ce6ae13966dde772e259d20aa998d213d19..57b92a9aba60bbd5866725549cfe85b3a5ab05b7 100644
--- a/dumux/freeflow/rans/zeroeq/model.hh
+++ b/dumux/freeflow/rans/zeroeq/model.hh
@@ -146,4 +146,4 @@ public:
 
 } // end namespace Dumux::Properties
 
-#endif // DUMUX_ZEROEQ_MODEL_HH
+#endif
diff --git a/dumux/freeflow/rans/zeroeq/volumevariables.hh b/dumux/freeflow/rans/zeroeq/volumevariables.hh
index a0a933714ea80247ee977f515abf4e8ca6938050..e8b3560be8fad17bd280abfc8df3482ea1bbcd2c 100644
--- a/dumux/freeflow/rans/zeroeq/volumevariables.hh
+++ b/dumux/freeflow/rans/zeroeq/volumevariables.hh
@@ -160,4 +160,4 @@ protected:
 
 } // end namespace Dumux
 
-#endif // DUMUX_ZEROEQ_VOLUME_VARIABLES_HH
+#endif
diff --git a/dumux/freeflow/shallowwater/localresidual.hh b/dumux/freeflow/shallowwater/localresidual.hh
index a7cb6e94e47435fc093e2ad7e443dcf6f176631a..c186b5b06478d5324485e4ae69e57e57193fade5 100644
--- a/dumux/freeflow/shallowwater/localresidual.hh
+++ b/dumux/freeflow/shallowwater/localresidual.hh
@@ -103,4 +103,4 @@ public:
 };
 } // end namespace Dumux
 
-#endif   // DUMUX_SHALLOW_WATER_LOCAL_RESIDUAL_HH
+#endif
diff --git a/dumux/freeflow/shallowwater/model.hh b/dumux/freeflow/shallowwater/model.hh
index db9b06b6a9742a2d0ab7c87c1e4970de9261f242..15094351f5c3e88940df38810b157b02add33165 100644
--- a/dumux/freeflow/shallowwater/model.hh
+++ b/dumux/freeflow/shallowwater/model.hh
@@ -165,4 +165,4 @@ struct AdvectionType<TypeTag, TTag::ShallowWater>
 } // end properties
 } // end namespace Dumux
 
-#endif // DUMUX_FREEFLOW_SHALLOW_WATER_MODEL_HH
+#endif
diff --git a/dumux/freeflow/staggeredupwindmethods.hh b/dumux/freeflow/staggeredupwindmethods.hh
index bc1d6065683de804d2a5c7039726efcb8f69304c..bc4a00583e2d03cc402ae9a49ce2be733c03f563 100644
--- a/dumux/freeflow/staggeredupwindmethods.hh
+++ b/dumux/freeflow/staggeredupwindmethods.hh
@@ -454,4 +454,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_UPWINDING_METHODS_HH
+#endif
diff --git a/dumux/freeflow/turbulenceproperties.hh b/dumux/freeflow/turbulenceproperties.hh
index 8d6ca770bff26b6888088a909c851d54aa69d18c..b9ef8debf3ec9d3b4fc6d99f4f9e5f6ea7b9be42 100644
--- a/dumux/freeflow/turbulenceproperties.hh
+++ b/dumux/freeflow/turbulenceproperties.hh
@@ -222,4 +222,4 @@ public:
 };
 } // end namespace Dumux
 
-#endif // DUMUX_TURBULENCE_PROPERTIES_HH
+#endif
diff --git a/dumux/freeflow/volumevariables.hh b/dumux/freeflow/volumevariables.hh
index eeeeb61f2fafb63e05461d62fbd6c09ddf6b218d..c2de40c93e461ad96a0953cb3117b4d02b75c7f6 100644
--- a/dumux/freeflow/volumevariables.hh
+++ b/dumux/freeflow/volumevariables.hh
@@ -228,4 +228,4 @@ public:
 };
 } // end namespace Dumux
 
-#endif // DUMUX_FREEFLOW_VOLUME_VARIABLES_HH
+#endif
diff --git a/dumux/geometry/makegeometry.hh b/dumux/geometry/makegeometry.hh
index 7148063a3d6e3ac60e26fa61d7745f3f17e92235..680951b9e81ed3bf925fca42a885d42c7aa6d8b8 100644
--- a/dumux/geometry/makegeometry.hh
+++ b/dumux/geometry/makegeometry.hh
@@ -207,4 +207,4 @@ auto makeDuneQuadrilaterial(const std::vector<Dune::FieldVector<CoordScalar, 3>>
 
 } // end namespace Dumux
 
-#endif // DUMUX_MAKE_GEOMETRY_HH
+#endif
diff --git a/dumux/io/gnuplotinterface.hh b/dumux/io/gnuplotinterface.hh
index 22950c5edd5bc189af6012ba56e9062f03edea9b..4d52b5eaa0fc7a5fca50362a6aa32f867931f3e5 100644
--- a/dumux/io/gnuplotinterface.hh
+++ b/dumux/io/gnuplotinterface.hh
@@ -444,4 +444,4 @@ private:
     std::string gnuplotPath_;
 };
 } // end namespace Dumux
-#endif // DUMUX_GNUPLOT_INTERFACE_HH
+#endif
diff --git a/dumux/io/ploteffectivediffusivitymodel.hh b/dumux/io/ploteffectivediffusivitymodel.hh
index d283eeec0a6b9eecff3b6a8ccd13e6e79f22ac14..279938d73e78354fab53f825c88f0d6c7cff28c4 100644
--- a/dumux/io/ploteffectivediffusivitymodel.hh
+++ b/dumux/io/ploteffectivediffusivitymodel.hh
@@ -118,4 +118,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_PLOT_EFFECTIVE_DIFFUSIVITY_MODEL_HH
+#endif
diff --git a/dumux/io/plotmateriallaw.hh b/dumux/io/plotmateriallaw.hh
index 7983e2067d9bc0d526258d3af3df34fd253b8ebe..92488748d5c28cca2f29f880ab747e8baf84a772 100644
--- a/dumux/io/plotmateriallaw.hh
+++ b/dumux/io/plotmateriallaw.hh
@@ -366,4 +366,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_PLOT_FLUID_MATRIX_LAW_HH
+#endif
diff --git a/dumux/io/plotmateriallaw3p.hh b/dumux/io/plotmateriallaw3p.hh
index bd73c10f3b6b986754a3b1a44d19d9784bd86568..7f4082a02e2195e5d5e6fa4981a8d97b162fe087 100644
--- a/dumux/io/plotmateriallaw3p.hh
+++ b/dumux/io/plotmateriallaw3p.hh
@@ -309,4 +309,4 @@ private:
 };
 } // end of namespace Dumux
 
-#endif // DUMUX_PLOT_FLUID_MATRIX_LAW_HH
+#endif
diff --git a/dumux/io/plotthermalconductivitymodel.hh b/dumux/io/plotthermalconductivitymodel.hh
index c89c8b0e3739bc0d304cca584e83e836357ba056..2b3342e78b820106c5ced3a4a396dbf8a4038b12 100644
--- a/dumux/io/plotthermalconductivitymodel.hh
+++ b/dumux/io/plotthermalconductivitymodel.hh
@@ -166,4 +166,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_PLOT_THERMAL_CONDUCTIVITY_LAW_HH
+#endif
diff --git a/dumux/io/rasterimagereader.hh b/dumux/io/rasterimagereader.hh
index ec4badcf3d2293c3c0cb0c12f5000b4961ae2e5b..d3ff963332ae7406e14aba731b0bc42002b25c09 100644
--- a/dumux/io/rasterimagereader.hh
+++ b/dumux/io/rasterimagereader.hh
@@ -493,4 +493,4 @@ private:
 
 } // namespace Dumux
 
-#endif // DUMUX_RASTER_IMAGE_READER_HH
+#endif
diff --git a/dumux/linear/amgbackend.hh b/dumux/linear/amgbackend.hh
index 77572ca1042276d3827375d0e168260ed370c4da..1509e06f15c9969ee3eb2d8d3782c387438ef1b8 100644
--- a/dumux/linear/amgbackend.hh
+++ b/dumux/linear/amgbackend.hh
@@ -229,4 +229,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_AMGBACKEND_HH
+#endif
diff --git a/dumux/linear/istlsolverfactorybackend.hh b/dumux/linear/istlsolverfactorybackend.hh
index 0d49a661470d29c90846ac87834af275d98bd14f..a2865f455e1434da48863901c2c0f8af49a7ba1d 100644
--- a/dumux/linear/istlsolverfactorybackend.hh
+++ b/dumux/linear/istlsolverfactorybackend.hh
@@ -309,4 +309,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // header guard
+#endif
diff --git a/dumux/linear/istlsolverregistry.hh b/dumux/linear/istlsolverregistry.hh
index 2746af7d0ee57d2a90b3cd5da72bff21fb8cf12d..a2d6f2ecb59df4ec049addf85f14cc32bc3e3301 100644
--- a/dumux/linear/istlsolverregistry.hh
+++ b/dumux/linear/istlsolverregistry.hh
@@ -53,4 +53,4 @@ struct MultiTypeBlockMatrixDirectSolverTag {};
 } // end namespace
 } // end namespace Dumux
 
-#endif // DUMUX_LINEAR_ISTL_SOLVER_REGISTRY_HH
+#endif
diff --git a/dumux/linear/linearsolverparameters.hh b/dumux/linear/linearsolverparameters.hh
index bf33ed39e33b5c6821c6cea4bacedeeda65b3be9..b222c9dc71e7dc6ee2bb506513b65a831dc85965 100644
--- a/dumux/linear/linearsolverparameters.hh
+++ b/dumux/linear/linearsolverparameters.hh
@@ -138,4 +138,4 @@ LinearSolverParameters<LinearSolverTraits>::dumuxToIstlSolverParams =
 
 } // end namespace Dumux
 
-#endif // DUMUX_LINEAR_SOLVER_PARAMETERS_HH
+#endif
diff --git a/dumux/linear/linearsolvertraits.hh b/dumux/linear/linearsolvertraits.hh
index b61ba21e14b26e44f58906c62bac35afaf6afd00..9ed580bc388eb26706c09b93fcce42a17ed03c67 100644
--- a/dumux/linear/linearsolvertraits.hh
+++ b/dumux/linear/linearsolvertraits.hh
@@ -184,4 +184,4 @@ struct LinearSolverTraitsImpl<GridGeometry, DiscretizationMethod::staggered>
 
 } // end namespace Dumux
 
-#endif // DUMUX_LINEAR_SOLVER_TRAITS_HH
+#endif
diff --git a/dumux/linear/parallelhelpers.hh b/dumux/linear/parallelhelpers.hh
index a69bac2507971060b2879723675581300e4f37a0..0de4246ab1515673fc6828e8f9aa3b9d186295e9 100644
--- a/dumux/linear/parallelhelpers.hh
+++ b/dumux/linear/parallelhelpers.hh
@@ -820,4 +820,4 @@ void prepareLinearAlgebraParallel(Matrix& A, Vector& b,
 } // end namespace Dumux
 
 #endif // HAVE_MPI
-#endif // DUMUX_PARALLELHELPERS_HH
+#endif
diff --git a/dumux/linear/preconditioners.hh b/dumux/linear/preconditioners.hh
index 08b10a7eff62fba997e0c6810dc091a488ccfc69..0776e9b54ca9219debc846fad094d01f93243cb2 100644
--- a/dumux/linear/preconditioners.hh
+++ b/dumux/linear/preconditioners.hh
@@ -335,4 +335,4 @@ DUMUX_REGISTER_PRECONDITIONER("uzawa", Dumux::MultiTypeBlockMatrixPreconditioner
 
 } // end namespace Dumux
 
-#endif // DUMUX_LINEAR_PRECONDITIONERS_HH
+#endif
diff --git a/dumux/linear/scotchbackend.hh b/dumux/linear/scotchbackend.hh
index 2d96791d845b01ac3be668cc79a3ab3cf4f9e1d5..1d8ee92832b334892c27e3bda4f5075060edbea3 100644
--- a/dumux/linear/scotchbackend.hh
+++ b/dumux/linear/scotchbackend.hh
@@ -173,4 +173,4 @@ public:
 
 } // end namespace Dumux
 
-#endif // DUMUX_SCOTCH_BACKEND_HH
+#endif
diff --git a/dumux/material/binarycoefficients/henryiapws.hh b/dumux/material/binarycoefficients/henryiapws.hh
index ee65c32be8d44eea5001c82a71de07c902e31e9b..4c130c8bb73fcf721baf5125fabfef97291c2d92 100644
--- a/dumux/material/binarycoefficients/henryiapws.hh
+++ b/dumux/material/binarycoefficients/henryiapws.hh
@@ -94,4 +94,4 @@ inline Scalar henryIAPWS(Scalar E,
 }
 }
 
-#endif // DUMUX_HENRY_IAPWS_HH
+#endif
diff --git a/dumux/material/components/constant.hh b/dumux/material/components/constant.hh
index a6380e183bfba8a3753940d75eb8e6efc44e0c63..e673dfdda476283767c4a6d6beecffe3731d8066 100644
--- a/dumux/material/components/constant.hh
+++ b/dumux/material/components/constant.hh
@@ -218,4 +218,4 @@ public:
 
 } // end namespace Dumux
 
-#endif // DUMUX_COMPONENTS_CONSTANT_HH
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
index cc9827550a4a57e78eac5db84c17d532c0e541b1..c74214cbc293b8dd77c99595cbc908ccb8daf880 100644
--- a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
@@ -273,4 +273,4 @@ public:
 
 } // end namespace Dumux
 
-#endif // BROOKS_COREY_HH
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh b/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh
index 97930ffbb071a0de75312134c1ba56b3e8023777..87c8afeed4cd15b9d45b81c7a555f93e4ceca07d 100644
--- a/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh
@@ -75,4 +75,4 @@ public:
 }   // namespace Dumux
 
 
-#endif // REGULARIZED_VAN_GENUCHTEN_OF_TEMPERATURE_HH
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3params.hh b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3params.hh
index 841a17748becd055954b50a599924a009553d503..7b3b390b467b8b3f4c5fe418a678696593a0177a 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3params.hh
+++ b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpswpcto3params.hh
@@ -92,4 +92,4 @@ private:
 };
 } // namespace Dumux
 
-#endif //AWN_SURFACE_EXP_SW_PC_TO_3_PARAMS
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh b/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh
index df2b9c7085db456e43eba24f1eff017f542a2f6d..28e1001f190c02e9aee087e58d67f49726407882 100644
--- a/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh
+++ b/dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh
@@ -70,4 +70,4 @@ public:
 };
 } // end namespace Dumux
 
-#endif // DIFFUSIVITY_CONSTANT_TORTUOSITY_HH
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh b/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh
index df64949e2ba22cf4e5547640d20a8556404c8a04..3a3153cdf8929ba93e66adecb1fc8c1b329859e4 100644
--- a/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh
+++ b/dumux/material/fluidmatrixinteractions/frictionlaws/frictionlaw.hh
@@ -104,4 +104,4 @@ public:
 
 } // end namespace Dumux
 
-#endif // DUMUX_FRICTIONLAW_HH
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh b/dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh
index 0286cd4752ed78f13ba716b558b9121f4f03ccf4..538a739e6da0ffe4ef2fa8b595afd62141ed3772 100644
--- a/dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh
+++ b/dumux/material/fluidmatrixinteractions/frictionlaws/manning.hh
@@ -85,4 +85,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_FRICTIONLAW_MANNING_HH
+#endif
diff --git a/dumux/material/fluidmatrixinteractions/frictionlaws/nikuradse.hh b/dumux/material/fluidmatrixinteractions/frictionlaws/nikuradse.hh
index f3882891b367de6d162159593ee785265cefb08d..7a85827458dc260b9f2b1296f44511927945a975 100644
--- a/dumux/material/fluidmatrixinteractions/frictionlaws/nikuradse.hh
+++ b/dumux/material/fluidmatrixinteractions/frictionlaws/nikuradse.hh
@@ -84,4 +84,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_FRICTIONLAW_NIKURADSE_HH
+#endif
diff --git a/dumux/material/spatialparams/fvnonequilibrium.hh b/dumux/material/spatialparams/fvnonequilibrium.hh
index 492d18d2485ba197018d05b2e4676346e91c9c4b..2abfdb0161762af31444fbee1376e229b44ae4b5 100644
--- a/dumux/material/spatialparams/fvnonequilibrium.hh
+++ b/dumux/material/spatialparams/fvnonequilibrium.hh
@@ -131,4 +131,4 @@ public:
 
 } // end namespace Dumux
 
-#endif // GUARDIAN
+#endif
diff --git a/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh b/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
index 6368527a94a6654703c9ba2c68c2c90d4275657b..a4afec061fa211a6ee35338d0109621601d47c7d 100644
--- a/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
+++ b/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh
@@ -1141,4 +1141,4 @@ protected:
 
 } // end namespace Dumux
 
-#endif // DUMUX_STOKES_DARCY_COUPLINGDATA_HH
+#endif
diff --git a/dumux/multidomain/facet/box/couplingmapper.hh b/dumux/multidomain/facet/box/couplingmapper.hh
index b54a1c5ddce5945f1f4084070217b5bf5dc46139..5e29524f206dd323defc50a23abeee0e4899c5d0 100644
--- a/dumux/multidomain/facet/box/couplingmapper.hh
+++ b/dumux/multidomain/facet/box/couplingmapper.hh
@@ -232,4 +232,4 @@ public:
 
 } // end namespace Dumux
 
-#endif // DUMUX_FACETCOUPLING_CCTPFA_COUPLING_MAPPER_HH
+#endif
diff --git a/dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh b/dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh
index 8905592da9b621e6245773ce346c74e67e8a3aab..4c4b6906c712ddc02383d9b86d235135612f68ab 100644
--- a/dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh
+++ b/dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh
@@ -258,4 +258,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_FACETCOUPLING_CCMPFA_COUPLING_MAPPER_HH
+#endif
diff --git a/dumux/multidomain/facet/cellcentered/tpfa/couplingmapper.hh b/dumux/multidomain/facet/cellcentered/tpfa/couplingmapper.hh
index 1bd84f6991eabaa650092a1c06659fe49eff0f26..40ea941edd3c0921cc63b0eb0b07ff6d9f66e931 100644
--- a/dumux/multidomain/facet/cellcentered/tpfa/couplingmapper.hh
+++ b/dumux/multidomain/facet/cellcentered/tpfa/couplingmapper.hh
@@ -172,4 +172,4 @@ public:
 
 } // end namespace Dumux
 
-#endif // DUMUX_FACETCOUPLING_CCTPFA_COUPLING_MAPPER_HH
+#endif
diff --git a/dumux/multidomain/facet/couplingmapper.hh b/dumux/multidomain/facet/couplingmapper.hh
index 1daeb34e358b87cc0d0c08b2431a45c9cb436cfa..844e8bccb3ea78bd18a329505bcd9c3cf661df91 100644
--- a/dumux/multidomain/facet/couplingmapper.hh
+++ b/dumux/multidomain/facet/couplingmapper.hh
@@ -140,4 +140,4 @@ public:
 #include <dumux/multidomain/facet/cellcentered/tpfa/couplingmapper.hh>
 #include <dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh>
 
-#endif // DUMUX_FACETCOUPLING_COUPLING_MAPPER_HH
+#endif
diff --git a/dumux/multidomain/facet/couplingmapperbase.hh b/dumux/multidomain/facet/couplingmapperbase.hh
index df6bac359a754475e67a5026f2c37b14bb5a1b41..da4e3dccba3cbe2a603a672546c6dda1faf67bf7 100644
--- a/dumux/multidomain/facet/couplingmapperbase.hh
+++ b/dumux/multidomain/facet/couplingmapperbase.hh
@@ -251,4 +251,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_FACETCOUPLING_COUPLING_MAPPER_BASE_HH
+#endif
diff --git a/dumux/multidomain/facet/gmshreader.hh b/dumux/multidomain/facet/gmshreader.hh
index 17e76355e02a241d34b95e5593488e3e35e56e97..af4c43d0b7bf509a395a472ff890cdb1c3d73fd5 100644
--- a/dumux/multidomain/facet/gmshreader.hh
+++ b/dumux/multidomain/facet/gmshreader.hh
@@ -425,4 +425,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_FACETCOUPLING_GMSH_READER_HH
+#endif
diff --git a/dumux/multidomain/facet/gridmanager.hh b/dumux/multidomain/facet/gridmanager.hh
index bc9719911379f471ce0d480446f1d5cdd0d2f250..304b94eb0613e4bd8726953f2a990e14d8b16f66 100644
--- a/dumux/multidomain/facet/gridmanager.hh
+++ b/dumux/multidomain/facet/gridmanager.hh
@@ -464,4 +464,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_FACETCOUPLING_GRID_CREATOR_HH
+#endif
diff --git a/dumux/parallel/vectorcommdatahandle.hh b/dumux/parallel/vectorcommdatahandle.hh
index f89c3e896cacbd21218a4f99822a1e5d646429d9..bb7d45696bd295a5825ab1ebbbe12d789e693dfb 100644
--- a/dumux/parallel/vectorcommdatahandle.hh
+++ b/dumux/parallel/vectorcommdatahandle.hh
@@ -136,4 +136,4 @@ using VectorCommDataHandleMax = VectorCommDataHandle<Mapper,Vector, codim, Detai
 
 } // end namespace Dumux
 
-#endif // DUMUX_VECTOR_COMM_DATA_HANDLE_HH
+#endif
diff --git a/dumux/porousmediumflow/2p/gridadaptindicator.hh b/dumux/porousmediumflow/2p/gridadaptindicator.hh
index e413924f1d1fa33d9b30bf2cae83d2438ba755e9..098498e6f994bb5de4be98b396b1b6459de98446 100644
--- a/dumux/porousmediumflow/2p/gridadaptindicator.hh
+++ b/dumux/porousmediumflow/2p/gridadaptindicator.hh
@@ -280,4 +280,4 @@ private:
 
 } // end namespace Dumux
 
-#endif /* DUMUX_TWOP_ADAPTION_INDICATOR_HH */
+#endif
diff --git a/dumux/porousmediumflow/2p/griddatatransfer.hh b/dumux/porousmediumflow/2p/griddatatransfer.hh
index e28be7a2fb3c03cf25f218d93c16699e36a63804..a10fff8980c41d4b19b0921b059bed958913d6b3 100644
--- a/dumux/porousmediumflow/2p/griddatatransfer.hh
+++ b/dumux/porousmediumflow/2p/griddatatransfer.hh
@@ -445,4 +445,4 @@ public:
 
 } // end namespace Dumux
 
-#endif /* DUMUX_TWOP_GRIDDATA_TRANSFER_HH */
+#endif
diff --git a/dumux/porousmediumflow/2p1c/darcyslaw.hh b/dumux/porousmediumflow/2p1c/darcyslaw.hh
index c453a7c6902d022d8cad09aea998b78886e63b35..f687bfd1c40ff3d726014237775876d43d49d72d 100644
--- a/dumux/porousmediumflow/2p1c/darcyslaw.hh
+++ b/dumux/porousmediumflow/2p1c/darcyslaw.hh
@@ -149,4 +149,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_2P1C_SPURIOUS_FLUX_BLOCKING_DARCYS_LAW_HH
+#endif
diff --git a/dumux/porousmediumflow/2p1c/model.hh b/dumux/porousmediumflow/2p1c/model.hh
index 83055d422496cde562b14bf37160e1ae4df5f2af..e3192d6f522cb32f5c293e92b85b0e6923d44465 100644
--- a/dumux/porousmediumflow/2p1c/model.hh
+++ b/dumux/porousmediumflow/2p1c/model.hh
@@ -222,4 +222,4 @@ struct IOFields<TypeTag, TTag::TwoPOneCNI> { using type = EnergyIOFields<TwoPOne
 } // end namespace Properties
 } // end namespace Dumux
 
-#endif // DUMUX_2P1C_MODEL_HH
+#endif
diff --git a/dumux/porousmediumflow/nonequilibrium/newtonsolver.hh b/dumux/porousmediumflow/nonequilibrium/newtonsolver.hh
index d94cbe850cda78d2d611c30eb087d2133d414868..87b34a8e4b0355ec0cabe96e4e380dc946467c9f 100644
--- a/dumux/porousmediumflow/nonequilibrium/newtonsolver.hh
+++ b/dumux/porousmediumflow/nonequilibrium/newtonsolver.hh
@@ -58,4 +58,4 @@ public:
 };
 
 } // end namespace Dumux
-#endif // DUMUX_NONEQUILIBRIUM_NEWTON_SOLVER_HH
+#endif
diff --git a/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh b/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
index 8aa4a73bf64b1c930ab497e7a828c1b31a2efd0f..8647db84e43c7447b6c10b2270dfcc27b26fe837 100644
--- a/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
+++ b/dumux/porousmediumflow/nonequilibrium/thermal/localresidual.hh
@@ -419,4 +419,4 @@ public:
 };
 } // end namespace Dumux
 
-#endif //
+#endif
diff --git a/dumux/porousmediumflow/sequential/gridadapt.hh b/dumux/porousmediumflow/sequential/gridadapt.hh
index 45ac87836385a5e748f9d28c629ffbb4de46ef46..9d123472c7f996623266397d193704abe939841c 100644
--- a/dumux/porousmediumflow/sequential/gridadapt.hh
+++ b/dumux/porousmediumflow/sequential/gridadapt.hh
@@ -484,4 +484,4 @@ public:
 };
 
 }
-#endif /* DUMUX_GRIDADAPT_HH */
+#endif
diff --git a/test/freeflow/navierstokes/sincos/problem.hh b/test/freeflow/navierstokes/sincos/problem.hh
index 619c4095aab6337b0b5c0032d3fb0af24538edf5..39c6090b9ac878bab051894ecaf02a1cb9e5e625 100644
--- a/test/freeflow/navierstokes/sincos/problem.hh
+++ b/test/freeflow/navierstokes/sincos/problem.hh
@@ -307,4 +307,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_SINCOS_TEST_PROBLEM_HH
+#endif
diff --git a/test/io/gridmanager/gmshboundaryflagtest.hh b/test/io/gridmanager/gmshboundaryflagtest.hh
index 4f67a0380334ca8a24c150aa5f4f288c087900a4..472195c83566afbfaab135a342e35820de2021d6 100644
--- a/test/io/gridmanager/gmshboundaryflagtest.hh
+++ b/test/io/gridmanager/gmshboundaryflagtest.hh
@@ -108,4 +108,4 @@ private:
 } // end namespace Dumux
 
 
-#endif /* DUMUX_TEST_IO_GMSHBOUNDARYFLAG_TEST_HH */
+#endif
diff --git a/test/material/fluidsystems/checkfluidsystem.hh b/test/material/fluidsystems/checkfluidsystem.hh
index 0136f374459508996b53d58049fbd55c9639cad1..83e3830532be9583eb4a489dac59e9f37e72d8cf 100644
--- a/test/material/fluidsystems/checkfluidsystem.hh
+++ b/test/material/fluidsystems/checkfluidsystem.hh
@@ -667,4 +667,4 @@ int checkFluidSystem(bool enablePhaseRestriction = true)
 
 } // end namespace Dumux
 
-#endif // DUMUX_CHECK_FLUIDSYSTEM_HH
+#endif
diff --git a/test/material/solidsystems/checksolidsystem.hh b/test/material/solidsystems/checksolidsystem.hh
index a542004789e2350e85ad69ef8c4a160993594f48..e92fcf0d28d502b78af016fc8f4f320757f232a5 100644
--- a/test/material/solidsystems/checksolidsystem.hh
+++ b/test/material/solidsystems/checksolidsystem.hh
@@ -138,4 +138,4 @@ int checkSolidSystem()
 
 } // end namespace Dumux
 
-#endif // DUMUX_CHECK_SOLIDSYSTEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
index 4ae5b9639cb9e032ad7072996583128f25ff3bee..a5111a6d58a1743cc1d27734b1a49a53acb20285 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
@@ -273,4 +273,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
index 1d1ab1b7e33000b66d6256de8a6a6228ec493f0f..e5d7ef4df65b60f80b4c141bb33e72a15c1cb3d7 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
@@ -329,4 +329,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif // DUMUX_STOKES_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
index ce1ac8bf016db413e35b11e76444d1e9139b62b3..e1cc391831ecc3ee303c3caeb6c93b6623e97e5a 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
@@ -306,4 +306,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
index e5456d4dcea3183823532219d44d8ae10d6f7339..2a3980f7a7bbfa27c6f348c1d15000a10a6a2d7e 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
@@ -381,4 +381,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif // DUMUX_STOKES_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
index e861194670d9ccc5dea39832ddc41781db8a5440..9ff44f6abc014be3660ed7a599bf789152fb39e7 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
@@ -342,4 +342,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif //DUMUX_DARCY2P2C_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
index 1dfcb69a13fca9224f2846d1d8589d14a012032a..1a1c91a9fcb958a4003d17a20697919a1e8e618a 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
@@ -416,4 +416,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif // DUMUX_STOKES1P2C_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
index 13555be963a0288e23a39d1c511d3937818f59a4..c92a8d3f6eb6985228e4185d9af5bd70ae49e02b 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
@@ -267,4 +267,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
index 5b16159b3ac5217ce3fd2d418a50c51dabab7390..b371fc02d8953681dbebcc2fecfc08f51fe799fa 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
@@ -292,4 +292,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif // DUMUX_STOKES_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
index e1a116a2ff9a2811b66c64c0df1e82277f85fecd..df692f3b435c24943c6e56c7830104a5eaa40d7b 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_darcy.hh
@@ -394,4 +394,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
index 8c03263bdf6d4f3652eecc602fa0c7db46a82cca..4c1d0beeefa342decf43f0f5aba6da303a843236 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/problem_stokes.hh
@@ -396,4 +396,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif // DUMUX_FREEFLOW_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/spatialparams.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/spatialparams.hh
index 7001a20935fed29d717ff77d606a8ec7d80ae163..0f0c9f2b181eeed802bb2b79a0e82f93e3227749 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/spatialparams.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/spatialparams.hh
@@ -128,4 +128,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_CONVERGENCE_TEST_SPATIALPARAMS_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/testcase.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/testcase.hh
index ebca2389a0e2ea1f73d9388c617076d075966ccc..39aaaf7dc036e3019b85241dbbc8cbc4fce364be 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/testcase.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/testcase.hh
@@ -34,4 +34,4 @@ enum class TestCase
 
 } // end namespace Dumux
 
-#endif // DUMUX_CONVERGENCE_TEST_TESTCASE_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
index bfeb060efde31a38f52f0e43dd0b8f1f11bc4a46..57e4745f4fd8456944606c516b620c6177d132b4 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
@@ -251,4 +251,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
index bdfc62aaca6069663ba3c4d771bede14d3068b90..389e340fa7485fb1ac38e8e17d346df2686d5994 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
@@ -308,4 +308,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif // DUMUX_STOKES_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
index f92a3933ea25f4047f68b12a81d1a83f3957a775..65fe8b6ee9a1e8466a03d0535601e63e24f1af90 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
@@ -287,4 +287,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif //DUMUX_DARCY_SUBPROBLEM_HH
+#endif
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
index 78757dad664ce3ab491e7ee68390e758b6fc5bb3..74f33a75697adc711e7f121e30edd8ba4f634ac3 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
@@ -272,4 +272,4 @@ private:
 };
 } // end namespace Dumux
 
-#endif // DUMUX_STOKES_SUBPROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/1p/implicit/convergence/analyticsolution/spatialparams.hh b/test/porousmediumflow/1p/implicit/convergence/analyticsolution/spatialparams.hh
index d57ca0acdf8a954fb30f7512d9641a45f5d8cf5d..2ab8465c670269970fb1762c4f2252f070301e6c 100644
--- a/test/porousmediumflow/1p/implicit/convergence/analyticsolution/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/convergence/analyticsolution/spatialparams.hh
@@ -100,4 +100,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_CONVERGENCE_TEST_ONEP_SPATIALPARAMS_HH
+#endif
diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh b/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh
index b1ee93e219e5cd92a39bb4d946dc5d8ab511483b..b233b5bab3372c695595d4bfa6cc2af4d3ebff8c 100644
--- a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh
+++ b/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh
@@ -289,4 +289,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_1PNI_CONDUCTION_PROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh b/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh
index 578207283fbab0f35956f931abfb1d6a6168671a..0bfd07570799b0a5078edfcab11acbb756e66b2e 100644
--- a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh
+++ b/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh
@@ -342,4 +342,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_1PNI_CONVECTION_PROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
index 2ecfd19a8e572944545a7332e073f0d39bd37f5c..228dafa236b358019f6d5c355ac8b0ec733515cd 100644
--- a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
@@ -255,4 +255,4 @@ private:
 };
 } //end namespace
 
-#endif // DUMUX_TEST_IMPES_ADAPTIVE_PROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
index 4d28a2ff4d528c092a6dcd21f5c01343e305981a..964e6e2c6737283db051678822b988c9399710ab 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
@@ -449,4 +449,4 @@ McWhorterAnalytic<TypeTag> analyticSolution_;
 };
 } //end namespace
 
-#endif // DUMUX_TEST_MPFA2P_PROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
index 3fd1d97294f6fd17bc4ec1cb4bc108ac644286cd..2bc16993b16a19443675d387073d46bce86d8899 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
@@ -271,4 +271,4 @@ static constexpr Scalar eps_ = 1e-6;
 };
 } //end namespace
 
-#endif // DUMUX_TEST_ADAPTIVE3D_2P2C_PROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
index c1c3b4ff8bc742c62a15c2f9d8555442d8979001..fda52a9e4dfbeff737c4c3afd6ad256170e1f0ec 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
@@ -407,4 +407,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // GUARDIAN
+#endif
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh
index 95489392190cf261ca926b7ad956bd58b708299b..0ad703c3037902a7e77592d3ed065cb5f755658b 100644
--- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/combustionlocalresidual.hh
@@ -218,4 +218,4 @@ public:
 };
 } // end namespace Dumux
 
-#endif //
+#endif
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
index 47999c82dd34aee54f545887e389e4344f950005..32ef6c727d68805c24509e517bfb686d7f1c6a3f 100644
--- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
@@ -225,4 +225,4 @@ private:
 
 }
 
-#endif // GUARDIAN
+#endif
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
index 206e39407769f0e333ce19516437245e3c4f238e..d1270c794d991b8eb23e2b29834d299adce3f40b 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
@@ -318,4 +318,4 @@ private:
 };
 
 } // end namespace Dumux
-#endif // DUMUX_RICHARDSNINI_CONDUCTION_PROBLEM_HH
+#endif
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
index 639272dd0991c720ea04fa8e40f153f207c203e0..89f8851c8e2a98cd9f438a14bf3acea45a18d508 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
@@ -340,4 +340,4 @@ private:
 };
 
 } // end namespace
-#endif // DUMUX_RICHARDSNI_CONVECTION_PROBLEM_HH
+#endif