Some header cleanups