Catch up with some imports.

Signed-off-by: Magnus Therning <magnus@therning.org>