header file cleanup