Clean up header files and #includes.