Cleaning up #includes that are not needed in header files but only needed in the .cpp files