Various header changes.
4 files changed