Clean-up files and move include lines.