Reformat layouts and includes.