diff --git a/build/msw/wx_aui.vcxproj b/build/msw/wx_aui.vcxproj
index 888f0fa9ed..a2226c0e0e 100644
--- a/build/msw/wx_aui.vcxproj
+++ b/build/msw/wx_aui.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_aui.vcxproj.filters b/build/msw/wx_aui.vcxproj.filters
index 233007d3b5..34ce33530b 100644
--- a/build/msw/wx_aui.vcxproj.filters
+++ b/build/msw/wx_aui.vcxproj.filters
@@ -110,4 +110,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_base.vcxproj b/build/msw/wx_base.vcxproj
index 0bfdfe1669..7f5a03c6d4 100644
--- a/build/msw/wx_base.vcxproj
+++ b/build/msw/wx_base.vcxproj
@@ -825,4 +825,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_base.vcxproj.filters b/build/msw/wx_base.vcxproj.filters
index a641d2f18c..b2a36fd44b 100644
--- a/build/msw/wx_base.vcxproj.filters
+++ b/build/msw/wx_base.vcxproj.filters
@@ -943,4 +943,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_core.vcxproj b/build/msw/wx_core.vcxproj
index fc9608749b..0f76d002f1 100644
--- a/build/msw/wx_core.vcxproj
+++ b/build/msw/wx_core.vcxproj
@@ -1384,4 +1384,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_core.vcxproj.filters b/build/msw/wx_core.vcxproj.filters
index 357b1ec0a1..38eb2f2785 100644
--- a/build/msw/wx_core.vcxproj.filters
+++ b/build/msw/wx_core.vcxproj.filters
@@ -1945,4 +1945,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_custom_build.vcxproj b/build/msw/wx_custom_build.vcxproj
index 6b5e51df0b..45ef184798 100644
--- a/build/msw/wx_custom_build.vcxproj
+++ b/build/msw/wx_custom_build.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_gl.vcxproj b/build/msw/wx_gl.vcxproj
index e372ef3eab..11d18e781f 100644
--- a/build/msw/wx_gl.vcxproj
+++ b/build/msw/wx_gl.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_gl.vcxproj.filters b/build/msw/wx_gl.vcxproj.filters
index 7425caae50..7d63a96a17 100644
--- a/build/msw/wx_gl.vcxproj.filters
+++ b/build/msw/wx_gl.vcxproj.filters
@@ -49,4 +49,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_html.vcxproj b/build/msw/wx_html.vcxproj
index 5d421cb9fe..4460699604 100644
--- a/build/msw/wx_html.vcxproj
+++ b/build/msw/wx_html.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_html.vcxproj.filters b/build/msw/wx_html.vcxproj.filters
index 4249c9751a..40b089c127 100644
--- a/build/msw/wx_html.vcxproj.filters
+++ b/build/msw/wx_html.vcxproj.filters
@@ -187,4 +187,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_media.vcxproj.filters b/build/msw/wx_media.vcxproj.filters
index 86c8194d48..5333879f13 100644
--- a/build/msw/wx_media.vcxproj.filters
+++ b/build/msw/wx_media.vcxproj.filters
@@ -52,4 +52,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_net.vcxproj b/build/msw/wx_net.vcxproj
index 2f6b78e984..2486938c55 100644
--- a/build/msw/wx_net.vcxproj
+++ b/build/msw/wx_net.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -513,4 +513,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_net.vcxproj.filters b/build/msw/wx_net.vcxproj.filters
index a035d90fe4..00da630e3e 100644
--- a/build/msw/wx_net.vcxproj.filters
+++ b/build/msw/wx_net.vcxproj.filters
@@ -106,4 +106,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_propgrid.vcxproj b/build/msw/wx_propgrid.vcxproj
index 02da78b799..78cb421603 100644
--- a/build/msw/wx_propgrid.vcxproj
+++ b/build/msw/wx_propgrid.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_propgrid.vcxproj.filters b/build/msw/wx_propgrid.vcxproj.filters
index e5bc5d5bca..b72adefb76 100644
--- a/build/msw/wx_propgrid.vcxproj.filters
+++ b/build/msw/wx_propgrid.vcxproj.filters
@@ -92,4 +92,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_qa.vcxproj b/build/msw/wx_qa.vcxproj
index 3835adcc06..f69336239c 100644
--- a/build/msw/wx_qa.vcxproj
+++ b/build/msw/wx_qa.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_qa.vcxproj.filters b/build/msw/wx_qa.vcxproj.filters
index 6f46761f46..e2b34e781f 100644
--- a/build/msw/wx_qa.vcxproj.filters
+++ b/build/msw/wx_qa.vcxproj.filters
@@ -49,4 +49,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_ribbon.vcxproj b/build/msw/wx_ribbon.vcxproj
index c56eca74f0..66cbc744b9 100644
--- a/build/msw/wx_ribbon.vcxproj
+++ b/build/msw/wx_ribbon.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -511,4 +511,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_ribbon.vcxproj.filters b/build/msw/wx_ribbon.vcxproj.filters
index 9395b143f7..88411fe979 100644
--- a/build/msw/wx_ribbon.vcxproj.filters
+++ b/build/msw/wx_ribbon.vcxproj.filters
@@ -104,4 +104,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_richtext.vcxproj b/build/msw/wx_richtext.vcxproj
index e1e0844495..0af08c8ea0 100644
--- a/build/msw/wx_richtext.vcxproj
+++ b/build/msw/wx_richtext.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -524,4 +524,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_richtext.vcxproj.filters b/build/msw/wx_richtext.vcxproj.filters
index 0c8a2d68df..bb0708de74 100644
--- a/build/msw/wx_richtext.vcxproj.filters
+++ b/build/msw/wx_richtext.vcxproj.filters
@@ -143,4 +143,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_stc.vcxproj b/build/msw/wx_stc.vcxproj
index 03bd593f7c..96bae252b1 100644
--- a/build/msw/wx_stc.vcxproj
+++ b/build/msw/wx_stc.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_stc.vcxproj.filters b/build/msw/wx_stc.vcxproj.filters
index ad555d0c97..02b17b10f0 100644
--- a/build/msw/wx_stc.vcxproj.filters
+++ b/build/msw/wx_stc.vcxproj.filters
@@ -53,4 +53,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_vc10.sln b/build/msw/wx_vc10.sln
index a1310d6285..f0dd96cc61 100644
--- a/build/msw/wx_vc10.sln
+++ b/build/msw/wx_vc10.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_custom_build", "wx_custom_build.vcxproj", "{01F4CE10-2CFB-41A8-B41F-E54337868A1D}"
diff --git a/build/msw/wx_vc11.sln b/build/msw/wx_vc11.sln
index 4714d7c1ca..8512ffee51 100644
--- a/build/msw/wx_vc11.sln
+++ b/build/msw/wx_vc11.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_custom_build", "wx_custom_build.vcxproj", "{01F4CE10-2CFB-41A8-B41F-E54337868A1D}"
diff --git a/build/msw/wx_vc12.sln b/build/msw/wx_vc12.sln
index 367f52d1eb..6b7f680f9a 100644
--- a/build/msw/wx_vc12.sln
+++ b/build/msw/wx_vc12.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
diff --git a/build/msw/wx_vc14.sln b/build/msw/wx_vc14.sln
index ad8c9c93eb..f384886c5d 100644
--- a/build/msw/wx_vc14.sln
+++ b/build/msw/wx_vc14.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
diff --git a/build/msw/wx_vc15.sln b/build/msw/wx_vc15.sln
index 5027a5392e..f1aa83c830 100644
--- a/build/msw/wx_vc15.sln
+++ b/build/msw/wx_vc15.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.25920.0
diff --git a/build/msw/wx_vc7.sln b/build/msw/wx_vc7.sln
index d1554b6b3c..4a7988c948 100644
--- a/build/msw/wx_vc7.sln
+++ b/build/msw/wx_vc7.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc7_wxregex.vcproj", "{7A1A5354-6DB4-53F1-B75C-FE909D796167}"
 EndProject
