Clean up includes, clean up build.