diff --git a/src/Avalonia.Visuals/Platform/IEllipseGeometryImpl.cs b/src/Avalonia.Visuals/Platform/IEllipseGeometryImpl.cs
deleted file mode 100644
index 982cf286a3..0000000000
--- a/src/Avalonia.Visuals/Platform/IEllipseGeometryImpl.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.EllipseGeometry"/>.
-    /// </summary>
-    public interface IEllipseGeometryImpl : IGeometryImpl
-    {
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/ILineGeometryImpl.cs b/src/Avalonia.Visuals/Platform/ILineGeometryImpl.cs
deleted file mode 100644
index a8aa46fb13..0000000000
--- a/src/Avalonia.Visuals/Platform/ILineGeometryImpl.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.LineGeometry"/>.
-    /// </summary>
-    public interface ILineGeometryImpl : IGeometryImpl
-    {
-    }
-}
diff --git a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
index 45ce8f5874..87db9251e1 100644
--- a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
+++ b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
@@ -40,23 +40,23 @@ namespace Avalonia.Platform
         /// Creates an ellipse geometry implementation.
         /// </summary>
         /// <param name="rect">The bounds of the ellipse.</param>
-        /// <returns>An <see cref="IEllipseGeometryImpl"/>.</returns>
-        IEllipseGeometryImpl CreateEllipseGeometry(Rect rect);
+        /// <returns>An ellipse geometry..</returns>
+        IGeometryImpl CreateEllipseGeometry(Rect rect);
 
         /// <summary>
         /// Creates a line geometry implementation.
         /// </summary>
         /// <param name="p1">The start of the line.</param>
         /// <param name="p2">The end of the line.</param>
-        /// <returns>An <see cref="ILineGeometryImpl"/>.</returns>
-        ILineGeometryImpl CreateLineGeometry(Point p1, Point p2);
+        /// <returns>A line geometry.</returns>
+        IGeometryImpl CreateLineGeometry(Point p1, Point p2);
 
         /// <summary>
         /// Creates a rectangle geometry implementation.
         /// </summary>
         /// <param name="rect">The bounds of the rectangle.</param>
-        /// <returns>An <see cref="IRectangleGeometryImpl"/>.</returns>
-        IRectangleGeometryImpl CreateRectangleGeometry(Rect rect);
+        /// <returns>A rectangle.</returns>
+        IGeometryImpl CreateRectangleGeometry(Rect rect);
 
         /// <summary>
         /// Creates a stream geometry implementation.
diff --git a/src/Avalonia.Visuals/Platform/IRectangleGeometryImpl.cs b/src/Avalonia.Visuals/Platform/IRectangleGeometryImpl.cs
deleted file mode 100644
index 7ada2c874d..0000000000
--- a/src/Avalonia.Visuals/Platform/IRectangleGeometryImpl.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-namespace Avalonia.Platform
-{
-    /// <summary>
-    /// Defines the platform-specific interface for a <see cref="Avalonia.Media.RectangleGeometry"/>.
-    /// </summary>
-    public interface IRectangleGeometryImpl : IGeometryImpl
-    {
-    }
-}
diff --git a/src/Skia/Avalonia.Skia/EllipseGeometryImpl.cs b/src/Skia/Avalonia.Skia/EllipseGeometryImpl.cs
index 92a0a5ff80..aae1dd8cef 100644
--- a/src/Skia/Avalonia.Skia/EllipseGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/EllipseGeometryImpl.cs
@@ -1,7 +1,6 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Avalonia.Platform;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -9,7 +8,7 @@ namespace Avalonia.Skia
     /// <summary>
     /// A Skia implementation of a <see cref="Avalonia.Media.EllipseGeometry"/>.
     /// </summary>
