Force proper require order

Fixes #534