Some header clean-up.