From 975d820a75e2a4cb1c73d375260770f922fd6e50 Mon Sep 17 00:00:00 2001
From: lateralusX <lateralusx.github@gmail.com>
Date: Thu, 28 Sep 2017 13:41:49 +0200
Subject: [PATCH] Align libmonoruntime vcxproj with makefile.

---
 msvc/libmonoruntime-common.targets         | 251 ++++----
 msvc/libmonoruntime-common.targets.filters | 663 ++++++++++-----------
 msvc/libmonoruntime-posix.targets          |  28 +-
 msvc/libmonoruntime-posix.targets.filters  |  34 +-
 msvc/libmonoruntime-win32.targets          |  24 +-
 msvc/libmonoruntime-win32.targets.filters  |  60 +-
 6 files changed, 520 insertions(+), 540 deletions(-)

diff --git a/msvc/libmonoruntime-common.targets b/msvc/libmonoruntime-common.targets
index 20e704b937a..69f10227f6b 100644
--- a/msvc/libmonoruntime-common.targets
+++ b/msvc/libmonoruntime-common.targets
@@ -2,76 +2,162 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="common_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\appdomain.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\domain.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain-icalls.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\assembly.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\assembly-internals.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\attach.h" />    
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\attach.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cil-coff.h" />    
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-internals.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-inlines.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class-accessors.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\cominterop.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-io.h" />    
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\coree.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\custom-attrs.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree-internals.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info-tables.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-helpers.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-mono-ppdb.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-ppdb.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-mono-ppdb.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\decimal-ms.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\domain.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\dynamic-image.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\dynamic-stream.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\decimal-ms.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\domain-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\environment.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\exception.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\fdhandle.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-posix.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-windows.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\exception-internals.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\filewatcher.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\handle.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\filewatcher.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\gc-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\icall.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-internals.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-def.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\image.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\image-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\jit-info.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\loader.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\locales.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\locales.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\lock-tracer.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\lock-tracer.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\marshal.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mempool.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mempool.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mempool-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-cross-helpers.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-verify.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\metadata-internals.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\method-builder.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\method-builder.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-config.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-debug.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-internals.h" />    
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-endian.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-endian.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-hash.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-mlist.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-mlist.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters-def.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-ptr-array.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-route.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-security.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-route.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\monitor.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\normalization-tables.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\number-formatter.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\number-ms.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\number-ms.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\object.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\opcodes.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\profiler.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\property-bag.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\property-bag.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32socket.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32socket-internals.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-internals.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\profiler.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\profiler-private.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\rand.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\rand.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\reflection.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\remoting.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\remoting.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\runtime.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-security.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\security-core-clr.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security-core-clr.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\security-manager.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-encode.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-save.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security-manager.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\string-icalls.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\string-icalls.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sysmath.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sysmath.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\tabledefs.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threads.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threads-types.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool-io.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool-worker-default.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threads.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool-worker.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool-io.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool-io.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\verify.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32handle.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\verify-internals.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\wrapper-types.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\dynamic-image-internals.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\dynamic-stream.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\dynamic-stream-internals.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-cache.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\custom-attrs-internals.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sre-internals.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-internals.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-posix.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-windows.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\file-mmap.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object-offsets.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\abi-details.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-cross-helpers.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\handle.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\handle.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32mutex.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32semaphore.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32event.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32handle-namespace.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32handle-namespace.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32handle.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32handle.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32error.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\reflection.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\dynamic-image.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-encode.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-save.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\custom-attrs.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\fdhandle.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\fdhandle.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\runtime.h" />
   </ItemGroup>
   <ItemGroup Label="config_sources">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-config-dirs.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-config-dirs.c" />
   </ItemGroup>
   <ItemGroup Label="null_sources">
@@ -81,6 +167,7 @@
   </ItemGroup>
   <ItemGroup Label="null_gc_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\null-gc.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\null-gc-handles.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\null-gc-handles.c" />
   </ItemGroup>
   <ItemGroup Label="gc_dependent_sources">
