Add some missing imports to fix doctests

Fixes the build errors introduced in my last few commits.