Reapplied Win32 make-it-build patch.  What's going on?  Still get rendering artifacts when testing on x11, have literally no idea why.