Fix common include ordering by sorting keys first