Part 1.1: obvious fixes for some headers