Clean up a number of superfluous header includes.