diff --git a/cpp/autobuilder/Semmle.Autobuild.Cpp/CppAutobuilder.cs b/cpp/autobuilder/Semmle.Autobuild.Cpp/CppAutobuilder.cs
index 223425a8b18..ee1d775e17d 100644
--- a/cpp/autobuilder/Semmle.Autobuild.Cpp/CppAutobuilder.cs
+++ b/cpp/autobuilder/Semmle.Autobuild.Cpp/CppAutobuilder.cs
@@ -1,4 +1,5 @@
 using Semmle.Autobuild.Shared;
+using Semmle.Util;
 
 namespace Semmle.Autobuild.Cpp
 {
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/AutobuildOptions.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/AutobuildOptions.cs
index d51612272d0..8a02370bcf6 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/AutobuildOptions.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/AutobuildOptions.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Semmle.Util;
 
 namespace Semmle.Autobuild.Shared
 {
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/EnvVars.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/EnvVars.cs
index 1e925b24431..5d1197f0a9e 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/EnvVars.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/EnvVars.cs
@@ -1,3 +1,5 @@
+using Semmle.Util;
+
 namespace Semmle.Autobuild.Shared
 {
     public static class EnvVars
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/ProjectOrSolution.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/ProjectOrSolution.cs
index d0c9eeb9669..c0504dbcba4 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/ProjectOrSolution.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/ProjectOrSolution.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Semmle.Util;
 
 namespace Semmle.Autobuild.Shared
 {
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/Language.cs b/csharp/extractor/Semmle.Util/Language.cs
similarity index 95%
rename from csharp/autobuilder/Semmle.Autobuild.Shared/Language.cs
rename to csharp/extractor/Semmle.Util/Language.cs
index c53eb7e592d..fa3d71b6154 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/Language.cs
+++ b/csharp/extractor/Semmle.Util/Language.cs
@@ -1,4 +1,4 @@
-namespace Semmle.Autobuild.Shared
+namespace Semmle.Util
 {
     public sealed class Language
     {