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