Reorder includes

Fixes #12