Tidied up imports.

--HG--
branch : single-codebase