re. !76498, Tidy headers and suppress cppcheck warning (parameter is altered, cannot be const ref). Apply 'rule of zero' to function objects.