reorder vellum includes to not break with changes
Merge pull request #960 from dimagi/fd-types-cleanup

reorder vellum includes to not break with changes