More header cleanups