Revert "Consolidate headers:"

This reverts commit 0f8763fdf4b6e14ec8b6bb7dec9368977b5e0a5e.