diff --git a/src/Avalonia.Controls/DataGrid/Collections/AvaloniaSortDescription.cs b/src/Avalonia.Controls/DataGrid/Collections/AvaloniaSortDescription.cs
index 6ecb4f9a20..d80cfa6a29 100644
--- a/src/Avalonia.Controls/DataGrid/Collections/AvaloniaSortDescription.cs
+++ b/src/Avalonia.Controls/DataGrid/Collections/AvaloniaSortDescription.cs
@@ -8,6 +8,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using Avalonia.Controls;
+using Avalonia.Controls.Utils;
 using Avalonia.Utilities;
 
 namespace Avalonia.Collections
diff --git a/src/Avalonia.Controls/DataGrid/Collections/CollectionView.cs b/src/Avalonia.Controls/DataGrid/Collections/CollectionView.cs
index 0864f45514..0dcffac8f6 100644
--- a/src/Avalonia.Controls/DataGrid/Collections/CollectionView.cs
+++ b/src/Avalonia.Controls/DataGrid/Collections/CollectionView.cs
@@ -3,6 +3,7 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.Controls.Utils;
 using Avalonia.Utilities;
 using System;
 using System.Collections;
diff --git a/src/Avalonia.Controls/DataGrid/DataGrid.cs b/src/Avalonia.Controls/DataGrid/DataGrid.cs
index 33b4978596..a936f4e2f9 100644
--- a/src/Avalonia.Controls/DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls/DataGrid/DataGrid.cs
@@ -23,6 +23,7 @@ using System.Text;
 using System.Linq;
 using Avalonia.Input.Platform;
 using System.ComponentModel.DataAnnotations;
