diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp
index a294902ad8b..3339a182140 100644
--- a/lib/VMCore/Constants.cpp
+++ b/lib/VMCore/Constants.cpp
@@ -1371,6 +1371,7 @@ namespace llvm {
         return new CompareConstantExpr(Instruction::FCmp, V.predicate, 
                                        V.operands[0], V.operands[1]);
       assert(0 && "Invalid ConstantExpr!");
+      return 0;
     }
   };
 
diff --git a/win32/Analysis/Analysis.vcproj b/win32/Analysis/Analysis.vcproj
index 3d3ec61b5be..d2241392e7e 100644
--- a/win32/Analysis/Analysis.vcproj
+++ b/win32/Analysis/Analysis.vcproj
@@ -193,52 +193,6 @@
 					RelativePath="..\..\lib\Analysis\Ipa\GlobalsModRef.cpp">
 				</File>
 			</Filter>
-			<Filter
-				Name="DataStructure"
-				Filter="">
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\BottomUpClosure.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\CallTargets.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\CompleteBottomUp.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\DataStructure.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\DataStructureAA.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\DataStructureOpt.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\DataStructureStats.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\DSCallSiteIterator.h">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\EquivClassGraphs.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\GraphChecker.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\Local.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\Printer.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\Steensgaard.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Analysis\DataStructure\TopDownClosure.cpp">
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -319,28 +273,6 @@
 			<File
 				RelativePath="..\..\include\llvm\Analysis\Verifier.h">
 			</File>
-			<Filter
-				Name="DataStructure"
-				Filter="">
-				<File
-					RelativePath="..\..\include\llvm\Analysis\DataStructure\CallTargets.h">
-				</File>
-				<File
-					RelativePath="..\..\include\llvm\Analysis\DataStructure\DataStructure.h">
-				</File>
-				<File
-					RelativePath="..\..\include\llvm\Analysis\DataStructure\DSGraph.h">
-				</File>
-				<File
-					RelativePath="..\..\include\llvm\Analysis\DataStructure\DSGraphTraits.h">
-				</File>
-				<File
-					RelativePath="..\..\include\llvm\Analysis\DataStructure\DSNode.h">
-				</File>
-				<File
-					RelativePath="..\..\include\llvm\Analysis\DataStructure\DSSupport.h">
-				</File>
-			</Filter>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj
index 37484f545f0..7addd7cb489 100644
--- a/win32/VMCore/VMCore.vcproj
+++ b/win32/VMCore/VMCore.vcproj
@@ -112,9 +112,6 @@
 			<File
 				RelativePath="..\..\lib\VMCore\AsmWriter.cpp">
 			</File>
-			<File
-				RelativePath="..\..\lib\VMCore\AutoUpgrade.cpp">
-			</File>
 			<File
 				RelativePath="..\..\lib\VMCore\BasicBlock.cpp">
 			</File>
@@ -221,15 +218,9 @@
 			<File
 				RelativePath="..\..\include\llvm\Assembly\AsmAnnotationWriter.h">
 			</File>
-			<File
-				RelativePath="..\..\include\llvm\Assembly\AutoUpgrade.h">
-			</File>
 			<File
 				RelativePath="..\..\include\llvm\BasicBlock.h">
 			</File>
-			<File
-				RelativePath="..\..\include\llvm\Assembly\CachedWriter.h">
-			</File>
 			<File
 				RelativePath="..\..\include\llvm\CallGraphSCCPass.h">
 			</File>