diff --git a/src/Avalonia/Prism.Avalonia/Navigation/Regions/AllActiveRegion.cs b/src/Avalonia/Prism.Avalonia/Navigation/Regions/AllActiveRegion.cs
deleted file mode 100644
index 4f43a6ade..000000000
--- a/src/Avalonia/Prism.Avalonia/Navigation/Regions/AllActiveRegion.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using Prism.Properties;
-
-namespace Prism.Navigation.Regions
-{
-    /// <summary>
-    /// Region that keeps all the views in it as active. Deactivation of views is not allowed.
-    /// </summary>
-    public class AllActiveRegion : Region
-    {
-        /// <summary>
-        /// Gets a readonly view of the collection of all the active views in the region. These are all the added views.
-        /// </summary>
-        /// <value>An <see cref="IViewsCollection"/> of all the active views.</value>
-        public override IViewsCollection ActiveViews => Views;
-
-        /// <summary>
-        /// Deactivate is not valid in this Region. This method will always throw <see cref="InvalidOperationException"/>.
-        /// </summary>
-        /// <param name="view">The view to deactivate.</param>
-        /// <exception cref="InvalidOperationException">Every time this method is called.</exception>
-        public override void Deactivate(object view)
-        {
-            throw new InvalidOperationException(Resources.DeactiveNotPossibleException);
-        }
-    }
-}
diff --git a/src/Avalonia/Prism.Avalonia/Navigation/Regions/ContentControlRegionAdapter.cs b/src/Avalonia/Prism.Avalonia/Navigation/Regions/ContentControlRegionAdapter.cs
deleted file mode 100644
index f2a10cf66..000000000
--- a/src/Avalonia/Prism.Avalonia/Navigation/Regions/ContentControlRegionAdapter.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Avalonia.Controls;
-using Prism.Properties;
-using System;
-using System.Collections.Specialized;
-using System.Linq;
-
-namespace Prism.Navigation.Regions
-{
-    /// <summary>
-    /// Adapter that creates a new <see cref="SingleActiveRegion"/> and monitors its
-    /// active view to set it on the adapted <see cref="ContentControl"/>.
-    /// </summary>
-    public class ContentControlRegionAdapter : RegionAdapterBase<ContentControl>
-    {
-        /// <summary>
-        /// Initializes a new instance of <see cref="ContentControlRegionAdapter"/>.
-        /// </summary>
-        /// <param name="regionBehaviorFactory">The factory used to create the region behaviors to attach to the created regions.</param>
-        public ContentControlRegionAdapter(IRegionBehaviorFactory regionBehaviorFactory)
-            : base(regionBehaviorFactory)
-        {
-        }
-
-        /// <summary>
-        /// Adapts a <see cref="ContentControl"/> to an <see cref="IRegion"/>.
-        /// </summary>
-        /// <param name="region">The new region being used.</param>
-        /// <param name="regionTarget">The object to adapt.</param>
-        protected override void Adapt(IRegion region, ContentControl regionTarget)
-        {
-            if (regionTarget == null)
-                throw new ArgumentNullException(nameof(regionTarget));
-
-            bool contentIsSet = regionTarget.Content != null;
-            contentIsSet = contentIsSet || regionTarget[ContentControl.ContentProperty] != null;
-
-            if (contentIsSet)
-                throw new InvalidOperationException(Resources.ContentControlHasContentException);
-
-            region.ActiveViews.CollectionChanged += delegate
-            {
-                regionTarget.Content = region.ActiveViews.FirstOrDefault();
-            };
-
-            region.Views.CollectionChanged +=
-                (sender, e) =>
-                {
-                    if (e.Action == NotifyCollectionChangedAction.Add && region.ActiveViews.Count() == 0)
-                    {
-                        region.Activate(e.NewItems[0]);
-                    }
-                };
-        }
-
-        /// <summary>
-        /// Creates a new instance of <see cref="SingleActiveRegion"/>.
-        /// </summary>
-        /// <returns>A new instance of <see cref="SingleActiveRegion"/>.</returns>
-        protected override IRegion CreateRegion()
-        {
-            return new SingleActiveRegion();
-        }
-    }
-}
diff --git a/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj b/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj
index edf13bb8e..089955350 100644
--- a/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj
+++ b/src/Avalonia/Prism.Avalonia/Prism.Avalonia.csproj
@@ -26,6 +26,8 @@ Prism.Avalonia helps you more easily design and build rich, flexible, and easy t
     <Compile Include="..\..\Wpf\Prism.Wpf\PrismInitializationExtensions.cs" Link="PrismInitializationExtensions.cs" />
     <Compile Include="..\..\Wpf\Prism.Wpf\Ioc\*.cs" LinkBase="Ioc" />
     <Compile Include="..\..\Wpf\Prism.Wpf\Mvvm\*.cs" LinkBase="Mvvm" />
+    <Compile Include="..\..\Wpf\Prism.Wpf\Navigation\Regions\AllActiveRegion.cs" LinkBase="Navigation\Regions" />
+    <Compile Include="..\..\Wpf\Prism.Wpf\Navigation\Regions\ContentControlRegionAdapter.cs" LinkBase="Navigation\Regions" />
 
     <Using Include="Prism.Extensions" />
   </ItemGroup>
diff --git a/src/Wpf/Prism.Wpf/Navigation/Regions/ContentControlRegionAdapter.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/ContentControlRegionAdapter.cs
index 52aa7a991..702c4eb75 100644
--- a/src/Wpf/Prism.Wpf/Navigation/Regions/ContentControlRegionAdapter.cs
+++ b/src/Wpf/Prism.Wpf/Navigation/Regions/ContentControlRegionAdapter.cs
@@ -29,7 +29,11 @@ protected override void Adapt(IRegion region, ContentControl regionTarget)
                 throw new ArgumentNullException(nameof(regionTarget));
 
             bool contentIsSet = regionTarget.Content != null;
+#if AVALONIA
+            contentIsSet = contentIsSet || regionTarget[ContentControl.ContentProperty] != null;
+#else
             contentIsSet = contentIsSet || regionTarget.HasBinding(ContentControl.ContentProperty);
+#endif
 
             if (contentIsSet)
                 throw new InvalidOperationException(Resources.ContentControlHasContentException);
diff --git a/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs b/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs
index 42a96e9ec..e607e7dea 100644
--- a/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs
+++ b/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs
@@ -44,7 +44,6 @@ internal static void RegisterRequiredTypes(this IContainerRegistry containerRegi
         internal static void RegisterDefaultRegionBehaviors(this IRegionBehaviorFactory regionBehaviors)
         {
 #if AVALONIA
-            //// Avalonia to WPF Equivilant: BindRegionContextToAvaloniaObjectBehavior == BindRegionContextToDependencyObjectBehavior
             regionBehaviors.AddIfMissing<BindRegionContextToAvaloniaObjectBehavior>(BindRegionContextToAvaloniaObjectBehavior.BehaviorKey);
 #else
             regionBehaviors.AddIfMissing<BindRegionContextToDependencyObjectBehavior>(BindRegionContextToDependencyObjectBehavior.BehaviorKey);