diff --git a/MapControl/Avalonia/MapControl.Avalonia.csproj b/MapControl/Avalonia/MapControl.Avalonia.csproj
index 6b26e89b..ea0e446c 100644
--- a/MapControl/Avalonia/MapControl.Avalonia.csproj
+++ b/MapControl/Avalonia/MapControl.Avalonia.csproj
@@ -17,34 +17,24 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Compile Include="..\Shared\BoundingBox.cs" Link="BoundingBox.cs" />
-        <Compile Include="..\Shared\ImageFileCache.cs" Link="ImageFileCache.cs" />
-        <Compile Include="..\Shared\ImageLoader.cs" Link="ImageLoader.cs" />
-        <Compile Include="..\Shared\Location.cs" Link="Location.cs" />
-        <Compile Include="..\Shared\LocationCollection.cs" Link="LocationCollection.cs" />
-        <Compile Include="..\Shared\MapBase.cs" Link="MapBase.cs" />
-        <Compile Include="..\Shared\MapImageLayer.cs" Link="MapImageLayer.cs" />
-        <Compile Include="..\Shared\MapPanel.cs" Link="MapPanel.cs" />
-        <Compile Include="..\Shared\MapProjection.cs" Link="MapProjection.cs" />
-        <Compile Include="..\Shared\MapTileLayer.cs" Link="MapTileLayer.cs" />
-        <Compile Include="..\Shared\MapTileLayerBase.cs" Link="MapTileLayerBase.cs" />
-        <Compile Include="..\Shared\Tile.cs" Link="Tile.cs" />
-        <Compile Include="..\Shared\TileCollection.cs" Link="TileCollection.cs" />
-        <Compile Include="..\Shared\TileImageLoader.cs" Link="TileImageLoader.cs" />
-        <Compile Include="..\Shared\TileMatrix.cs" Link="TileMatrix.cs" />
-        <Compile Include="..\Shared\TileSource.cs" Link="TileSource.cs" />
-        <Compile Include="..\Shared\ViewportChangedEventArgs.cs" Link="ViewportChangedEventArgs.cs" />
-        <Compile Include="..\Shared\ViewRect.cs" Link="ViewRect.cs" />
-        <Compile Include="..\Shared\WebMercatorProjection.cs" Link="WebMercatorProjection.cs" />
-        <Compile Include="..\Shared\WmsImageLayer.cs" Link="WmsImageLayer.cs" />
-        <Compile Include="..\Shared\WmtsCapabilities.cs" Link="WmtsCapabilities.cs" />
-        <Compile Include="..\Shared\WmtsTileLayer.cs" Link="WmtsTileLayer.cs" />
-        <Compile Include="..\Shared\WmtsTileMatrix.cs" Link="WmtsTileMatrix.cs" />
-        <Compile Include="..\Shared\WmtsTileMatrixLayer.cs" Link="WmtsTileMatrixLayer.cs" />
-        <Compile Include="..\Shared\WmtsTileMatrixSet.cs" Link="WmtsTileMatrixSet.cs" />
-        <Compile Include="..\Shared\WmtsTileSource.cs" Link="WmtsTileSource.cs" />
-        <Compile Include="..\WPF\Timer.WPF.cs" Link="Timer.WPF.cs" />
-        <Compile Include="..\WPF\TypeConverters.WPF.cs" Link="TypeConverters.WPF.cs" />
+        <Compile Include="..\Shared\*.cs" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Remove="..\Shared\BindingHelper.cs" />
+        <Compile Remove="..\Shared\GeoImage.cs" />
+        <Compile Remove="..\Shared\GroundOverlay.cs" />
+        <Compile Remove="..\Shared\MapBorderPanel.cs" />
+        <Compile Remove="..\Shared\MapGraticule.cs" />
+        <Compile Remove="..\Shared\MapItem.cs" />
+        <Compile Remove="..\Shared\MapItemsControl.cs" />
+        <Compile Remove="..\Shared\MapOverlay.cs" />
+        <Compile Remove="..\Shared\MapPath.cs" />
+        <Compile Remove="..\Shared\MapPolyline.cs" />
+        <Compile Remove="..\Shared\MapPolygon.cs" />
+        <Compile Remove="..\Shared\MapScale.cs" />
+        <Compile Remove="..\Shared\PushpinBorder.cs" />
+        <Compile Remove="..\Shared\ViewTransform.cs" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/MapControl/Shared/BingMapsTileLayer.cs b/MapControl/Shared/BingMapsTileLayer.cs
index b7334dd4..7dcf21c0 100644
--- a/MapControl/Shared/BingMapsTileLayer.cs
+++ b/MapControl/Shared/BingMapsTileLayer.cs
@@ -13,6 +13,8 @@ using System.Windows;
 using Windows.UI.Xaml;
 #elif WINUI
 using Microsoft.UI.Xaml;
