Re-sort the #include lines which have gotten out of order.