Consolidate headers.
9 files changed