Build fixes for MSWin32 + gcc