@@ -95,135 +182,41 @@
   </ItemGroup>
   <ItemGroup Label="sgen_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-mono.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-new-bridge.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-old-bridge.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-stw.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-new-bridge.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-tarjan-bridge.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-toggleref.c" />
-  </ItemGroup>
-  <ItemGroup Label="common_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\abi-details.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain-icalls.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\assembly-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\attach.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cil-coff.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-inlines.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-io.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info-tables.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\custom-attrs-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-ppdb.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\decimal-ms.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\domain-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\dynamic-image-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\dynamic-stream-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\exception-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\fdhandle.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\filewatcher.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\file-mmap.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\gc-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\handle.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-def.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\image-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\locales.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\lock-tracer.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mempool.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mempool-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\metadata-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\method-builder.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\monitor.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-endian.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-hash.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-mlist.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters-def.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-ptr-array.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-route.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\normalization-tables.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\number-formatter.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\number-ms.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object-offsets.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\profiler-private.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\property-bag.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\rand.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-cache.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\remoting.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\runtime.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security-core-clr.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security-manager.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sre-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\string-icalls.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sysmath.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\tabledefs.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool-io.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool-worker.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threads-types.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\verify-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\wrapper-types.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32event.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32error.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32handle.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32handle-namespace.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32mutex.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32semaphore.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32socket.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32socket-internals.h" />
-  </ItemGroup>
-  <ItemGroup Label="config_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-config-dirs.h" />
-  </ItemGroup>
-  <ItemGroup Label="null_gc_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\null-gc-handles.h" />
-  </ItemGroup>
-  <ItemGroup Label="sgen_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge-internals.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-toggleref.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-stw.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-mono.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-client-mono.h" />
   </ItemGroup>
-  <ItemGroup Label="libmonoruntime_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain.h" />
+  <ItemGroup Label="libmonoruntimeinclude_headers">
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\assembly.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\attrdefs.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\blob.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-helpers.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\environment.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.h" />    
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threads.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\environment.h" />    
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\exception.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\image.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\loader.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\metadata.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-config.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-debug.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-debug.h" />    
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-gc.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\opcodes.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\profiler.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\profiler-events.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\row-indexes.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threads.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\tokentype.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\verify.h" />    
   </ItemGroup>
   <ItemGroup>
