header file clean up