win32 build cleanup