Merge pull request #1099 from OpenMS/fix/windows_fix

[FIX,BUILD] fix Windows build
[FIX,BUILD] fix Windows build
[NOP] cleanup