Various changes to stop VC++ choking under Win32.
6 files changed