Fix make check: Order includes alphabetical
Merge pull request #95 from undingen/fix_include_order

Fix make check: Order includes alphabetical