Add a few missing imports.

These have no immediate effect since they're either redundant due to
being imported elsewhere, or they're not tested at the moment.