Renamed parse-vals.h -> .hpp