diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp
index f961b467b7c..1df54c56ca4 100644
--- a/lib/Analysis/ScalarEvolution.cpp
+++ b/lib/Analysis/ScalarEvolution.cpp
@@ -1929,7 +1929,7 @@ ComputeIterationCountExhaustively(const Loop *L, Value *Cond, bool ExitWhen) {
     // Couldn't symbolically evaluate.
     if (!CondVal) return UnknownValue;
 
-    if (CondVal->getZExtValue() == ExitWhen) {
+    if (CondVal->getZExtValue() == uint64_t(ExitWhen)) {
       ConstantEvolutionLoopExitValue[PN] = PHIVal;
       ++NumBruteForceTripCountsComputed;
       return SCEVConstant::get(ConstantInt::get(Type::Int32Ty, IterationNum));
diff --git a/win32/CBackend/CBackend.vcproj b/win32/CBackend/CBackend.vcproj
index d9333b48381..e194126a333 100644
--- a/win32/CBackend/CBackend.vcproj
+++ b/win32/CBackend/CBackend.vcproj
@@ -109,7 +109,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\lib\Target\CBackend\Writer.cpp">
+				RelativePath="..\..\lib\Target\CBackend\CBackend.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index f67c16177cf..43ef031348b 100644
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -291,6 +291,9 @@
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\RegAllocRegistry.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\CodeGen\RuntimeLibcalls.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\SchedGraphCommon.h">
 			</File>
diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj
index 7cd69e93d8d..c9b4b5e7c9f 100644
--- a/win32/VMCore/VMCore.vcproj
+++ b/win32/VMCore/VMCore.vcproj
@@ -290,6 +290,9 @@
 			<File
 				RelativePath="..\..\include\llvm\PassManager.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\PassManagers.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\PassSupport.h">
 			</File>
diff --git a/win32/llc/llc.vcproj b/win32/llc/llc.vcproj
index 0c5552297bc..2a066b88750 100644
--- a/win32/llc/llc.vcproj
+++ b/win32/llc/llc.vcproj
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\Writer.obj"
+				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\CBackend.obj"
 				OutputFile="$(OutDir)/llc.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\Writer.obj"
+				AdditionalDependencies="$(SolutionDir)X86\$(IntDir)\X86TargetMachine.obj $(SolutionDir)\CBackend\$(IntDir)\CBackend.obj"
 				OutputFile="$(OutDir)/llc.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"