diff --git a/cpp/IEDriverServer.sln b/cpp/IEDriverServer.sln
index 2b012b46d3bd3..9f6a0d8342085 100644
--- a/cpp/IEDriverServer.sln
+++ b/cpp/IEDriverServer.sln
@@ -1,17 +1,17 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "civetweb", "..\third_party\cpp\civetweb\civetweb.vcxproj", "{19517B2F-334D-4F39-BEA7-E5D044AD78AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "civetweb", "..\third_party\cpp\civetweb\civetweb.vcxproj", "{19417464-5B84-45FE-BE6B-7A01D4B8D412}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-cpp", "..\third_party\cpp\json-cpp\json-cpp.vcxproj", "{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-cpp", "..\third_party\cpp\json-cpp\json-cpp.vcxproj", "{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-server", "webdriver-server\webdriver-server.vcxproj", "{4E509D48-78BF-44FE-84D4-117AFDCD3788}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-server", "webdriver-server\webdriver-server.vcxproj", "{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriver", "iedriver\IEDriver.vcxproj", "{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriver", "iedriver\IEDriver.vcxproj", "{0B34D228-8584-4589-B4BF-96182E86638D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriverServer", "IEDriverServer\IEDriverServer.vcxproj", "{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriverServer", "iedriverserver\IEDriverServer.vcxproj", "{D419FE07-1F4C-457C-952C-9492854F7C36}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,46 +21,46 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Debug|x64.ActiveCfg = Debug|x64
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Debug|x64.Build.0 = Debug|x64
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Debug|x86.ActiveCfg = Debug|Win32
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Debug|x86.Build.0 = Debug|Win32
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Release|x64.ActiveCfg = Release|x64
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Release|x64.Build.0 = Release|x64
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Release|x86.ActiveCfg = Release|Win32
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Release|x86.Build.0 = Release|Win32
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Debug|x64.ActiveCfg = Debug|x64
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Debug|x64.Build.0 = Debug|x64
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Debug|x86.ActiveCfg = Debug|Win32
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Debug|x86.Build.0 = Debug|Win32
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Release|x64.ActiveCfg = Release|x64
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Release|x64.Build.0 = Release|x64
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Release|x86.ActiveCfg = Release|Win32
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Release|x86.Build.0 = Release|Win32
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Debug|x64.ActiveCfg = Debug|x64
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Debug|x64.Build.0 = Debug|x64
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Debug|x86.ActiveCfg = Debug|Win32
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Debug|x86.Build.0 = Debug|Win32
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Release|x64.ActiveCfg = Release|x64
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Release|x64.Build.0 = Release|x64
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Release|x86.ActiveCfg = Release|Win32
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Release|x86.Build.0 = Release|Win32
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Debug|x64.ActiveCfg = Debug|x64
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Debug|x64.Build.0 = Debug|x64
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Debug|x86.ActiveCfg = Debug|Win32
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Debug|x86.Build.0 = Debug|Win32
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Release|x64.ActiveCfg = Release|x64
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Release|x64.Build.0 = Release|x64
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Release|x86.ActiveCfg = Release|Win32
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Release|x86.Build.0 = Release|Win32
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Debug|x64.ActiveCfg = Debug|x64
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Debug|x64.Build.0 = Debug|x64
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Debug|x86.ActiveCfg = Debug|Win32
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Debug|x86.Build.0 = Debug|Win32
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Release|x64.ActiveCfg = Release|x64
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Release|x64.Build.0 = Release|x64
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Release|x86.ActiveCfg = Release|Win32
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Release|x86.Build.0 = Release|Win32
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Debug|x64.ActiveCfg = Debug|x64
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Debug|x64.Build.0 = Debug|x64
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Debug|x86.ActiveCfg = Debug|Win32
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Debug|x86.Build.0 = Debug|Win32
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Release|x64.ActiveCfg = Release|x64
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Release|x64.Build.0 = Release|x64
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Release|x86.ActiveCfg = Release|Win32
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Release|x86.Build.0 = Release|Win32
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Debug|x64.ActiveCfg = Debug|x64
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Debug|x64.Build.0 = Debug|x64
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Debug|x86.ActiveCfg = Debug|Win32
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Debug|x86.Build.0 = Debug|Win32
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Release|x64.ActiveCfg = Release|x64
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Release|x64.Build.0 = Release|x64
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Release|x86.ActiveCfg = Release|Win32
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Release|x86.Build.0 = Release|Win32
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Debug|x64.ActiveCfg = Debug|x64
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Debug|x64.Build.0 = Debug|x64
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Debug|x86.ActiveCfg = Debug|Win32
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Debug|x86.Build.0 = Debug|Win32
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Release|x64.ActiveCfg = Release|x64
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Release|x64.Build.0 = Release|x64
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Release|x86.ActiveCfg = Release|Win32
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Release|x86.Build.0 = Release|Win32
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Debug|x64.ActiveCfg = Debug|x64
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Debug|x64.Build.0 = Debug|x64
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Debug|x86.ActiveCfg = Debug|Win32
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Debug|x86.Build.0 = Debug|Win32
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Release|x64.ActiveCfg = Release|x64
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Release|x64.Build.0 = Release|x64
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Release|x86.ActiveCfg = Release|Win32
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Release|x86.Build.0 = Release|Win32
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Debug|x64.ActiveCfg = Debug|x64
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Debug|x64.Build.0 = Debug|x64
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Debug|x86.ActiveCfg = Debug|Win32
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Debug|x86.Build.0 = Debug|Win32
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Release|x64.ActiveCfg = Release|x64
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Release|x64.Build.0 = Release|x64
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Release|x86.ActiveCfg = Release|Win32
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/cpp/iedriver/IEDriver.vcxproj b/cpp/iedriver/IEDriver.vcxproj
index ea9f0be3ab45a..6c23a9718b2ec 100644
--- a/cpp/iedriver/IEDriver.vcxproj
+++ b/cpp/iedriver/IEDriver.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,34 +19,35 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}</ProjectGuid>
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{0B34D228-8584-4589-B4BF-96182E86638D}</ProjectGuid>
     <RootNamespace>IEDriver</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -90,11 +91,11 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\iewebdriverheader;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;version.lib;iepmapi.lib;psapi.lib;oleacc.lib;comsuppw.lib;wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -108,11 +109,11 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\iewebdriverheader;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;version.lib;iepmapi.lib;psapi.lib;oleacc.lib;comsuppw.lib;wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -127,11 +128,11 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\iewebdriverheader;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -148,11 +149,11 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\iewebdriverheader;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -344,7 +345,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\webdriver-server\webdriver-server.vcxproj">
-      <Project>{4e509d48-78bf-44fe-84d4-117afdcd3788}</Project>
+      <Project>{d1b7e5b4-2caf-4c55-89e0-2634038c8472}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/cpp/iedriver/IEDriver.vcxproj.filters b/cpp/iedriver/IEDriver.vcxproj.filters
index 754b027edc740..91e22329db369 100644
--- a/cpp/iedriver/IEDriver.vcxproj.filters
+++ b/cpp/iedriver/IEDriver.vcxproj.filters
@@ -9,14 +9,15 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Header Files\CommandHandlers">
-      <UniqueIdentifier>{83d14930-5df5-434a-94d2-650be5a82ae4}</UniqueIdentifier>
+    <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;mfcribbon-ms</Extensions>
     </Filter>
     <Filter Include="Header Files\Generated">
-      <UniqueIdentifier>{1fbb1843-fa98-491a-bcea-4fe6868c3b11}</UniqueIdentifier>
+      <UniqueIdentifier>{64aee133-4df1-4019-89da-7f58b4ae915a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\CommandHandlers">
-      <UniqueIdentifier>{a5181e1f-fef9-46b3-bcdb-81ff5fd8f03b}</UniqueIdentifier>
+    <Filter Include="Header Files\CommandHandlers">
+      <UniqueIdentifier>{6a030b34-e684-4696-91d8-8a62c8e4bf56}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -105,160 +106,160 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\AcceptAlertCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
+    </ClCompile>
+    <ClCompile Include="CommandHandlers\ActionsCommandHandler.cpp">
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\AddCookieCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\ClearElementCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\ClickElementCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\CloseWindowCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\DeleteAllCookiesCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\DeleteCookieCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\DismissAlertCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\ElementEqualsCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\ExecuteAsyncScriptCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\ExecuteScriptCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\FindChildElementCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\FindChildElementsCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\FindElementCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\FindElementsCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetActiveElementCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetAlertTextCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetAllCookiesCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetAllWindowHandlesCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetCurrentUrlCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetCurrentWindowHandleCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetElementAttributeCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
+    </ClCompile>
+    <ClCompile Include="CommandHandlers\GetElementRectCommandHandler.cpp">
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetElementTagNameCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetElementTextCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetElementValueOfCssPropertyCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetPageSourceCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetSessionCapabilitiesCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
+    </ClCompile>
+    <ClCompile Include="CommandHandlers\GetTimeoutsCommandHandler.cpp">
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GetTitleCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
+    </ClCompile>
+    <ClCompile Include="CommandHandlers\GetWindowRectCommandHandler.cpp">
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GoBackCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GoForwardCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\GoToUrlCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\IsElementDisplayedCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\IsElementEnabledCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\IsElementSelectedCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\MaximizeWindowCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\NewSessionCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\QuitCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\RefreshCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
+    </ClCompile>
+    <ClCompile Include="CommandHandlers\ReleaseActionsCommandHandler.cpp">
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\ScreenshotCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\SendKeysCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\SendKeysToAlertCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\SetAlertCredentialsCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
-    </ClCompile>
-    <ClCompile Include="CommandHandlers\SwitchToFrameCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
-    </ClCompile>
-    <ClCompile Include="CommandHandlers\SwitchToParentFrameCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
-    </ClCompile>
-    <ClCompile Include="CommandHandlers\SwitchToWindowCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
-    </ClCompile>
-    <ClCompile Include="CommandHandlers\GetTimeoutsCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\SetTimeoutsCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
     <ClCompile Include="CommandHandlers\SetWindowRectCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
-    </ClCompile>
-    <ClCompile Include="CommandHandlers\GetWindowRectCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
-    <ClCompile Include="CommandHandlers\GetElementRectCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+    <ClCompile Include="CommandHandlers\SwitchToFrameCommandHandler.cpp">
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
-    <ClCompile Include="CommandHandlers\ActionsCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+    <ClCompile Include="CommandHandlers\SwitchToParentFrameCommandHandler.cpp">
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
-    <ClCompile Include="CommandHandlers\ReleaseActionsCommandHandler.cpp">
-      <Filter>Source Files\CommandHandlers</Filter>
+    <ClCompile Include="CommandHandlers\SwitchToWindowCommandHandler.cpp">
+      <Filter>Header Files\CommandHandlers</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -286,6 +287,9 @@
     <ClInclude Include="CookieManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="CustomTypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="DocumentHost.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -298,6 +302,9 @@
     <ClInclude Include="ElementRepository.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ElementScrollBehavior.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="FileUtilities.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -358,15 +365,12 @@
     <ClInclude Include="WindowUtilities.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Generated\atoms.h">
-      <Filter>Header Files\Generated</Filter>
-    </ClInclude>
-    <ClInclude Include="Generated\sizzle.h">
-      <Filter>Header Files\Generated</Filter>
-    </ClInclude>
     <ClInclude Include="CommandHandlers\AcceptAlertCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
+    <ClInclude Include="CommandHandlers\ActionsCommandHandler.h">
+      <Filter>Header Files\CommandHandlers</Filter>
+    </ClInclude>
     <ClInclude Include="CommandHandlers\AddCookieCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
@@ -430,6 +434,9 @@
     <ClInclude Include="CommandHandlers\GetElementAttributeCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
+    <ClInclude Include="CommandHandlers\GetElementRectCommandHandler.h">
+      <Filter>Header Files\CommandHandlers</Filter>
+    </ClInclude>
     <ClInclude Include="CommandHandlers\GetElementTagNameCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
@@ -445,9 +452,15 @@
     <ClInclude Include="CommandHandlers\GetSessionCapabilitiesCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
+    <ClInclude Include="CommandHandlers\GetTimeoutsCommandHandler.h">
+      <Filter>Header Files\CommandHandlers</Filter>
+    </ClInclude>
     <ClInclude Include="CommandHandlers\GetTitleCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
+    <ClInclude Include="CommandHandlers\GetWindowRectCommandHandler.h">
+      <Filter>Header Files\CommandHandlers</Filter>
+    </ClInclude>
     <ClInclude Include="CommandHandlers\GoBackCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
@@ -478,6 +491,9 @@
     <ClInclude Include="CommandHandlers\RefreshCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
+    <ClInclude Include="CommandHandlers\ReleaseActionsCommandHandler.h">
+      <Filter>Header Files\CommandHandlers</Filter>
+    </ClInclude>
     <ClInclude Include="CommandHandlers\ScreenshotCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
@@ -490,41 +506,26 @@
     <ClInclude Include="CommandHandlers\SetAlertCredentialsCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
-    <ClInclude Include="CommandHandlers\SwitchToFrameCommandHandler.h">
-      <Filter>Header Files\CommandHandlers</Filter>
-    </ClInclude>
-    <ClInclude Include="CommandHandlers\SwitchToParentFrameCommandHandler.h">
-      <Filter>Header Files\CommandHandlers</Filter>
-    </ClInclude>
-    <ClInclude Include="CommandHandlers\SwitchToWindowCommandHandler.h">
-      <Filter>Header Files\CommandHandlers</Filter>
-    </ClInclude>
-    <ClInclude Include="CustomTypes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="ElementScrollBehavior.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CommandHandlers\GetTimeoutsCommandHandler.h">
-      <Filter>Header Files\CommandHandlers</Filter>
-    </ClInclude>
     <ClInclude Include="CommandHandlers\SetTimeoutsCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
     <ClInclude Include="CommandHandlers\SetWindowRectCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
-    <ClInclude Include="CommandHandlers\GetWindowRectCommandHandler.h">
+    <ClInclude Include="CommandHandlers\SwitchToFrameCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
-    <ClInclude Include="CommandHandlers\GetElementRectCommandHandler.h">
+    <ClInclude Include="CommandHandlers\SwitchToParentFrameCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
-    <ClInclude Include="CommandHandlers\ActionsCommandHandler.h">
+    <ClInclude Include="CommandHandlers\SwitchToWindowCommandHandler.h">
       <Filter>Header Files\CommandHandlers</Filter>
     </ClInclude>
-    <ClInclude Include="CommandHandlers\ReleaseActionsCommandHandler.h">
-      <Filter>Header Files\CommandHandlers</Filter>
+    <ClInclude Include="Generated\atoms.h">
+      <Filter>Header Files\Generated</Filter>
+    </ClInclude>
+    <ClInclude Include="Generated\sizzle.h">
+      <Filter>Header Files\Generated</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/cpp/iedriverserver/IEDriverServer.vcxproj b/cpp/iedriverserver/IEDriverServer.vcxproj
index a1ce433c388f7..2360a76d192c8 100644
--- a/cpp/iedriverserver/IEDriverServer.vcxproj
+++ b/cpp/iedriverserver/IEDriverServer.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,34 +19,35 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}</ProjectGuid>
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{D419FE07-1F4C-457C-952C-9492854F7C36}</ProjectGuid>
     <RootNamespace>IEDriverServer</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -90,14 +91,14 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
+      <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
       <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -106,14 +107,14 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
+      <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
       <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -124,16 +125,16 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
+      <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
       <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -144,16 +145,16 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(ProjectDir)..\IEDriver;$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
+      <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
       <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -182,7 +183,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\iedriver\IEDriver.vcxproj">
-      <Project>{b6a4f828-e503-4c94-9ebd-0b1e9246e18d}</Project>
+      <Project>{0b34d228-8584-4589-b4bf-96182e86638d}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/cpp/webdriver-server/webdriver-server.vcxproj b/cpp/webdriver-server/webdriver-server.vcxproj
index b53c4764410f4..06b4ac7bcee5f 100644
--- a/cpp/webdriver-server/webdriver-server.vcxproj
+++ b/cpp/webdriver-server/webdriver-server.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,34 +19,35 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{4E509D48-78BF-44FE-84D4-117AFDCD3788}</ProjectGuid>
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}</ProjectGuid>
     <RootNamespace>webdriverserver</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -90,10 +91,10 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderFile>precompile.h</PrecompiledHeaderFile>
       <ForcedIncludeFiles>precompile.h</ForcedIncludeFiles>
+      <PrecompiledHeaderFile>precompile.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -102,10 +103,10 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderFile>precompile.h</PrecompiledHeaderFile>
       <ForcedIncludeFiles>precompile.h</ForcedIncludeFiles>
+      <PrecompiledHeaderFile>precompile.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -116,10 +117,10 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeaderFile>precompile.h</PrecompiledHeaderFile>
       <ForcedIncludeFiles>precompile.h</ForcedIncludeFiles>
+      <PrecompiledHeaderFile>precompile.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -134,16 +135,23 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeaderFile>precompile.h</PrecompiledHeaderFile>
       <ForcedIncludeFiles>precompile.h</ForcedIncludeFiles>
+      <PrecompiledHeaderFile>precompile.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="command.cc" />
+    <ClCompile Include="precompile.cc" />
+    <ClCompile Include="response.cc" />
+    <ClCompile Include="server.cc" />
+    <ClCompile Include="uri_info.cc" />
+  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="command.h" />
     <ClInclude Include="command_handler.h" />
@@ -157,18 +165,12 @@
     <ClInclude Include="session.h" />
     <ClInclude Include="uri_info.h" />
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="command.cc" />
-    <ClCompile Include="response.cc" />
-    <ClCompile Include="server.cc" />
-    <ClCompile Include="uri_info.cc" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\third_party\cpp\civetweb\civetweb.vcxproj">
-      <Project>{19517b2f-334d-4f39-bea7-e5d044ad78af}</Project>
+      <Project>{19417464-5b84-45fe-be6b-7a01d4b8d412}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\third_party\cpp\json-cpp\json-cpp.vcxproj">
-      <Project>{64edf9a1-3c2c-489d-ac94-dad0e55eca88}</Project>
+      <Project>{e526fab4-5cb3-4737-89d2-6cc88aa83b5b}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/cpp/webdriver-server/webdriver-server.vcxproj.filters b/cpp/webdriver-server/webdriver-server.vcxproj.filters
index 178e02c7637db..d8c57b8fdd2db 100644
--- a/cpp/webdriver-server/webdriver-server.vcxproj.filters
+++ b/cpp/webdriver-server/webdriver-server.vcxproj.filters
@@ -9,54 +9,61 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</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;mfcribbon-ms</Extensions>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="uri_info.h">
+    <ClCompile Include="command.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="precompile.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="response.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="server.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="uri_info.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="command.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="session.h">
+    <ClInclude Include="command_handler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="server.h">
+    <ClInclude Include="command_types.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="response.h">
+    <ClInclude Include="errorcodes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="precompile.h">
+    <ClInclude Include="keycodes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="logging.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="keycodes.h">
+    <ClInclude Include="precompile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="errorcodes.h">
+    <ClInclude Include="response.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="command_types.h">
+    <ClInclude Include="server.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="command_handler.h">
+    <ClInclude Include="session.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="command.h">
+    <ClInclude Include="uri_info.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="uri_info.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="server.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="response.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="command.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/third_party/cpp/civetweb/civetweb.vcxproj b/third_party/cpp/civetweb/civetweb.vcxproj
index 8815ce38ff2ac..6162dae9a1baa 100644
--- a/third_party/cpp/civetweb/civetweb.vcxproj
+++ b/third_party/cpp/civetweb/civetweb.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,34 +19,35 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{19517B2F-334D-4F39-BEA7-E5D044AD78AF}</ProjectGuid>
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{19417464-5B84-45FE-BE6B-7A01D4B8D412}</ProjectGuid>
     <RootNamespace>civetweb</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -72,15 +73,15 @@
     <OutDir>$(ProjectDir)..\..\..\build\cpp\lib\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\..\build\cpp\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)..\..\..\build\cpp\lib\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\..\build\cpp\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(ProjectDir)..\..\..\build\cpp\lib\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\..\build\cpp\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(ProjectDir)..\..\..\build\cpp\lib\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\..\build\cpp\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -133,10 +134,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="civetweb.h" />
+    <ClCompile Include="civetweb.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="civetweb.c" />
+    <ClInclude Include="civetweb.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="ReadMe.txt" />
diff --git a/third_party/cpp/civetweb/civetweb.vcxproj.filters b/third_party/cpp/civetweb/civetweb.vcxproj.filters
index 4d17c95e5e4e8..f9d9510225220 100644
--- a/third_party/cpp/civetweb/civetweb.vcxproj.filters
+++ b/third_party/cpp/civetweb/civetweb.vcxproj.filters
@@ -9,17 +9,21 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="civetweb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
+    <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;mfcribbon-ms</Extensions>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="civetweb.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="civetweb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
   <ItemGroup>
     <Text Include="ReadMe.txt" />
   </ItemGroup>
diff --git a/third_party/cpp/json-cpp/json-cpp.vcxproj b/third_party/cpp/json-cpp/json-cpp.vcxproj
index 936c1ece6f213..646a36ca7bbe6 100644
--- a/third_party/cpp/json-cpp/json-cpp.vcxproj
+++ b/third_party/cpp/json-cpp/json-cpp.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,34 +19,36 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}</ProjectGuid>
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}</ProjectGuid>
     <RootNamespace>jsoncpp</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -71,15 +73,15 @@
     <OutDir>$(ProjectDir)..\..\..\build\cpp\lib\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\..\build\cpp\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)..\..\..\build\cpp\lib\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\..\build\cpp\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(ProjectDir)..\..\..\build\cpp\lib\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\..\build\cpp\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(ProjectDir)..\..\..\build\cpp\lib\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)..\..\..\build\cpp\intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -88,9 +90,9 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(ProjectDir)\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -98,9 +100,9 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(ProjectDir)\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -110,9 +112,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(ProjectDir)\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -126,9 +128,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>$(ProjectDir)\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/third_party/cpp/json-cpp/json-cpp.vcxproj.filters b/third_party/cpp/json-cpp/json-cpp.vcxproj.filters
index 407807642e847..c98cb5d63ce0b 100644
--- a/third_party/cpp/json-cpp/json-cpp.vcxproj.filters
+++ b/third_party/cpp/json-cpp/json-cpp.vcxproj.filters
@@ -9,6 +9,10 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</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;mfcribbon-ms</Extensions>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\json\json.h">