Win32 changes, include files we need when compiling under win32