Move imports to header file.
More plugin cleanups.