Remove the fixed-include header hacks.