diff --git a/msvc/libmonoruntime-common.targets.filters b/msvc/libmonoruntime-common.targets.filters
index 9723ca399db..fdabb436546 100644
--- a/msvc/libmonoruntime-common.targets.filters
+++ b/msvc/libmonoruntime-common.targets.filters
@@ -4,302 +4,51 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\appdomain.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\assembly.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\attach.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class-accessors.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\cominterop.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\coree.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\custom-attrs.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-helpers.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-mono-ppdb.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\decimal-ms.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\domain.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\dynamic-image.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\dynamic-stream.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\environment.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\exception.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\fdhandle.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-posix.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-windows.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\filewatcher.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\handle.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\icall.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\image.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\jit-info.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\loader.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\locales.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\lock-tracer.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\marshal.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mempool.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-cross-helpers.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-verify.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\method-builder.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-config.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-debug.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-endian.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-mlist.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-route.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-security.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\number-ms.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\object.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\opcodes.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\profiler.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\property-bag.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\rand.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\reflection.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\remoting.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\runtime.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\security-core-clr.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\security-manager.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-encode.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-save.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\string-icalls.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sysmath.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool-io.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool-worker-default.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threads.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\verify.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32handle.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32handle-namespace.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup Label="config_sources">
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-config-dirs.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\config</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup Label="null_sources">
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\console-null.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\null</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup Label="null_gc_sources">
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\null-gc.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\null</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\null-gc-handles.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\null</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup Label="gc_dependent_sources">
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\gc-stats.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\gc.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\monitor.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-hash.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup Label="boehm_sources">
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\boehm-gc.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\boehm</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup Label="sgen_sources">
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-mono.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-new-bridge.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-old-bridge.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-stw.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-tarjan-bridge.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-toggleref.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup Label="common_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\abi-details.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain-icalls.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\assembly.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\assembly-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\attach.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\attach.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cil-coff.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-inlines.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-internals.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\class-inlines.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\class-accessors.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\cominterop.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-io.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\coree.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\coree.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
@@ -312,96 +61,156 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\culture-info-tables.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\custom-attrs-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-helpers.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-ppdb.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\debug-mono-ppdb.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\decimal-ms.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\decimal-ms.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\domain-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\dynamic-image-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\dynamic-stream-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\environment.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\exception.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\exception-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\fdhandle.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\filewatcher.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\file-mmap.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\filewatcher.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\filewatcher.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\gc-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\handle.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\icall.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-def.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\image.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\image-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\jit-info.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\loader.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\locales.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\locales.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\lock-tracer.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\lock-tracer.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\marshal.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mempool.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mempool.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mempool-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-verify.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\metadata-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\method-builder.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\monitor.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\method-builder.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-basic-block.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-config.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-debug.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-endian.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-endian.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-hash.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-mlist.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-mlist.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-perfcounters.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
@@ -411,7 +220,13 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-ptr-array.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-route.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-route.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-route.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\monitor.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\normalization-tables.h">
@@ -420,146 +235,323 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\number-formatter.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\number-ms.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\number-ms.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\object.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object-offsets.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\opcodes.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\property-bag.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\profiler-private.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\property-bag.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32socket.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\property-bag.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32socket-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\rand.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-cache.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-internals.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\profiler.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\profiler-private.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\remoting.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\rand.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\runtime.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\rand.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\remoting.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\remoting.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\runtime.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-security.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\security-core-clr.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security-core-clr.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\security-manager.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\security-manager.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sre-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
-    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\string-icalls.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\string-icalls.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sysmath.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sysmath.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\tabledefs.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threads.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threads-types.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool-io.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool-worker-default.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool-worker.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threads-types.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\threadpool-io.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threadpool-io.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\verify.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\verify-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\wrapper-types.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32event.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\dynamic-image-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32error.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\dynamic-stream.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\dynamic-stream-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-cache.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-internals.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\custom-attrs-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32handle.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sre-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32handle-namespace.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\reflection-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32mutex.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-posix.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\file-mmap-windows.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\file-mmap.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object-offsets.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-internals.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\abi-details.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\metadata-cross-helpers.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\seq-points-data.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\handle.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\handle.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32mutex.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32semaphore.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32socket.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32event.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32socket-internals.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32handle-namespace.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32handle-namespace.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32handle.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32handle.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32error.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\reflection.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\dynamic-image.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-encode.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-save.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\custom-attrs.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\fdhandle.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\fdhandle.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\runtime.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup Label="config_headers">
+  <ItemGroup Label="config_sources">
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-config-dirs.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\config</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-config-dirs.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\config</Filter>
+    </ClCompile>
   </ItemGroup>
-  <ItemGroup Label="null_gc_headers">
+  <ItemGroup Label="null_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\console-null.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\null</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup Label="null_gc_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\null-gc.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\null</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\null-gc-handles.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\null</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\null-gc-handles.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\null</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup Label="gc_dependent_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\gc-stats.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\gc.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\monitor.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-hash.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-conc-hash.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\gc</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup Label="boehm_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\boehm-gc.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\boehm</Filter>
+    </ClCompile>
   </ItemGroup>
-  <ItemGroup Label="sgen_headers">
+  <ItemGroup Label="sgen_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge-internals.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-old-bridge.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-new-bridge.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-tarjan-bridge.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-toggleref.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-toggleref.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-stw.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sgen-mono.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-client-mono.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\sgen</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup Label="libmonoruntime_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
-    </ClInclude>
+  <ItemGroup Label="libmonoruntimeinclude_headers">
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\assembly.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\attrdefs.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
     </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\appdomain.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
