Removed one header and changed the remaining 2 files