diff --git a/lecture/common/co2tablesbenchmark3.hh b/lecture/common/co2tablesbenchmark3.hh
index 651a4ac1204ffcbfa2bf70ac04ba4c04b9716eaf..b42f3c5a8486b4589402c597b647f0bc56196e00 100644
--- a/lecture/common/co2tablesbenchmark3.hh
+++ b/lecture/common/co2tablesbenchmark3.hh
@@ -35,4 +35,4 @@ namespace CO2TablesBenchmarkThree {
 } // end namespace CO2TablesBenchmarkThree
 } // end namespace Dumux
 
-#endif // DUMUX_HETEROGENEOUS_CO2TABLES_HH
+#endif
diff --git a/lecture/common/viplaboutput.hh b/lecture/common/viplaboutput.hh
index f5af623519f1fc945285fbbb49bc9db41cfa81d9..bdf8263380534200dbd9aadb9b264fffd1487f4e 100644
--- a/lecture/common/viplaboutput.hh
+++ b/lecture/common/viplaboutput.hh
@@ -259,4 +259,4 @@ private:
 
 }//end namespace Dumux
 
-#endif // DUMUX_VIPLAB_OUTPUT_HH
+#endif
diff --git a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
index f63fb9430867a21d1e8f9715eb132a589bde6bfa..ecf451d41abc10957bde943648bdbd2c75704536 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens1p2cproblem.hh
@@ -245,4 +245,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_LENS_1P2C_PROBLEM_HH
+#endif
diff --git a/lecture/efm/1p2c_2p_2p2c/lens1p2cproperties.hh b/lecture/efm/1p2c_2p_2p2c/lens1p2cproperties.hh
index d2bfd92bde148a80cc3088fceb043fd7c291cdb5..fffe197c05070a677dfd37b3fc0c6468c8ee2b74 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens1p2cproperties.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens1p2cproperties.hh
@@ -80,4 +80,4 @@ public:
 
 } //end namespace Dumux::Properties
 
-#endif // DUMUX_LENS_1P2C_PROPERTIES_HH
+#endif
diff --git a/lecture/efm/1p2c_2p_2p2c/lens1p2cspatialparams.hh b/lecture/efm/1p2c_2p_2p2c/lens1p2cspatialparams.hh
index 9ad43fe8a7f197cc86caca71e560436f7fbc161c..1888161fe4d77166c1b3c1f5a267b24e6e1a7e45 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens1p2cspatialparams.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens1p2cspatialparams.hh
@@ -165,4 +165,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_1P2C_SPATIALPARAMS_HH
+#endif
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
index 97782cdfd3ebfae0f13d260a5f37ecd9cc03e3e6..0c57726825fc0b4f68ea9a4ff40e90457fd542cb 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2p2cproblem.hh
@@ -252,4 +252,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_LENS_2P2C_PROBLEM_HH
+#endif
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2p2cproperties.hh b/lecture/efm/1p2c_2p_2p2c/lens2p2cproperties.hh
index f5be300cc30a981f34dc6c7eb21aeed8c3ad275b..1a3c7e5df9263cd38743df5d61dda54b08c2a5c7 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2p2cproperties.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2p2cproperties.hh
@@ -75,4 +75,4 @@ public:
 
 } // end namespace Dumux::Properties
 
-#endif // DUMUX_LENS_2P2C_PROPERTIES_HH
+#endif
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh b/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
index f8a449ebfa8b0649835614900ae3a92c5eaa218a..2f43f7b11736f93e7d51cbcf60c5e27e60107e0f 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2pproblem.hh
@@ -234,4 +234,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_LENS2P_PROBLEM_HH
+#endif
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2pproperties.hh b/lecture/efm/1p2c_2p_2p2c/lens2pproperties.hh
index 0d3d9d62483c9e8e5b5c28dcce55df2199d3e74d..61fccba2e2c4ce3602a8e168b75e74484cf79cc9 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2pproperties.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2pproperties.hh
@@ -86,4 +86,4 @@ public:
 
 } // end namespace Dumux::Properties
 
