Add missing imports
Merge pull request #2280 from 9rnsr/fix12359

Add missing imports