diff --git a/src/Avalonia.Base/Layout/IEmbeddedLayoutRoot.cs b/src/Avalonia.Base/Layout/IEmbeddedLayoutRoot.cs
deleted file mode 100644
index 24f0ccd82e..0000000000
--- a/src/Avalonia.Base/Layout/IEmbeddedLayoutRoot.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Avalonia.Layout
-{
-    /// <summary>
-    /// A special layout root with enforced size for Arrange pass
-    /// </summary>
-    public interface IEmbeddedLayoutRoot : ILayoutRoot
-    {
-        Size AllocatedSize { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Base/Layout/ILayoutManager.cs b/src/Avalonia.Base/Layout/ILayoutManager.cs
index 5035d3a48d..588ce97ba5 100644
--- a/src/Avalonia.Base/Layout/ILayoutManager.cs
+++ b/src/Avalonia.Base/Layout/ILayoutManager.cs
@@ -6,8 +6,7 @@ namespace Avalonia.Layout
     /// <summary>
     /// Manages measuring and arranging of controls.
     /// </summary>
-    [PrivateApi]
-    public interface ILayoutManager : IDisposable
+    internal interface ILayoutManager : IDisposable
     {
         /// <summary>
         /// Raised when the layout manager completes a layout pass.
diff --git a/src/Avalonia.Base/Layout/ILayoutRoot.cs b/src/Avalonia.Base/Layout/ILayoutRoot.cs
index 4ebab396cf..0bfb10ea36 100644
--- a/src/Avalonia.Base/Layout/ILayoutRoot.cs
+++ b/src/Avalonia.Base/Layout/ILayoutRoot.cs
@@ -5,14 +5,8 @@ namespace Avalonia.Layout
     /// <summary>
     /// Defines the root of a layoutable tree.
     /// </summary>
-    [PrivateApi]
-    public interface ILayoutRoot
+    internal interface ILayoutRoot
     {
-        /// <summary>
-        /// The size available to lay out the controls.
-        /// </summary>
-        Size ClientSize { get; }
-
         /// <summary>
         /// The scaling factor to use in layout.
         /// </summary>
diff --git a/src/Avalonia.Base/Layout/LayoutManager.cs b/src/Avalonia.Base/Layout/LayoutManager.cs
index 411b747107..6199b38b5c 100644
--- a/src/Avalonia.Base/Layout/LayoutManager.cs
+++ b/src/Avalonia.Base/Layout/LayoutManager.cs
@@ -17,8 +17,7 @@ namespace Avalonia.Layout
     /// <summary>
     /// Manages measuring and arranging of controls.
     /// </summary>
-    [PrivateApi]
-    public class LayoutManager : ILayoutManager, IDisposable
+    internal class LayoutManager : ILayoutManager, IDisposable
     {
         private const int MaxPasses = 10;
         private readonly Layoutable _owner;
@@ -329,9 +328,7 @@ namespace Avalonia.Layout
 
             if (!control.IsArrangeValid)
             {
-                if (control is IEmbeddedLayoutRoot embeddedRoot)
-                    control.Arrange(new Rect(embeddedRoot.AllocatedSize));
-                else if (control is ILayoutRoot root)
+                if (control is ILayoutRoot root)
                     control.Arrange(new Rect(control.DesiredSize));
                 else if (control.PreviousArrange != null)
                 {