Fix require orders.

Because of the renaming of the namespace some reordering of the requires
has been due.
Missing new line at end of file.