Header file cleanups