diff --git a/Solutions/Clienttelemetry/Clienttelemetry.vcxitems b/Solutions/Clienttelemetry/Clienttelemetry.vcxitems
index 4ed829608..065ca3118 100644
--- a/Solutions/Clienttelemetry/Clienttelemetry.vcxitems
+++ b/Solutions/Clienttelemetry/Clienttelemetry.vcxitems
@@ -87,7 +87,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\CompactBinaryProtocolWriter.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\BondConstTypes.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_readers.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_types.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_writers.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\compression\HttpDeflateCompression.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\config\RuntimeConfig_Default.hpp" />
@@ -116,7 +115,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IPropertyChangedCallback.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\ISystemInformation.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\oacr.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\TransmitProfiles.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CommonFields.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CompliantByDefaultFilterApi.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CsProtocol_types.hpp" />
@@ -159,7 +157,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\Version.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\ClockSkewManager.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\ISqlite3Proxy.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\IStorage.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\KillSwitchManager.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\LogSessionDataProvider.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\MemoryStorage.hpp" />
diff --git a/Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters b/Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters
index 87a11c450..376e1dfba 100644
--- a/Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters
+++ b/Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters
@@ -72,7 +72,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\CompactBinaryProtocolWriter.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\BondConstTypes.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_readers.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_types.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_writers.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\compression\HttpDeflateCompression.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\config\RuntimeConfig_Default.hpp" />
@@ -101,7 +100,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IPropertyChangedCallback.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\ISystemInformation.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\oacr.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\TransmitProfiles.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CommonFields.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CompliantByDefaultFilterApi.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CsProtocol_types.hpp" />
@@ -124,8 +122,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\IEventFilterCollection.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\ILogManager.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\IOfflineStorage.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\IDataViewer.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\IDataViewerCollection.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\IHttpClient.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\ILogConfiguration.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\ILogger.hpp" />
@@ -146,7 +142,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\Version.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\ClockSkewManager.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\ISqlite3Proxy.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\IStorage.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\KillSwitchManager.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\LogSessionDataProvider.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\offline\MemoryStorage.hpp" />
diff --git a/examples/cpp/EventSender/EventSender.vcxproj b/examples/cpp/EventSender/EventSender.vcxproj
index 73899d2e5..50332eda6 100644
--- a/examples/cpp/EventSender/EventSender.vcxproj
+++ b/examples/cpp/EventSender/EventSender.vcxproj
@@ -200,10 +200,10 @@
     <ClCompile Include="EventSender.cpp" />
   </ItemGroup>
   <ItemGroup Condition="$(Configuration.Contains('static'))">
-    <ProjectReference Include="..\..\Solutions\win32-lib\win32-lib.vcxproj">
+    <ProjectReference Include="..\..\..\Solutions\win32-lib\win32-lib.vcxproj">
       <Project>{1DC6B38A-B390-34CE-907F-4958807A3D42}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\sqlite\sqlite.vcxproj">
+    <ProjectReference Include="..\..\..\sqlite\sqlite.vcxproj">
       <Project>{2ebc7b3c-2af1-442c-9285-cab39bbb8c00}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\..\third_party\Solutions\zlib\vc14\zlibvc.vcxproj">
diff --git a/examples/cpp/EventSender/EventSender.vcxproj.filters b/examples/cpp/EventSender/EventSender.vcxproj.filters
index f5b9ccda5..3eed0873f 100644
--- a/examples/cpp/EventSender/EventSender.vcxproj.filters
+++ b/examples/cpp/EventSender/EventSender.vcxproj.filters
@@ -19,99 +19,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="deploy-dll.cmd" />
-    <None Include="include\Version.hpp.template">
-      <Filter>Header Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="include\AggregatedMetric.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\mat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\CAPIClient.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\CorrelationVector.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\ctmacros.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\DebugEvents.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Enums.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\EventProperties.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\EventProperty.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\IAFDClient.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\IAuthTokensController.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\IBandwidthController.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\IECSClient.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\IHttpClient.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\ILogConfiguration.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\ILogger.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\ILogManager.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\ISemanticContext.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\LogConfiguration.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\LogManager.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\LogManagerBase.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\LogManagerProvider.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\LogSessionData.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\NullObjects.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\TransmitProfiles.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Variant.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\VariantType.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Version.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/examples/cpp/SampleCpp/SampleCpp.vcxproj b/examples/cpp/SampleCpp/SampleCpp.vcxproj
index 417568222..9c539f10a 100644
--- a/examples/cpp/SampleCpp/SampleCpp.vcxproj
+++ b/examples/cpp/SampleCpp/SampleCpp.vcxproj
@@ -1093,10 +1093,10 @@
     <None Include="deploy-dll.cmd" />
   </ItemGroup>
   <ItemGroup Condition="$(Configuration.Contains('static'))">
-    <ProjectReference Include="..\..\Solutions\win32-lib\win32-lib.vcxproj">
+    <ProjectReference Include="..\..\..\Solutions\win32-lib\win32-lib.vcxproj">
       <Project>{1DC6B38A-B390-34CE-907F-4958807A3D42}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\sqlite\sqlite.vcxproj">
