This series cleans up various #includes, in preparation for sorting. The patches make sense even if sort isn't desirable, though, as for the most part they fix latent ordering bugs. Tested by the buildbot. Tom