Fixed use statements
Merge pull request #4891 from GrahamCampbell/4.2-use

[4.2] Fixed Use Statements