-#endif // DUMUX_LENS_2P_PROPERTIES_HH
+#endif
diff --git a/lecture/efm/1p2c_2p_2p2c/lens2pspatialparams.hh b/lecture/efm/1p2c_2p_2p2c/lens2pspatialparams.hh
index 32ec8a8617d932d03827eaaff47849b17aed8b2c..ecc5bce1a6f31ef5ebb6e84cbdc9cb51d505e1d5 100644
--- a/lecture/efm/1p2c_2p_2p2c/lens2pspatialparams.hh
+++ b/lecture/efm/1p2c_2p_2p2c/lens2pspatialparams.hh
@@ -185,4 +185,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_LENS2P_SPATIALPARAMS_HH
+#endif
diff --git a/lecture/efm/1p2cvs2p/lens1p2cproblem.hh b/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
index 7f4d894b0c89ee3f6c019616ed42691cebfad0e1..4b4845dc2e75c98ebd5f398aef08d63aa6d8ff28 100644
--- a/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
+++ b/lecture/efm/1p2cvs2p/lens1p2cproblem.hh
@@ -284,4 +284,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_LENS_1P2C_PROBLEM_HH
+#endif
diff --git a/lecture/efm/1p2cvs2p/lens1p2cproperties.hh b/lecture/efm/1p2cvs2p/lens1p2cproperties.hh
index 026d1fcc7a3fa116821b93ce5abe94c5953984e8..e84bfbd63a0c86649f5f05c75b0c00925ed8b795 100644
--- a/lecture/efm/1p2cvs2p/lens1p2cproperties.hh
+++ b/lecture/efm/1p2cvs2p/lens1p2cproperties.hh
@@ -80,4 +80,4 @@ public:
 
 } //end namespace Dumux::Properties
 
-#endif // DUMUX_LENS_1P2C_PROPERTIES_HH
+#endif
diff --git a/lecture/efm/1p2cvs2p/lens2pproblem.hh b/lecture/efm/1p2cvs2p/lens2pproblem.hh
index 142ab4eeaac76b1d72e239872642caaef02c4f24..1834c992056661b9c633121ebd0decb326ea5a62 100644
--- a/lecture/efm/1p2cvs2p/lens2pproblem.hh
+++ b/lecture/efm/1p2cvs2p/lens2pproblem.hh
@@ -296,4 +296,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_LENS2P_PROBLEM_HH
+#endif
diff --git a/lecture/efm/1p2cvs2p/lens2pproperties.hh b/lecture/efm/1p2cvs2p/lens2pproperties.hh
index 4a01fa20f706f617b8cbc832ac144ad010ca32c9..541c824c88d0fb205e9688acadcfe4ef859be6af 100644
--- a/lecture/efm/1p2cvs2p/lens2pproperties.hh
+++ b/lecture/efm/1p2cvs2p/lens2pproperties.hh
@@ -79,4 +79,4 @@ public:
 
 } //end namespace Dumux::Properties
 
-#endif // DUMUX_LENS2P_EXERCISE1_PROPERTIES_HH
+#endif
diff --git a/lecture/efm/2p/lens2pproblem.hh b/lecture/efm/2p/lens2pproblem.hh
index 97f536fdbf640fa58ff3cb7810606c8c561b1b84..be2dee0a0b90516145a32c242baebd6fc4c1bf63 100644
--- a/lecture/efm/2p/lens2pproblem.hh
+++ b/lecture/efm/2p/lens2pproblem.hh
@@ -331,4 +331,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_LENS2P_PROBLEM_HH
+#endif
diff --git a/lecture/efm/2p/lens2pproperties.hh b/lecture/efm/2p/lens2pproperties.hh
index 3f567cb9464e70f87fa9205b03683c24d6991efc..f2b9f53efd77153c30ded4b0abf3717dd4f9fdcf 100644
--- a/lecture/efm/2p/lens2pproperties.hh
+++ b/lecture/efm/2p/lens2pproperties.hh
@@ -75,4 +75,4 @@ public:
 
 } //end namespace Dumux::Properties
 
