Reinstate imports needed by Javadoc

Eclipse seems a bit finicky about imports that are needed for types
that are only referenced in Javadoc, sometimes incorrectly reporting
them as unused.

This commit reinstates the imports needed for types referenced in the
Javadoc.