Unreviewed, speculative build fix for WinCairo, part 2