-#endif // DUMUX_LENS2P_EXERCISE2_PROPERTIES_HH
+#endif
diff --git a/lecture/mhs/groundwater/groundwaterproblem.hh b/lecture/mhs/groundwater/groundwaterproblem.hh
index 0e70f765da9f16e4a08a82769d229d843f307929..1b421a96865f3a84fec3ce6a9575c2c3778929be 100644
--- a/lecture/mhs/groundwater/groundwaterproblem.hh
+++ b/lecture/mhs/groundwater/groundwaterproblem.hh
@@ -448,4 +448,4 @@ private:
 
 } // end namespace Dumux
 
-#endif //DUMUX_LECTURE_MHS_GROUNDWATER_PROBLEM_HH
+#endif
diff --git a/lecture/mhs/groundwater/groundwaterproperties.hh b/lecture/mhs/groundwater/groundwaterproperties.hh
index a0986a920c7f12a1e56dbacc50316868dfabb82a..90cd397d0df5244b68e6d7b3227b66ccd7a46bef 100644
--- a/lecture/mhs/groundwater/groundwaterproperties.hh
+++ b/lecture/mhs/groundwater/groundwaterproperties.hh
@@ -63,4 +63,4 @@ struct Problem<TypeTag, TTag::GroundwaterProblemTypeTag> { using type = Dumux::G
 
 } // end namespace Dumux::Properties
 
-#endif //DUMUX_LECTURE_MHS_GROUNDWATER_PROPERTIES_HH
+#endif
diff --git a/lecture/mhs/groundwater/groundwaterspatialparams.hh b/lecture/mhs/groundwater/groundwaterspatialparams.hh
index 49f8662cdb2077f8255ddda6e2836505d87dbe45..ef7df1b2e791aa5a2effed0892094cc28044277b 100644
--- a/lecture/mhs/groundwater/groundwaterspatialparams.hh
+++ b/lecture/mhs/groundwater/groundwaterspatialparams.hh
@@ -125,4 +125,4 @@ private:
 };
 
 } // end namespace Dumux
-#endif // DUMUX_LECTURE_MHS_GROUNDWATER_SPATIALPARAMS_HH
+#endif
diff --git a/lecture/mm/buckleyleverett/buckleyleverettanalyticsolution.hh b/lecture/mm/buckleyleverett/buckleyleverettanalyticsolution.hh
index f7b211ba6f01333c0f64ed514439d9c51b2c102f..012b7de08574ea43b9e15ec6e770725276560055 100644
--- a/lecture/mm/buckleyleverett/buckleyleverettanalyticsolution.hh
+++ b/lecture/mm/buckleyleverett/buckleyleverettanalyticsolution.hh
@@ -372,4 +372,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_BUCKLEYLEVERETT_ANALYTICAL_HH
+#endif
diff --git a/lecture/mm/buckleyleverett/buckleyleverettproblem.hh b/lecture/mm/buckleyleverett/buckleyleverettproblem.hh
index 65d47245cf91af8fac0724f94d5877d8a9eab2f7..920430f06ca8b835db60ed4ea337f2043a29a12e 100644
--- a/lecture/mm/buckleyleverett/buckleyleverettproblem.hh
+++ b/lecture/mm/buckleyleverett/buckleyleverettproblem.hh
@@ -261,4 +261,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_LECTURE_MM_BUCKLEYLEVERETT_BUCKLEYLEVERETTPROBLEM_HH
+#endif
diff --git a/lecture/mm/buckleyleverett/buckleyleverettproperties.hh b/lecture/mm/buckleyleverett/buckleyleverettproperties.hh
index 140e6cea2aebd2c368ecb53da361a128241c95b5..7702477f19c4dd08fbe91dc42cd9ee4fc2ba2706 100644
--- a/lecture/mm/buckleyleverett/buckleyleverettproperties.hh
+++ b/lecture/mm/buckleyleverett/buckleyleverettproperties.hh
@@ -71,4 +71,4 @@ struct Formulation<TypeTag, TTag::BuckleyLeverettProblemTypeTag> { static conste
 
 } // end namespace Dumux::Properties
 
