Removed old headers, added new ones.