diff --git a/build/msw/wx_vc8.sln b/build/msw/wx_vc8.sln
index c5337121df..052e8057e8 100644
--- a/build/msw/wx_vc8.sln
+++ b/build/msw/wx_vc8.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc8_wxregex.vcproj", "{078F4E39-D258-54B5-B1B1-4905D10E06DC}"
diff --git a/build/msw/wx_vc9.sln b/build/msw/wx_vc9.sln
index 56f929fe3b..d5cda2e8b8 100644
--- a/build/msw/wx_vc9.sln
+++ b/build/msw/wx_vc9.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc9_wxregex.vcproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}"
diff --git a/build/msw/wx_webview.vcxproj b/build/msw/wx_webview.vcxproj
index 3312156e1d..bfb29eaab2 100644
--- a/build/msw/wx_webview.vcxproj
+++ b/build/msw/wx_webview.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_webview.vcxproj.filters b/build/msw/wx_webview.vcxproj.filters
index af106ab90b..3dda95cd8a 100644
--- a/build/msw/wx_webview.vcxproj.filters
+++ b/build/msw/wx_webview.vcxproj.filters
@@ -67,4 +67,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_wxexpat.vcxproj b/build/msw/wx_wxexpat.vcxproj
index 2ce4018a83..f3bee7331e 100644
--- a/build/msw/wx_wxexpat.vcxproj
+++ b/build/msw/wx_wxexpat.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_wxjpeg.vcxproj b/build/msw/wx_wxjpeg.vcxproj
index db732f2966..dd0fe60185 100644
--- a/build/msw/wx_wxjpeg.vcxproj
+++ b/build/msw/wx_wxjpeg.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_wxpng.vcxproj b/build/msw/wx_wxpng.vcxproj
index eaa619eaef..9aafd4b9a1 100644
--- a/build/msw/wx_wxpng.vcxproj
+++ b/build/msw/wx_wxpng.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_wxregex.vcxproj b/build/msw/wx_wxregex.vcxproj
index 06b8ec8fd6..bd78808390 100644
--- a/build/msw/wx_wxregex.vcxproj
+++ b/build/msw/wx_wxregex.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_wxregex.vcxproj.filters b/build/msw/wx_wxregex.vcxproj.filters
index 13f1956e2b..d97c011a87 100644
--- a/build/msw/wx_wxregex.vcxproj.filters
+++ b/build/msw/wx_wxregex.vcxproj.filters
@@ -32,4 +32,4 @@
       <Filter>Header Files</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_wxscintilla.vcxproj b/build/msw/wx_wxscintilla.vcxproj