-#endif // DUMUX_LECTURE_MM_BUCKLEYLEVERETT_BUCKLEYLEVERETTPROPERTIES_HH
+#endif
diff --git a/lecture/mm/buckleyleverett/buckleyleverettspatialparams.hh b/lecture/mm/buckleyleverett/buckleyleverettspatialparams.hh
index ee7d02271a51383637cf2a9f7cb2d8fa07b76b03..2758388e66272ced69f37572541149a4f2d19dea 100644
--- a/lecture/mm/buckleyleverett/buckleyleverettspatialparams.hh
+++ b/lecture/mm/buckleyleverett/buckleyleverettspatialparams.hh
@@ -120,4 +120,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // BUCKLEYLEVERETT_SPATIALPARAMS_HH
+#endif
diff --git a/lecture/mm/buckleyleverett/pseudoh2o.hh b/lecture/mm/buckleyleverett/pseudoh2o.hh
index 95843b60bbc9c6854f3b81969b0ff5692004fe79..432d2d7c6461fe12f681f113632963bc87db3b33 100644
--- a/lecture/mm/buckleyleverett/pseudoh2o.hh
+++ b/lecture/mm/buckleyleverett/pseudoh2o.hh
@@ -98,4 +98,4 @@ typename PseudoH2O<ScalarT>::Scalar PseudoH2O<ScalarT>::density_ = 1000;
 
 } // end namepace Dumux
 
-#endif // DUMUX_PSEUDOH2O_HH
+#endif
diff --git a/lecture/mm/buckleyleverett/pseudooil.hh b/lecture/mm/buckleyleverett/pseudooil.hh
index 2e1401177f50913fcb9ff16c2de8320d381c8396..c31fb41be89cd84dc59c9789f43d7274ad6081ac 100644
--- a/lecture/mm/buckleyleverett/pseudooil.hh
+++ b/lecture/mm/buckleyleverett/pseudooil.hh
@@ -99,4 +99,4 @@ typename PseudoOil<ScalarT>::Scalar PseudoOil<ScalarT>::density_ = 1000;
 
 } // end namepace Dumux
 
-#endif // DUMUX_PSEUDOOIL_HH
+#endif
diff --git a/lecture/mm/columnxylene/columnxylenespatialparams.hh b/lecture/mm/columnxylene/columnxylenespatialparams.hh
index ee0d61763cc3d363122dcd81b64ea0d5cd9a4a36..1d26bc7a0f93d122b6d76afa7885ca25c05db5b9 100644
--- a/lecture/mm/columnxylene/columnxylenespatialparams.hh
+++ b/lecture/mm/columnxylene/columnxylenespatialparams.hh
@@ -208,4 +208,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_COLUMNXYLENE_SPATIAL_PARAMS_HH
+#endif
diff --git a/lecture/mm/fuelcell/fuelcellproblem.hh b/lecture/mm/fuelcell/fuelcellproblem.hh
index a69f64116427628491bec4c2448f07bac17105d5..c6d7f2348593a875826a196c0092c46e6efb7060 100644
--- a/lecture/mm/fuelcell/fuelcellproblem.hh
+++ b/lecture/mm/fuelcell/fuelcellproblem.hh
@@ -374,4 +374,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_FUELCELL_LECTURE_PROBLEM_HH
+#endif
diff --git a/lecture/mm/fuelcell/fuelcellproperties.hh b/lecture/mm/fuelcell/fuelcellproperties.hh
index 66d50158f06a08d031bf08c7de1d71930d7bc534..ab27a150cf866b7dc35964a071bfc83b9bf14d3b 100644
--- a/lecture/mm/fuelcell/fuelcellproperties.hh
+++ b/lecture/mm/fuelcell/fuelcellproperties.hh
@@ -78,4 +78,4 @@ struct ReplaceCompEqIdx<TypeTag, TTag::FuelCellLectureProblem> { static constexp
 
 } // end namespace Dumux::Properties
 
