Re-fix includes and headings.