diff --git a/ExternalProjects/AnalyzersCommon.props b/ExternalProjects/AnalyzersCommon.props
index 10878e91f7..bd0ab426e7 100644
--- a/ExternalProjects/AnalyzersCommon.props
+++ b/ExternalProjects/AnalyzersCommon.props
@@ -16,5 +16,7 @@
 		<EditorConfigFiles Include="$(MSBuildProjectDirectory)/../Analyzers.editorconfig" />
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
 		<Compile Include="$(MSBuildProjectDirectory)/../AnalyzersCommon/**/*.cs" />
+		<Using Include="Microsoft.CodeAnalysis;Microsoft.CodeAnalysis.CSharp;Microsoft.CodeAnalysis.CSharp.Syntax;Microsoft.CodeAnalysis.Diagnostics;Microsoft.CodeAnalysis.Operations;Microsoft.CodeAnalysis.Text" />
+		<Using Include="System" />
 	</ItemGroup>
 </Project>
diff --git a/ExternalProjects/AnalyzersCommon/RoslynUtils.cs b/ExternalProjects/AnalyzersCommon/RoslynUtils.cs
index 40b12e569e..8710e0be71 100644
--- a/ExternalProjects/AnalyzersCommon/RoslynUtils.cs
+++ b/ExternalProjects/AnalyzersCommon/RoslynUtils.cs
@@ -2,11 +2,6 @@ namespace BizHawk.Analyzers;
 
 using System.Threading;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Operations;
