PKG: MSVC build fixes by Christoph Gohlke.