Add more local imports
Merge pull request #2006 from 9rnsr/fix_imports

Add more local imports