Merge pull request #573 from zhekov/cleanup-win32defines