diff --git a/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisConstraint.cs b/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisConstraint.cs
index 78c5ea606f..e40d928df6 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisConstraint.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisConstraint.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
namespace BizHawk.Emulation.Common
{
public interface AxisConstraint
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisDict.cs b/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisDict.cs
index e1b2d2633c..88d3577762 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisDict.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisDict.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
using System.Collections;
using System.Collections.Generic;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisPairOrientation.cs b/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisPairOrientation.cs
index 4410bb19bc..89c5808fcc 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisPairOrientation.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisPairOrientation.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
namespace BizHawk.Emulation.Common
{
/// represents the direction of (+, +)
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisSpec.cs b/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisSpec.cs
index 41679550fe..d9a683703c 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisSpec.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisSpec.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
using System;
using BizHawk.Common;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/Axes/CircularAxisConstraint.cs b/src/BizHawk.Emulation.Common/Base Implementations/Axes/CircularAxisConstraint.cs
index 1300b9e397..c56dc67ea9 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/Axes/CircularAxisConstraint.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/Axes/CircularAxisConstraint.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
using System;
namespace BizHawk.Emulation.Common
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/Axes/NoOpAxisConstraint.cs b/src/BizHawk.Emulation.Common/Base Implementations/Axes/NoOpAxisConstraint.cs
index 773d3f6301..5fb71e89ca 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/Axes/NoOpAxisConstraint.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/Axes/NoOpAxisConstraint.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
namespace BizHawk.Emulation.Common
{
public sealed class NoOpAxisConstraint : AxisConstraint
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/BasicServiceProvider.cs b/src/BizHawk.Emulation.Common/Base Implementations/BasicServiceProvider.cs
index 3c975e9efd..bce7a13a55 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/BasicServiceProvider.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/BasicServiceProvider.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/CallbackBasedTraceBuffer.cs b/src/BizHawk.Emulation.Common/Base Implementations/CallbackBasedTraceBuffer.cs
index 0dd6726282..8a40f208ed 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/CallbackBasedTraceBuffer.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/CallbackBasedTraceBuffer.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/CodeDataLog.cs b/src/BizHawk.Emulation.Common/Base Implementations/CodeDataLog.cs
index cc9a5c4ac5..a8bd928c53 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/CodeDataLog.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/CodeDataLog.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.InteropServices;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs b/src/BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs
index 5e0ef335ad..ec5b6f8556 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+#nullable disable
+
+using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/InputCallbackSystem.cs b/src/BizHawk.Emulation.Common/Base Implementations/InputCallbackSystem.cs
index 21e6383c18..5588be99ad 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/InputCallbackSystem.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/InputCallbackSystem.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/MemoryBasedInputCallbackSystem.cs b/src/BizHawk.Emulation.Common/Base Implementations/MemoryBasedInputCallbackSystem.cs
index 3516cfab53..7b384e5458 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/MemoryBasedInputCallbackSystem.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/MemoryBasedInputCallbackSystem.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections;
using System.Collections.Generic;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs b/src/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs
index 2090556165..6126e15330 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Linq;
using System.Collections;
using System.Collections.Generic;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs b/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs
index 15ce64d416..6b83f3c7f3 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using BizHawk.Common;
namespace BizHawk.Emulation.Common
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainImpls.cs b/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainImpls.cs
index cc310a2bc4..48d4a1099a 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainImpls.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainImpls.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Runtime.InteropServices;
using BizHawk.Common;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainList.cs b/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainList.cs
index 2eb561a5d8..65e10564cd 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainList.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainList.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainStream.cs b/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainStream.cs
index b2dfbac950..58175cb989 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainStream.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/MemoryDomainStream.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
using System;
using System.IO;
using BizHawk.Common;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/NullController.cs b/src/BizHawk.Emulation.Common/Base Implementations/NullController.cs
index ac22d2f96e..002e5b87c0 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/NullController.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/NullController.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
namespace BizHawk.Emulation.Common
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs b/src/BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs
index be0ba19494..2348ee546f 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/NullEmulator.cs
@@ -1,4 +1,6 @@
-using System.Threading;
+#nullable disable
+
+using System.Threading;
namespace BizHawk.Emulation.Common
{
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/NullSound.cs b/src/BizHawk.Emulation.Common/Base Implementations/NullSound.cs
index 685f16358c..ca2b047618 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/NullSound.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/NullSound.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
namespace BizHawk.Emulation.Common
{
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/NullVideo.cs b/src/BizHawk.Emulation.Common/Base Implementations/NullVideo.cs
index 309fa086cd..33c03b1b12 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/NullVideo.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/NullVideo.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// A default IVideoProvider that simply returns
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/SimpleSyncSoundProvider.cs b/src/BizHawk.Emulation.Common/Base Implementations/SimpleSyncSoundProvider.cs
index 9fa040d2b4..05058925d4 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/SimpleSyncSoundProvider.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/SimpleSyncSoundProvider.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
namespace BizHawk.Emulation.Common.Base_Implementations
{
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/StateSerializer.cs b/src/BizHawk.Emulation.Common/Base Implementations/StateSerializer.cs
index e6f79ae2d8..31fb789258 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/StateSerializer.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/StateSerializer.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.IO;
using BizHawk.Common;
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/TraceBuffer.cs b/src/BizHawk.Emulation.Common/Base Implementations/TraceBuffer.cs
index 3f288cdce6..8ecf461696 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/TraceBuffer.cs
+++ b/src/BizHawk.Emulation.Common/Base Implementations/TraceBuffer.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// A generic implementation of ITraceable that can be used by any core
diff --git a/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index ee11da7014..6c722d4d36 100644
--- a/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -5,7 +5,6 @@
true
- disable
diff --git a/src/BizHawk.Emulation.Common/ControllerDefinitionMerger.cs b/src/BizHawk.Emulation.Common/ControllerDefinitionMerger.cs
index 2bdab39d50..5f09a0befb 100644
--- a/src/BizHawk.Emulation.Common/ControllerDefinitionMerger.cs
+++ b/src/BizHawk.Emulation.Common/ControllerDefinitionMerger.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
namespace BizHawk.Emulation.Common
diff --git a/src/BizHawk.Emulation.Common/CoreAttribute.cs b/src/BizHawk.Emulation.Common/CoreAttribute.cs
index 215dc76bb2..21ee164d6d 100644
--- a/src/BizHawk.Emulation.Common/CoreAttribute.cs
+++ b/src/BizHawk.Emulation.Common/CoreAttribute.cs
@@ -1,6 +1,4 @@
-#nullable enable
-
-using System;
+using System;
namespace BizHawk.Emulation.Common
{
diff --git a/src/BizHawk.Emulation.Common/CoreComms.cs b/src/BizHawk.Emulation.Common/CoreComms.cs
index e2106acf6a..872d91cfde 100644
--- a/src/BizHawk.Emulation.Common/CoreComms.cs
+++ b/src/BizHawk.Emulation.Common/CoreComms.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
namespace BizHawk.Emulation.Common
{
diff --git a/src/BizHawk.Emulation.Common/DSKIdentifier.cs b/src/BizHawk.Emulation.Common/DSKIdentifier.cs
index ec74893d35..c5408af2d0 100644
--- a/src/BizHawk.Emulation.Common/DSKIdentifier.cs
+++ b/src/BizHawk.Emulation.Common/DSKIdentifier.cs
@@ -1,4 +1,6 @@
-using System.Linq;
+#nullable disable
+
+using System.Linq;
using System.Text;
namespace BizHawk.Emulation.Common
diff --git a/src/BizHawk.Emulation.Common/Database/Database.cs b/src/BizHawk.Emulation.Common/Database/Database.cs
index 2749b70c11..c062c6674b 100644
--- a/src/BizHawk.Emulation.Common/Database/Database.cs
+++ b/src/BizHawk.Emulation.Common/Database/Database.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
diff --git a/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs b/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
index 8e62cb6560..00e84e570f 100644
--- a/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
+++ b/src/BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
using System.Collections.Generic;
// ReSharper disable IdentifierTypo
diff --git a/src/BizHawk.Emulation.Common/Database/FirmwareFile.cs b/src/BizHawk.Emulation.Common/Database/FirmwareFile.cs
index 34f91dca8a..a855962b5c 100644
--- a/src/BizHawk.Emulation.Common/Database/FirmwareFile.cs
+++ b/src/BizHawk.Emulation.Common/Database/FirmwareFile.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
namespace BizHawk.Emulation.Common
{
public readonly struct FirmwareFile
diff --git a/src/BizHawk.Emulation.Common/Database/FirmwareID.cs b/src/BizHawk.Emulation.Common/Database/FirmwareID.cs
index ce36bd506d..fb259f4904 100644
--- a/src/BizHawk.Emulation.Common/Database/FirmwareID.cs
+++ b/src/BizHawk.Emulation.Common/Database/FirmwareID.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
namespace BizHawk.Emulation.Common
{
public readonly struct FirmwareID
diff --git a/src/BizHawk.Emulation.Common/Database/FirmwareOption.cs b/src/BizHawk.Emulation.Common/Database/FirmwareOption.cs
index 9e93651d37..a0576b2a59 100644
--- a/src/BizHawk.Emulation.Common/Database/FirmwareOption.cs
+++ b/src/BizHawk.Emulation.Common/Database/FirmwareOption.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
namespace BizHawk.Emulation.Common
{
public readonly struct FirmwareOption
diff --git a/src/BizHawk.Emulation.Common/Database/FirmwareRecord.cs b/src/BizHawk.Emulation.Common/Database/FirmwareRecord.cs
index f2ca9d4d8b..286c79e91a 100644
--- a/src/BizHawk.Emulation.Common/Database/FirmwareRecord.cs
+++ b/src/BizHawk.Emulation.Common/Database/FirmwareRecord.cs
@@ -1,5 +1,3 @@
-#nullable enable
-
namespace BizHawk.Emulation.Common
{
public readonly struct FirmwareRecord
diff --git a/src/BizHawk.Emulation.Common/Database/GameInfo.cs b/src/BizHawk.Emulation.Common/Database/GameInfo.cs
index fd166418c7..9d4fb881a8 100644
--- a/src/BizHawk.Emulation.Common/Database/GameInfo.cs
+++ b/src/BizHawk.Emulation.Common/Database/GameInfo.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+#nullable disable
+
+using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Globalization;
diff --git a/src/BizHawk.Emulation.Common/Extensions.cs b/src/BizHawk.Emulation.Common/Extensions.cs
index 34bc348d9d..b25044c80a 100644
--- a/src/BizHawk.Emulation.Common/Extensions.cs
+++ b/src/BizHawk.Emulation.Common/Extensions.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
diff --git a/src/BizHawk.Emulation.Common/Interfaces/IController.cs b/src/BizHawk.Emulation.Common/Interfaces/IController.cs
index a28fe345dd..0e17cec7a6 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/IController.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/IController.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+#nullable disable
+
+using System.Collections.Generic;
namespace BizHawk.Emulation.Common
{
diff --git a/src/BizHawk.Emulation.Common/Interfaces/ICoreFileProvider.cs b/src/BizHawk.Emulation.Common/Interfaces/ICoreFileProvider.cs
index 2c6263af88..8716e36ec0 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/ICoreFileProvider.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/ICoreFileProvider.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// Defines the means by which firmware, bios and other necessary files are provided to a core that needs them
diff --git a/src/BizHawk.Emulation.Common/Interfaces/IEmulator.cs b/src/BizHawk.Emulation.Common/Interfaces/IEmulator.cs
index 02e6f647a5..aab2fbc74c 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/IEmulator.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/IEmulator.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
namespace BizHawk.Emulation.Common
{
diff --git a/src/BizHawk.Emulation.Common/Interfaces/IEmulatorService.cs b/src/BizHawk.Emulation.Common/Interfaces/IEmulatorService.cs
index cd2b2e2394..9de958f107 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/IEmulatorService.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/IEmulatorService.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// This interface specifies that an interface or implementation is a emulator core service, such as ,
diff --git a/src/BizHawk.Emulation.Common/Interfaces/IEmulatorServiceProvider.cs b/src/BizHawk.Emulation.Common/Interfaces/IEmulatorServiceProvider.cs
index 9e0421fa6e..4d6214b623 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/IEmulatorServiceProvider.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/IEmulatorServiceProvider.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
namespace BizHawk.Emulation.Common
diff --git a/src/BizHawk.Emulation.Common/Interfaces/IInputCallbackSystem.cs b/src/BizHawk.Emulation.Common/Interfaces/IInputCallbackSystem.cs
index 65c2c71f7b..b14cc14e70 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/IInputCallbackSystem.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/IInputCallbackSystem.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
namespace BizHawk.Emulation.Common
diff --git a/src/BizHawk.Emulation.Common/Interfaces/IMemoryCallbackSystem.cs b/src/BizHawk.Emulation.Common/Interfaces/IMemoryCallbackSystem.cs
index d146083c60..79e57a40f0 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/IMemoryCallbackSystem.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/IMemoryCallbackSystem.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
namespace BizHawk.Emulation.Common
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/IBoardInfo.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/IBoardInfo.cs
index 9e58fd1f11..3daba5307f 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/IBoardInfo.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/IBoardInfo.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// An that returns cart/mapper/board information about the Game hardware itself, if available
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/ICodeDataLogger.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/ICodeDataLogger.cs
index 8b0115bff0..f933942780 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/ICodeDataLogger.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/ICodeDataLogger.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.IO;
using System.Collections.Generic;
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/ICreateGameDBEntries.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/ICreateGameDBEntries.cs
index bb14b5a328..437efc2080 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/ICreateGameDBEntries.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/ICreateGameDBEntries.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// This service provides a means for the current core to generate a
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/ICycleTiming.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/ICycleTiming.cs
index 9982216981..61c92f2cad 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/ICycleTiming.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/ICycleTiming.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
public interface ICycleTiming
{
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/IDebuggable.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/IDebuggable.cs
index 9030e682a5..d2b08b7408 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/IDebuggable.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/IDebuggable.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
namespace BizHawk.Emulation.Common
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/IDisassemblable.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/IDisassemblable.cs
index d1e0aabde4..777860cef8 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/IDisassemblable.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/IDisassemblable.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Linq;
using System.Collections.Generic;
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/IDriveLight.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/IDriveLight.cs
index 122e414589..64d976c9c3 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/IDriveLight.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/IDriveLight.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// Specifies an interface for returning the state of a LED drive light such as on Disk and CD Drives,
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/IInputPollable.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/IInputPollable.cs
index 468bf81fb6..66a72905f7 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/IInputPollable.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/IInputPollable.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// This service specifies the interaction of the client and the core in terms of the state of input polling
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/ILinkable.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/ILinkable.cs
index c406b57200..72f4ac5ecb 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/ILinkable.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/ILinkable.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// This service is use by link cable capable cores to manage the status of the link cable
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/IMemoryDomains.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/IMemoryDomains.cs
index 16545425f6..9012f98ce9 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/IMemoryDomains.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/IMemoryDomains.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+#nullable disable
+
+using System.Collections.Generic;
namespace BizHawk.Emulation.Common
{
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/IRegionable.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/IRegionable.cs
index 26178d3da6..6a2ea5b693 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/IRegionable.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/IRegionable.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// This service provides the means for a core to specify region information to the client, such NTSC versus PAL
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/IRomInfo.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/IRomInfo.cs
index 295aaee26e..df7573a225 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/IRomInfo.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/IRomInfo.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// Provides detailed information about the Rom such as hashes,
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/ISaveRam.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/ISaveRam.cs
index f0cab3f1fb..e0422a5ac8 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/ISaveRam.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/ISaveRam.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// This service provides the system by which a client can request SaveRAM data to be stored by the client
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/ISettable.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/ISettable.cs
index d9358e7a1d..06b2702285 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/ISettable.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/ISettable.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Linq;
using System.Reflection;
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/ISoundProvider.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/ISoundProvider.cs
index b83161de34..98e07e96db 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/ISoundProvider.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/ISoundProvider.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
namespace BizHawk.Emulation.Common
{
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/IStatable.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/IStatable.cs
index 22d6cc592c..c3bee6be7a 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/IStatable.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/IStatable.cs
@@ -1,4 +1,6 @@
-using System.IO;
+#nullable disable
+
+using System.IO;
using BizHawk.Common.BufferExtensions;
namespace BizHawk.Emulation.Common
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/ITraceable.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/ITraceable.cs
index aba72c21d0..e78341464f 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/ITraceable.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/ITraceable.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
public interface ITraceSink
{
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/IVideoOffset.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/IVideoOffset.cs
index 2515a9d7a3..3b04492e16 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/IVideoOffset.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/IVideoOffset.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
///
/// Provides an interface to convey the effective X, Y coordinates that represent
diff --git a/src/BizHawk.Emulation.Common/Interfaces/Services/IVideoProvider.cs b/src/BizHawk.Emulation.Common/Interfaces/Services/IVideoProvider.cs
index d6ecba85e6..54dda91e4e 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/Services/IVideoProvider.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/Services/IVideoProvider.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
namespace BizHawk.Emulation.Common
{
diff --git a/src/BizHawk.Emulation.Common/SaveController.cs b/src/BizHawk.Emulation.Common/SaveController.cs
index f29360e340..ca268b909f 100644
--- a/src/BizHawk.Emulation.Common/SaveController.cs
+++ b/src/BizHawk.Emulation.Common/SaveController.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
diff --git a/src/BizHawk.Emulation.Common/ServiceAttributes.cs b/src/BizHawk.Emulation.Common/ServiceAttributes.cs
index a382e747d3..d7de7b7755 100644
--- a/src/BizHawk.Emulation.Common/ServiceAttributes.cs
+++ b/src/BizHawk.Emulation.Common/ServiceAttributes.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/src/BizHawk.Emulation.Common/ServiceInjector.cs b/src/BizHawk.Emulation.Common/ServiceInjector.cs
index ca3c6cbedb..ec7ba20fca 100644
--- a/src/BizHawk.Emulation.Common/ServiceInjector.cs
+++ b/src/BizHawk.Emulation.Common/ServiceInjector.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Linq;
using BizHawk.Common.ReflectionExtensions;
diff --git a/src/BizHawk.Emulation.Common/Sound/BlipBuffer.cs b/src/BizHawk.Emulation.Common/Sound/BlipBuffer.cs
index 00c1b571a9..d42f9bc1ff 100644
--- a/src/BizHawk.Emulation.Common/Sound/BlipBuffer.cs
+++ b/src/BizHawk.Emulation.Common/Sound/BlipBuffer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
using System;
using System.Runtime.InteropServices;
diff --git a/src/BizHawk.Emulation.Common/Sound/DCFilter.cs b/src/BizHawk.Emulation.Common/Sound/DCFilter.cs
index 3d4e7a9c36..76debfbcaf 100644
--- a/src/BizHawk.Emulation.Common/Sound/DCFilter.cs
+++ b/src/BizHawk.Emulation.Common/Sound/DCFilter.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
namespace BizHawk.Emulation.Common
{
diff --git a/src/BizHawk.Emulation.Common/Sound/LibSpeexDSP.cs b/src/BizHawk.Emulation.Common/Sound/LibSpeexDSP.cs
index 9765f219fc..ec7193c87b 100644
--- a/src/BizHawk.Emulation.Common/Sound/LibSpeexDSP.cs
+++ b/src/BizHawk.Emulation.Common/Sound/LibSpeexDSP.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
using System;
using System.Runtime.InteropServices;
using BizHawk.BizInvoke;
diff --git a/src/BizHawk.Emulation.Common/Sound/SpeexResampler.cs b/src/BizHawk.Emulation.Common/Sound/SpeexResampler.cs
index 5fb8115bf1..5220752396 100644
--- a/src/BizHawk.Emulation.Common/Sound/SpeexResampler.cs
+++ b/src/BizHawk.Emulation.Common/Sound/SpeexResampler.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using BizHawk.BizInvoke;
using BizHawk.Common;
diff --git a/src/BizHawk.Emulation.Common/Sound/Waves.cs b/src/BizHawk.Emulation.Common/Sound/Waves.cs
index 28d4ba2868..27077e0a48 100644
--- a/src/BizHawk.Emulation.Common/Sound/Waves.cs
+++ b/src/BizHawk.Emulation.Common/Sound/Waves.cs
@@ -1,4 +1,6 @@
-namespace BizHawk.Emulation.Common
+#nullable disable
+
+namespace BizHawk.Emulation.Common
{
public static class Waves
{
diff --git a/src/BizHawk.Emulation.Common/SystemLookup.cs b/src/BizHawk.Emulation.Common/SystemLookup.cs
index 2c057d45a6..ccedf2be4d 100644
--- a/src/BizHawk.Emulation.Common/SystemLookup.cs
+++ b/src/BizHawk.Emulation.Common/SystemLookup.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+#nullable disable
+
+using System.Collections.Generic;
using System.Linq;
namespace BizHawk.Emulation.Common
diff --git a/src/BizHawk.Emulation.Common/TextState.cs b/src/BizHawk.Emulation.Common/TextState.cs
index d33a612920..d3c89356ac 100644
--- a/src/BizHawk.Emulation.Common/TextState.cs
+++ b/src/BizHawk.Emulation.Common/TextState.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using Newtonsoft.Json;
diff --git a/src/BizHawk.Emulation.Common/vpads_schemata/IVirtualPadSchema.cs b/src/BizHawk.Emulation.Common/vpads_schemata/IVirtualPadSchema.cs
index e5072fa039..7e70178b38 100644
--- a/src/BizHawk.Emulation.Common/vpads_schemata/IVirtualPadSchema.cs
+++ b/src/BizHawk.Emulation.Common/vpads_schemata/IVirtualPadSchema.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
using System.Collections.Generic;
using BizHawk.Emulation.Common;
diff --git a/src/BizHawk.Emulation.Common/vpads_schemata/PadSchema.cs b/src/BizHawk.Emulation.Common/vpads_schemata/PadSchema.cs
index 39c343d150..c0b498ed5d 100644
--- a/src/BizHawk.Emulation.Common/vpads_schemata/PadSchema.cs
+++ b/src/BizHawk.Emulation.Common/vpads_schemata/PadSchema.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+#nullable disable
+
+using System.Collections.Generic;
using System.Drawing;
namespace BizHawk.Emulation.Common
diff --git a/src/BizHawk.Emulation.Common/vpads_schemata/PadSchemaControl.cs b/src/BizHawk.Emulation.Common/vpads_schemata/PadSchemaControl.cs
index dbff310468..629ea3416e 100644
--- a/src/BizHawk.Emulation.Common/vpads_schemata/PadSchemaControl.cs
+++ b/src/BizHawk.Emulation.Common/vpads_schemata/PadSchemaControl.cs
@@ -1,6 +1,4 @@
-#nullable enable
-
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Drawing;
using BizHawk.Emulation.Common;