diff --git a/cli/cppcheck.vcproj b/cli/cppcheck.vcproj
index 10136b733..1f098bb9a 100755
--- a/cli/cppcheck.vcproj
+++ b/cli/cppcheck.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="cppcheck"
 	ProjectGUID="{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}"
 	RootNamespace="cppcheck"
@@ -46,7 +46,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="..\lib"
+				AdditionalIncludeDirectories="..\lib;..\externals"
 				PreprocessorDefinitions="_DEBUG;WIN32;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -130,7 +130,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\lib"
+				AdditionalIncludeDirectories="..\lib;..\externals"
 				PreprocessorDefinitions="NDEBUG,WIN32;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				TreatWChar_tAsBuiltInType="false"
@@ -213,7 +213,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="..\lib"
+				AdditionalIncludeDirectories="..\lib;..\externals"
 				PreprocessorDefinitions="_DEBUG;WIN64;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -298,7 +298,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\lib"
+				AdditionalIncludeDirectories="..\lib;..\externals"
 				PreprocessorDefinitions="NDEBUG,WIN64;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				TreatWChar_tAsBuiltInType="false"
@@ -613,6 +613,34 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="TinyXml"
+			>
+			<File
+				RelativePath="..\externals\tinyxml\tinystr.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\externals\tinyxml\tinystr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\externals\tinyxml\tinyxml.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\externals\tinyxml\tinyxml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\externals\tinyxml\tinyxmlerror.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\externals\tinyxml\tinyxmlparser.cpp"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="cppcheck.rc"
 			>
diff --git a/test/test.vcproj b/test/test.vcproj
index 2dd824661..0c465f444 100755
--- a/test/test.vcproj
+++ b/test/test.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\lib;..\cli"
+				AdditionalIncludeDirectories="..\lib;..\cli;..\externals"
 				PreprocessorDefinitions="_DEBUG,WIN32,UNIT_TESTING;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -128,7 +128,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\lib;..\cli"
+				AdditionalIncludeDirectories="..\lib;..\cli;..\externals"
 				PreprocessorDefinitions="NDEBUG,WIN32,UNIT_TESTING;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				TreatWChar_tAsBuiltInType="false"
@@ -210,7 +210,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\lib;..\cli"
+				AdditionalIncludeDirectories="..\lib;..\cli;..\externals"
 				PreprocessorDefinitions="_DEBUG,WIN64,UNIT_TESTING;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -295,7 +295,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\lib;..\cli"
+				AdditionalIncludeDirectories="..\lib;..\cli;..\externals"
 				PreprocessorDefinitions="NDEBUG,WIN64,UNIT_TESTING;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				TreatWChar_tAsBuiltInType="false"
@@ -594,22 +594,6 @@
 				RelativePath="..\lib\timer.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\tinyxml\tinystr.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tinyxml\tinyxml.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tinyxml\tinyxmlerror.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tinyxml\tinyxmlparser.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\lib\token.cpp"
 				>
@@ -744,14 +728,6 @@
 				RelativePath="..\lib\timer.h"
 				>
 			</File>
-			<File
-				RelativePath=".\tinyxml\tinystr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tinyxml\tinyxml.h"
-				>
-			</File>
 			<File
 				RelativePath="..\lib\token.h"
 				>
@@ -761,6 +737,34 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="TinyXml"
+			>
+			<File
+				RelativePath="..\externals\tinyxml\tinystr.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\externals\tinyxml\tinystr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\externals\tinyxml\tinyxml.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\externals\tinyxml\tinyxml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\externals\tinyxml\tinyxmlerror.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\externals\tinyxml\tinyxmlparser.cpp"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>