From: lateralusX <lateralusx.github@gmail.com>
Date: Wed, 27 Sep 2017 12:11:07 +0000 (+0200)
Subject: Fix libmonoutils targets and filters.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=fde89788939c39a7c106bf0bb097f8ede647c662

Fix libmonoutils targets and filters.
---

diff --git a/msvc/libmonoutils-arch.targets b/msvc/libmonoutils-arch.targets
new file mode 100644
index 00000000000..79a10bc06a2
--- /dev/null
+++ b/msvc/libmonoutils-arch.targets
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <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\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>
+    <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">
+      <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">
+      <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">
+      <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">
+      <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">
+      <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">
+      <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-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">
+      <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">
+      <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">
+      <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" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
+  </ImportGroup>
+</Project>
diff --git a/msvc/libmonoutils-arch.targets.filters b/msvc/libmonoutils-arch.targets.filters
new file mode 100644
index 00000000000..dc10f5ab067
--- /dev/null
+++ b/msvc/libmonoutils-arch.targets.filters
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-x86.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-amd64.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+    </ClCompile>
+    <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>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-arm.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-arm64.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-cross.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+    </ClCompile>
+    <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>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-ppc.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-sparc.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-wasm.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm">
+      <Filter>Resource Files$(MonoUtilsFilterSubFolder)\arch</Filter>
+    </MASM>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Resource Files$(MonoUtilsFilterSubFolder)\arch">
+      <UniqueIdentifier>{CF1B494F-7FC7-4B1F-9356-1E6F4C3AA151}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\arch">
+      <UniqueIdentifier>{6603FB44-3F5A-490C-A2FB-3FCD4818EA6A}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
diff --git a/msvc/libmonoutils-common.targets b/msvc/libmonoutils-common.targets
new file mode 100644
index 00000000000..0d49e29cfc5
--- /dev/null
+++ b/msvc/libmonoutils-common.targets
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <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-codeman.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-context.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-counters.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl.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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-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-dl-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-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">
+      <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">
+      <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">
+      <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-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" />
+    <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" />
+    <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" />
+    <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" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads.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-coop.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>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <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-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.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">
+      <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-netbsd.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-openbsd.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.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">
+      <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" />
+    <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" />
+    <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>
+    <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\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" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\parse.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" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger.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" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MonoSourceLocation)\mono\utils\Makefile.am" />
+  </ItemGroup>
+</Project>
diff --git a/msvc/libmonoutils-common.targets.filters b/msvc/libmonoutils-common.targets.filters
new file mode 100644
index 00000000000..3e24b798b8e
--- /dev/null
+++ b/msvc/libmonoutils-common.targets.filters
@@ -0,0 +1,497 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <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">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\memfuncs.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <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">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-counters.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <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">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-logger.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">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-darwin.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-posix.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-windows.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-math.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-md5.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClCompile>
+    <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>
+    <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">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\json.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\linux_magic.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mach-support.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memcheck.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memfuncs.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\monobitset.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-codeman.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <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>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-context.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-mutex.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-semaphore.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-digest.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <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>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error-internals.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-vars.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-lazy-init.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger-internals.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-machine.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-math.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-membar.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-memory-model.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-internals.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows-internals.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-once.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-semaphore.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-wait.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-path.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-poll.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows-internals.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows-internals.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-sigcontext.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-signal-handler.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stack-unwinding.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-string.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-debug.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-api.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-time.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-tls.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-uri.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\networking.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\os-event.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\parse.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\refcount.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\strenc.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\unlocked.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\valgrind.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\mono-logger.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-publib.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-fallback.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-counters.h">
+      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MonoSourceLocation)\mono\utils\Makefile.am">
+      <Filter>Resource Files$(MonoUtilsFilterSubFolder)\common</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files$(MonoUtilsFilterSubFolder)\common">
+      <UniqueIdentifier>{467B47D6-631B-4DFD-83B7-70CD1E314F7F}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files$(MonoUtilsFilterSubFolder)\common">
+      <UniqueIdentifier>{E4760A93-A38F-48E5-B89D-78487FA2805D}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\common">
+      <UniqueIdentifier>{0CB40928-2D3E-46B9-A8DF-D7F63A35A6CD}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
diff --git a/msvc/libmonoutils-posix.targets b/msvc/libmonoutils-posix.targets
new file mode 100644
index 00000000000..6b6fdbb0680
--- /dev/null
+++ b/msvc/libmonoutils-posix.targets
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-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>
+</Project>
diff --git a/msvc/libmonoutils-posix.targets.filters b/msvc/libmonoutils-posix.targets.filters
new file mode 100644
index 00000000000..7622e74ba95
--- /dev/null
+++ b/msvc/libmonoutils-posix.targets.filters
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-unix.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\posix</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\posix">
+      <UniqueIdentifier>{CFAFABB9-9646-402C-BD4E-A0E1EF4F3595}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
diff --git a/msvc/libmonoutils-win32.targets b/msvc/libmonoutils-win32.targets
new file mode 100644
index 00000000000..f5ec8193404
--- /dev/null
+++ b/msvc/libmonoutils-win32.targets
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-wait-win32.c" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-win32.c" />
+  </ItemGroup>
+</Project>
diff --git a/msvc/libmonoutils-win32.targets.filters b/msvc/libmonoutils-win32.targets.filters
new file mode 100644
index 00000000000..f5ae49f62a7
--- /dev/null
+++ b/msvc/libmonoutils-win32.targets.filters
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-wait-win32.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\win32</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-win32.c">
+      <Filter>Source Files$(MonoUtilsFilterSubFolder)\win32</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Source Files$(MonoUtilsFilterSubFolder)\win32">
+      <UniqueIdentifier>{56DCE5E4-A83E-487B-BFED-577E1F784C14}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
diff --git a/msvc/libmonoutils.targets b/msvc/libmonoutils.targets
index 50865a483fe..a9a95828f05 100644
--- a/msvc/libmonoutils.targets
+++ b/msvc/libmonoutils.targets
@@ -1,198 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <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\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>
-    <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-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\mach-support.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-codeman.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-context.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-counters.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-error.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-filemap.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-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-common.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-math.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-md5.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-wait-win32.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-state-machine.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-posix.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-missing.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-path.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-poll.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-publib.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-sha1.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.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-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-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-windows.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-time.c" />
-    <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" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\monobitset.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-win32.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\strenc.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\atomic.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\bsearch.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\memfuncs.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\parse.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <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\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-counters.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-digest.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-fallback.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error.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-linked-list-set.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger.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-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap.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-windows-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-publib.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-sigcontext.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-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\monobitset.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\os-event.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\strenc.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\valgrind.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\atomic.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\unlocked.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\bsearch.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memfuncs.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\parse.h" />
-  </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>
-  <ItemGroup>
-    <None Include="$(MonoSourceLocation)\mono\utils\Makefile.am" />
-  </ItemGroup>
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(MonoSourceLocation)\msvc\masm.fixed.props" />
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
-  </ImportGroup>
+  <Import Project="libmonoutils-common.targets" />
+  <Import Project="libmonoutils-win32.targets" />
+  <Import Project="libmonoutils-posix.targets" />
+  <Import Project="libmonoutils-arch.targets" />
 </Project>
