Catch up with the importing I've done.

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