index 583ce4c4bb..de98004a67 100644
--- a/build/msw/wx_wxscintilla.vcxproj
+++ b/build/msw/wx_wxscintilla.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -570,4 +570,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_wxscintilla.vcxproj.filters b/build/msw/wx_wxscintilla.vcxproj.filters
index 4cdff93676..cab9e7ec56 100644
--- a/build/msw/wx_wxscintilla.vcxproj.filters
+++ b/build/msw/wx_wxscintilla.vcxproj.filters
@@ -446,4 +446,4 @@
       <Filter>Header Files</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_wxtiff.vcxproj b/build/msw/wx_wxtiff.vcxproj
index 105736a80b..68ba078db1 100644
--- a/build/msw/wx_wxtiff.vcxproj
+++ b/build/msw/wx_wxtiff.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_wxzlib.vcxproj b/build/msw/wx_wxzlib.vcxproj
index d27b4e9761..623345f25f 100644
--- a/build/msw/wx_wxzlib.vcxproj
+++ b/build/msw/wx_wxzlib.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/build/msw/wx_wxzlib.vcxproj.filters b/build/msw/wx_wxzlib.vcxproj.filters
index 61fc76f670..0b11e022ed 100644
--- a/build/msw/wx_wxzlib.vcxproj.filters
+++ b/build/msw/wx_wxzlib.vcxproj.filters
@@ -53,4 +53,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_xml.vcxproj b/build/msw/wx_xml.vcxproj
index e9dc9c0249..82354568b4 100644
--- a/build/msw/wx_xml.vcxproj
+++ b/build/msw/wx_xml.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -494,4 +494,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_xml.vcxproj.filters b/build/msw/wx_xml.vcxproj.filters
index 294ba1105e..a7f34f24be 100644
--- a/build/msw/wx_xml.vcxproj.filters
+++ b/build/msw/wx_xml.vcxproj.filters
@@ -53,4 +53,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_xrc.vcxproj b/build/msw/wx_xrc.vcxproj
index dd66e1fd24..0087daaa72 100644
--- a/build/msw/wx_xrc.vcxproj
+++ b/build/msw/wx_xrc.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -623,4 +623,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/build/msw/wx_xrc.vcxproj.filters b/build/msw/wx_xrc.vcxproj.filters
index b0a7a7b9b7..4a20a3e0b8 100644
--- a/build/msw/wx_xrc.vcxproj.filters
+++ b/build/msw/wx_xrc.vcxproj.filters
@@ -157,9 +157,9 @@
     <ClCompile Include="..\..\src\xrc\xh_scwin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\xrc\xh_simplebook.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    <ClCompile Include="..\..\src\xrc\xh_simplebook.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\xrc\xh_sizer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -368,9 +368,9 @@
     <ClInclude Include="..\..\include\wx\xrc\xh_scwin.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\xrc\xh_simplebook.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