+using Avalonia.Controls.Utils;
 
 namespace Avalonia.Controls
 {
diff --git a/src/Avalonia.Controls/DataGrid/DataGridBoundColumn.cs b/src/Avalonia.Controls/DataGrid/DataGridBoundColumn.cs
index e2e834cd08..224fdcdf22 100644
--- a/src/Avalonia.Controls/DataGrid/DataGridBoundColumn.cs
+++ b/src/Avalonia.Controls/DataGrid/DataGridBoundColumn.cs
@@ -10,6 +10,7 @@ using System.Reactive.Disposables;
 using System.Reactive.Subjects;
 using Avalonia.Reactive;
 using System.Diagnostics;
+using Avalonia.Controls.Utils;
 
 namespace Avalonia.Controls
 {
diff --git a/src/Avalonia.Controls/DataGrid/DataGridColumn.cs b/src/Avalonia.Controls/DataGrid/DataGridColumn.cs
index ce3d2cd204..c57f2b0296 100644
--- a/src/Avalonia.Controls/DataGrid/DataGridColumn.cs
+++ b/src/Avalonia.Controls/DataGrid/DataGridColumn.cs
@@ -11,6 +11,7 @@ using Avalonia.Utilities;
 using System;
 using System.Linq;
 using System.Diagnostics;
+using Avalonia.Controls.Utils;
 
 namespace Avalonia.Controls
 {
diff --git a/src/Avalonia.Controls/DataGrid/DataGridColumnHeader.cs b/src/Avalonia.Controls/DataGrid/DataGridColumnHeader.cs
index 21ae1ed053..38d54b5da1 100644
--- a/src/Avalonia.Controls/DataGrid/DataGridColumnHeader.cs
+++ b/src/Avalonia.Controls/DataGrid/DataGridColumnHeader.cs
@@ -12,6 +12,7 @@ using System.ComponentModel;
 using System.Diagnostics;
 using Avalonia.Utilities;
 using System;
+using Avalonia.Controls.Utils;
 
 namespace Avalonia.Controls
 {
diff --git a/src/Avalonia.Controls/DataGrid/DataGridColumns.cs b/src/Avalonia.Controls/DataGrid/DataGridColumns.cs
index 9d36a784dc..e8b7eed5fb 100644
--- a/src/Avalonia.Controls/DataGrid/DataGridColumns.cs
+++ b/src/Avalonia.Controls/DataGrid/DataGridColumns.cs
@@ -3,6 +3,7 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.Controls.Utils;
 using Avalonia.Data;
 using Avalonia.Utilities;
 using System;
diff --git a/src/Avalonia.Controls/DataGrid/DataGridDataConnection.cs b/src/Avalonia.Controls/DataGrid/DataGridDataConnection.cs
index 24264f3126..12ef456aac 100644
--- a/src/Avalonia.Controls/DataGrid/DataGridDataConnection.cs
+++ b/src/Avalonia.Controls/DataGrid/DataGridDataConnection.cs
@@ -14,6 +14,7 @@ using System.Diagnostics;
 using System.Reflection;
 using System.ComponentModel.DataAnnotations;
 using Avalonia.Utilities;
+using Avalonia.Controls.Utils;
 
 namespace Avalonia.Controls
 {
diff --git a/src/Avalonia.Controls/DataGrid/DataGridFillerColumn.cs b/src/Avalonia.Controls/DataGrid/DataGridFillerColumn.cs
index 29c6c336b5..9866684bf4 100644
--- a/src/Avalonia.Controls/DataGrid/DataGridFillerColumn.cs
+++ b/src/Avalonia.Controls/DataGrid/DataGridFillerColumn.cs
@@ -3,6 +3,7 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.Controls.Utils;
 using Avalonia.Interactivity;
 using Avalonia.Utilities;
 
diff --git a/src/Avalonia.Controls/DataGrid/DataGridRow.cs b/src/Avalonia.Controls/DataGrid/DataGridRow.cs
index 1889aeb3a6..dc230e7fbb 100644
--- a/src/Avalonia.Controls/DataGrid/DataGridRow.cs
+++ b/src/Avalonia.Controls/DataGrid/DataGridRow.cs
@@ -6,6 +6,7 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Controls.Templates;
+using Avalonia.Controls.Utils;
 using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Media;
diff --git a/src/Avalonia.Controls/DataGrid/DataGridRows.cs b/src/Avalonia.Controls/DataGrid/DataGridRows.cs
index 112d93c705..ed79adc761 100644
--- a/src/Avalonia.Controls/DataGrid/DataGridRows.cs
+++ b/src/Avalonia.Controls/DataGrid/DataGridRows.cs
@@ -4,6 +4,7 @@
 // All other rights reserved.
 
 using Avalonia.Collections;
+using Avalonia.Controls.Utils;
 using Avalonia.Media;
 using Avalonia.Utilities;
 using System;
diff --git a/src/Avalonia.Controls/DataGrid/DataGridTemplateColumn.cs b/src/Avalonia.Controls/DataGrid/DataGridTemplateColumn.cs
index 279d9e0c52..2ab17792e7 100644
--- a/src/Avalonia.Controls/DataGrid/DataGridTemplateColumn.cs
+++ b/src/Avalonia.Controls/DataGrid/DataGridTemplateColumn.cs
@@ -4,6 +4,7 @@
 // All other rights reserved.
 
 using Avalonia.Controls.Templates;
+using Avalonia.Controls.Utils;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
diff --git a/src/Avalonia.Controls/DataGrid/DataGridValueConverter.cs b/src/Avalonia.Controls/DataGrid/DataGridValueConverter.cs
index ed49817a69..82670bf989 100644
--- a/src/Avalonia.Controls/DataGrid/DataGridValueConverter.cs
+++ b/src/Avalonia.Controls/DataGrid/DataGridValueConverter.cs
@@ -3,6 +3,7 @@
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
 // All other rights reserved.
 
+using Avalonia.Controls.Utils;
 using Avalonia.Data.Converters;
 using Avalonia.Utilities;
 using System;
diff --git a/src/Avalonia.Controls/Primitives/DataGridCellsPresenter.cs b/src/Avalonia.Controls/Primitives/DataGridCellsPresenter.cs
index 98af030b1b..6f5dfe25d6 100644
--- a/src/Avalonia.Controls/Primitives/DataGridCellsPresenter.cs
+++ b/src/Avalonia.Controls/Primitives/DataGridCellsPresenter.cs
@@ -8,6 +8,7 @@ using Avalonia.Utilities;
 using System;
 using System.Diagnostics;
 using Avalonia.Controls;
+using Avalonia.Controls.Utils;
 
 namespace Avalonia.Controls.Primitives
 {