Get rid of some unneeded header includes.