+    <ClInclude Include="..\..\include\wx\xrc\xh_simplebook.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\xrc\xh_sizer.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -440,4 +440,4 @@
       <Filter>MSW Headers</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/minimal/minimal_vc10.sln b/samples/minimal/minimal_vc10.sln
index e153e0c08e..a88fa9cedb 100644
--- a/samples/minimal/minimal_vc10.sln
+++ b/samples/minimal/minimal_vc10.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minimal", "minimal.vcxproj", "{853D1FD7-20AB-586C-9699-9680F84AC985}"
diff --git a/samples/minimal/minimal_vc11.sln b/samples/minimal/minimal_vc11.sln
index bd9a19cb0f..312f385249 100644
--- a/samples/minimal/minimal_vc11.sln
+++ b/samples/minimal/minimal_vc11.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minimal", "minimal.vcxproj", "{853D1FD7-20AB-586C-9699-9680F84AC985}"
diff --git a/samples/minimal/minimal_vc12.sln b/samples/minimal/minimal_vc12.sln
index b2711b4401..0fce339c92 100644
--- a/samples/minimal/minimal_vc12.sln
+++ b/samples/minimal/minimal_vc12.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0
diff --git a/samples/minimal/minimal_vc14.sln b/samples/minimal/minimal_vc14.sln
index e29d60720e..029e09d05a 100644
--- a/samples/minimal/minimal_vc14.sln
+++ b/samples/minimal/minimal_vc14.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
diff --git a/samples/minimal/minimal_vc15.sln b/samples/minimal/minimal_vc15.sln
index 6ced9306b5..d91e9873ef 100644
--- a/samples/minimal/minimal_vc15.sln
+++ b/samples/minimal/minimal_vc15.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.25920.0
diff --git a/tests/benchmarks/bench_vc7.sln b/tests/benchmarks/bench_vc7.sln
index 01e7f8a42b..63981a6ce3 100644
--- a/tests/benchmarks/bench_vc7.sln
+++ b/tests/benchmarks/bench_vc7.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc7_bench.vcproj", "{737049A0-9449-5B95-B173-0C906929CCD3}"
 EndProject
