diff --git a/cli/cppcheck.vcproj b/cli/cppcheck.vcproj
index 982f032d0..9993d6ea7 100755
--- a/cli/cppcheck.vcproj
+++ b/cli/cppcheck.vcproj
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="9,00"
 	Name="cppcheck"
-	ProjectGUID="{56B0F403-02CE-3F89-9A1B-E03F21240A63}"
+	ProjectGUID="{230A4467-25A6-3276-A1D0-CB521812CD43}"
 	Keyword="Qt4VSv1.0">
 	<Platforms>
 		<Platform
@@ -125,6 +125,8 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
 				RelativePath="..\lib\check64bit.cpp" />
+			<File
+				RelativePath="..\lib\checkassignif.cpp" />
 			<File
 				RelativePath="..\lib\checkautovariables.cpp" />
 			<File
@@ -135,6 +137,8 @@
 				RelativePath="..\lib\checkexceptionsafety.cpp" />
 			<File
 				RelativePath="..\lib\checkmemoryleak.cpp" />
+			<File
+				RelativePath="..\lib\checknonreentrantfunctions.cpp" />
 			<File
 				RelativePath="..\lib\checknullpointer.cpp" />
 			<File
@@ -200,6 +204,8 @@
 				RelativePath="..\lib\check.h" />
 			<File
 				RelativePath="..\lib\check64bit.h" />
+			<File
+				RelativePath="..\lib\checkassignif.h" />
 			<File
 				RelativePath="..\lib\checkautovariables.h" />
 			<File
@@ -210,6 +216,8 @@
 				RelativePath="..\lib\checkexceptionsafety.h" />
 			<File
 				RelativePath="..\lib\checkmemoryleak.h" />
+			<File
+				RelativePath="..\lib\checknonreentrantfunctions.h" />
 			<File
 				RelativePath="..\lib\checknullpointer.h" />
 			<File
diff --git a/cli/cppcheck.vcxproj b/cli/cppcheck.vcxproj
index 7c751fbf1..50bbf613c 100644
--- a/cli/cppcheck.vcxproj
+++ b/cli/cppcheck.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A6DACC3F-847F-3498-9415-164FBC746D6B}</ProjectGuid>
+    <ProjectGuid>{35CBDF51-2456-3EC3-99ED-113C30858883}</ProjectGuid>
     <RootNamespace>cppcheck</RootNamespace>
     <Keyword>Qt4VSv1.0</Keyword>
   </PropertyGroup>
@@ -118,11 +118,13 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\lib\check64bit.cpp" />
+    <ClCompile Include="..\lib\checkassignif.cpp" />
     <ClCompile Include="..\lib\checkautovariables.cpp" />
     <ClCompile Include="..\lib\checkbufferoverrun.cpp" />
     <ClCompile Include="..\lib\checkclass.cpp" />
     <ClCompile Include="..\lib\checkexceptionsafety.cpp" />
     <ClCompile Include="..\lib\checkmemoryleak.cpp" />
+    <ClCompile Include="..\lib\checknonreentrantfunctions.cpp" />
     <ClCompile Include="..\lib\checknullpointer.cpp" />
     <ClCompile Include="..\lib\checkobsoletefunctions.cpp" />
     <ClCompile Include="..\lib\checkother.cpp" />
@@ -155,11 +157,13 @@
   <ItemGroup>
     <ClInclude Include="..\lib\check.h" />
     <ClInclude Include="..\lib\check64bit.h" />
+    <ClInclude Include="..\lib\checkassignif.h" />
     <ClInclude Include="..\lib\checkautovariables.h" />
     <ClInclude Include="..\lib\checkbufferoverrun.h" />
     <ClInclude Include="..\lib\checkclass.h" />
     <ClInclude Include="..\lib\checkexceptionsafety.h" />
     <ClInclude Include="..\lib\checkmemoryleak.h" />
+    <ClInclude Include="..\lib\checknonreentrantfunctions.h" />
     <ClInclude Include="..\lib\checknullpointer.h" />
     <ClInclude Include="..\lib\checkobsoletefunctions.h" />
     <ClInclude Include="..\lib\checkother.h" />
diff --git a/cli/cppcheck.vcxproj.filters b/cli/cppcheck.vcxproj.filters
index 7f0c47137..ab6240267 100644
--- a/cli/cppcheck.vcxproj.filters
+++ b/cli/cppcheck.vcxproj.filters
@@ -18,6 +18,9 @@
     <ClCompile Include="..\lib\check64bit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib\checkassignif.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\lib\checkautovariables.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -33,6 +36,9 @@
     <ClCompile Include="..\lib\checkmemoryleak.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib\checknonreentrantfunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\lib\checknullpointer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -125,6 +131,9 @@
     <ClInclude Include="..\lib\check64bit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\checkassignif.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\lib\checkautovariables.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -140,6 +149,9 @@
     <ClInclude Include="..\lib\checkmemoryleak.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\checknonreentrantfunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\lib\checknullpointer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/cppcheck.sln b/cppcheck.sln
