Also reorder some other #include when applicable.
It can be useful for debugging. Based on a patch by Stefano Sabatini <stefano.sabatini-lala@poste.it>