+    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\blob.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
     </ClInclude>
@@ -572,6 +564,9 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\debug-mono-symfile.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
     </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threads.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
+    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\environment.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
     </ClInclude>
@@ -596,6 +591,9 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-gc.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
     </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
+    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\object.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
     </ClInclude>
@@ -614,10 +612,7 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\row-indexes.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\sgen-bridge.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\threads.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\tokentype.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common\public</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\verify.h">
diff --git a/msvc/libmonoruntime-posix.targets b/msvc/libmonoruntime-posix.targets
index 878002bef23..9ea4f29f1f8 100644
--- a/msvc/libmonoruntime-posix.targets
+++ b/msvc/libmonoruntime-posix.targets
@@ -7,43 +7,44 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-unix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-unix.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-unix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-unix.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-unix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-unix.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-unix-glob.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-unix.c">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-internals.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-osx.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-bsd.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-bsd.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-haiku.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -55,33 +56,30 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-haiku.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-unix.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-osx.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-unix.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-unix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-unix-glob.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-unix.c">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-unix-glob.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-unix.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup Label="posix_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-unix-glob.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-internals.h" />
-  </ItemGroup>
 </Project>
diff --git a/msvc/libmonoruntime-posix.targets.filters b/msvc/libmonoruntime-posix.targets.filters
index 0f98d8eae81..becf24e9c60 100644
--- a/msvc/libmonoruntime-posix.targets.filters
+++ b/msvc/libmonoruntime-posix.targets.filters
@@ -4,50 +4,48 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\console-unix.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-unix.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-unix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-unix.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-unix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-unix.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-unix-glob.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-unix.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-unix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix.c">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-internals.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-osx.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-bsd.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-default.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-haiku.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-haiku.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-default.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-osx.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-unix.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-unix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-unix.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-unix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-unix-glob.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup Label="posix_headers">
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-unix-glob.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-unix-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
-    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-unix.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\posix</Filter>
+    </ClCompile>   
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files$(MonoRuntimeFilterSubFolder)\posix">
diff --git a/msvc/libmonoruntime-win32.targets b/msvc/libmonoruntime-win32.targets
index b879381b79f..93830b0180c 100644
--- a/msvc/libmonoruntime-win32.targets
+++ b/msvc/libmonoruntime-win32.targets
@@ -2,24 +2,22 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="win32_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\console-win32.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-win32-internals.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop-win32-internals.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-win32.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-win32-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\icall-windows.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-windows-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\marshal-windows.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-windows-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-win32.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-win32.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-win32.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-win32.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-win32.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-win32.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-win32.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-win32.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-win32.c" />   
-  </ItemGroup>
-  <ItemGroup Label="win32_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop-win32-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-win32-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-windows-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-windows-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-win32-internals.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-win32-internals.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-win32.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-win32.c" />
   </ItemGroup>
 </Project>
diff --git a/msvc/libmonoruntime-win32.targets.filters b/msvc/libmonoruntime-win32.targets.filters
index 5c7983e0cc2..eab619cb689 100644
--- a/msvc/libmonoruntime-win32.targets.filters
+++ b/msvc/libmonoruntime-win32.targets.filters
@@ -4,60 +4,58 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\console-win32.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-win32-internals.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop-win32-internals.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-win32.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-win32-internals.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\icall-windows.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-windows-internals.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\marshal-windows.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-windows-internals.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-win32.c">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows-internals.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-win32.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-win32.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-win32.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-win32.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-win32-internals.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
+    </ClInclude>    
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32socket-win32.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32process-win32.c">
-      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32error-win32.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup Label="win32_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop-win32-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-win32-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-windows-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-windows-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-win32-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32process-win32-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
-  </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files$(MonoRuntimeFilterSubFolder)\win32">
       <UniqueIdentifier>{C6938EF2-A57F-4941-90EB-FCD7CF1E035D}</UniqueIdentifier>
-- 
2.25.1