2nd attempt at getting what I did to try to fix the Windows build, I think it should contain edits to 7 files