Fix formatting of includes and lists