From df03eb3fac273fc8687c26324e45c3a5b4a1bc1b Mon Sep 17 00:00:00 2001
From: lateralusX <lateralusx.github@gmail.com>
Date: Thu, 28 Sep 2017 12:39:36 +0200
Subject: [PATCH] Align libmonoutils vcxproj with makefile.

---
 msvc/libmonoutils-arch.targets           |  56 ++-
 msvc/libmonoutils-arch.targets.filters   | 132 ++++--
 msvc/libmonoutils-common.targets         | 254 ++++++-----
 msvc/libmonoutils-common.targets.filters | 545 ++++++++++++-----------
 msvc/libmonoutils-win32.targets          |   2 +-
 msvc/libmonoutils-win32.targets.filters  |   4 +-
 6 files changed, 544 insertions(+), 449 deletions(-)

diff --git a/msvc/libmonoutils-arch.targets b/msvc/libmonoutils-arch.targets
index d18289a4418..2790d649a0a 100644
--- a/msvc/libmonoutils-arch.targets
+++ b/msvc/libmonoutils-arch.targets
@@ -1,93 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="arch_sources">
+  <ItemGroup Label="arch_x86_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-x86.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\utils\mono-hwcap-x86.c" />
+  </ItemGroup>
+  <ItemGroup Label="arch_amd64_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-amd64.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>
+    <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm">
+      <FileType>Document</FileType>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <PreprocessorDefinitions>X64</PreprocessorDefinitions>
+    </MASM>
+  </ItemGroup>
+  <ItemGroup Label="arch_arm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-arm.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\utils\mach-support-arm64.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-arm.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\utils\mach-support-unknown.c">
+  </ItemGroup>
+  <ItemGroup Label="arch_arm64_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-arm64.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\utils\mono-hwcap-arm.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-arm64.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\utils\mono-hwcap-arm64.c">
+  </ItemGroup>
+  <ItemGroup Label="arch_mips_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-mips.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\utils\mono-hwcap-cross.c">
+  </ItemGroup>
+  <ItemGroup Label="arch_ppc_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-ppc.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\utils\mono-hwcap-mips.c">
+  </ItemGroup>
+  <ItemGroup Label="arch_sparc_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-sparc.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="arch_s390x_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-os390x.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\utils\mono-hwcap-ppc.c">
+  </ItemGroup>
+  <ItemGroup Label="arch_wasm_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-wasm.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\utils\mono-hwcap-sparc.c">
+  </ItemGroup>
+  <ItemGroup Label="arch_unknown_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-unknown.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\utils\mono-hwcap-wasm.c">
+  </ItemGroup>
+  <ItemGroup Label="arch_cross_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-cross.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\utils\mono-hwcap-x86.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions>X64</PreprocessorDefinitions>
-    </MASM>
   </ItemGroup>
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(MonoSourceLocation)\msvc\masm.fixed.props" />
diff --git a/msvc/libmonoutils-arch.targets.filters b/msvc/libmonoutils-arch.targets.filters
index 942d3ec978a..261fc2f662e 100644
--- a/msvc/libmonoutils-arch.targets.filters
+++ b/msvc/libmonoutils-arch.targets.filters
@@ -1,53 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="arch_sources">
+  <ItemGroup Label="arch_x86_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-x86.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\x86</Filter>
     </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\x86</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup Label="arch_amd64_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-amd64.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\amd64</Filter>
     </ClCompile>
+    <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm">
+      <Filter>Resource Files$(MonoUtilsFilterSubFolder)\arch\amd64</Filter>
+    </MASM>
+  </ItemGroup>
+  <ItemGroup Label="arch_arm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-arm.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-arm64.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-unknown.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\arm</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-arm.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\arm</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-arm64.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+  </ItemGroup>
+  <ItemGroup Label="arch_arm64_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-arm64.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\arm64</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-cross.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-arm64.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\arm64</Filter>
     </ClCompile>
+  </ItemGroup>
+  <ItemGroup Label="arch_mips_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-mips.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-os390x.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\mips</Filter>
     </ClCompile>
+  </ItemGroup>
+  <ItemGroup Label="arch_ppc_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-ppc.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\ppc</Filter>
     </ClCompile>
+  </ItemGroup>
+  <ItemGroup Label="arch_sparc_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-sparc.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\sparc</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup Label="arch_s390x_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-os390x.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\s390x</Filter>
     </ClCompile>
+  </ItemGroup>
+  <ItemGroup Label="arch_wasm_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-wasm.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\wasm</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+  </ItemGroup>
+  <ItemGroup Label="arch_unknown_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-unknown.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\unknown</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm">
-      <Filter>Resource Files$(MonoUtilsFilterSubFolder)\arch</Filter>
-    </MASM>
+  <ItemGroup Label="arch_cross_sources">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-cross.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch\cross</Filter>
+    </ClCompile>    
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Resource Files$(MonoUtilsFilterSubFolder)\arch">
@@ -57,4 +75,62 @@
       <UniqueIdentifier>{6603FB44-3F5A-490C-A2FB-3FCD4818EA6A}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\arch\x86">
