Added a few missing imports.

18 files changed