Can we try to maintain include ordering? (see wiki)