Just a minor cleanup to order the headers alphabetically.
This helps prevent merge conflicts.
Tested-by: NMathieu Malaterre <malat@debian.org>
Signed-off-by: NEzequiel Garcia <ezequiel@collabora.co.uk>
Signed-off-by: NUlf Hansson <ulf.hansson@linaro.org>