Cleanup header includes