Can you remove these three headers? I don't see why they are needed looking at your changes in this file.