diff --git a/win32/clangAnalysis/clangAnalysis.vcproj b/win32/clangAnalysis/clangAnalysis.vcproj
index b313243..f768c3e 100644
--- a/win32/clangAnalysis/clangAnalysis.vcproj
+++ b/win32/clangAnalysis/clangAnalysis.vcproj
@@ -183,6 +183,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\include\clang\Analysis\ProgramEdge.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\clang\Analysis\UninitializedValues.h"
 				>
 			</File>
@@ -205,10 +209,6 @@
 					RelativePath="..\..\include\clang\Analysis\Visitors\CFGVarDeclVisitor.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\include\clang\Analysis\Visitors\DataflowStmtVisitor.h"
-					>
-				</File>
 			</Filter>
 			<Filter
 				Name="ADT"
@@ -238,14 +238,6 @@
 					>
 				</File>
 			</Filter>
-			<Filter
-				Name="PathSensitive"
-				>
-				<File
-					RelativePath="..\..\include\clang\Analysis\PathSensitive\ProgramEdge.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/win32/clangBasic/clangBasic.vcproj b/win32/clangBasic/clangBasic.vcproj
index eea5d8d..4a8e1bf 100644
--- a/win32/clangBasic/clangBasic.vcproj
+++ b/win32/clangBasic/clangBasic.vcproj
@@ -162,6 +162,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Basic\IdentifierTable.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Basic\SourceManager.cpp"
 				>
 			</File>
@@ -188,6 +192,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\include\clang\Basic\IdentifierTable.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\clang\Basic\LangOptions.h"
 				>
 			</File>
diff --git a/win32/clangDriver/clangDriver.vcproj b/win32/clangDriver/clangDriver.vcproj
index c38b2ac..957d2f6 100644
--- a/win32/clangDriver/clangDriver.vcproj
+++ b/win32/clangDriver/clangDriver.vcproj
@@ -186,7 +186,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\Driver\ASTStreamers.cpp"
+				RelativePath="..\..\Driver\ASTConsumers.cpp"
 				>
 			</File>
 			<File
@@ -228,7 +228,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\Driver\ASTStreamers.h"
+				RelativePath="..\..\Driver\ASTConsumers.h"
 				>
 			</File>
 			<File
diff --git a/win32/clangLex/clangLex.vcproj b/win32/clangLex/clangLex.vcproj
index e23d21a..b6f2a5f 100644
--- a/win32/clangLex/clangLex.vcproj
+++ b/win32/clangLex/clangLex.vcproj
@@ -157,10 +157,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Lex\IdentifierTable.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Lex\Lexer.cpp"
 				>
 			</File>
@@ -207,10 +203,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\clang\Lex\IdentifierTable.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\include\clang\Lex\Lexer.h"
 				>
 			</File>