diff --git a/src/Avalonia.Controls/Image.cs b/src/Avalonia.Controls/Image.cs
index 50e4f1515e..fd90f9f2e8 100644
--- a/src/Avalonia.Controls/Image.cs
+++ b/src/Avalonia.Controls/Image.cs
@@ -3,7 +3,6 @@
 
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
-using Avalonia.Visuals.Media;
 
 namespace Avalonia.Controls
 {   
diff --git a/src/Avalonia.Controls/Remote/RemoteWidget.cs b/src/Avalonia.Controls/Remote/RemoteWidget.cs
index 618a0c3f62..ea8c3ebe52 100644
--- a/src/Avalonia.Controls/Remote/RemoteWidget.cs
+++ b/src/Avalonia.Controls/Remote/RemoteWidget.cs
@@ -9,7 +9,7 @@ using Avalonia.Threading;
 using PixelFormat = Avalonia.Platform.PixelFormat;
 
 namespace Avalonia.Controls.Remote
-{   
+{
     public class RemoteWidget : Control
     {
         private readonly IAvaloniaRemoteTransportConnection _connection;
@@ -76,4 +76,4 @@ namespace Avalonia.Controls.Remote
             base.Render(context);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Media/ITileBrush.cs b/src/Avalonia.Visuals/Media/ITileBrush.cs
index 6c29b159de..5cffe02193 100644
--- a/src/Avalonia.Visuals/Media/ITileBrush.cs
+++ b/src/Avalonia.Visuals/Media/ITileBrush.cs
@@ -1,7 +1,10 @@
-namespace Avalonia.Media
-{
-    using Avalonia.Visuals.Media.Imaging;
+// 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.Visuals.Media.Imaging;
+
+namespace Avalonia.Media
+{  
     /// <summary>
     /// A brush which displays a repeating image.
     /// </summary>
diff --git a/src/Avalonia.Visuals/Media/TileBrush.cs b/src/Avalonia.Visuals/Media/TileBrush.cs
index 506b406856..094208d021 100644
--- a/src/Avalonia.Visuals/Media/TileBrush.cs
+++ b/src/Avalonia.Visuals/Media/TileBrush.cs
@@ -1,11 +1,10 @@
 // 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.Visuals.Media.Imaging;
+
 namespace Avalonia.Media
 {
-    using Avalonia.Visuals.Media;
-    using Avalonia.Visuals.Media.Imaging;
-
     /// <summary>
     /// Describes how a <see cref="TileBrush"/> is tiled.
     /// </summary>
diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
index 3ffcde7165..debc7103c0 100644
--- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
@@ -4,11 +4,10 @@
 using System;
 using Avalonia.Media;
 using Avalonia.Utilities;
+using Avalonia.Visuals.Media.Imaging;
 
 namespace Avalonia.Platform
 {
-    using Avalonia.Visuals.Media.Imaging;
-
     /// <summary>
     /// Defines the interface through which drawing occurs.
     /// </summary>
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 7903e6cf6e..28ac311605 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -15,8 +15,6 @@ using SkiaSharp;
 
 namespace Avalonia.Skia
 {
-    using Avalonia.Controls;
-
     /// <summary>
     /// Skia based drawing context.
     /// </summary>
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index 659c89bb58..ae5dd3ae13 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@@ -7,19 +7,17 @@ using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Utilities;
-using Avalonia.Visuals.Media.Imaging;
 using SharpDX;
 using SharpDX.Direct2D1;
 using SharpDX.Mathematics.Interop;
+using BitmapInterpolationMode = Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode;
 
 namespace Avalonia.Direct2D1.Media
 {
-    using BitmapInterpolationMode = Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode;
-
     /// <summary>
     /// Draws using Direct2D1.
     /// </summary>
-    public class DrawingContextImpl : IDrawingContextImpl, IDisposable
+    public class DrawingContextImpl : IDrawingContextImpl
     {
         private readonly IVisualBrushRenderer _visualBrushRenderer;
         private readonly ILayerFactory _layerFactory;
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
index c792334ec1..d58f023391 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs
@@ -1,15 +1,11 @@
-// 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 System;
+using System;
 using System.IO;
 using Avalonia.Platform;
 using SharpDX.WIC;
+using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media
 {
-    using SharpDX.Direct2D1;
-
     public abstract class BitmapImpl : IBitmapImpl, IDisposable
     {
         public BitmapImpl(ImagingFactory imagingFactory)
@@ -21,7 +17,7 @@ namespace Avalonia.Direct2D1.Media
         public abstract int PixelWidth { get; }
         public abstract int PixelHeight { get; }
 
-        public abstract OptionalDispose<Bitmap> GetDirect2DBitmap(RenderTarget target);
+        public abstract OptionalDispose<D2DBitmap> GetDirect2DBitmap(SharpDX.Direct2D1.RenderTarget target);
 
         public void Save(string fileName)
         {