Header file cleanup