Reorder includes directives

These went out of order moving some stuff around. Reorder them so
that there won't be unnecessary line changes in future.