Also remove unused includes since most files no longer need the compat header and its transient includes.