fix more import insufficiency
Merge pull request #1824 from 9rnsr/fix_imports

fix more import insufficiency