+#elif AVALONIA
+using Avalonia.Interactivity;
 #endif
 
 namespace MapControl
diff --git a/MapControl/Shared/BoundingBoxTileSource.cs b/MapControl/Shared/BoundingBoxTileSource.cs
index 1444db03..eb99e80d 100644
--- a/MapControl/Shared/BoundingBoxTileSource.cs
+++ b/MapControl/Shared/BoundingBoxTileSource.cs
@@ -11,6 +11,8 @@ using System.Windows.Media;
 using Windows.UI.Xaml.Media;
 #elif WINUI
 using Microsoft.UI.Xaml.Media;
+#elif AVALONIA
+using ImageSource = Avalonia.Media.IImage;
 #endif
 
 namespace MapControl
diff --git a/MapControl/WPF/Timer.WPF.cs b/MapControl/Shared/Timer.cs
similarity index 100%
rename from MapControl/WPF/Timer.WPF.cs
rename to MapControl/Shared/Timer.cs
diff --git a/MapControl/WPF/TypeConverters.WPF.cs b/MapControl/Shared/TypeConverters.cs
similarity index 100%
rename from MapControl/WPF/TypeConverters.WPF.cs
rename to MapControl/Shared/TypeConverters.cs
diff --git a/MapControl/UWP/MapControl.UWP.csproj b/MapControl/UWP/MapControl.UWP.csproj
index d1e71c09..fd9a25a5 100644
--- a/MapControl/UWP/MapControl.UWP.csproj
+++ b/MapControl/UWP/MapControl.UWP.csproj
@@ -179,6 +179,9 @@
     <Compile Include="..\Shared\TileSource.cs">
       <Link>TileSource.cs</Link>
     </Compile>
+    <Compile Include="..\Shared\Timer.cs">
+      <Link>Timer.cs</Link>
+    </Compile>
     <Compile Include="..\Shared\TransverseMercatorProjection.cs">
       <Link>TransverseMercatorProjection.cs</Link>
     </Compile>
@@ -275,9 +278,6 @@
     <Compile Include="..\WinUI\Tile.WinUI.cs">
       <Link>Tile.WinUI.cs</Link>
     </Compile>
-    <Compile Include="..\WPF\Timer.WPF.cs">
-      <Link>Timer.WPF.cs</Link>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TileImageLoader.UWP.cs" />
     <EmbeddedResource Include="Properties\MapControl.UWP.rd.xml" />
diff --git a/MapControl/WinUI/MapControl.WinUI.csproj b/MapControl/WinUI/MapControl.WinUI.csproj
index f4fe7c27..70671a29 100644
--- a/MapControl/WinUI/MapControl.WinUI.csproj
+++ b/MapControl/WinUI/MapControl.WinUI.csproj
@@ -26,6 +26,11 @@
         <Compile Include="..\Shared\*.cs" />
     </ItemGroup>
 
+    <ItemGroup>
+        <Compile Remove="..\Shared\Timer.cs" />
+        <Compile Remove="..\Shared\TypeConverters.cs" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
         <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />