Copy contract.{other,win32}.cpp over from Vlinder branch, and remove Contract.cpp (which is replaced)