Header file cleanup.