Add a couple of missing imports.

Fixes #1584.