diff --git a/win32/Analysis/Analysis.vcproj b/win32/Analysis/Analysis.vcproj
index 7052b1757ff..fd19cfd37a4 100644
--- a/win32/Analysis/Analysis.vcproj
+++ b/win32/Analysis/Analysis.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -73,7 +73,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/AsmParser/AsmParser.vcproj b/win32/AsmParser/AsmParser.vcproj
index 7808d5b2026..2f23030278a 100644
--- a/win32/AsmParser/AsmParser.vcproj
+++ b/win32/AsmParser/AsmParser.vcproj
@@ -32,7 +32,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -74,7 +74,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/Bytecode/Bytecode.vcproj b/win32/Bytecode/Bytecode.vcproj
index e84edf42c26..8ea730b136a 100644
--- a/win32/Bytecode/Bytecode.vcproj
+++ b/win32/Bytecode/Bytecode.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -73,7 +73,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/CBackend/CBackend.vcproj b/win32/CBackend/CBackend.vcproj
index 4a041410900..36cb4082c0e 100644
--- a/win32/CBackend/CBackend.vcproj
+++ b/win32/CBackend/CBackend.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -73,7 +73,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index 85dfaea203b..35185585aeb 100644
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -73,7 +73,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/ExecutionEngine/ExecutionEngine.vcproj b/win32/ExecutionEngine/ExecutionEngine.vcproj
index 8292077910b..33b20f6c44b 100644
--- a/win32/ExecutionEngine/ExecutionEngine.vcproj
+++ b/win32/ExecutionEngine/ExecutionEngine.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -73,7 +73,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/Fibonacci/Fibonacci.vcproj b/win32/Fibonacci/Fibonacci.vcproj
index 9dd6f9fd2f1..e9a0e3f6b0b 100644
--- a/win32/Fibonacci/Fibonacci.vcproj
+++ b/win32/Fibonacci/Fibonacci.vcproj
@@ -32,7 +32,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -83,7 +83,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/Linker/Linker.vcproj b/win32/Linker/Linker.vcproj
index a8584fa028c..d24fd48bcb4 100644
--- a/win32/Linker/Linker.vcproj
+++ b/win32/Linker/Linker.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -73,7 +73,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/Support/Support.vcproj b/win32/Support/Support.vcproj
index 2cf7fcd26e5..f5f53f16298 100644
--- a/win32/Support/Support.vcproj
+++ b/win32/Support/Support.vcproj
@@ -32,7 +32,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -74,7 +74,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/System/System.vcproj b/win32/System/System.vcproj
index 48181821e42..2f03809667f 100644
--- a/win32/System/System.vcproj
+++ b/win32/System/System.vcproj
@@ -32,7 +32,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -74,7 +74,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/TableGen/TableGen.vcproj b/win32/TableGen/TableGen.vcproj
index 232699148f0..f2ce7913265 100644
--- a/win32/TableGen/TableGen.vcproj
+++ b/win32/TableGen/TableGen.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -81,7 +81,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/Target/Target.vcproj b/win32/Target/Target.vcproj
index 46a82b4494e..e5a1d672af5 100644
--- a/win32/Target/Target.vcproj
+++ b/win32/Target/Target.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -73,7 +73,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/Transforms/Transforms.vcproj b/win32/Transforms/Transforms.vcproj
index d30fbd21ea0..3af164bd203 100644
--- a/win32/Transforms/Transforms.vcproj
+++ b/win32/Transforms/Transforms.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -73,7 +73,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/VMCore/VMCore.vcproj b/win32/VMCore/VMCore.vcproj
index 0a995709e80..f84b05d5486 100644
--- a/win32/VMCore/VMCore.vcproj
+++ b/win32/VMCore/VMCore.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -73,7 +73,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/analyze/analyze.vcproj b/win32/analyze/analyze.vcproj
index f979f875e41..f08d3391009 100644
--- a/win32/analyze/analyze.vcproj
+++ b/win32/analyze/analyze.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -82,7 +82,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/bugpoint/bugpoint.vcproj b/win32/bugpoint/bugpoint.vcproj
index e3dcc7faa93..3c84e15abc2 100644
--- a/win32/bugpoint/bugpoint.vcproj
+++ b/win32/bugpoint/bugpoint.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -81,7 +81,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/llc/llc.vcproj b/win32/llc/llc.vcproj
index 4a9bdab1a5d..34af009e04b 100644
--- a/win32/llc/llc.vcproj
+++ b/win32/llc/llc.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -82,7 +82,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/lli/lli.vcproj b/win32/lli/lli.vcproj
index 0aae82f72b9..4fc569fa882 100644
--- a/win32/lli/lli.vcproj
+++ b/win32/lli/lli.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -82,7 +82,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/llvm-ar/llvm-ar.vcproj b/win32/llvm-ar/llvm-ar.vcproj
index e99beb9ae9d..a4db32d050d 100644
--- a/win32/llvm-ar/llvm-ar.vcproj
+++ b/win32/llvm-ar/llvm-ar.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -81,7 +81,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/llvm-as/llvm-as.vcproj b/win32/llvm-as/llvm-as.vcproj
index dad0127572b..758f0bffd09 100644
--- a/win32/llvm-as/llvm-as.vcproj
+++ b/win32/llvm-as/llvm-as.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -81,7 +81,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/llvm-bcanalyzer/llvm-bcanalyzer.vcproj b/win32/llvm-bcanalyzer/llvm-bcanalyzer.vcproj
index 057e076e75e..53db470ef27 100644
--- a/win32/llvm-bcanalyzer/llvm-bcanalyzer.vcproj
+++ b/win32/llvm-bcanalyzer/llvm-bcanalyzer.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -81,7 +81,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/llvm-dis/llvm-dis.vcproj b/win32/llvm-dis/llvm-dis.vcproj
index 332275bc318..12edbfcd551 100644
--- a/win32/llvm-dis/llvm-dis.vcproj
+++ b/win32/llvm-dis/llvm-dis.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -81,7 +81,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/llvm-ld/llvm-ld.vcproj b/win32/llvm-ld/llvm-ld.vcproj
index e0e9c9e9231..470b421cf52 100644
--- a/win32/llvm-ld/llvm-ld.vcproj
+++ b/win32/llvm-ld/llvm-ld.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -81,7 +81,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/llvm-link/llvm-link.vcproj b/win32/llvm-link/llvm-link.vcproj
index 8aedf9f6043..bbce8fa1828 100644
--- a/win32/llvm-link/llvm-link.vcproj
+++ b/win32/llvm-link/llvm-link.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -81,7 +81,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/llvm-nm/llvm-nm.vcproj b/win32/llvm-nm/llvm-nm.vcproj
index ceaeb44f425..a6348d7ea41 100644
--- a/win32/llvm-nm/llvm-nm.vcproj
+++ b/win32/llvm-nm/llvm-nm.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -81,7 +81,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/llvm-prof/llvm-prof.vcproj b/win32/llvm-prof/llvm-prof.vcproj
index 34f967ad9ff..69ce0e20028 100644
--- a/win32/llvm-prof/llvm-prof.vcproj
+++ b/win32/llvm-prof/llvm-prof.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -81,7 +81,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/llvm-ranlib/llvm-ranlib.vcproj b/win32/llvm-ranlib/llvm-ranlib.vcproj
index 1bf89dbdc1a..a15ba546cb7 100644
--- a/win32/llvm-ranlib/llvm-ranlib.vcproj
+++ b/win32/llvm-ranlib/llvm-ranlib.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -81,7 +81,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/opt/opt.vcproj b/win32/opt/opt.vcproj
index 0c6efc50f47..7351ac313cc 100644
--- a/win32/opt/opt.vcproj
+++ b/win32/opt/opt.vcproj
@@ -31,7 +31,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -81,7 +81,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
diff --git a/win32/x86/x86.vcproj b/win32/x86/x86.vcproj
index 65a2974dbe8..1d2cf110b21 100644
--- a/win32/x86/x86.vcproj
+++ b/win32/x86/x86.vcproj
@@ -32,7 +32,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -74,7 +74,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool