Some header file cleanup