+      <UniqueIdentifier>{9931E7C8-6C44-48E6-8752-AD0E3CB99A40}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Resource Files$(MonoUtilsFilterSubFolder)\arch\amd64">
+      <UniqueIdentifier>{6F39D983-0414-4906-A8B4-F3EE6D66ADB2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\arch\amd64">
+      <UniqueIdentifier>{711787B7-91B8-4FDF-937B-35C28B17F264}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\arch\arm">
+      <UniqueIdentifier>{BF9E07DE-1E58-485B-8A1D-E98B51AA3335}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\arch\arm64">
+      <UniqueIdentifier>{7F0740FA-7CF3-4281-B044-76AA9D603173}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\arch\mips">
+      <UniqueIdentifier>{C994366B-5CDF-4221-9F02-0889EE48AE84}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\arch\ppc">
+      <UniqueIdentifier>{350298FD-D211-4A13-9FDD-5CFFE2693D3E}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\arch\sparc">
+      <UniqueIdentifier>{58B688AA-3E02-4D79-A17F-FC287BC36BD4}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\arch\s390x">
+      <UniqueIdentifier>{D0DAB5B3-50DB-4122-81A2-FB82F6569DC7}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\arch\wasm">
+      <UniqueIdentifier>{CCF0AA6D-4EC2-4D0B-80DE-3D304D3F1B06}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\arch\unknown">
+      <UniqueIdentifier>{1241F641-C6B5-4139-87D9-9981D309FFBA}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\arch\cross">
+      <UniqueIdentifier>{23738EAA-81C9-4974-B742-6054F15292A4}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
 </Project>
diff --git a/msvc/libmonoutils-common.targets b/msvc/libmonoutils-common.targets
index be71b4224f8..f68262ab176 100644
--- a/msvc/libmonoutils-common.targets
+++ b/msvc/libmonoutils-common.targets
@@ -1,23 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="monoutils_sources">
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\atomic.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\bsearch.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\checked-build.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\dlmalloc.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\json.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\monobitset.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\memfuncs.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-md5.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-sha1.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-logger.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-codeman.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-context.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\dlmalloc.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\dlmalloc.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-counters.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-compiler.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-complex.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-darwin.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -36,83 +31,138 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-error.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-filemap.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-logger.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-android.c">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows-internals.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-windows.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-common.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-posix.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\utils\mono-log-common.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-darwin.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-android.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\utils\mono-log-posix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-darwin.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\utils\mono-log-windows.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\monobitset.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-filemap.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-math.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-md5.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-internals.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows-internals.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-path.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-poll.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-wait.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-mutex.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-once.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-lazy-init.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-publib.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-sha1.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-string.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-time.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-time.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\strenc.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\strenc.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-uri.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-poll.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-path.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-semaphore.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-semaphore.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-sigcontext.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf_common.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf32.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf64.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-dwarf.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\dtrace.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\gc_wrapper.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-error.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error-internals.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\monobitset.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-codeman.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-digest.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-machine.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-math.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-membar.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-path.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-poll.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-uri.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\valgrind.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mach-support.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memcheck.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-context.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-context.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stack-unwinding.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-android.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-state-machine.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix.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\utils\mono-threads-coop.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-freebsd.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix-signals.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\utils\mono-threads-haiku.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach.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\utils\mono-threads-linux.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach-helper.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\utils\mono-threads-mach.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-windows.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-linux.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\utils\mono-threads-mach-helper.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-freebsd.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>
@@ -130,124 +180,72 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-android.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\utils\mono-threads-posix-signals.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-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>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-state-machine.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-wasm.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\utils\mono-threads-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-time.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-debug.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-api.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-tls.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-tls.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-uri.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\linux_magic.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-memory-model.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\atomic.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\atomic.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-vars.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\bsearch.h" />        
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\bsearch.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-signal-handler.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\json.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\json.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-posix.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-fallback.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-missing.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\parse.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\strenc.c" />
-  </ItemGroup>
-  <ItemGroup Label="monoutils_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\atomic.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\bsearch.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\checked-build.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\dlmalloc.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\dtrace.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-dwarf.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf32.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf64.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf_common.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\gc_wrapper.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\json.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\linux_magic.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mach-support.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memcheck.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memfuncs.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\monobitset.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-codeman.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-compiler.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-complex.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-context.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-mutex.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-semaphore.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-digest.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-vars.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-lazy-init.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-machine.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-math.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-membar.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-memory-model.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-once.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-semaphore.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-wait.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-path.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-poll.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\networking.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-sigcontext.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-signal-handler.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stack-unwinding.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-string.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-debug.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-api.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-time.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-tls.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-uri.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\networking.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\os-event.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\memfuncs.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memfuncs.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\parse.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\parse.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\checked-build.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\checked-build.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\os-event.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\refcount.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\strenc.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\unlocked.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\valgrind.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\w32api.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\unlocked.h" />  
   </ItemGroup>
   <ItemGroup Label="libmonoutilsinclude_headers">
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error.h" />    
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-publib.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-fallback.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-counters.h" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-counters.h" />    
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MonoSourceLocation)\mono\utils\Makefile.am" />
diff --git a/msvc/libmonoutils-common.targets.filters b/msvc/libmonoutils-common.targets.filters
index c7efc5cc80f..3852bf936e4 100644
--- a/msvc/libmonoutils-common.targets.filters
+++ b/msvc/libmonoutils-common.targets.filters
@@ -1,109 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="monoutils_sources">
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\atomic.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\bsearch.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\checked-build.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\dlmalloc.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\json.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\monobitset.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-md5.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-sha1.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\memfuncs.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-logger.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger-internals.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-codeman.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-context.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\dlmalloc.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\dlmalloc.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-counters.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-compiler.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-complex.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-darwin.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-posix.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-wasm.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-error.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-filemap.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-darwin.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-posix.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-wasm.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.c">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows-internals.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-windows.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-common.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-logger.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-posix.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-android.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-common.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-darwin.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-darwin.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-posix.c">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-windows.c">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\monobitset.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-math.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-filemap.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-md5.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-math.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap.c">
@@ -112,234 +94,133 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-path.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-poll.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-publib.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-sha1.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-android.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-freebsd.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-haiku.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-linux.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach-helper.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-netbsd.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-openbsd.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix-signals.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-state-machine.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-wasm.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-windows.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-time.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-tls.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-uri.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-posix.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-fallback.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-missing.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-windows.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\parse.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\strenc.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup Label="monoutils_headers">
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\atomic.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\bsearch.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\checked-build.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\dlmalloc.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\dtrace.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-dwarf.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf32.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf64.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf_common.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\gc_wrapper.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-internals.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\json.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows-internals.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\linux_magic.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-wait.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-mutex.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-once.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mach-support.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-lazy-init.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memcheck.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memfuncs.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\monobitset.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows-internals.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-codeman.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-publib.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-string.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-compiler.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-time.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-time.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-complex.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\strenc.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\strenc.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-uri.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-poll.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-path.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-semaphore.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-context.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-semaphore.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-mutex.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-sigcontext.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-semaphore.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-digest.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf_common.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows-internals.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf32.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error-internals.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf64.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-dwarf.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-vars.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\dtrace.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\gc_wrapper.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-error.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error-internals.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-lazy-init.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\monobitset.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-codeman.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger-internals.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-digest.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-machine.h">
@@ -351,133 +232,250 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-membar.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-memory-model.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-path.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-poll.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-internals.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-uri.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows-internals.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\valgrind.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-once.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mach-support.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memcheck.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-semaphore.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-context.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-context.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-wait.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stack-unwinding.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-path.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-poll.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows-internals.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-state-machine.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix-signals.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach-helper.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-windows.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-linux.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-freebsd.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-netbsd.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-openbsd.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-android.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-haiku.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-wasm.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows-internals.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-debug.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-sigcontext.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-api.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-signal-handler.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stack-unwinding.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-tls.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-tls.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\linux_magic.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-string.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-memory-model.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\atomic.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\atomic.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-debug.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-api.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-vars.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\bsearch.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-time.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\bsearch.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-signal-handler.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-tls.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-uri.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\json.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\json.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-posix.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-fallback.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-missing.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-windows.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\networking.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\networking.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\os-event.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows-internals.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\parse.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\memfuncs.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memfuncs.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\refcount.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\parse.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\parse.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\strenc.h">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\checked-build.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\checked-build.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\unlocked.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\os-event.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\valgrind.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\refcount.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\w32api.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\unlocked.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup Label="libmonoutilsinclude_headers">
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common\public</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common\public</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-publib.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common\public</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-fallback.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common\public</Filter>
     </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-counters.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common\public</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -496,4 +494,9 @@
       <UniqueIdentifier>{0CB40928-2D3E-46B9-A8DF-D7F63A35A6CD}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files$(MonoUtilsFilterSubFolder)\common\public">
+      <UniqueIdentifier>{23D97CF3-2DE0-42A1-8AF7-40D6981EB259}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
 </Project>
diff --git a/msvc/libmonoutils-win32.targets b/msvc/libmonoutils-win32.targets
index daed11ae09f..c1484ed9e66 100644
--- a/msvc/libmonoutils-win32.targets
+++ b/msvc/libmonoutils-win32.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="win32_sources">
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-wait-win32.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-win32.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-wait-win32.c" />
   </ItemGroup>
 </Project>
diff --git a/msvc/libmonoutils-win32.targets.filters b/msvc/libmonoutils-win32.targets.filters
index 9de46bb3a35..122e39eedaf 100644
--- a/msvc/libmonoutils-win32.targets.filters
+++ b/msvc/libmonoutils-win32.targets.filters
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="win32_sources">
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-wait-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-win32.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-win32.c">
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-wait-win32.c">
       <Filter>Source Files$(MonoUtilsFilterSubFolder)\win32</Filter>
     </ClCompile>
   </ItemGroup>
-- 
2.25.1