-
 public static class RoslynUtils
 {
 	public static SyntaxNode? EnclosingTypeDeclarationSyntax(this CSharpSyntaxNode node)
diff --git a/ExternalProjects/BizHawk.Analyzer/AmbiguousMoneyToFloatConversionAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/AmbiguousMoneyToFloatConversionAnalyzer.cs
index 1418e9cb8c..55d02b1f53 100644
--- a/ExternalProjects/BizHawk.Analyzer/AmbiguousMoneyToFloatConversionAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/AmbiguousMoneyToFloatConversionAnalyzer.cs
@@ -2,11 +2,6 @@
 
 using System.Collections.Immutable;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class AmbiguousMoneyToFloatConversionAnalyzer : DiagnosticAnalyzer
 {
diff --git a/ExternalProjects/BizHawk.Analyzer/ExprBodiedMemberFlowAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/ExprBodiedMemberFlowAnalyzer.cs
index 58d2fbcd13..8275c8acc5 100644
--- a/ExternalProjects/BizHawk.Analyzer/ExprBodiedMemberFlowAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/ExprBodiedMemberFlowAnalyzer.cs
@@ -3,11 +3,6 @@
 using System.Collections.Immutable;
 using System.Linq;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class ExprBodiedMemberFlowAnalyzer : DiagnosticAnalyzer
 {
diff --git a/ExternalProjects/BizHawk.Analyzer/FeatureNotImplementedAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/FeatureNotImplementedAnalyzer.cs
index 440bd0a3de..f4cf5fb505 100644
--- a/ExternalProjects/BizHawk.Analyzer/FeatureNotImplementedAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/FeatureNotImplementedAnalyzer.cs
@@ -3,11 +3,6 @@
 using System.Collections.Immutable;
 using System.Linq;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class FeatureNotImplementedAnalyzer : DiagnosticAnalyzer
 {
diff --git a/ExternalProjects/BizHawk.Analyzer/FirstOrDefaultOnStructAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/FirstOrDefaultOnStructAnalyzer.cs
index 5007b25d2f..b8f2cc8308 100644
--- a/ExternalProjects/BizHawk.Analyzer/FirstOrDefaultOnStructAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/FirstOrDefaultOnStructAnalyzer.cs
@@ -1,14 +1,8 @@
 namespace BizHawk.Analyzers;
 
-using System;
 using System.Collections.Immutable;
 using System.Linq;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class FirstOrDefaultOnStructAnalyzer : DiagnosticAnalyzer
 {
diff --git a/ExternalProjects/BizHawk.Analyzer/HawkSourceAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/HawkSourceAnalyzer.cs
index c87869484e..63fc98a0cb 100644
--- a/ExternalProjects/BizHawk.Analyzer/HawkSourceAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/HawkSourceAnalyzer.cs
@@ -1,13 +1,7 @@
 namespace BizHawk.Analyzers;
 
-using System;
 using System.Collections.Immutable;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public class HawkSourceAnalyzer : DiagnosticAnalyzer
 {
diff --git a/ExternalProjects/BizHawk.Analyzer/LINQOnStringsAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/LINQOnStringsAnalyzer.cs
index 065e2625e5..5ddee615be 100644
--- a/ExternalProjects/BizHawk.Analyzer/LINQOnStringsAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/LINQOnStringsAnalyzer.cs
@@ -4,10 +4,6 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class LINQOnStringsAnalyzer : DiagnosticAnalyzer
 {
diff --git a/ExternalProjects/BizHawk.Analyzer/NoTargetTypedThrowAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/NoTargetTypedThrowAnalyzer.cs
index 504059dc04..ba4fedf297 100644
--- a/ExternalProjects/BizHawk.Analyzer/NoTargetTypedThrowAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/NoTargetTypedThrowAnalyzer.cs
@@ -2,11 +2,6 @@
 
 using System.Collections.Immutable;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class NoTargetTypedThrowAnalyzer : DiagnosticAnalyzer
 {
diff --git a/ExternalProjects/BizHawk.Analyzer/OrderBySelfAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/OrderBySelfAnalyzer.cs
index 8fc6539fa4..e97bde5e66 100644
--- a/ExternalProjects/BizHawk.Analyzer/OrderBySelfAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/OrderBySelfAnalyzer.cs
@@ -3,11 +3,6 @@
 using System.Collections.Immutable;
 using System.Linq;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public class OrderBySelfAnalyzer : DiagnosticAnalyzer
 {
diff --git a/ExternalProjects/BizHawk.Analyzer/TernaryInferredTypeMismatchAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/TernaryInferredTypeMismatchAnalyzer.cs
index 519fe0b23d..c16b99a076 100644
--- a/ExternalProjects/BizHawk.Analyzer/TernaryInferredTypeMismatchAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/TernaryInferredTypeMismatchAnalyzer.cs
@@ -2,10 +2,6 @@
 
 using System.Collections.Immutable;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class TernaryInferredTypeMismatchAnalyzer : DiagnosticAnalyzer
 {
diff --git a/ExternalProjects/BizHawk.Analyzer/TryGetValueImplicitDiscardAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/TryGetValueImplicitDiscardAnalyzer.cs
index 41051fe009..d7d38b10cd 100644
--- a/ExternalProjects/BizHawk.Analyzer/TryGetValueImplicitDiscardAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/TryGetValueImplicitDiscardAnalyzer.cs
@@ -3,10 +3,6 @@
 using System.Collections.Immutable;
 using System.Linq;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class TryGetValueImplicitDiscardAnalyzer : DiagnosticAnalyzer
 {
diff --git a/ExternalProjects/BizHawk.Analyzer/UseNameofOperatorAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/UseNameofOperatorAnalyzer.cs
index ebc018cfe0..6d0bebe4e3 100644
--- a/ExternalProjects/BizHawk.Analyzer/UseNameofOperatorAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/UseNameofOperatorAnalyzer.cs
@@ -2,11 +2,6 @@
 
 using System.Collections.Immutable;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class UseNameofOperatorAnalyzer : DiagnosticAnalyzer
 {
diff --git a/ExternalProjects/BizHawk.Analyzer/UseSimplerBoolFlipAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/UseSimplerBoolFlipAnalyzer.cs
index 45dfe246b0..6c063b4697 100644
--- a/ExternalProjects/BizHawk.Analyzer/UseSimplerBoolFlipAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/UseSimplerBoolFlipAnalyzer.cs
@@ -2,10 +2,6 @@
 
 using System.Collections.Immutable;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-
 /// <remarks>shoutouts to SimpleFlips</remarks>
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class UseSimplerBoolFlipAnalyzer : DiagnosticAnalyzer
diff --git a/ExternalProjects/BizHawk.Analyzer/UseTypeofOperatorAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/UseTypeofOperatorAnalyzer.cs
index 6212856ec2..30784fae34 100644
--- a/ExternalProjects/BizHawk.Analyzer/UseTypeofOperatorAnalyzer.cs
+++ b/ExternalProjects/BizHawk.Analyzer/UseTypeofOperatorAnalyzer.cs
@@ -2,12 +2,6 @@
 
 using System.Collections.Immutable;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public sealed class UseTypeofOperatorAnalyzer : DiagnosticAnalyzer
 {
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/AmbiguousMoneyToFloatConversionAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/AmbiguousMoneyToFloatConversionAnalyzerTests.cs
index b6b91d8b44..38f88699ad 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/AmbiguousMoneyToFloatConversionAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/AmbiguousMoneyToFloatConversionAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.AmbiguousMoneyToFloatConversionAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/ExprBodiedMemberFlowAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/ExprBodiedMemberFlowAnalyzerTests.cs
index 58581100fb..af03962367 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/ExprBodiedMemberFlowAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/ExprBodiedMemberFlowAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.ExprBodiedMemberFlowAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/FeatureNotImplementedAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/FeatureNotImplementedAnalyzerTests.cs
index 01966574e2..37b39141d3 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/FeatureNotImplementedAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/FeatureNotImplementedAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.FeatureNotImplementedAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/FirstOrDefaultOnStructAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/FirstOrDefaultOnStructAnalyzerTests.cs
index b36bef47e4..b1d7c59bed 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/FirstOrDefaultOnStructAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/FirstOrDefaultOnStructAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.FirstOrDefaultOnStructAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/HawkSourceAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/HawkSourceAnalyzerTests.cs
index e476980d19..42ca6ffdb5 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/HawkSourceAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/HawkSourceAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.HawkSourceAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/LINQOnStringsAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/LINQOnStringsAnalyzerTests.cs
index 9ed20daf72..ee53647cd3 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/LINQOnStringsAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/LINQOnStringsAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.LINQOnStringsAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/NoTargetTypedThrowAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/NoTargetTypedThrowAnalyzerTests.cs
index 77bf77923c..e2e50d66a0 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/NoTargetTypedThrowAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/NoTargetTypedThrowAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.NoTargetTypedThrowAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/OrderBySelfAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/OrderBySelfAnalyzerTests.cs
index 3d03eca028..a2b394454d 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/OrderBySelfAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/OrderBySelfAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.OrderBySelfAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/TernaryInferredTypeMismatchAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/TernaryInferredTypeMismatchAnalyzerTests.cs
index f638806fa2..e7d2a29be2 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/TernaryInferredTypeMismatchAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/TernaryInferredTypeMismatchAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.TernaryInferredTypeMismatchAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/TryGetValueImplicitDiscardAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/TryGetValueImplicitDiscardAnalyzerTests.cs
index 936a6ec062..ea37c720c5 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/TryGetValueImplicitDiscardAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/TryGetValueImplicitDiscardAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.TryGetValueImplicitDiscardAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/UseNameofOperatorAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/UseNameofOperatorAnalyzerTests.cs
index db7ce9b3dc..62460fd7d3 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/UseNameofOperatorAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/UseNameofOperatorAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.UseNameofOperatorAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/UseSimplerBoolFlipAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/UseSimplerBoolFlipAnalyzerTests.cs
index 9caf862c97..d34cb55959 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/UseSimplerBoolFlipAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/UseSimplerBoolFlipAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.UseSimplerBoolFlipAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/UseTypeofOperatorAnalyzerTests.cs b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/UseTypeofOperatorAnalyzerTests.cs
index 36325cc620..3f435624e0 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/UseTypeofOperatorAnalyzerTests.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.Analyzer/UseTypeofOperatorAnalyzerTests.cs
@@ -1,9 +1,5 @@
 namespace BizHawk.Tests.Analyzers;
 
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 using Verify = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<
 	BizHawk.Analyzers.UseTypeofOperatorAnalyzer,
 	Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.AnalyzersTests.csproj b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.AnalyzersTests.csproj
index ecc7133ee7..dbfd65db91 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.AnalyzersTests.csproj
+++ b/ExternalProjects/BizHawk.AnalyzersTests/BizHawk.AnalyzersTests.csproj
@@ -14,6 +14,8 @@
 		<PackageReference Include="JunitXml.TestLogger" PrivateAssets="all" />
 		<ProjectReference Include="$(MSBuildProjectDirectory)/../BizHawk.Analyzer/BizHawk.Analyzer.csproj" />
 		<None Remove="*.sh" />
+		<Using Include="System;System.Threading.Tasks" />
+		<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
 	</ItemGroup>
 	<Target Name="DontUpdatePrebuiltAssemblies" AfterTargets="PostBuildEvent">
 		<Exec Command="git restore $(MSBuildProjectDirectory)/../../References" />
diff --git a/ExternalProjects/BizHawk.AnalyzersTests/Properties/AssemblyInfo.cs b/ExternalProjects/BizHawk.AnalyzersTests/Properties/AssemblyInfo.cs
index ae411c7a1b..300f5b1a74 100644
--- a/ExternalProjects/BizHawk.AnalyzersTests/Properties/AssemblyInfo.cs
+++ b/ExternalProjects/BizHawk.AnalyzersTests/Properties/AssemblyInfo.cs
@@ -1,3 +1 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 [assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
diff --git a/ExternalProjects/BizHawk.SrcGen.ReflectionCache/ReflectionCacheGenerator.cs b/ExternalProjects/BizHawk.SrcGen.ReflectionCache/ReflectionCacheGenerator.cs
index 81e2d90318..de2c2a1403 100644
--- a/ExternalProjects/BizHawk.SrcGen.ReflectionCache/ReflectionCacheGenerator.cs
+++ b/ExternalProjects/BizHawk.SrcGen.ReflectionCache/ReflectionCacheGenerator.cs
@@ -1,14 +1,9 @@
 namespace BizHawk.SrcGen.ReflectionCache;
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-
 [Generator]
 public sealed class ReflectionCacheGenerator : ISourceGenerator
 {
diff --git a/ExternalProjects/BizHawk.SrcGen.SettingsUtil/DefaultSetterGenerator.cs b/ExternalProjects/BizHawk.SrcGen.SettingsUtil/DefaultSetterGenerator.cs
index bfb95e166e..2d4a55f182 100644
--- a/ExternalProjects/BizHawk.SrcGen.SettingsUtil/DefaultSetterGenerator.cs
+++ b/ExternalProjects/BizHawk.SrcGen.SettingsUtil/DefaultSetterGenerator.cs
@@ -5,10 +5,6 @@ using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
 
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-
 [Generator]
 public class DefaultSetterGenerator : ISourceGenerator
 {
diff --git a/ExternalProjects/BizHawk.SrcGen.VersionInfo/VersionInfoGenerator.cs b/ExternalProjects/BizHawk.SrcGen.VersionInfo/VersionInfoGenerator.cs
index d9deaeabe2..bca016ad2f 100644
--- a/ExternalProjects/BizHawk.SrcGen.VersionInfo/VersionInfoGenerator.cs
+++ b/ExternalProjects/BizHawk.SrcGen.VersionInfo/VersionInfoGenerator.cs
@@ -1,10 +1,8 @@
 namespace BizHawk.SrcGen.VersionInfo;
 
-using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using Microsoft.CodeAnalysis;
 
 [Generator]
 public class VersionInfoGenerator : ISourceGenerator
diff --git a/References/BizHawk.Analyzer.dll b/References/BizHawk.Analyzer.dll
index b18ae032f2..55fc503de8 100644
Binary files a/References/BizHawk.Analyzer.dll and b/References/BizHawk.Analyzer.dll differ
diff --git a/References/BizHawk.SrcGen.ReflectionCache.dll b/References/BizHawk.SrcGen.ReflectionCache.dll
index 574c2bc02e..d201f895a8 100644
Binary files a/References/BizHawk.SrcGen.ReflectionCache.dll and b/References/BizHawk.SrcGen.ReflectionCache.dll differ
diff --git a/References/BizHawk.SrcGen.SettingsUtil.dll b/References/BizHawk.SrcGen.SettingsUtil.dll
index 02a042e57e..d2d9636c95 100644
Binary files a/References/BizHawk.SrcGen.SettingsUtil.dll and b/References/BizHawk.SrcGen.SettingsUtil.dll differ
diff --git a/References/BizHawk.SrcGen.VersionInfo.dll b/References/BizHawk.SrcGen.VersionInfo.dll
index 87cdf9c34b..24df491356 100644
Binary files a/References/BizHawk.SrcGen.VersionInfo.dll and b/References/BizHawk.SrcGen.VersionInfo.dll differ