Clean up some #includes.