diff --git a/lib/System/DynamicLibrary.cpp b/lib/System/DynamicLibrary.cpp
index fc3d41316ad..0c3caac0f10 100644
--- a/lib/System/DynamicLibrary.cpp
+++ b/lib/System/DynamicLibrary.cpp
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/System/DynamicLibrary.h"
+#include "llvm/Config/config.h"
 
 // It is not possible to use ltdl.c on VC++ builds as the terms of its LGPL
 // license and special exception would cause all of LLVM to be placed under
@@ -19,7 +20,7 @@
 // used, and obviously libtool is not used with Visual Studio.  An entirely
 // separate implementation is provided in win32/DynamicLibrary.cpp.
 
-#ifdef _WIN32
+#ifdef LLVM_ON_WIN32
 
 #include "win32/DynamicLibrary.cpp"
 
@@ -148,4 +149,4 @@ void *DynamicLibrary::GetAddressOfSymbol(const char *symbolName) {
   return lt_dlsym((lt_dlhandle) handle, symbolName);
 }
 
-#endif // _WIN32
\ No newline at end of file
+#endif // LLVM_ON_WIN32
diff --git a/win32/Configure/Configure.vcproj b/win32/Configure/Configure.vcproj
index 087d1986e39..08192c298f4 100644
--- a/win32/Configure/Configure.vcproj
+++ b/win32/Configure/Configure.vcproj
@@ -73,7 +73,7 @@
 					Name="Configure|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="..\tools\sed &lt;$(InputPath) &gt;$(ProjectDir)..\llvm\Config\config.h &quot;s/#undef PACKAGE_NAME/#define PACKAGE_NAME \&quot;LLVM (win32 vc7.1)\&quot;/;s/#undef PACKAGE_VERSION/#define PACKAGE_VERSION 1.4/;s/#undef HAVE_WINDOWS_H/#define HAVE_WINDOWS_H 1/;s/#undef HAVE_LIMITS_H/#define HAVE_LIMITS_H 1/;s/#undef HAVE_SYS_STAT_H/#define HAVE_SYS_STAT_H 1/;s/#undef HAVE_STDLIB_H/#define HAVE_STDLIB_H 1/;s/#undef HAVE_STDIO_H/#define HAVE_STDIO_H 1/;s/#undef HAVE_STRING_H/#define HAVE_STRING_H 1/;s/#undef SHLIBEXT/#define SHLIBEXT \&quot;.lib\&quot;/;s/#undef error_t/#define error_t int/;s/#undef HAVE_ERRNO_H/#define HAVE_ERRNO_H 1/;s/#undef LTDL_DLOPEN_DEPLIBS/#define LTDL_DLOPEN_DEPLIBS 1/;s/#undef LTDL_OBJDIR/#define LTDL_OBJDIR \&quot;_libs\&quot;/;s/#undef LTDL_SHLIBPATH_VAR/#define LTDL_SHLIBPATH_VAR \&quot;PATH\&quot;/;s/#undef LTDL_SHLIB_EXT/#define LTDL_SHLIB_EXT \&quot;.dll\&quot;/;s/#undef LTDL_SYSSEARCHPATH/#define LTDL_SYSSEARCHPATH \&quot;\&quot;/;&quot;
+						CommandLine="..\tools\sed &lt;$(InputPath) &gt;$(ProjectDir)..\llvm\Config\config.h &quot;s/#undef PACKAGE_NAME/#define PACKAGE_NAME \&quot;LLVM (win32 vc7.1)\&quot;/;s/#undef PACKAGE_VERSION/#define PACKAGE_VERSION 1.4/;s/#undef HAVE_WINDOWS_H/#define HAVE_WINDOWS_H 1/;s/#undef HAVE_LIMITS_H/#define HAVE_LIMITS_H 1/;s/#undef HAVE_SYS_STAT_H/#define HAVE_SYS_STAT_H 1/;s/#undef HAVE_STDLIB_H/#define HAVE_STDLIB_H 1/;s/#undef HAVE_STDIO_H/#define HAVE_STDIO_H 1/;s/#undef HAVE_STRING_H/#define HAVE_STRING_H 1/;s/#undef SHLIBEXT/#define SHLIBEXT \&quot;.lib\&quot;/;s/#undef error_t/#define error_t int/;s/#undef HAVE_ERRNO_H/#define HAVE_ERRNO_H 1/;s/#undef LTDL_DLOPEN_DEPLIBS/#define LTDL_DLOPEN_DEPLIBS 1/;s/#undef LTDL_OBJDIR/#define LTDL_OBJDIR \&quot;_libs\&quot;/;s/#undef LTDL_SHLIBPATH_VAR/#define LTDL_SHLIBPATH_VAR \&quot;PATH\&quot;/;s/#undef LTDL_SHLIB_EXT/#define LTDL_SHLIB_EXT \&quot;.dll\&quot;/;s/#undef LTDL_SYSSEARCHPATH/#define LTDL_SYSSEARCHPATH \&quot;\&quot;/;s/#undef LLVM_ON_WIN32/#define LLVM_ON_WIN32 1/;&quot;
 "
 						Outputs="$(ProjectDir)..\llvm\Config\config.h"/>
 				</FileConfiguration>
