Instead of deleting those headers in order to solve missing file errors while building, better add them to the config
Make the patch actually revert the commit, duh