Fixes for building on Win32 with the new gtk3 packages