diff --git a/tests/benchmarks/bench_vc8.sln b/tests/benchmarks/bench_vc8.sln
index 226cc6641d..564fa22394 100644
--- a/tests/benchmarks/bench_vc8.sln
+++ b/tests/benchmarks/bench_vc8.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc8_bench.vcproj", "{6DD4A887-C3C2-5C7D-9C00-8A250C1856D6}"
diff --git a/tests/benchmarks/bench_vc9.sln b/tests/benchmarks/bench_vc9.sln
index 0ffd485b69..5930f48250 100644
--- a/tests/benchmarks/bench_vc9.sln
+++ b/tests/benchmarks/bench_vc9.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench", "bench_vc9_bench.vcproj", "{B5A0DEAC-4B91-5F56-9192-C86A1ED7DA2F}"
diff --git a/tests/test.vcxproj b/tests/test.vcxproj
index feb395234b..649e48a205 100644
--- a/tests/test.vcxproj
+++ b/tests/test.vcxproj
@@ -554,4 +554,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/test_gui.vcxproj b/tests/test_gui.vcxproj
index 6fb8112a6d..fdad3e3be6 100644
--- a/tests/test_gui.vcxproj
+++ b/tests/test_gui.vcxproj
@@ -562,4 +562,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/test_gui.vcxproj.filters b/tests/test_gui.vcxproj.filters
index 583050573b..169cb53ca1 100644
--- a/tests/test_gui.vcxproj.filters
+++ b/tests/test_gui.vcxproj.filters
@@ -1,296 +1,296 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="menu\accelentry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="graphics\affinematrix.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="asserthelper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="graphics\bitmap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\bitmapcomboboxtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\bitmaptogglebuttontest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\bookctrlbasetest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="graphics\boundingbox.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sizers\boxsizer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sizers\gridsizer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\buttontest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\checkboxtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\checklistboxtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\choicebooktest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\choicetest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="window\clientsize.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="events\clone.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="graphics\colour.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\comboboxtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="config\config.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\dataviewctrltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\datepickerctrltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\dialogtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dummy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="graphics\ellipsization.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="events\evtlooptest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="exec\exec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="font\fonttest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\frametest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="misc\garbage.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\gaugetest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\gridtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="misc\guifuncs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\headerctrltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\htmllboxtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="html\htmlparser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="html\htmlwindow.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\hyperlinkctrltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="image\image.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\itemcontainertest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="events\keyboard.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\label.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\listbasetest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\listbooktest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\listboxtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\listctrltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\listviewtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\markuptest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="graphics\measuring.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="menu\menu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\notebooktest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\ownerdrawncomboboxtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\pickerbasetest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\pickertest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="geometry\point.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="events\propagation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\radioboxtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\radiobuttontest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="image\rawbmp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\rearrangelisttest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="geometry\rect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="geometry\region.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\richtextctrltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="misc\safearrayconverttest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\searchctrltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="misc\selstoretest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="window\setsize.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="misc\settings.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\simplebooktest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="geometry\size.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\slidertest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="net\socket.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\spinctrldbltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\spinctrltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="test.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="testableframe.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\textctrltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\textentrytest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\togglebuttontest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\toolbooktest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="toplevel\toplevel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\treebooktest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\treectrltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\treelistctrltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="validators\valnum.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\virtlistctrltest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\webtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="controls\windowtest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sizers\wrapsizer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="xml\xrctest.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="graphics\clippingbox.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="graphics\graphmatrix.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\samples\sample.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="menu\accelentry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="graphics\affinematrix.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="asserthelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="graphics\bitmap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\bitmapcomboboxtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\bitmaptogglebuttontest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\bookctrlbasetest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="graphics\boundingbox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sizers\boxsizer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sizers\gridsizer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\buttontest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\checkboxtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\checklistboxtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\choicebooktest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\choicetest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="window\clientsize.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="events\clone.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="graphics\colour.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\comboboxtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="config\config.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\dataviewctrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\datepickerctrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\dialogtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="dummy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="graphics\ellipsization.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="events\evtlooptest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="exec\exec.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="font\fonttest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\frametest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="misc\garbage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\gaugetest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\gridtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="misc\guifuncs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\headerctrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\htmllboxtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="html\htmlparser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="html\htmlwindow.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\hyperlinkctrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="image\image.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\itemcontainertest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="events\keyboard.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\label.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\listbasetest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\listbooktest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\listboxtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\listctrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\listviewtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\markuptest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="graphics\measuring.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="menu\menu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\notebooktest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\ownerdrawncomboboxtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\pickerbasetest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\pickertest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="geometry\point.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="events\propagation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\radioboxtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\radiobuttontest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="image\rawbmp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\rearrangelisttest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="geometry\rect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="geometry\region.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\richtextctrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="misc\safearrayconverttest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\searchctrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="misc\selstoretest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="window\setsize.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="misc\settings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\simplebooktest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="geometry\size.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\slidertest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="net\socket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\spinctrldbltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\spinctrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="test.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="testableframe.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\textctrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\textentrytest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\togglebuttontest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\toolbooktest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="toplevel\toplevel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\treebooktest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\treectrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\treelistctrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="validators\valnum.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\virtlistctrltest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\webtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="controls\windowtest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sizers\wrapsizer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="xml\xrctest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="graphics\clippingbox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="graphics\graphmatrix.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\samples\sample.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/test_vc15.sln b/tests/test_vc15.sln
index a9a08d2317..27821483dd 100644
--- a/tests/test_vc15.sln
+++ b/tests/test_vc15.sln
@@ -1,4 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.25920.0
 MinimumVisualStudioVersion = 10.0.40219.1
