sort include + whitespace fix