diff --git a/.gitignore b/.gitignore
index afda55c3dd..9486205356 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@
 /build/msw/*c*_mswhdll_x64
 /build/msw/*c*_mswuhdll
 /build/msw/*c*_mswuhdll_x64
+/build/msw/wx_local.props
 
 /build/msw/*.vcproj.*.user
 /build/msw/*.vcxproj.user
@@ -76,30 +77,30 @@
 
 # /demos/
 /demos/*/*.sln
-/demos/*/vc_msw
-/demos/*/vc_msw_x64
-/demos/*/vc_msw[du]
-/demos/*/vc_msw[du]_x64
-/demos/*/vc_mswud
-/demos/*/vc_mswud_x64
-/demos/*/vc_mswdll
-/demos/*/vc_mswdll_x64
-/demos/*/vc_msw[du]dll
-/demos/*/vc_msw[du]dll_x64
-/demos/*/vc_mswuddll
-/demos/*/vc_mswuddll_x64
-/demos/*/vc_mswuniv
-/demos/*/vc_mswuniv_x64
-/demos/*/vc_mswuniv[du]
-/demos/*/vc_mswuniv[du]_x64
-/demos/*/vc_mswunivud
-/demos/*/vc_mswunivud_x64
-/demos/*/vc_mswunivdll
-/demos/*/vc_mswunivdll_x64
-/demos/*/vc_mswuniv[du]dll
-/demos/*/vc_mswuniv[du]dll_x64
-/demos/*/vc_mswunivuddll
-/demos/*/vc_mswunivuddll_x64
+/demos/*/*c*_msw
+/demos/*/*c*_msw_x64
+/demos/*/*c*_msw[du]
+/demos/*/*c*_msw[du]_x64
+/demos/*/*c*_mswud
+/demos/*/*c*_mswud_x64
+/demos/*/*c*_mswdll
+/demos/*/*c*_mswdll_x64
+/demos/*/*c*_msw[du]dll
+/demos/*/*c*_msw[du]dll_x64
+/demos/*/*c*_mswuddll
+/demos/*/*c*_mswuddll_x64
+/demos/*/*c*_mswuniv
+/demos/*/*c*_mswuniv_x64
+/demos/*/*c*_mswuniv[du]
+/demos/*/*c*_mswuniv[du]_x64
+/demos/*/*c*_mswunivud
+/demos/*/*c*_mswunivud_x64
+/demos/*/*c*_mswunivdll
+/demos/*/*c*_mswunivdll_x64
+/demos/*/*c*_mswuniv[du]dll
+/demos/*/*c*_mswuniv[du]dll_x64
+/demos/*/*c*_mswunivuddll
+/demos/*/*c*_mswunivuddll_x64
 /demos/*/*Classic?Debug*
 /demos/*/*Classic?Release*
 /demos/*/*Carbon?Debug*
@@ -270,30 +271,30 @@
 /misc/libtool
 
 # /samples/
-/samples/**/vc_msw
-/samples/**/vc_msw_x64
-/samples/**/vc_msw[du]
-/samples/**/vc_msw[du]_x64
-/samples/**/vc_mswud
-/samples/**/vc_mswud_x64
-/samples/**/vc_mswdll
-/samples/**/vc_mswdll_x64
-/samples/**/vc_msw[du]dll
-/samples/**/vc_msw[du]dll_x64
-/samples/**/vc_mswuddll
-/samples/**/vc_mswuddll_x64
-/samples/**/vc_mswuniv
-/samples/**/vc_mswuniv_x64
-/samples/**/vc_mswuniv[du]
-/samples/**/vc_mswuniv[du]_x64
-/samples/**/vc_mswunivud
-/samples/**/vc_mswunivud_x64
-/samples/**/vc_mswunivdll
-/samples/**/vc_mswunivdll_x64
-/samples/**/vc_mswuniv[du]dll
-/samples/**/vc_mswuniv[du]dll_x64
-/samples/**/vc_mswunivuddll
-/samples/**/vc_mswunivuddll_x64
+/samples/**/*c*_msw
+/samples/**/*c*_msw_x64
+/samples/**/*c*_msw[du]
+/samples/**/*c*_msw[du]_x64
+/samples/**/*c*_mswud
+/samples/**/*c*_mswud_x64
+/samples/**/*c*_mswdll
+/samples/**/*c*_mswdll_x64
+/samples/**/*c*_msw[du]dll
+/samples/**/*c*_msw[du]dll_x64
+/samples/**/*c*_mswuddll
+/samples/**/*c*_mswuddll_x64
+/samples/**/*c*_mswuniv
+/samples/**/*c*_mswuniv_x64
+/samples/**/*c*_mswuniv[du]
+/samples/**/*c*_mswuniv[du]_x64
+/samples/**/*c*_mswunivud
+/samples/**/*c*_mswunivud_x64
+/samples/**/*c*_mswunivdll
+/samples/**/*c*_mswunivdll_x64
+/samples/**/*c*_mswuniv[du]dll
+/samples/**/*c*_mswuniv[du]dll_x64
+/samples/**/*c*_mswunivuddll
+/samples/**/*c*_mswunivuddll_x64
 
 # /samples/image/
 /samples/image/saved.xpm
