diff --git a/src/Avalonia.Visuals/Media/DrawingContext.cs b/src/Avalonia.Visuals/Media/DrawingContext.cs
index 8c3f41aec7..1aa3fd21de 100644
--- a/src/Avalonia.Visuals/Media/DrawingContext.cs
+++ b/src/Avalonia.Visuals/Media/DrawingContext.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Media.Imaging;
+using Avalonia.Platform;
 
 namespace Avalonia.Media
 {
diff --git a/src/Avalonia.Visuals/Media/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
similarity index 98%
rename from src/Avalonia.Visuals/Media/IDrawingContextImpl.cs
rename to src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
index c62bca3486..5c4eb01771 100644
--- a/src/Avalonia.Visuals/Media/IDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
@@ -2,9 +2,10 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using Avalonia.Media;
 using Avalonia.Platform;
 
-namespace Avalonia.Media
+namespace Avalonia.Platform
 {
     /// <summary>
     /// Defines the interface through which drawing occurs.
diff --git a/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs b/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
index caa7011075..a95a6fe7f2 100644
--- a/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
+++ b/tests/Avalonia.Visuals.UnitTests/RenderTests_Culling.cs
@@ -6,6 +6,7 @@ using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Rendering;
 using Xunit;
+using Avalonia.Platform;
 
 namespace Avalonia.Visuals.UnitTests
 {
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/BoundsTrackerTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/BoundsTrackerTests.cs
index d18a604f31..925b21b691 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/BoundsTrackerTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/BoundsTrackerTests.cs
@@ -13,6 +13,7 @@ using Xunit;
 using Avalonia.Media;
 using Moq;
 using Avalonia.UnitTests;
+using Avalonia.Platform;
 
 namespace Avalonia.Visuals.UnitTests.VisualTree
 {
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensionsTests_GetVisualsAt.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensionsTests_GetVisualsAt.cs
index 28ca7cdd41..7fb5d7c966 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensionsTests_GetVisualsAt.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/VisualExtensionsTests_GetVisualsAt.cs
@@ -6,6 +6,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Layout;
 using Avalonia.Media;
+using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;