correct imports

Kenji has recently tightened up missing imports, this pull adds the necessary imports to keep things building on git master.