diff --git a/utils/execmon/execmon_vc7.sln b/utils/execmon/execmon_vc7.sln
index b2839241a7..b87de82d94 100644
--- a/utils/execmon/execmon_vc7.sln
+++ b/utils/execmon/execmon_vc7.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execmon", "execmon_vc7.vcproj", "{C52B1010-5B36-55C4-90F9-F6DCD0DF1DAB}"
 EndProject
diff --git a/utils/execmon/execmon_vc8.sln b/utils/execmon/execmon_vc8.sln
index f0ca1183b3..852bbd62d8 100644
--- a/utils/execmon/execmon_vc8.sln
+++ b/utils/execmon/execmon_vc8.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execmon", "execmon_vc8.vcproj", "{77853792-0C62-5E96-A5B5-BA0F518B7572}"
diff --git a/utils/execmon/execmon_vc9.sln b/utils/execmon/execmon_vc9.sln
index 3f0d647c1e..e5ed11e5f5 100644
--- a/utils/execmon/execmon_vc9.sln
+++ b/utils/execmon/execmon_vc9.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "execmon", "execmon_vc9.vcproj", "{8AF5279F-6710-5392-A32E-993D957C55F8}"
diff --git a/utils/ifacecheck/src/ifacecheck_vc7.sln b/utils/ifacecheck/src/ifacecheck_vc7.sln
index 11aa24b474..a1303d0599 100644
--- a/utils/ifacecheck/src/ifacecheck_vc7.sln
+++ b/utils/ifacecheck/src/ifacecheck_vc7.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc7.vcproj", "{355B6651-9A8E-5D72-A3E9-DAB21650C0FC}"
 EndProject
diff --git a/utils/ifacecheck/src/ifacecheck_vc8.sln b/utils/ifacecheck/src/ifacecheck_vc8.sln
index a9891b82e7..eb9535b30b 100644
--- a/utils/ifacecheck/src/ifacecheck_vc8.sln
+++ b/utils/ifacecheck/src/ifacecheck_vc8.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc8.vcproj", "{82C85703-712C-59F7-9E08-9F8EDE5D9DDF}"
diff --git a/utils/ifacecheck/src/ifacecheck_vc9.sln b/utils/ifacecheck/src/ifacecheck_vc9.sln
index 4c83dfdc9a..c9ade910ea 100644
--- a/utils/ifacecheck/src/ifacecheck_vc9.sln
+++ b/utils/ifacecheck/src/ifacecheck_vc9.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifacecheck", "ifacecheck_vc9.vcproj", "{C15BEEE5-A7F4-59AF-88F0-B9C94DFA8EAA}"
diff --git a/utils/screenshotgen/src/screenshotgen_vc7.sln b/utils/screenshotgen/src/screenshotgen_vc7.sln
index 23192e80f1..49b7a098da 100644
--- a/utils/screenshotgen/src/screenshotgen_vc7.sln
+++ b/utils/screenshotgen/src/screenshotgen_vc7.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshotgen_vc7.vcproj", "{65A1C4C8-E1D5-5972-8550-0F5631031FBB}"
 EndProject
diff --git a/utils/screenshotgen/src/screenshotgen_vc8.sln b/utils/screenshotgen/src/screenshotgen_vc8.sln
index cffabc4ab7..6babb1d418 100644
--- a/utils/screenshotgen/src/screenshotgen_vc8.sln
+++ b/utils/screenshotgen/src/screenshotgen_vc8.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshotgen_vc8.vcproj", "{D36F115C-330D-5EAE-B66F-885D6BE20540}"
diff --git a/utils/screenshotgen/src/screenshotgen_vc9.sln b/utils/screenshotgen/src/screenshotgen_vc9.sln
index 7ccd9d4584..583ccd5715 100644
--- a/utils/screenshotgen/src/screenshotgen_vc9.sln
+++ b/utils/screenshotgen/src/screenshotgen_vc9.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshotgen", "screenshotgen_vc9.vcproj", "{820F5E3E-095B-580D-AE31-7E492C647B90}"