-#endif // DUMUX_FUELCELL_LECTURE_PROBLEM_HH
+#endif
diff --git a/lecture/mm/fuelcell/fuelcellspatialparams.hh b/lecture/mm/fuelcell/fuelcellspatialparams.hh
index 0242c0e5766bb5f9f87c06971259945f178fb510..930c3fe4389d57c632c4ca7a20d18fca8c7c713c 100644
--- a/lecture/mm/fuelcell/fuelcellspatialparams.hh
+++ b/lecture/mm/fuelcell/fuelcellspatialparams.hh
@@ -228,4 +228,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_FUELCELL_LECTURE_SPATIAL_PARAMS_HH
+#endif
diff --git a/lecture/mm/heatpipe/heatpipeproblem.hh b/lecture/mm/heatpipe/heatpipeproblem.hh
index edac966d3b8bf97a38a8236b6600e9d69e0888a9..87c20ba846fe986047e823f2655d9d41dc63ef56 100644
--- a/lecture/mm/heatpipe/heatpipeproblem.hh
+++ b/lecture/mm/heatpipe/heatpipeproblem.hh
@@ -124,4 +124,4 @@ private:
 
 } // namespace Dumux
 
-#endif // DUMUX_HEATPIPE_PROBLEM_HH
+#endif
diff --git a/lecture/mm/heatpipe/heatpipeproperties.hh b/lecture/mm/heatpipe/heatpipeproperties.hh
index 7342de635e2b73a12c1ff45ee3de6ee4308ffc01..c63a7a476553bf23761e96fa3568f02a25b52ced 100644
--- a/lecture/mm/heatpipe/heatpipeproperties.hh
+++ b/lecture/mm/heatpipe/heatpipeproperties.hh
@@ -64,4 +64,4 @@ struct SpatialParams<TypeTag, TTag::HeatPipeTypeTag>
 
 } // namespace Dumux::Properties
 
-#endif // DUMUX_HEATPIPE_PROPERTIES_HH
+#endif
diff --git a/lecture/mm/heatpipe/heatpipespatialparams.hh b/lecture/mm/heatpipe/heatpipespatialparams.hh
index 48949bcd7e98ec1e518ae4f81787653da0c9a188..65d9daf3276bec14413921af450bbd0bcd397186 100644
--- a/lecture/mm/heatpipe/heatpipespatialparams.hh
+++ b/lecture/mm/heatpipe/heatpipespatialparams.hh
@@ -83,4 +83,4 @@ private:
 
 }
 
-#endif // DUMUX_HEATPIPE_SPATIAL_PARAMS_HH
+#endif
diff --git a/lecture/mm/heatpipe/krpcheatpipe.hh b/lecture/mm/heatpipe/krpcheatpipe.hh
index a6c341302f6b02b564e77897216efaa1830f8501..0183150216b857c8a13639e8a906b4c90cd10ed4 100644
--- a/lecture/mm/heatpipe/krpcheatpipe.hh
+++ b/lecture/mm/heatpipe/krpcheatpipe.hh
@@ -103,4 +103,4 @@ public:
 };
 }
 
-#endif // DUMUX_KR_PC_HEATPIPE_HH
+#endif
diff --git a/lecture/mm/heavyoil/3p/parkervangenuchtenzero.hh b/lecture/mm/heavyoil/3p/parkervangenuchtenzero.hh
index a54d37559ad68e7029cd279ac084cfab41339158..4caddf06c0bccd234aa8100a1ac5ed66b7224221 100644
--- a/lecture/mm/heavyoil/3p/parkervangenuchtenzero.hh
+++ b/lecture/mm/heavyoil/3p/parkervangenuchtenzero.hh
@@ -306,4 +306,4 @@ public:
 
 } // end namespace Dumux
 
-#endif // DUMUX_PARKERVANGENZERO_3P_HH
+#endif
diff --git a/lecture/mm/heavyoil/3p/parkervangenuchtenzerohysteresis.hh b/lecture/mm/heavyoil/3p/parkervangenuchtenzerohysteresis.hh
index 3084ee4a75a478cd0a78ad9bed0f7554886873c5..9ed3ab03890be8a0037261149bce3daf237f4464 100644
--- a/lecture/mm/heavyoil/3p/parkervangenuchtenzerohysteresis.hh
+++ b/lecture/mm/heavyoil/3p/parkervangenuchtenzerohysteresis.hh
@@ -306,4 +306,4 @@ public:
 
 } // end namespace Dumux
 
