Order the populated includes

[msuchane]

The include statements prepared with the --include-in assembly aren't sorted in the order that you specify them on the command line. Fix the option to sort the includes.

This actually involves working around the Clap library, which stores all options in an unsorted collection. We need to re-sort them manually later.