@@ -355,47 +356,49 @@
 /src/zlib/Release
 
 # /tests/
-/tests/vc_msw
-/tests/vc_msw_x64
-/tests/vc_msw[du]
-/tests/vc_msw[du]_x64
-/tests/vc_mswud
-/tests/vc_mswud_x64
-/tests/vc_mswdll
-/tests/vc_mswdll_x64
-/tests/vc_msw[du]dll
-/tests/vc_msw[du]dll_x64
-/tests/vc_mswuddll
-/tests/vc_mswuddll_x64
-/tests/vc_mswuniv
-/tests/vc_mswuniv_x64
-/tests/vc_mswuniv[du]
-/tests/vc_mswuniv[du]_x64
-/tests/vc_mswunivud
-/tests/vc_mswunivud_x64
-/tests/vc_mswunivdll
-/tests/vc_mswunivdll_x64
-/tests/vc_mswuniv[du]dll
-/tests/vc_mswuniv[du]dll_x64
-/tests/vc_mswunivuddll
-/tests/vc_mswunivuddll_x64
+/tests/*c*_msw
+/tests/*c*_msw_x64
+/tests/*c*_msw[du]
+/tests/*c*_msw[du]_x64
+/tests/*c*_mswud
+/tests/*c*_mswud_x64
+/tests/*c*_mswdll
+/tests/*c*_mswdll_x64
+/tests/*c*_msw[du]dll
+/tests/*c*_msw[du]dll_x64
+/tests/*c*_mswuddll
+/tests/*c*_mswuddll_x64
+/tests/*c*_mswuniv
+/tests/*c*_mswuniv_x64
+/tests/*c*_mswuniv[du]
+/tests/*c*_mswuniv[du]_x64
+/tests/*c*_mswunivud
+/tests/*c*_mswunivud_x64
+/tests/*c*_mswunivdll
+/tests/*c*_mswunivdll_x64
+/tests/*c*_mswuniv[du]dll
+/tests/*c*_mswuniv[du]dll_x64
+/tests/*c*_mswunivuddll
+/tests/*c*_mswunivuddll_x64
 /tests/test.opt
-/tests/test.sln
+/tests/test*.dsw
+/tests/test*.sln
 /tests/test.suo
 /tests/test_test.vcproj
 
 # /tests/benchmarks/
 /tests/benchmarks/*.sln
+/tests/benchmarks/*c*_msw*/
 
 # /utils/
-/utils/**/vc_mswu
-/utils/**/vc_mswu_x64
-/utils/**/vc_mswud
-/utils/**/vc_mswud_x64
-/utils/**/vc_mswudll
-/utils/**/vc_mswudll_x64
-/utils/**/vc_mswuddll
-/utils/**/vc_mswuddll_x64
+/utils/**/*c*_mswu
+/utils/**/*c*_mswu_x64
+/utils/**/*c*_mswud
+/utils/**/*c*_mswud_x64
+/utils/**/*c*_mswudll
+/utils/**/*c*_mswudll_x64
+/utils/**/*c*_mswuddll
+/utils/**/*c*_mswuddll_x64
 
 # /utils/emulator/src/
 /utils/emulator/src/*.sln