-#endif // DUMUX_PARKERVANGENZEROHYST_3P_HH
+#endif
diff --git a/lecture/mm/heavyoil/3p/parkervangenuchtenzerohysteresisparams.hh b/lecture/mm/heavyoil/3p/parkervangenuchtenzerohysteresisparams.hh
index 744ae92f6a34bcaf5c67e351eb121a48ba99a604..ad04a861718f961702361b627a6410d509793555 100644
--- a/lecture/mm/heavyoil/3p/parkervangenuchtenzerohysteresisparams.hh
+++ b/lecture/mm/heavyoil/3p/parkervangenuchtenzerohysteresisparams.hh
@@ -430,4 +430,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_PARKERVANGENZEROHYST_PARAMS_3P_HH
+#endif
diff --git a/lecture/mm/heavyoil/3p/parkervangenuchtenzeroparams.hh b/lecture/mm/heavyoil/3p/parkervangenuchtenzeroparams.hh
index 701006eeb6da2169b0c190c5b4dbb19ee3b7f4c0..fc5b56a95b41afb948250a2626867c22b84f7b3c 100644
--- a/lecture/mm/heavyoil/3p/parkervangenuchtenzeroparams.hh
+++ b/lecture/mm/heavyoil/3p/parkervangenuchtenzeroparams.hh
@@ -424,4 +424,4 @@ private:
 
 } // namespace Dumux
 
-#endif // DUMUX_PARKERVANGENZERO_PARAMS_3P_HH
+#endif
diff --git a/lecture/mm/heavyoil/3p/relativepermeabilityhysteresis.hh b/lecture/mm/heavyoil/3p/relativepermeabilityhysteresis.hh
index f6cbdfb06d67b0076aaf399b383f670f63fd1043..dc279c77ea1cdab012e49388116236282048212f 100644
--- a/lecture/mm/heavyoil/3p/relativepermeabilityhysteresis.hh
+++ b/lecture/mm/heavyoil/3p/relativepermeabilityhysteresis.hh
@@ -304,4 +304,4 @@ public:
 
 } // end namespace Dumux
 
-#endif // DUMUX_RELATIVEPERMHYST3P_HH
+#endif
diff --git a/lecture/mm/heavyoil/3p/relativepermeabilityhysteresisparams.hh b/lecture/mm/heavyoil/3p/relativepermeabilityhysteresisparams.hh
index feac5695ea5e669afc3711d91d6ca6983d459ba9..3592e670f43ee8e6181d80b262823474fc1e9c46 100644
--- a/lecture/mm/heavyoil/3p/relativepermeabilityhysteresisparams.hh
+++ b/lecture/mm/heavyoil/3p/relativepermeabilityhysteresisparams.hh
@@ -860,4 +860,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_RELATIVEPERMHYST_PARAMS_3P_HH
+#endif
diff --git a/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh b/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
index 6289ccfacb1d48d491789ba62ddd337c1eac9b5a..fd2ee5f8f8d0fad76be25e8b0e6554c38420c7f9 100644
--- a/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
+++ b/lecture/mm/henryproblem/henry1p2c/henry1p2cproblem.hh
@@ -212,4 +212,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_HENRY1P2C_PROBLEM_HH
+#endif
diff --git a/lecture/mm/henryproblem/henry1p2c/henry1p2cspatialparameters.hh b/lecture/mm/henryproblem/henry1p2c/henry1p2cspatialparameters.hh
index 644b54c4c82410ee4096467fba7159c64c0f5b97..6f9e74a959d3d569f1115d02ee33b850d86aee3c 100644
--- a/lecture/mm/henryproblem/henry1p2c/henry1p2cspatialparameters.hh
+++ b/lecture/mm/henryproblem/henry1p2c/henry1p2cspatialparameters.hh
@@ -90,4 +90,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_HENRY1P2C_SPATIAL_PARAMETERS_HH
+#endif
diff --git a/lecture/mm/henryproblem/henry1p2c/watersaltfluidsystem.hh b/lecture/mm/henryproblem/henry1p2c/watersaltfluidsystem.hh
index 03ac9b592b625f47eafeafbc0362f3dc664541be..0afffb57884e5566d405764d7cd5d4ab60d6e3dc 100644
--- a/lecture/mm/henryproblem/henry1p2c/watersaltfluidsystem.hh
+++ b/lecture/mm/henryproblem/henry1p2c/watersaltfluidsystem.hh
@@ -523,4 +523,4 @@ template <class FluidState>
 #endif // DUMUX_PROPERTIES_HH
 } // end namespace Dumux
 
