Add missing imports for Windows
Merge pull request #5521 from UtahDave/develop

Add missing imports for Windows