Can you do a `git pull upstream develop` to remove these headers?