Re-order imports to prevent circular requires.