Fixes so it will compile again under Win32.
5 files changed