Fixed missing use statements

--
Merge pull request #1642 from saro0h/fix-use-statements

Fixed missing use statements.