Fix cppcheck defects (possible indexing beyond array bounds, prefix->postfix iterator) and tidy headers.