-    internal class EllipseGeometryImpl : GeometryImpl, IEllipseGeometryImpl
+    internal class EllipseGeometryImpl : GeometryImpl
     {
         public override Rect Bounds { get; }
         public override SKPath EffectivePath { get; }
diff --git a/src/Skia/Avalonia.Skia/LineGeometryImpl.cs b/src/Skia/Avalonia.Skia/LineGeometryImpl.cs
index a78c76d44a..e929e153d1 100644
--- a/src/Skia/Avalonia.Skia/LineGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/LineGeometryImpl.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using Avalonia.Platform;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -10,7 +9,7 @@ namespace Avalonia.Skia
     /// <summary>
     /// A Skia implementation of a <see cref="Avalonia.Media.LineGeometry"/>.
     /// </summary>
-    internal class LineGeometryImpl : GeometryImpl, ILineGeometryImpl
+    internal class LineGeometryImpl : GeometryImpl
     {
         public override Rect Bounds { get; }
         public override SKPath EffectivePath { get; }
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index f1e89bc464..6240a1cb4b 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -50,11 +50,11 @@ namespace Avalonia.Skia
             return new FormattedTextImpl(text, typeface, textAlignment, wrapping, constraint, spans);
         }
 
-        public IEllipseGeometryImpl CreateEllipseGeometry(Rect rect) => new EllipseGeometryImpl(rect);
+        public IGeometryImpl CreateEllipseGeometry(Rect rect) => new EllipseGeometryImpl(rect);
 
-        public ILineGeometryImpl CreateLineGeometry(Point p1, Point p2) => new LineGeometryImpl(p1, p2);
+        public IGeometryImpl CreateLineGeometry(Point p1, Point p2) => new LineGeometryImpl(p1, p2);
 
-        public IRectangleGeometryImpl CreateRectangleGeometry(Rect rect) => new RectangleGeometryImpl(rect);
+        public IGeometryImpl CreateRectangleGeometry(Rect rect) => new RectangleGeometryImpl(rect);
 
         /// <inheritdoc />
         public IStreamGeometryImpl CreateStreamGeometry()
diff --git a/src/Skia/Avalonia.Skia/RectangleGeometryImpl.cs b/src/Skia/Avalonia.Skia/RectangleGeometryImpl.cs
index 235cd37b56..a873e8e2df 100644
--- a/src/Skia/Avalonia.Skia/RectangleGeometryImpl.cs
+++ b/src/Skia/Avalonia.Skia/RectangleGeometryImpl.cs
@@ -1,7 +1,6 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Avalonia.Platform;
 using SkiaSharp;
 
 namespace Avalonia.Skia
@@ -9,7 +8,7 @@ namespace Avalonia.Skia
     /// <summary>
     /// A Skia implementation of a <see cref="Avalonia.Media.RectangleGeometry"/>.
     /// </summary>
-    internal class RectangleGeometryImpl : GeometryImpl, IRectangleGeometryImpl
+    internal class RectangleGeometryImpl : GeometryImpl
     {
         public override Rect Bounds { get; }
         public override SKPath EffectivePath { get; }
diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index cb37a93bb3..5ab9a8f74d 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -182,9 +182,9 @@ namespace Avalonia.Direct2D1
             return new WriteableWicBitmapImpl(size, dpi, format);
         }
 
-        public IEllipseGeometryImpl CreateEllipseGeometry(Rect rect) => new EllipseGeometryImpl(rect);
-        public ILineGeometryImpl CreateLineGeometry(Point p1, Point p2) => new LineGeometryImpl(p1, p2);
-        public IRectangleGeometryImpl CreateRectangleGeometry(Rect rect) => new RectangleGeometryImpl(rect);
+        public IGeometryImpl CreateEllipseGeometry(Rect rect) => new EllipseGeometryImpl(rect);
+        public IGeometryImpl CreateLineGeometry(Point p1, Point p2) => new LineGeometryImpl(p1, p2);
+        public IGeometryImpl CreateRectangleGeometry(Rect rect) => new RectangleGeometryImpl(rect);
         public IStreamGeometryImpl CreateStreamGeometry() => new StreamGeometryImpl();
 
         public IBitmapImpl LoadBitmap(string fileName)
diff --git a/src/Windows/Avalonia.Direct2D1/Media/EllipseGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/EllipseGeometryImpl.cs
index c6bf475ed1..9440966406 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/EllipseGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/EllipseGeometryImpl.cs
@@ -1,7 +1,6 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
@@ -9,7 +8,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A Direct2D implementation of a <see cref="Avalonia.Media.EllipseGeometry"/>.
     /// </summary>
-    internal class EllipseGeometryImpl : GeometryImpl, IEllipseGeometryImpl
+    internal class EllipseGeometryImpl : GeometryImpl
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamGeometryImpl"/> class.
diff --git a/src/Windows/Avalonia.Direct2D1/Media/LineGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/LineGeometryImpl.cs
index b2d11247b9..6b73fce309 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/LineGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/LineGeometryImpl.cs
@@ -1,7 +1,6 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
@@ -9,7 +8,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A Direct2D implementation of a <see cref="Avalonia.Media.LineGeometry"/>.
     /// </summary>
-    internal class LineGeometryImpl : StreamGeometryImpl, ILineGeometryImpl
+    internal class LineGeometryImpl : StreamGeometryImpl
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamGeometryImpl"/> class.
diff --git a/src/Windows/Avalonia.Direct2D1/Media/RectangleGeometryImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/RectangleGeometryImpl.cs
index 55b2b66b3f..194de4dd14 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/RectangleGeometryImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/RectangleGeometryImpl.cs
@@ -1,7 +1,6 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
@@ -9,7 +8,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A Direct2D implementation of a <see cref="Avalonia.Media.RectangleGeometry"/>.
     /// </summary>
-    internal class RectangleGeometryImpl : GeometryImpl, IRectangleGeometryImpl
+    internal class RectangleGeometryImpl : GeometryImpl
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamGeometryImpl"/> class.
diff --git a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
index c73c30365b..a3cc3dec17 100644
--- a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
+++ b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
@@ -22,19 +22,19 @@ namespace Avalonia.UnitTests
             return Mock.Of<IFormattedTextImpl>();
         }
 