index e08a5c811..61013a97d 100644
--- a/cppcheck.sln
+++ b/cppcheck.sln
@@ -1,8 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "cli\cppcheck.vcproj", "{A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "cli\cppcheck.vcproj", "{230A4467-25A6-3276-A1D0-CB521812CD43}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcproj", "{E690724D-4286-3049-8439-595D1CB80EAB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcproj", "{5B7869EA-A1CB-3E73-8569-5B385608779E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -12,22 +12,22 @@ Global
 		Release-x64|Win32 = Release-x64|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Debug|Win32.Build.0 = Debug|Win32
-		{A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Debug-x64|Win32.ActiveCfg = Debug-x64|Win32
-		{A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Debug-x64|Win32.Build.0 = Debug-x64|Win32
-		{A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Release|Win32.ActiveCfg = Release|Win32
-		{A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Release|Win32.Build.0 = Release|Win32
-		{A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Release-x64|Win32.ActiveCfg = Release-x64|Win32
-		{A610CB5D-FA83-3FC9-96AB-5689E3B50CEC}.Release-x64|Win32.Build.0 = Release-x64|Win32
-		{E690724D-4286-3049-8439-595D1CB80EAB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E690724D-4286-3049-8439-595D1CB80EAB}.Debug|Win32.Build.0 = Debug|Win32
-		{E690724D-4286-3049-8439-595D1CB80EAB}.Debug-x64|Win32.ActiveCfg = Debug-x64|Win32
-		{E690724D-4286-3049-8439-595D1CB80EAB}.Debug-x64|Win32.Build.0 = Debug-x64|Win32
-		{E690724D-4286-3049-8439-595D1CB80EAB}.Release|Win32.ActiveCfg = Release|Win32
-		{E690724D-4286-3049-8439-595D1CB80EAB}.Release|Win32.Build.0 = Release|Win32
-		{E690724D-4286-3049-8439-595D1CB80EAB}.Release-x64|Win32.ActiveCfg = Release-x64|Win32
-		{E690724D-4286-3049-8439-595D1CB80EAB}.Release-x64|Win32.Build.0 = Release-x64|Win32
+		{230A4467-25A6-3276-A1D0-CB521812CD43}.Debug|Win32.ActiveCfg = Debug|Win32
+		{230A4467-25A6-3276-A1D0-CB521812CD43}.Debug|Win32.Build.0 = Debug|Win32
+		{230A4467-25A6-3276-A1D0-CB521812CD43}.Debug-x64|Win32.ActiveCfg = Debug-x64|Win32
+		{230A4467-25A6-3276-A1D0-CB521812CD43}.Debug-x64|Win32.Build.0 = Debug-x64|Win32
+		{230A4467-25A6-3276-A1D0-CB521812CD43}.Release|Win32.ActiveCfg = Release|Win32
+		{230A4467-25A6-3276-A1D0-CB521812CD43}.Release|Win32.Build.0 = Release|Win32
+		{230A4467-25A6-3276-A1D0-CB521812CD43}.Release-x64|Win32.ActiveCfg = Release-x64|Win32
+		{230A4467-25A6-3276-A1D0-CB521812CD43}.Release-x64|Win32.Build.0 = Release-x64|Win32
+		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Debug|Win32.Build.0 = Debug|Win32
+		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Debug-x64|Win32.ActiveCfg = Debug-x64|Win32
+		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Debug-x64|Win32.Build.0 = Debug-x64|Win32
+		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Release|Win32.ActiveCfg = Release|Win32
+		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Release|Win32.Build.0 = Release|Win32
+		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Release-x64|Win32.ActiveCfg = Release-x64|Win32
+		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Release-x64|Win32.Build.0 = Release-x64|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/test/test.vcproj b/test/test.vcproj
index c4b0ff1a1..3de75e127 100644
--- a/test/test.vcproj
+++ b/test/test.vcproj
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="9,00"
 	Name="test"
-	ProjectGUID="{5B7869EA-A1CB-3E73-8569-5B385608779E}"
+	ProjectGUID="{26089205-888A-3B36-A3DF-6911F2B15F7F}"
 	Keyword="Qt4VSv1.0">
 	<Platforms>
 		<Platform
@@ -72,7 +72,7 @@
 			UseOfMfc="0">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;.&quot;,&quot;..\cli&quot;,&quot;..\lib&quot;,&quot;..\externals&quot;,&quot;..\externals\tinyxml&quot;,..\..\..\..\Qt\qt-everywhere-opensource-src-4.7.2-vs2008-x86\mkspecs\win32-msvc2008"
+				AdditionalIncludeDirectories="&quot;.&quot;,&quot;..\cli&quot;,&quot;..\lib&quot;,&quot;..\externals&quot;,&quot;..\externals\tinyxml&quot;,..\..\Qt\VS4.7.0\mkspecs\win32-msvc2008"
 				AdditionalOptions="-Zm200 -w34100 -w34189"
 				AssemblerListingLocation="temp\"
 				BufferSecurityCheck="false"
@@ -125,6 +125,8 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
 				RelativePath="..\lib\check64bit.cpp" />
+			<File
+				RelativePath="..\lib\checkassignif.cpp" />
 			<File
 				RelativePath="..\lib\checkautovariables.cpp" />
 			<File
@@ -135,6 +137,8 @@
 				RelativePath="..\lib\checkexceptionsafety.cpp" />
 			<File
 				RelativePath="..\lib\checkmemoryleak.cpp" />
+			<File
+				RelativePath="..\lib\checknonreentrantfunctions.cpp" />
 			<File
 				RelativePath="..\lib\checknullpointer.cpp" />
 			<File
@@ -272,6 +276,8 @@
 				RelativePath="..\lib\check.h" />
 			<File
 				RelativePath="..\lib\check64bit.h" />
+			<File
+				RelativePath="..\lib\checkassignif.h" />
 			<File
 				RelativePath="..\lib\checkautovariables.h" />
 			<File
@@ -282,6 +288,8 @@
 				RelativePath="..\lib\checkexceptionsafety.h" />
 			<File
 				RelativePath="..\lib\checkmemoryleak.h" />
+			<File
+				RelativePath="..\lib\checknonreentrantfunctions.h" />
 			<File
 				RelativePath="..\lib\checknullpointer.h" />
 			<File
diff --git a/test/test.vcxproj b/test/test.vcxproj
index 79d134048..8a8b1c00f 100644
--- a/test/test.vcxproj
+++ b/test/test.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{D0001948-3B19-3314-8BEE-3B92350BC5B5}</ProjectGuid>
+    <ProjectGuid>{BED73C50-0373-3E1B-BFBD-5449C1396DBF}</ProjectGuid>
     <RootNamespace>test</RootNamespace>
     <Keyword>Qt4VSv1.0</Keyword>
   </PropertyGroup>
@@ -118,11 +118,13 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\lib\check64bit.cpp" />
+    <ClCompile Include="..\lib\checkassignif.cpp" />
     <ClCompile Include="..\lib\checkautovariables.cpp" />
     <ClCompile Include="..\lib\checkbufferoverrun.cpp" />
     <ClCompile Include="..\lib\checkclass.cpp" />
     <ClCompile Include="..\lib\checkexceptionsafety.cpp" />
     <ClCompile Include="..\lib\checkmemoryleak.cpp" />
+    <ClCompile Include="..\lib\checknonreentrantfunctions.cpp" />
     <ClCompile Include="..\lib\checknullpointer.cpp" />
     <ClCompile Include="..\lib\checkobsoletefunctions.cpp" />
     <ClCompile Include="..\lib\checkother.cpp" />
@@ -191,11 +193,13 @@
   <ItemGroup>
     <ClInclude Include="..\lib\check.h" />
     <ClInclude Include="..\lib\check64bit.h" />
+    <ClInclude Include="..\lib\checkassignif.h" />
     <ClInclude Include="..\lib\checkautovariables.h" />
     <ClInclude Include="..\lib\checkbufferoverrun.h" />
     <ClInclude Include="..\lib\checkclass.h" />
     <ClInclude Include="..\lib\checkexceptionsafety.h" />
     <ClInclude Include="..\lib\checkmemoryleak.h" />
+    <ClInclude Include="..\lib\checknonreentrantfunctions.h" />
     <ClInclude Include="..\lib\checknullpointer.h" />
     <ClInclude Include="..\lib\checkobsoletefunctions.h" />
     <ClInclude Include="..\lib\checkother.h" />
diff --git a/test/test.vcxproj.filters b/test/test.vcxproj.filters
index 446b942da..300c1c243 100644
--- a/test/test.vcxproj.filters
+++ b/test/test.vcxproj.filters
@@ -14,6 +14,9 @@
     <ClCompile Include="..\lib\check64bit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib\checkassignif.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\lib\checkautovariables.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -29,6 +32,9 @@
     <ClCompile Include="..\lib\checkmemoryleak.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib\checknonreentrantfunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\lib\checknullpointer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -229,6 +235,9 @@
     <ClInclude Include="..\lib\check64bit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\checkassignif.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\lib\checkautovariables.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -244,6 +253,9 @@
     <ClInclude Include="..\lib\checkmemoryleak.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\checknonreentrantfunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\lib\checknullpointer.h">
       <Filter>Header Files</Filter>
     </ClInclude>