Some header clean-up v.2.