-        public IEllipseGeometryImpl CreateEllipseGeometry(Rect rect)
+        public IGeometryImpl CreateEllipseGeometry(Rect rect)
         {
-            return Mock.Of<IEllipseGeometryImpl>();
+            return Mock.Of<IGeometryImpl>();
         }
 
-        public ILineGeometryImpl CreateLineGeometry(Point p1, Point p2)
+        public IGeometryImpl CreateLineGeometry(Point p1, Point p2)
         {
-            return Mock.Of<ILineGeometryImpl>();
+            return Mock.Of<IGeometryImpl>();
         }
 
-        public IRectangleGeometryImpl CreateRectangleGeometry(Rect rect)
+        public IGeometryImpl CreateRectangleGeometry(Rect rect)
         {
-            return Mock.Of<IRectangleGeometryImpl>();
+            return Mock.Of<IGeometryImpl>();
         }
 
         public IRenderTarget CreateRenderTarget(IEnumerable<object> surfaces)
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
index 34be5f1dde..03470670d2 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
@@ -56,17 +56,17 @@ namespace Avalonia.Visuals.UnitTests.VisualTree
             throw new NotImplementedException();
         }
 
-        public IEllipseGeometryImpl CreateEllipseGeometry(Rect rect)
+        public IGeometryImpl CreateEllipseGeometry(Rect rect)
         {
             throw new NotImplementedException();
         }
 
-        public ILineGeometryImpl CreateLineGeometry(Point p1, Point p2)
+        public IGeometryImpl CreateLineGeometry(Point p1, Point p2)
         {
             throw new NotImplementedException();
         }
 
-        public IRectangleGeometryImpl CreateRectangleGeometry(Rect rect)
+        public IGeometryImpl CreateRectangleGeometry(Rect rect)
         {
             throw new NotImplementedException();
         }