Updated unified codebase for Win32-Visual Studio builds.