Remove another unnecessary patch.
The code built fine without the extra headers on 11.2, 12.0 and HEAD.