Cleanup header includes and conditionals.