diff --git a/src/Avalonia.Visuals/Utilities/StringTokenizer.cs b/src/Avalonia.Base/Utilities/StringTokenizer.cs
similarity index 99%
rename from src/Avalonia.Visuals/Utilities/StringTokenizer.cs
rename to src/Avalonia.Base/Utilities/StringTokenizer.cs
index 2f378f44df..1c9f475eb7 100644
--- a/src/Avalonia.Visuals/Utilities/StringTokenizer.cs
+++ b/src/Avalonia.Base/Utilities/StringTokenizer.cs
@@ -4,7 +4,7 @@ using static System.Char;
 
 namespace Avalonia.Utilities
 {
-    internal struct StringTokenizer : IDisposable
+    public struct StringTokenizer : IDisposable
     {
         private const char DefaultSeparatorChar = ',';
 
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 1490afb5e3..997e15050f 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -26,7 +26,6 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\Avalonia.Visuals\Utilities\StringTokenizer.cs" Link="Utils\StringTokenizer.cs" />
     <Compile Include="..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>