Add missing imports
Merge pull request #2783 from 9rnsr/fix_imports

Add missing imports