Fix build for MSVC9.
16 files changed