-#endif // DUMUX_WATER_SALT_FLUID_SYSTEM_HH
+#endif
diff --git a/lecture/mm/henryproblem/henry2p/henry2pproblem.hh b/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
index b1935e4f1bc0380ddb44a22ca41300811724ceae..b2883b76fd239d4e028e9af9e282b71ba0a74521 100644
--- a/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
+++ b/lecture/mm/henryproblem/henry2p/henry2pproblem.hh
@@ -241,4 +241,4 @@ private:
 
 } //end namespace Dumux
 
-#endif // DUMUX_HENRY2PPROBLEM_HH
+#endif
diff --git a/lecture/mm/henryproblem/henry2p/henry2pspatialparams.hh b/lecture/mm/henryproblem/henry2p/henry2pspatialparams.hh
index 16a5e7350cde81f5f496c5f08de0b82ecefc3237..05305414fdaa803c3de683720dd5a06a8e24946a 100644
--- a/lecture/mm/henryproblem/henry2p/henry2pspatialparams.hh
+++ b/lecture/mm/henryproblem/henry2p/henry2pspatialparams.hh
@@ -139,4 +139,4 @@ private:
 };
 
 } // end namespace Dumux
-#endif // DUMUX_LENS_SPATIAL_PARAMS_HH
+#endif
diff --git a/lecture/mm/henryproblem/henry2p/simplesaltwater.hh b/lecture/mm/henryproblem/henry2p/simplesaltwater.hh
index 19e290a27ff67ee3c4a21ef2e1514513c620059f..9c6794bee7ef59ad463aaecd9ae22c063ffff07c 100644
--- a/lecture/mm/henryproblem/henry2p/simplesaltwater.hh
+++ b/lecture/mm/henryproblem/henry2p/simplesaltwater.hh
@@ -314,4 +314,4 @@ const Scalar SimpleSaltwater<Scalar>::R = Dumux::Constants<Scalar>::R / 18e-3;
 
 } // end namespace Dumux
 
-#endif // DUMUX_SIMPLE_SALTWATER_HH
+#endif
diff --git a/lecture/mm/mcwhorter/mcwhorteranalyticsolution.hh b/lecture/mm/mcwhorter/mcwhorteranalyticsolution.hh
index 0fa9cf7842c1b9a9382a505bb860bea4399c1a8b..ecb76000793aaaf1a13c3719e890d3de04a1696c 100644
--- a/lecture/mm/mcwhorter/mcwhorteranalyticsolution.hh
+++ b/lecture/mm/mcwhorter/mcwhorteranalyticsolution.hh
@@ -351,4 +351,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_MCWHORTER_ANALYTIC_HH
+#endif
diff --git a/lecture/mm/mcwhorter/mcwhorterproblem.hh b/lecture/mm/mcwhorter/mcwhorterproblem.hh
index 9e3032af74c7a67d862e85ef89acf7ebc30838b5..b755be7e0ef097e0f96c965e9a02c229026ade48 100644
--- a/lecture/mm/mcwhorter/mcwhorterproblem.hh
+++ b/lecture/mm/mcwhorter/mcwhorterproblem.hh
@@ -229,4 +229,4 @@ private:
 
 } // end namespace Dumux
 
-#endif // DUMUX_MCWHORTERPROBLEM_HH
+#endif
diff --git a/lecture/mm/mcwhorter/mcwhorterproperties.hh b/lecture/mm/mcwhorter/mcwhorterproperties.hh
index 8daee600021e8a52624b50af7f57ca976323bee5..64856a20e14da5827fe8e9577f5d78b2cffd15b6 100644
--- a/lecture/mm/mcwhorter/mcwhorterproperties.hh
+++ b/lecture/mm/mcwhorter/mcwhorterproperties.hh
@@ -68,4 +68,4 @@ struct EvalCflFluxFunction<TypeTag, TTag::McWhorterProblemTypeTag> { using type
 
 } // end namespace Dumux::Properties
 
-#endif // DUMUX_MCWHORTERPROPERTIES_HH
+#endif