add Win32 include fixes to -I