diff --git a/win32/System/System.vcproj b/win32/System/System.vcproj
index 10472ed35b7..99d5508ba2e 100644
--- a/win32/System/System.vcproj
+++ b/win32/System/System.vcproj
@@ -44,10 +44,8 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist ..\..\lib\System\platform\DynamicLibrary.cpp echo #include &quot;../win32/DynamicLibrary.cpp&quot;  &gt;..\..\lib\System\platform\DynamicLibrary.cpp
-if not exist ..\..\lib\System\platform\MappedFile.cpp echo #include &quot;../win32/MappedFile.cpp&quot;  &gt;..\..\lib\System\platform\MappedFile.cpp
+				CommandLine="if not exist ..\..\lib\System\platform\MappedFile.cpp echo #include &quot;../win32/MappedFile.cpp&quot;  &gt;..\..\lib\System\platform\MappedFile.cpp
 if not exist ..\..\lib\System\platform\Memory.cpp echo #include &quot;../win32/Memory.cpp&quot;  &gt;..\..\lib\System\platform\Memory.cpp
-if not exist ..\..\lib\System\platform\Path.cpp echo #include &quot;../win32/Path.cpp&quot;  &gt;..\..\lib\System\platform\Path.cpp
 if not exist ..\..\lib\System\platform\Process.cpp echo #include &quot;../win32/Process.cpp&quot;  &gt;..\..\lib\System\platform\Process.cpp
 if not exist ..\..\lib\System\platform\Program.cpp echo #include &quot;../win32/Program.cpp&quot;  &gt;..\..\lib\System\platform\Program.cpp
 if not exist ..\..\lib\System\platform\Signals.cpp echo #include &quot;../win32/Signals.cpp&quot;  &gt;..\..\lib\System\platform\Signals.cpp
@@ -96,10 +94,8 @@ if not exist ..\..\lib\System\platform\TimeValue.cpp echo #include &quot;../win3
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist ..\..\lib\System\platform\DynamicLibrary.cpp echo #include &quot;../win32/DynamicLibrary.cpp&quot;  &gt;..\..\lib\System\platform\DynamicLibrary.cpp
-if not exist ..\..\lib\System\platform\MappedFile.cpp echo #include &quot;../win32/MappedFile.cpp&quot;  &gt;..\..\lib\System\platform\MappedFile.cpp
+				CommandLine="if not exist ..\..\lib\System\platform\MappedFile.cpp echo #include &quot;../win32/MappedFile.cpp&quot;  &gt;..\..\lib\System\platform\MappedFile.cpp
 if not exist ..\..\lib\System\platform\Memory.cpp echo #include &quot;../win32/Memory.cpp&quot;  &gt;..\..\lib\System\platform\Memory.cpp
-if not exist ..\..\lib\System\platform\Path.cpp echo #include &quot;../win32/Path.cpp&quot;  &gt;..\..\lib\System\platform\Path.cpp
 if not exist ..\..\lib\System\platform\Process.cpp echo #include &quot;../win32/Process.cpp&quot;  &gt;..\..\lib\System\platform\Process.cpp
 if not exist ..\..\lib\System\platform\Program.cpp echo #include &quot;../win32/Program.cpp&quot;  &gt;..\..\lib\System\platform\Program.cpp
 if not exist ..\..\lib\System\platform\Signals.cpp echo #include &quot;../win32/Signals.cpp&quot;  &gt;..\..\lib\System\platform\Signals.cpp