23.0-cppcheck-Herwig7_i

[minor] Clear cppcheck warning about invalid iteration by using a for_each algorithm. Also tidied headers slightly.