Fixup WIN32 headers again