This should be handled fine now by .dir-locals.el, so need to carry that stuff in every file.
This is a continuation of the previous include sort patch, which only sorted for .c files.
Accidentally forgot to commit this. Sorry!