Merge pull request #839 from reaperhulk/more-import-order

Import order fixes for generation scripts