More splitting and formatting of includes/layouts