diff --git a/IKVM.sln b/IKVM.sln
index d69efc6beb..e2dbf3936d 100644
--- a/IKVM.sln
+++ b/IKVM.sln
@@ -54,6 +54,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.MSBuild.Tasks.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Java", "src\IKVM.Java\IKVM.Java.msbuildproj", "{ABD81C7E-F986-4018-986E-ACAF82C64D3A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Java.runtime.linux", "src\IKVM.Java.runtime.linux\IKVM.Java.runtime.linux.msbuildproj", "{BC8E0429-5E53-4F23-8CE8-86A1B44D669E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Java.runtime.win", "src\IKVM.Java.runtime.win\IKVM.Java.runtime.win.msbuildproj", "{537B5ACE-81A2-4DCA-AB4D-9862E63F448D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.Java.runtime.osx", "src\IKVM.Java.runtime.osx\IKVM.Java.runtime.osx.msbuildproj", "{C6BC9419-F394-4B59-A707-F9A82A3FE625}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.NET.Sdk", "src\IKVM.NET.Sdk\IKVM.NET.Sdk.msbuildproj", "{704BD7C7-7746-4D72-A86E-ECFE7BBD80CC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IKVM.MSBuild", "src\IKVM.MSBuild\IKVM.MSBuild.msbuildproj", "{AE5BFBC6-7DD4-4ACA-BEA7-86F842F38B64}"
@@ -383,6 +389,18 @@ Global
 		{ABD81C7E-F986-4018-986E-ACAF82C64D3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ABD81C7E-F986-4018-986E-ACAF82C64D3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ABD81C7E-F986-4018-986E-ACAF82C64D3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC8E0429-5E53-4F23-8CE8-86A1B44D669E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC8E0429-5E53-4F23-8CE8-86A1B44D669E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC8E0429-5E53-4F23-8CE8-86A1B44D669E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC8E0429-5E53-4F23-8CE8-86A1B44D669E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{537B5ACE-81A2-4DCA-AB4D-9862E63F448D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{537B5ACE-81A2-4DCA-AB4D-9862E63F448D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{537B5ACE-81A2-4DCA-AB4D-9862E63F448D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{537B5ACE-81A2-4DCA-AB4D-9862E63F448D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6BC9419-F394-4B59-A707-F9A82A3FE625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6BC9419-F394-4B59-A707-F9A82A3FE625}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6BC9419-F394-4B59-A707-F9A82A3FE625}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6BC9419-F394-4B59-A707-F9A82A3FE625}.Release|Any CPU.Build.0 = Release|Any CPU
 		{704BD7C7-7746-4D72-A86E-ECFE7BBD80CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{704BD7C7-7746-4D72-A86E-ECFE7BBD80CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{704BD7C7-7746-4D72-A86E-ECFE7BBD80CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/openjdk.props b/openjdk.props
index cee82ceadb..6b1b4373f1 100644
--- a/openjdk.props
+++ b/openjdk.props
@@ -2,7 +2,15 @@
     <ItemDefinitionGroup>
         <OpenJdkSource>
             <SourcePath>%(Identity)</SourcePath>
+            <PackagePath></PackagePath>
+            <RuntimeIdentifier></RuntimeIdentifier>
         </OpenJdkSource>
+        <OpenJdkClass>
+            <RuntimeIdentifier></RuntimeIdentifier>
+        </OpenJdkClass>
+        <OpenJdkResource>
+            <RuntimeIdentifier></RuntimeIdentifier>
+        </OpenJdkResource>
     </ItemDefinitionGroup>
 
     <ItemGroup>
@@ -1348,33 +1356,7 @@
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\ftp\FtpReplyCode.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\ftp\impl\DefaultFtpClientProvider.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\ftp\impl\FtpClient.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\AuthFilter.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\ChunkedInputStream.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\ChunkedOutputStream.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\Code.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\ContextList.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\DefaultHttpServerProvider.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\Event.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\ExchangeImpl.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\FixedLengthInputStream.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\FixedLengthOutputStream.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpConnection.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpContextImpl.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpError.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpExchangeImpl.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpServerImpl.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpsExchangeImpl.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\HttpsServerImpl.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\LeftOverInputStream.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\Request.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\ServerConfig.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\ServerImpl.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\SSLStreams.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\StreamClosedException.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\TimeSource.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\UndefLengthOutputStream.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\UnmodifiableHeaders.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\WriteFinishedEvent.java" />
+        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\httpserver\**\*.java" PackagePath="sun\net\httpserver" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\idn\Punycode.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\idn\StringPrep.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\net\idn\StringPrepDataReader.java" />
@@ -1537,42 +1519,7 @@
         <OpenJdkSource Remove="$(OpenJdkDir)\jdk\src\share\classes\sun\security\jgss\wrapper\SunNativeProvider.java" />
         <OpenJdkSource Remove="$(OpenJdkDir)\jdk\src\share\classes\sun\security\pkcs11\**\*.java" />
         <OpenJdkSource Remove="$(OpenJdkDir)\jdk\src\share\classes\sun\security\smartcardio\**\*.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\AccumulativeRunnable.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\BakedArrayList.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\CachedPainter.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\DefaultLayoutStyle.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\DefaultLookup.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\FilePane.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\icon\SortArrowIcon.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\ImageCache.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\ImageIconUIResource.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\JLightweightFrame.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\LightweightContent.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\MenuItemCheckIconFactory.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\MenuItemLayoutHelper.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\GTKKeybindings.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\synth\DefaultSynthStyle.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\synth\Paint9Painter.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\synth\StyleAssociation.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\synth\SynthFileChooserUI.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\synth\SynthFileChooserUIImpl.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\synth\SynthIcon.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\windows\ClassicSortArrowIcon.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\plaf\WindowsKeybindings.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\PrintColorUIResource.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\PrintingStatus.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\StringUIClientPropertyKey.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\SwingAccessor.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\SwingLazyValue.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\SwingUtilities2.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\table\DefaultTableCellHeaderRenderer.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\text\CompoundPrintable.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\text\CountingPrintable.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\text\html\FrameEditorPaneTag.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\text\TextComponentPrintable.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\UIAction.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\UIClientPropertyKey.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\WindowsPlacesBar.java" />
+        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\swing\**\*.java" PackagePath="sun\swing" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\text\**\*.java" PackagePath="sun\text" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\tools\**\*.java" PackagePath="sun\tools" />
         <OpenJdkSource Remove="$(OpenJdkDir)\jdk\src\share\classes\sun\tools\attach\**\*.java" />
@@ -1674,18 +1621,7 @@
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\util\spi\CalendarProvider.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\util\spi\XmlPropertiesProvider.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\classes\sun\util\xml\PlatformXmlPropertiesProvider.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\JarFileSystemProvider.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipCoder.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipConstants.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipDirectoryStream.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipFileAttributes.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipFileAttributeView.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipFileStore.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipFileSystem.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipFileSystemProvider.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipInfo.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipPath.java" />
-        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\ZipUtils.java" />
+        <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\share\demo\nio\zipfs\src\com\sun\nio\zipfs\**\*.java" PackagePath="com\sun\nio\zipfs" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\solaris\classes\java\io\UnixFileSystem.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\solaris\classes\java\util\prefs\FileSystemPreferences.java" />
         <OpenJdkSource Include="$(OpenJdkDir)\jdk\src\solaris\classes\java\util\prefs\FileSystemPreferencesFactory.java" />
diff --git a/src/IKVM.Java.runtime.linux/IKVM.Java.runtime.linux.msbuildproj b/src/IKVM.Java.runtime.linux/IKVM.Java.runtime.linux.msbuildproj
new file mode 100644
index 0000000000..fe5d9ed7e5
--- /dev/null
+++ b/src/IKVM.Java.runtime.linux/IKVM.Java.runtime.linux.msbuildproj
@@ -0,0 +1,9 @@
+<Project>
+    <PropertyGroup>
+        <PackageId>IKVM.Java.runtime.linux</PackageId>
+        <IkvmJavaRuntimeIdentifier>linux</IkvmJavaRuntimeIdentifier>
+    </PropertyGroup>
+    
+    <Import Project="..\IKVM.Java\IKVM.Java.runtime.props" />
+    <Import Project="..\IKVM.Java\IKVM.Java.runtime.targets" />
+</Project>
diff --git a/src/IKVM.Java.runtime.osx/IKVM.Java.runtime.osx.msbuildproj b/src/IKVM.Java.runtime.osx/IKVM.Java.runtime.osx.msbuildproj
new file mode 100644
index 0000000000..3d716ad07a
--- /dev/null
+++ b/src/IKVM.Java.runtime.osx/IKVM.Java.runtime.osx.msbuildproj
@@ -0,0 +1,9 @@
+<Project>
+    <PropertyGroup>
+        <PackageId>IKVM.Java.runtime.osx</PackageId>
+        <IkvmJavaRuntimeIdentifier>osx</IkvmJavaRuntimeIdentifier>
+    </PropertyGroup>
+    
+    <Import Project="..\IKVM.Java\IKVM.Java.runtime.props" />
+    <Import Project="..\IKVM.Java\IKVM.Java.runtime.targets" />
+</Project>
diff --git a/src/IKVM.Java.runtime.win/IKVM.Java.runtime.win.msbuildproj b/src/IKVM.Java.runtime.win/IKVM.Java.runtime.win.msbuildproj
new file mode 100644
index 0000000000..8b00a8071f
--- /dev/null
+++ b/src/IKVM.Java.runtime.win/IKVM.Java.runtime.win.msbuildproj
@@ -0,0 +1,9 @@
+<Project>
+    <PropertyGroup>
+        <PackageId>IKVM.Java.runtime.win</PackageId>
+        <IkvmJavaRuntimeIdentifier>win</IkvmJavaRuntimeIdentifier>
+    </PropertyGroup>
+    
+    <Import Project="..\IKVM.Java\IKVM.Java.runtime.props" />
+    <Import Project="..\IKVM.Java\IKVM.Java.runtime.targets" />
+</Project>
diff --git a/src/IKVM.Java/IKVM.Java.msbuildproj b/src/IKVM.Java/IKVM.Java.msbuildproj
index 81ddd9d256..cac99f43a6 100644
--- a/src/IKVM.Java/IKVM.Java.msbuildproj
+++ b/src/IKVM.Java/IKVM.Java.msbuildproj
@@ -1,154 +1,8 @@
 <Project>
-    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\openjdk.props" />
-
-    <PropertyGroup>
-        <TargetFrameworks>net472;net6.0</TargetFrameworks>
-        <Bootstrap>true</Bootstrap>
-        <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <InternalsVisibleTo Include="IKVM.Runtime" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\IKVM.Runtime-ref\IKVM.Runtime-ref.csproj" Private="False" PrivateAssets="All" IncludeNonPublicTypes="true" />
-        <ProjectReference Include="..\IKVM.Java-ref\IKVM.Java-ref.csproj" Private="False" PrivateAssets="All" HideFromJava="true" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <TransformValues Include="Name" Value="$(ProductName)" />
-        <TransformValues Include="Version" Value="$(Version)" />
-        <TransformValues Include="FileVersion" Value="$(FileVersion)" />
-        <TransformValues Include="VendorUrl" Value="$(PackageProjectUrl)" />
-        <TransformValues Include="VendorUrlBug" Value="$(PackageProjectUrl)/issues/" />
-        <TransformValues Include="OpenJdkVersion" Value="$(OpenJdkVersion)" />
-        <TransformValues Include="OpenJdkFullVersion" Value="$(OpenJdkFullVersion)" />
-        <TransformValues Include="OpenJdkVendor" Value="$(OpenJdkVendor)" />
-        <TransformValues Include="OpenJdkImplementationVendor" Value="$(OpenJdkImplementationVendor)" />
-        <TransformValues Include="OpenJdkImplementationVersion" Value="$(OpenJdkImplementationVersion)" />
-        <TransformValues Include="OpenJdkSpecificationVersion" Value="$(OpenJdkSpecificationVersion)" />
-        <TransformValues Include="OpenJdkSpecificationVendor" Value="$(OpenJdkSpecificationVendor)" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <JavaResource Include="local\**\*" Exclude="local\**\*.java;**\*.tt" ResourcePath="%(RecursiveDir)%(Filename)%(Extension)" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <None Include="icedtea_jce\**\*" />
-        <None Include="icedtea_rt\**\*" />
-        <None Include="local\**\*" />
-        <None Include="@(OpenJdkSource)" LinkBase="openjdk\%(PackagePath)" />
-        <Compile Include="@(OpenJdkSource)" LinkBase="openjdk\%(PackagePath)" />
-        <Convert Include="@(OpenJdkClass)" LinkBase="openjdk\%(PackagePath)" />
-        <None Include="@(OpenJdkClass)" LinkBase="openjdk\%(PackagePath)" />
-        <JavaResource Include="@(OpenJdkResource)" LinkBase="openjdk\%(PackagePath)" />
-        <ExcludeRegex Include="@(OpenJdkExcludeRegex)" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Transform Include="local\META-INF\MANIFEST.MF.tt" TargetPath="$(IntermediateOutputPath)transform\local\META-INF\MANIFEST.MF" />
-        <JavaResource Include="$(IntermediateOutputPath)transform\local\META-INF\MANIFEST.MF" Visible="False" ResourcePath="META-INF/MANIFEST.MF" Link="local\META-INF\MANIFEST.MF" />
-        <Transform Include="local\nashorn\version.properties.tt" TargetPath="$(IntermediateOutputPath)transform\local\nashorn\version.properties" />
-        <JavaResource Include="$(IntermediateOutputPath)transform\local\nashorn\version.properties" Visible="False" ResourcePath="nashorn/version.properties" Link="local\nashorn\version.properties" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <MapFile Include="map.xml" />
-    </ItemGroup>
-
-    <Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.deps.targets" />
-    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
-    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
-
-    <!-- IKVM.Java uses the javac executable from JAVA_HOME: bootstrap -->
-    <Target Name="ResolveJavaCompiler" Condition=" '$(JAVA_HOME)' != '' And '$(JavaCompilerPath)' == '' ">
-        <PropertyGroup>
-            <JavaCompilerPath Condition=" '$([MSBuild]::IsOSUnixLike())' == 'true' And Exists('$(JAVA_HOME)\bin\javac') ">$([System.IO.Path]::GetFullPath('$(JAVA_HOME)\bin\javac'))</JavaCompilerPath>
-            <JavaCompilerPath Condition=" '$([MSBuild]::IsOSUnixLike())' != 'true' And Exists('$(JAVA_HOME)\bin\javac.exe') ">$([System.IO.Path]::GetFullPath('$(JAVA_HOME)\bin\javac.exe'))</JavaCompilerPath>
-            <JavaCompilerArgs>-J-Xmx1536M</JavaCompilerArgs>
-            <JavaCompilerExec Condition=" '$(JavaCompilerPath)' != '' ">"$(JavaCompilerPath)" $(JavaCompilerArgs)</JavaCompilerExec>
-        </PropertyGroup>
-        <Message Text="Using javac executable found in JAVA_HOME at '$(JavaCompilerPath)'." Importance="high" Condition=" '$(JavaCompilerPath)' != '' " />
-    </Target>
-
-    <Target Name="ResolveRmiStubInputItems" DependsOnTargets="CompileJava">
-        <ItemGroup>
-            <RmiStubInputItem Include="@(Classpath)" />
-            <RmiStubInputItem Include="$(ClassOutputPath)**\*.class" />
-        </ItemGroup>
-    </Target>
-
-    <Target Name="ResolveRmiCompiler" Condition=" '$(JAVA_HOME)' != '' And '$(RmiCompilerPath)' == '' ">
-        <PropertyGroup>
-            <RmiCompilerPath Condition=" '$([MSBuild]::IsOSUnixLike())' == 'true' And Exists('$(JAVA_HOME)\bin\rmic') ">$([System.IO.Path]::GetFullPath('$(JAVA_HOME)\bin\rmic'))</RmiCompilerPath>
-            <RmiCompilerPath Condition=" '$([MSBuild]::IsOSUnixLike())' != 'true' And Exists('$(JAVA_HOME)\bin\rmic.exe') ">$([System.IO.Path]::GetFullPath('$(JAVA_HOME)\bin\rmic.exe'))</RmiCompilerPath>
-            <RmiCompilerArgs>-J-client -J-Xms128m</RmiCompilerArgs>
-            <RmiCompilerExec Condition=" '$(RmiCompilerPath)' != '' ">"$(RmiCompilerPath)" $(RmiCompilerArgs)</RmiCompilerExec>
-        </PropertyGroup>
-        <Message Text="Using rmic executable found in JAVA_HOME at '$(RmiCompilerPath)'." Importance="high" Condition=" '$(RmiCompilerPath)' != '' " />
-    </Target>
-
-    <PropertyGroup>
-        <RmiStubsOutputPath>$(IntermediateOutputPath)rmistubs\</RmiStubsOutputPath>
-        <_BuildRmiStubsCoreStampFile>$(RmiStubsOutputPath)stamp</_BuildRmiStubsCoreStampFile>
-    </PropertyGroup>
-
-    <Target Name="_BuildRmiStubs" DependsOnTargets="ResolveRmiCompiler;ResolveRmiStubInputItems" Inputs="@(RmiStubInputItem)" Outputs="$(_BuildRmiStubsCoreStampFile)">
-        <ItemGroup>
-            <_RmiCompilerClasspath Include="@(Classpath);$(ClassOutputPath)" />
-            <_RmiCompilerArgs Include="@(RmiCompilerArgs)" />
-            <_RmiCompilerArgs Include="-nowarn" />
-            <_RmiCompilerArgs Include="-bootclasspath" />
-            <_RmiCompilerArgs Include="@(_RmiCompilerClasspath, '$([System.IO.Path]::PathSeparator)')" />
-            <_RmiCompilerArgs Include="-d" />
-            <_RmiCompilerArgs Include="$(RmiStubsOutputPath)" />
-        </ItemGroup>
-        <PropertyGroup>
-            <_RmiCompilerArgs>@(_RmiCompilerArgs, ' ')</_RmiCompilerArgs>
-        </PropertyGroup>
-        <Delete Files="$(RmiStubsOutputPath)**\*" />
-        <MakeDir Directories="$(RmiStubsOutputPath)" />
-        <Exec Command="$(RmiCompilerExec) $(_RmiCompilerArgs) %(OpenJdkRmiStub.Flags) $([System.String]::Copy('%(OpenJdkRmiStub.Identity)').Replace('$', '\$'))" Condition=" '$([MSBuild]::IsOSUnixLike())' == 'true' " />
-        <Exec Command="$(RmiCompilerExec) $(_RmiCompilerArgs) %(OpenJdkRmiStub.Flags) $([System.String]::Copy('%(OpenJdkRmiStub.Identity)'))" Condition=" '$([MSBuild]::IsOSUnixLike())' == 'false' " />
-        <Touch Files="$(_BuildRmiStubsCoreStampFile)" AlwaysCreate="true" ForceTouch="true" />
-    </Target>
-
-    <PropertyGroup>
-        <BuildRmiStubsDependsOn>
-            $(BuildRmiStubsDependsOn)
-            CompileJava;
-            ResolveRmiStubInputItems;
-            _BuildRmiStubs;
-        </BuildRmiStubsDependsOn>
-    </PropertyGroup>
-
-    <Target Name="BuildRmiStubs" DependsOnTargets="$(BuildRmiStubsDependsOn)">
-        <ItemGroup>
-            <Convert Include="$(RmiStubsOutputPath)**\*.class" />
-        </ItemGroup>
-    </Target>
-
-    <Target Name="CleanRmiStubs">
-        <Delete Files="$(_BuildRmiStubsCoreStampFile)" />
-        <RemoveDir Directories="$(RmiStubsOutputPath)" />
-    </Target>
-
-    <PropertyGroup>
-        <CoreCleanDependsOn>
-            $(CoreCleanDependsOn);
-            CleanRmiStubs;
-        </CoreCleanDependsOn>
-    </PropertyGroup>
-
     <PropertyGroup>
-        <CoreCompileDependsOn>
-            BuildRmiStubs;
-            $(CoreCompileDependsOn);
-        </CoreCompileDependsOn>
+        <IkvmJavaRuntimeIdentifier>ref</IkvmJavaRuntimeIdentifier>
     </PropertyGroup>
 
+    <Import Project="..\IKVM.Java\IKVM.Java.runtime.props" />
+    <Import Project="..\IKVM.Java\IKVM.Java.runtime.targets" />
 </Project>
diff --git a/src/IKVM.Java/IKVM.Java.runtime.props b/src/IKVM.Java/IKVM.Java.runtime.props
new file mode 100644
index 0000000000..fd751e1bee
--- /dev/null
+++ b/src/IKVM.Java/IKVM.Java.runtime.props
@@ -0,0 +1,86 @@
+<!--
+
+    IKVM.Java.runtime.props
+    
+    Imported by the .runtime projects.
+
+-->
+
+<Project>
+    <PropertyGroup>
+        <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    </PropertyGroup>
+
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.props" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.props" />
+    <Import Project="$(MSBuildThisFileDirectory)..\..\openjdk.props" />
+
+    <PropertyGroup>
+        <TargetFrameworks>net472;net6.0</TargetFrameworks>
+        <AssemblyName>IKVM.Java</AssemblyName>
+        <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+        <Bootstrap>true</Bootstrap>
+        <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <InternalsVisibleTo Include="IKVM.Runtime" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="$(MSBuildThisFileDirectory)..\IKVM.Runtime-ref\IKVM.Runtime-ref.csproj" Private="False" PrivateAssets="All" IncludeNonPublicTypes="true" />
+        <ProjectReference Include="$(MSBuildThisFileDirectory)..\IKVM.Java-ref\IKVM.Java-ref.csproj" Private="False" PrivateAssets="All" HideFromJava="true" Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'ref' " />
+        <ProjectReference Include="$(MSBuildThisFileDirectory)..\IKVM.Java\IKVM.Java.msbuildproj" Private="False" PrivateAssets="All" HideFromJava="true" Condition=" '$(IkvmJavaRuntimeIdentifier)' != 'ref' " />
+    </ItemGroup>
+
+    <ItemGroup>
+        <TransformValues Include="Name" Value="$(ProductName)" />
+        <TransformValues Include="Version" Value="$(Version)" />
+        <TransformValues Include="FileVersion" Value="$(FileVersion)" />
+        <TransformValues Include="VendorUrl" Value="$(PackageProjectUrl)" />
+        <TransformValues Include="VendorUrlBug" Value="$(PackageProjectUrl)/issues/" />
+        <TransformValues Include="OpenJdkVersion" Value="$(OpenJdkVersion)" />
+        <TransformValues Include="OpenJdkFullVersion" Value="$(OpenJdkFullVersion)" />
+        <TransformValues Include="OpenJdkVendor" Value="$(OpenJdkVendor)" />
+        <TransformValues Include="OpenJdkImplementationVendor" Value="$(OpenJdkImplementationVendor)" />
+        <TransformValues Include="OpenJdkImplementationVersion" Value="$(OpenJdkImplementationVersion)" />
+        <TransformValues Include="OpenJdkSpecificationVersion" Value="$(OpenJdkSpecificationVersion)" />
+        <TransformValues Include="OpenJdkSpecificationVendor" Value="$(OpenJdkSpecificationVendor)" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <JavaResource Include="$(MSBuildThisFileDirectory)local\**\*" Exclude="$(MSBuildThisFileDirectory)local\**\*.java;$(MSBuildThisFileDirectory)**\*.tt" ResourcePath="%(RecursiveDir)%(Filename)%(Extension)" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="$(MSBuildThisFileDirectory)icedtea_jce\**\*" Link="icedtea_jce\%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Include="$(MSBuildThisFileDirectory)icedtea_rt\**\*" Link="icedtea_rt\%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Include="$(MSBuildThisFileDirectory)local\**\*" Link="local\%(RecursiveDir)%(Filename)%(Extension)" />
+        <Compile Include="$(MSBuildThisFileDirectory)icedtea_jce\**\*.java" Link="icedtea_jce\%(RecursiveDir)%(Filename)%(Extension)" />
+        <Compile Include="$(MSBuildThisFileDirectory)icedtea_rt\**\*.java" Link="icedtea_rt\%(RecursiveDir)%(Filename)%(Extension)" />
+        <Compile Include="$(MSBuildThisFileDirectory)local\**\*.java" Link="local\%(RecursiveDir)%(Filename)%(Extension)" />
+        <None Include="@(OpenJdkSource->WithMetadataValue('RuntimeIdentifier', ''))" LinkBase="openjdk\%(PackagePath)" />
+        <None Include="@(OpenJdkSource->WithMetadataValue('RuntimeIdentifier', '$(IkvmJavaRuntimeIdentifier)'))" LinkBase="openjdk\%(PackagePath)" />
+        <Compile Include="@(OpenJdkSource->WithMetadataValue('RuntimeIdentifier', ''))" LinkBase="openjdk\%(PackagePath)" />
+        <Compile Include="@(OpenJdkSource->WithMetadataValue('RuntimeIdentifier', '$(IkvmJavaRuntimeIdentifier)'))" LinkBase="openjdk\%(PackagePath)" />
+        <Convert Include="@(OpenJdkClass->WithMetadataValue('RuntimeIdentifier', ''))" LinkBase="openjdk\%(PackagePath)" />
+        <Convert Include="@(OpenJdkClass->WithMetadataValue('RuntimeIdentifier', '$(IkvmJavaRuntimeIdentifier)'))" LinkBase="openjdk\%(PackagePath)" />
+        <None Include="@(OpenJdkClass->WithMetadataValue('RuntimeIdentifier', ''))" LinkBase="openjdk\%(PackagePath)" />
+        <None Include="@(OpenJdkClass->WithMetadataValue('RuntimeIdentifier', '$(IkvmJavaRuntimeIdentifier)'))" LinkBase="openjdk\%(PackagePath)" />
+        <JavaResource Include="@(OpenJdkResource->WithMetadataValue('RuntimeIdentifier', ''))" LinkBase="openjdk\%(PackagePath)" />
+        <JavaResource Include="@(OpenJdkResource->WithMetadataValue('RuntimeIdentifier', '$(IkvmJavaRuntimeIdentifier)'))" LinkBase="openjdk\%(PackagePath)" />
+        <ExcludeRegex Include="@(OpenJdkExcludeRegex)" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Transform Include="$(MSBuildThisFileDirectory)\local\META-INF\MANIFEST.MF.tt" TargetPath="$(IntermediateOutputPath)transform\local\META-INF\MANIFEST.MF" />
+        <JavaResource Include="$(IntermediateOutputPath)transform\local\META-INF\MANIFEST.MF" Visible="False" ResourcePath="META-INF/MANIFEST.MF" Link="local\META-INF\MANIFEST.MF" />
+        <Transform Include="$(MSBuildThisFileDirectory)\local\nashorn\version.properties.tt" TargetPath="$(IntermediateOutputPath)transform\local\nashorn\version.properties" />
+        <JavaResource Include="$(IntermediateOutputPath)transform\local\nashorn\version.properties" Visible="False" ResourcePath="nashorn/version.properties" Link="local\nashorn\version.properties" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <MapFile Include="$(MSBuildThisFileDirectory)map.xml" />
+    </ItemGroup>
+    
+</Project>
diff --git a/src/IKVM.Java/IKVM.Java.runtime.targets b/src/IKVM.Java/IKVM.Java.runtime.targets
new file mode 100644
index 0000000000..aaa976f4fa
--- /dev/null
+++ b/src/IKVM.Java/IKVM.Java.runtime.targets
@@ -0,0 +1,105 @@
+<!--
+
+    IKVM.Java.runtime.targets
+    
+    Imported by the .runtime projects.
+
+-->
+
+<Project>
+    <PropertyGroup>
+        <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    </PropertyGroup>
+
+    <Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.deps.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
+
+    <!-- IKVM.Java uses the javac executable from JAVA_HOME: bootstrap -->
+    <Target Name="ResolveJavaCompiler" Condition=" '$(JAVA_HOME)' != '' And '$(JavaCompilerPath)' == '' ">
+        <PropertyGroup>
+            <JavaCompilerPath Condition=" '$([MSBuild]::IsOSUnixLike())' == 'true' And Exists('$(JAVA_HOME)\bin\javac') ">$([System.IO.Path]::GetFullPath('$(JAVA_HOME)\bin\javac'))</JavaCompilerPath>
+            <JavaCompilerPath Condition=" '$([MSBuild]::IsOSUnixLike())' != 'true' And Exists('$(JAVA_HOME)\bin\javac.exe') ">$([System.IO.Path]::GetFullPath('$(JAVA_HOME)\bin\javac.exe'))</JavaCompilerPath>
+            <JavaCompilerArgs>-J-Xmx1536M</JavaCompilerArgs>
+            <JavaCompilerExec Condition=" '$(JavaCompilerPath)' != '' ">"$(JavaCompilerPath)" $(JavaCompilerArgs)</JavaCompilerExec>
+        </PropertyGroup>
+        <Message Text="Using javac executable found in JAVA_HOME at '$(JavaCompilerPath)'." Importance="high" Condition=" '$(JavaCompilerPath)' != '' " />
+    </Target>
+
+    <Target Name="ResolveRmiStubInputItems" DependsOnTargets="CompileJava">
+        <ItemGroup>
+            <RmiStubInputItem Include="@(Classpath)" />
+            <RmiStubInputItem Include="$(ClassOutputPath)**\*.class" />
+        </ItemGroup>
+    </Target>
+
+    <Target Name="ResolveRmiCompiler" Condition=" '$(JAVA_HOME)' != '' And '$(RmiCompilerPath)' == '' ">
+        <PropertyGroup>
+            <RmiCompilerPath Condition=" '$([MSBuild]::IsOSUnixLike())' == 'true' And Exists('$(JAVA_HOME)\bin\rmic') ">$([System.IO.Path]::GetFullPath('$(JAVA_HOME)\bin\rmic'))</RmiCompilerPath>
+            <RmiCompilerPath Condition=" '$([MSBuild]::IsOSUnixLike())' != 'true' And Exists('$(JAVA_HOME)\bin\rmic.exe') ">$([System.IO.Path]::GetFullPath('$(JAVA_HOME)\bin\rmic.exe'))</RmiCompilerPath>
+            <RmiCompilerArgs>-J-client -J-Xms128m</RmiCompilerArgs>
+            <RmiCompilerExec Condition=" '$(RmiCompilerPath)' != '' ">"$(RmiCompilerPath)" $(RmiCompilerArgs)</RmiCompilerExec>
+        </PropertyGroup>
+        <Message Text="Using rmic executable found in JAVA_HOME at '$(RmiCompilerPath)'." Importance="high" Condition=" '$(RmiCompilerPath)' != '' " />
+    </Target>
+
+    <PropertyGroup>
+        <RmiStubsOutputPath>$(IntermediateOutputPath)rmistubs\</RmiStubsOutputPath>
+        <_BuildRmiStubsCoreStampFile>$(RmiStubsOutputPath)stamp</_BuildRmiStubsCoreStampFile>
+    </PropertyGroup>
+
+    <Target Name="_BuildRmiStubs" DependsOnTargets="ResolveRmiCompiler;ResolveRmiStubInputItems" Inputs="@(RmiStubInputItem)" Outputs="$(_BuildRmiStubsCoreStampFile)">
+        <ItemGroup>
+            <_RmiCompilerClasspath Include="@(Classpath);$(ClassOutputPath)" />
+            <_RmiCompilerArgs Include="@(RmiCompilerArgs)" />
+            <_RmiCompilerArgs Include="-nowarn" />
+            <_RmiCompilerArgs Include="-bootclasspath" />
+            <_RmiCompilerArgs Include="@(_RmiCompilerClasspath, '$([System.IO.Path]::PathSeparator)')" />
+            <_RmiCompilerArgs Include="-d" />
+            <_RmiCompilerArgs Include="$(RmiStubsOutputPath)" />
+        </ItemGroup>
+        <PropertyGroup>
+            <_RmiCompilerArgs>@(_RmiCompilerArgs, ' ')</_RmiCompilerArgs>
+        </PropertyGroup>
+        <Delete Files="$(RmiStubsOutputPath)**\*" />
+        <MakeDir Directories="$(RmiStubsOutputPath)" />
+        <Exec Command="$(RmiCompilerExec) $(_RmiCompilerArgs) %(OpenJdkRmiStub.Flags) $([System.String]::Copy('%(OpenJdkRmiStub.Identity)').Replace('$', '\$'))" Condition=" '$([MSBuild]::IsOSUnixLike())' == 'true' " />
+        <Exec Command="$(RmiCompilerExec) $(_RmiCompilerArgs) %(OpenJdkRmiStub.Flags) $([System.String]::Copy('%(OpenJdkRmiStub.Identity)'))" Condition=" '$([MSBuild]::IsOSUnixLike())' == 'false' " />
+        <Touch Files="$(_BuildRmiStubsCoreStampFile)" AlwaysCreate="true" ForceTouch="true" />
+    </Target>
+
+    <PropertyGroup>
+        <BuildRmiStubsDependsOn>
+            $(BuildRmiStubsDependsOn)
+            CompileJava;
+            ResolveRmiStubInputItems;
+            _BuildRmiStubs;
+        </BuildRmiStubsDependsOn>
+    </PropertyGroup>
+
+    <Target Name="BuildRmiStubs" DependsOnTargets="$(BuildRmiStubsDependsOn)">
+        <ItemGroup>
+            <Convert Include="$(RmiStubsOutputPath)**\*.class" />
+        </ItemGroup>
+    </Target>
+
+    <Target Name="CleanRmiStubs">
+        <Delete Files="$(_BuildRmiStubsCoreStampFile)" />
+        <RemoveDir Directories="$(RmiStubsOutputPath)" />
+    </Target>
+
+    <PropertyGroup>
+        <CoreCleanDependsOn>
+            $(CoreCleanDependsOn);
+            CleanRmiStubs;
+        </CoreCleanDependsOn>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <CoreCompileDependsOn>
+            BuildRmiStubs;
+            $(CoreCompileDependsOn);
+        </CoreCompileDependsOn>
+    </PropertyGroup>
+    
+</Project>
diff --git a/src/libawt/libawt.clangproj b/src/libawt/libawt.clangproj
index f3140e4309..ef4e1b3c00 100644
--- a/src/libawt/libawt.clangproj
+++ b/src/libawt/libawt.clangproj
@@ -13,4 +13,4 @@
     <ItemGroup>
         <Compile Include="awt.c" />
     </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/libiava/libiava.clangproj b/src/libiava/libiava.clangproj
index fc18582a62..d10120fbd4 100644
--- a/src/libiava/libiava.clangproj
+++ b/src/libiava/libiava.clangproj
@@ -14,7 +14,6 @@
         <ProjectReference Include="..\libfdlibm\libfdlibm.clangproj" />
         <ProjectReference Include="..\libverify\libverify.clangproj" />
         <ProjectReference Include="..\libjvm\libjvm.clangproj" />
-        <ProjectReference Include="..\IKVM.Java\IKVM.Java.msbuildproj" Properties="TargetFramework=net6.0" GlobalPropertiesToRemove="TargetIdentifier" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetTriple.Contains('-windows-'))">
         <Dependencies Include="shell32;delayimp;advapi32;version" />
diff --git a/src/libnet/libnet.clangproj b/src/libnet/libnet.clangproj
index a7ac7d24f3..d541b70ac7 100644
--- a/src/libnet/libnet.clangproj
+++ b/src/libnet/libnet.clangproj
@@ -14,7 +14,6 @@
     <ItemGroup>
         <ProjectReference Include="..\libjvm\libjvm.clangproj" />
         <ProjectReference Include="..\libiava\libiava.clangproj" />
-        <ProjectReference Include="..\IKVM.Java\IKVM.Java.msbuildproj" Properties="TargetFramework=net6.0" GlobalPropertiesToRemove="TargetIdentifier" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetTriple.Contains('-windows-'))">
         <Dependencies Include="ws2_32;secur32;iphlpapi;delayimp;advapi32" />
diff --git a/src/libnio/libnio.clangproj b/src/libnio/libnio.clangproj
index 14fb5e5dd5..0e53cc0de0 100644
--- a/src/libnio/libnio.clangproj
+++ b/src/libnio/libnio.clangproj
@@ -19,7 +19,6 @@
         <ProjectReference Include="..\libjvm\libjvm.clangproj" />
         <ProjectReference Include="..\libiava\libiava.clangproj" />
         <ProjectReference Include="..\libnet\libnet.clangproj" />
-        <ProjectReference Include="..\IKVM.Java\IKVM.Java.msbuildproj" Properties="TargetFramework=net6.0" GlobalPropertiesToRemove="TargetIdentifier" />
     </ItemGroup>
     <ItemGroup Condition="$(TargetTriple.Contains('-windows-'))">
         <Dependencies Include="ws2_32;advapi32" />
diff --git a/src/libunpack/libunpack.clangproj b/src/libunpack/libunpack.clangproj
index 9e0f94059c..970f0f2a0b 100644
--- a/src/libunpack/libunpack.clangproj
+++ b/src/libunpack/libunpack.clangproj
@@ -12,7 +12,6 @@
     <ItemGroup>
         <ProjectReference Include="..\libjvm\libjvm.clangproj" />
         <ProjectReference Include="..\libiava\libiava.clangproj" />
-        <ProjectReference Include="..\IKVM.Java\IKVM.Java.msbuildproj" Properties="TargetFramework=net6.0" GlobalPropertiesToRemove="TargetIdentifier" />
     </ItemGroup>
     <ItemGroup>
         <Compile Include="$(OpenJdkDir)jdk\src\share\native\com\sun\java\util\jar\pack\**\*.cpp" Exclude="$(OpenJdkDir)jdk\src\share\native\com\sun\java\util\jar\pack\main.cpp;$(OpenJdkDir)jdk\src\share\native\com\sun\java\util\jar\pack\jni.cpp" LanguageStandard="c++11" />
diff --git a/targets/openjdk.lib.props b/targets/openjdk.lib.props
index 5a739d38f1..39465d08ca 100644
--- a/targets/openjdk.lib.props
+++ b/targets/openjdk.lib.props
@@ -28,6 +28,10 @@
         <PreprocessorDefinitions>$(PreprocessorDefinitions);_STATIC_CPPLIB;_DISABLE_DEPRECATE_STATIC_CPPLIB;WIN32_LEAN_AND_MEAN;IAL</PreprocessorDefinitions>
     </PropertyGroup>
 
+    <ItemGroup Condition="$(TargetTriple.Contains('-windows-')) ">
+        <ProjectReference Include="..\IKVM.Java.runtime.win\IKVM.Java.runtime.win.msbuildproj" Properties="TargetFramework=net6.0" GlobalPropertiesToRemove="TargetIdentifier" />
+    </ItemGroup>
+
     <!-- common/autoconf/flags.m4 -->
     <PropertyGroup Condition="$(TargetTriple.Contains('-linux-'))">
         <OpenJdkTargetOsApiDir>solaris</OpenJdkTargetOsApiDir>
@@ -35,6 +39,10 @@
         <PreprocessorDefinitions>$(PreprocessorDefinitions);_GNU_SOURCE;_REENTRANT;_LARGEFILE64_SOURCE</PreprocessorDefinitions>
     </PropertyGroup>
 
+    <ItemGroup Condition="$(TargetTriple.Contains('-linux-'))">
+        <ProjectReference Include="..\IKVM.Java.runtime.linux\IKVM.Java.runtime.linux.msbuildproj" Properties="TargetFramework=net6.0" GlobalPropertiesToRemove="TargetIdentifier" />
+    </ItemGroup>
+
     <!-- common/autoconf/flags.m4 -->
     <PropertyGroup Condition="$(TargetTriple.Contains('-apple-'))">
         <OpenJdkTargetOsApiDir>solaris</OpenJdkTargetOsApiDir>
@@ -42,6 +50,10 @@
         <EnableOSXCodeSign Condition=" '$(EnableOSXCodeSign)' == '' ">true</EnableOSXCodeSign>
     </PropertyGroup>
 
+    <ItemGroup Condition="$(TargetTriple.Contains('-apple-'))">
+        <ProjectReference Include="..\IKVM.Java.runtime.osx\IKVM.Java.runtime.osx.msbuildproj" Properties="TargetFramework=net6.0" GlobalPropertiesToRemove="TargetIdentifier" />
+    </ItemGroup>
+
     <!-- standard OpenJDK includes -->
     <PropertyGroup Condition=" '$(TargetTriple)' != '' ">
         <IncludeDirectories>$(IncludeDirectories);$(OpenJdkDir)jdk\src\share\native\common</IncludeDirectories>