+    <ProjectReference Include="..\..\..\sqlite\sqlite.vcxproj">
       <Project>{2ebc7b3c-2af1-442c-9285-cab39bbb8c00}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\..\third_party\Solutions\zlib\vc14\zlibvc.vcxproj">
diff --git a/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj b/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj
index 0f493a588..a55fbf088 100644
--- a/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj
+++ b/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj
@@ -281,7 +281,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="TestApp.pfx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Solutions\win10-dll\win10-dll.vcxproj">
diff --git a/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj.filters b/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj.filters
index 6aa826060..98247e7a6 100644
--- a/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj.filters
+++ b/examples/cpp/SampleCppUWP/SampleCppUWP.vcxproj.filters
@@ -46,6 +46,5 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="TestApp.pfx" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/lib/tracing/api/tracing-api.vcxitems b/lib/tracing/api/tracing-api.vcxitems
index e8d272545..173f7cccd 100644
--- a/lib/tracing/api/tracing-api.vcxitems
+++ b/lib/tracing/api/tracing-api.vcxitems
@@ -16,7 +16,7 @@
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)DebugLogger.hpp" />
     <ClInclude Include="$(MSBuildThisFileDirectory)DebugProviders.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)/../../../../third_party/sha1/sha1.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)/../../../third_party/sha1/sha1.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)sha1-wincrypt.hpp" />
   </ItemGroup>
   <ItemGroup>
@@ -24,7 +24,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(MSBuildThisFileDirectory)sha1-wincrypt.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)/../../../../third_party/sha1/sha1.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)/../../../third_party/sha1/sha1.c">
       <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
   </ItemGroup>
diff --git a/tests/functests/FuncTests.vcxproj.filters b/tests/functests/FuncTests.vcxproj.filters
index 22f2ac5d9..50dd37f27 100644
--- a/tests/functests/FuncTests.vcxproj.filters
+++ b/tests/functests/FuncTests.vcxproj.filters
@@ -22,7 +22,7 @@
     <ClCompile Include="$(ProjectDir)..\..\lib\modules\dataviewer\tests\functests\DefaultDataViewerFuncTests.cpp" />
     <ClCompile Include="$(ProjectDir)..\..\lib\modules\privacyguard\tests\functests\PrivacyGuardFuncTests.cpp" />
     <ClCompile Include="$(ProjectDir)..\..\lib\modules\liveeventinspector\tests\functests\LiveEventInspectorFuncTests.cpp" />
-    <ClCompile Include="..\..\lib\modules\signals\tests\functests\SignalsFuncTests.cpp" />
+    <ClCompile Include="$(ProjectDir)..\..\lib\modules\signals\tests\functests\SignalsFuncTests.cpp" />
     <ClCompile Include="$(ProjectDir)..\..\lib\modules\sanitizer\tests\functests\SanitizerFuncTests.cpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/googletest/googletest/msvc/gtest.vcxproj.filters b/tests/googletest/googletest/msvc/gtest.vcxproj.filters
index b566f891e..8d58a27b2 100644
--- a/tests/googletest/googletest/msvc/gtest.vcxproj.filters
+++ b/tests/googletest/googletest/msvc/gtest.vcxproj.filters
@@ -11,7 +11,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\gtest-all.cc">
+    <ClCompile Include="..\..\..\..\third_party\googletest\googletest\src\gtest-all.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/third_party/Solutions/zlib/vc14/zlibvc.vcxproj b/third_party/Solutions/zlib/vc14/zlibvc.vcxproj
index 9ac005ede..aeefce9d0 100644
--- a/third_party/Solutions/zlib/vc14/zlibvc.vcxproj
+++ b/third_party/Solutions/zlib/vc14/zlibvc.vcxproj
@@ -1199,11 +1199,8 @@ bld_ml64.bat</Command>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\zlib\deflate.h" />
-    <ClInclude Include="..\..\..\..\zlib\infblock.h" />
-    <ClInclude Include="..\..\..\..\zlib\infcodes.h" />
     <ClInclude Include="..\..\..\..\zlib\inffast.h" />
     <ClInclude Include="..\..\..\..\zlib\inftrees.h" />
-    <ClInclude Include="..\..\..\..\zlib\infutil.h" />
     <ClInclude Include="..\..\..\..\zlib\zconf.h" />
     <ClInclude Include="..\..\..\..\zlib\zlib.h" />
     <ClInclude Include="..\..\..\..\zlib\zutil.h" />
diff --git a/tools/ports/mstelemetry/v142-build.patch b/tools/ports/mstelemetry/v142-build.patch
index 35cd0ec8e..814418819 100644
--- a/tools/ports/mstelemetry/v142-build.patch
+++ b/tools/ports/mstelemetry/v142-build.patch
@@ -5687,11 +5687,8 @@ index 5ff55579..77518e48 100644
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\..\deflate.h" />
-+    <ClInclude Include="..\..\..\infblock.h" />
-+    <ClInclude Include="..\..\..\infcodes.h" />
 +    <ClInclude Include="..\..\..\inffast.h" />
 +    <ClInclude Include="..\..\..\inftrees.h" />
-+    <ClInclude Include="..\..\..\infutil.h" />
 +    <ClInclude Include="..\..\..\zconf.h" />
 +    <ClInclude Include="..\..\..\zlib.h" />
 +    <ClInclude Include="..\..\..\zutil.h" />