Modify to build in win32