Various header consistency fixes.
8 files changed