header clean-up with misc type fix.