Added some missing imports.

15 files changed