header file cleanups