Fix build on MSVC.
9 files changed