Now sorts includes, fixes #913