Changes to support compilation on Windows
4 files changed