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

Add missing imports