More Win32 build changes; thanks to Kerry Calvert.