diff --git a/msvc/libmonoutils.targets.filters b/msvc/libmonoutils.targets.filters
index 50154182a4e..9a23e04d407 100644
--- a/msvc/libmonoutils.targets.filters
+++ b/msvc/libmonoutils.targets.filters
@@ -1,451 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\atomic.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\bsearch.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\dlmalloc.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\json.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-amd64.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-arm.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mach-support-x86.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\memfuncs.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\monobitset.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-codeman.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-context.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-counters.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-error.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-filemap.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-logger.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-math.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-md5.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-path.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-poll.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-publib.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-sha1.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-mach.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-posix-signals.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-state-machine.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-threads-windows.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-time.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-tls.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-uri.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-missing.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-posix.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\networking-windows.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\parse.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\strenc.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-common.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-log-windows.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\os-event-win32.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-wait-win32.c">
-      <Filter>Source Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\atomic.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\bsearch.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\dlmalloc.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\dtrace.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-dwarf.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf_common.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf32.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\freebsd-elf64.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\gc_wrapper.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\hazard-pointer.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\json.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\linux_magic.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-alloc.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-array-queue.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\lock-free-queue.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mach-support.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memcheck.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\memfuncs.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\monobitset.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-codeman.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-compiler.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-complex.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-conc-hashtable.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-context.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-mutex.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-coop-semaphore.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-counters.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-digest.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-fallback.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-error-internals.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-hwcap-x86.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-internal-hash.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-io-portability.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-linked-list-set.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-logger-internals.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-machine.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-math.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-membar.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-memory-model.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-networkinterfaces.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-once.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-semaphore.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-path.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-poll.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-property-hash.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-publib.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-sigcontext.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stack-unwinding.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-stdlib.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-string.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-api.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-threads-coop.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-time.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-tls.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-uri.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-value-hash.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\parse.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\strenc.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\valgrind.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows-internals.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-internals.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-proclib-windows-internals.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-rand-windows-internals.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-dl-windows-internals.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\os-event.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\unlocked.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-wait.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="$(MonoSourceLocation)\mono\utils\win64.asm">
-      <Filter>Resource Files$(MonoUtilsFilterSubFolder)</Filter>
-    </MASM>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="$(MonoSourceLocation)\mono\utils\Makefile.am">
-      <Filter>Resource Files$(MonoUtilsFilterSubFolder)</Filter>
-    </None>
-  </ItemGroup>
+  <Import Project="libmonoutils-common.targets.filters" />
+  <Import Project="libmonoutils-win32.targets.filters" />
+  <Import Project="libmonoutils-posix.targets.filters" />
+  <Import Project="libmonoutils-arch.targets.filters" />
   <ItemGroup Condition="'$(MonoUtilsFilterSubFolder)'!=''">
-   <Filter Include="Header Files$(MonoUtilsFilterSubFolder)">
-      <UniqueIdentifier>{CFB7113E-BF38-420B-ADCE-D737EDD7C91A}</UniqueIdentifier>
+    <Filter Include="Header Files$(MonoUtilsFilterSubFolder)">
+      <UniqueIdentifier>{1ACFEA26-DBB0-44B9-8297-414DD74D7E22}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource Files$(MonoUtilsFilterSubFolder)">
-      <UniqueIdentifier>{CF1B494F-7FC7-4B1F-9356-1E6F4C3AA151}</UniqueIdentifier>
+      <UniqueIdentifier>{A52D473E-5928-4BD9-AA2D-284C4A04D9D4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files$(MonoUtilsFilterSubFolder)">
-      <UniqueIdentifier>{6603FB44-3F5A-490C-A2FB-3FCD4818EA6A}</UniqueIdentifier>
+      <UniqueIdentifier>{69B9EC3D-597F-46CE-8F9F-55B732E95CCC}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>