Compile time error fixes for multiwindow refactoring, Windows target
Merge pull request #3508 from procedural/procedural/refactor-multiwindow-fixes

Fixes for multiwindow refactoring, Windows target