Win32 build: fixed

[Thomas Briggs]

   I committed a bunch of small fixes last night that finally fix the Win32
build.  Now if only we could get the Windows machine back in tinderbox.
*nudge* *nudge* *hint* *hint*  This also means that nightlies will be up to
date once again.

   Thanks to Sam and Frodo for pulling my head out of my ass and making the
fixes easy to implement.

   -Tom