diff --git a/RombaSharp/Partials/RombaSharp_Helpers.cs b/RombaSharp/Partials/RombaSharp_Helpers.cs
index 1f98a167..8df18df8 100644
--- a/RombaSharp/Partials/RombaSharp_Helpers.cs
+++ b/RombaSharp/Partials/RombaSharp_Helpers.cs
@@ -13,12 +13,12 @@ using SabreTools.Helper.Tools;
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
-#endif
 
 using FileAccess = System.IO.FileAccess;
 using FileMode = System.IO.FileMode;
 using SearchOption = System.IO.SearchOption;
 using StreamWriter = System.IO.StreamWriter;
+#endif
 
 namespace SabreTools
 {
diff --git a/SabreTools.Helper/Dats/DatFile.cs b/SabreTools.Helper/Dats/DatFile.cs
index d1681b0e..6593eddc 100644
--- a/SabreTools.Helper/Dats/DatFile.cs
+++ b/SabreTools.Helper/Dats/DatFile.cs
@@ -15,9 +15,6 @@ using SabreTools.Helper.Tools;
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
-#endif
-using NaturalSort;
-using SharpCompress.Common;
 
 using FileAccess = System.IO.FileAccess;
 using FileMode = System.IO.FileMode;
@@ -28,6 +25,9 @@ using PathTooLongException = System.IO.PathTooLongException;
 using SearchOption = System.IO.SearchOption;
 using StreamReader = System.IO.StreamReader;
 using StreamWriter = System.IO.StreamWriter;
+#endif
+using NaturalSort;
+using SharpCompress.Common;
 
 namespace SabreTools.Helper.Dats
 {
diff --git a/SabreTools.Helper/External/SupportedFiles/ZipFile.cs b/SabreTools.Helper/External/SupportedFiles/ZipFile.cs
index ae6eaa27..cf92746c 100644
--- a/SabreTools.Helper/External/SupportedFiles/ZipFile.cs
+++ b/SabreTools.Helper/External/SupportedFiles/ZipFile.cs
@@ -8,8 +8,6 @@ using SabreTools.Helper.Data;
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
-#endif
-using OCRC;
 
 using BinaryReader = System.IO.BinaryReader;
 using BinaryWriter = System.IO.BinaryWriter;
@@ -19,6 +17,8 @@ using IOException = System.IO.IOException;
 using MemoryStream = System.IO.MemoryStream;
 using PathTooLongException = System.IO.PathTooLongException;
 using Stream = System.IO.Stream;
+#endif
+using OCRC;
 
 namespace ROMVault2.SupportedFiles.Zip
 {
diff --git a/SabreTools.Helper/External/Zlib/GZipStream.cs b/SabreTools.Helper/External/Zlib/GZipStream.cs
index d5ec6f4e..42b52f74 100644
--- a/SabreTools.Helper/External/Zlib/GZipStream.cs
+++ b/SabreTools.Helper/External/Zlib/GZipStream.cs
@@ -32,11 +32,11 @@ using System;
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
-#endif
 
 using MemoryStream = System.IO.MemoryStream;
 using SeekOrigin = System.IO.SeekOrigin;
 using Stream = System.IO.Stream;
+#endif
 
 namespace Ionic.Zlib
 {
diff --git a/SabreTools.Helper/Skippers/Skipper.cs b/SabreTools.Helper/Skippers/Skipper.cs
index b0544f84..278bd4df 100644
--- a/SabreTools.Helper/Skippers/Skipper.cs
+++ b/SabreTools.Helper/Skippers/Skipper.cs
@@ -10,12 +10,12 @@ using SabreTools.Helper.Tools;
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
-#endif
 
 using BinaryReader = System.IO.BinaryReader;
 using SearchOption = System.IO.SearchOption;
 using SeekOrigin = System.IO.SeekOrigin;
 using Stream = System.IO.Stream;
+#endif
 
 namespace SabreTools.Helper.Skippers
 {
diff --git a/SabreTools.Helper/Skippers/SkipperRule.cs b/SabreTools.Helper/Skippers/SkipperRule.cs
index c78a537c..029b9932 100644
--- a/SabreTools.Helper/Skippers/SkipperRule.cs
+++ b/SabreTools.Helper/Skippers/SkipperRule.cs
@@ -7,7 +7,6 @@ using SabreTools.Helper.Data;
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
-#endif
 
 using BinaryReader = System.IO.BinaryReader;
 using BinaryWriter = System.IO.BinaryWriter;
@@ -17,6 +16,7 @@ using FileShare = System.IO.FileShare;
 using FileStream = System.IO.FileStream;
 using SeekOrigin = System.IO.SeekOrigin;
 using Stream = System.IO.Stream;
+#endif
 
 namespace SabreTools.Helper.Skippers
 {
diff --git a/SabreTools.Helper/Tools/ArchiveTools.cs b/SabreTools.Helper/Tools/ArchiveTools.cs
index b9669661..4a5036a4 100644
--- a/SabreTools.Helper/Tools/ArchiveTools.cs
+++ b/SabreTools.Helper/Tools/ArchiveTools.cs
@@ -10,16 +10,6 @@ using SabreTools.Helper.Dats;
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
-#endif
-using Ionic.Zlib;
-using ROMVault2.SupportedFiles.Zip;
-using SharpCompress.Archives;
-using SharpCompress.Archives.Rar;
-using SharpCompress.Archives.SevenZip;
-using SharpCompress.Archives.Tar;
-using SharpCompress.Common;
-using SharpCompress.Readers;
-using SharpCompress.Writers;
 
 using BinaryReader = System.IO.BinaryReader;
 using BinaryWriter = System.IO.BinaryWriter;
@@ -31,6 +21,16 @@ using FileStream = System.IO.FileStream;
 using MemoryStream = System.IO.MemoryStream;
 using SeekOrigin = System.IO.SeekOrigin;
 using Stream = System.IO.Stream;
+#endif
+using Ionic.Zlib;
+using ROMVault2.SupportedFiles.Zip;
+using SharpCompress.Archives;
+using SharpCompress.Archives.Rar;
+using SharpCompress.Archives.SevenZip;
+using SharpCompress.Archives.Tar;
+using SharpCompress.Common;
+using SharpCompress.Readers;
+using SharpCompress.Writers;
 
 namespace SabreTools.Helper.Tools
 {
diff --git a/SabreTools.Helper/Tools/FileTools.cs b/SabreTools.Helper/Tools/FileTools.cs
index d04edcd7..6d320208 100644
--- a/SabreTools.Helper/Tools/FileTools.cs
+++ b/SabreTools.Helper/Tools/FileTools.cs
@@ -14,9 +14,6 @@ using SabreTools.Helper.Skippers;
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
-#endif
-using NaturalSort;
-using OCRC;
 
 using BinaryReader = System.IO.BinaryReader;
 using BinaryWriter = System.IO.BinaryWriter;
@@ -27,6 +24,9 @@ using SearchOption = System.IO.SearchOption;
 using SeekOrigin = System.IO.SeekOrigin;
 using Stream = System.IO.Stream;
 using StreamReader = System.IO.StreamReader;
+#endif
+using NaturalSort;
+using OCRC;
 
 namespace SabreTools.Helper.Tools
 {
diff --git a/SabreTools.Helper/Tools/Style.cs b/SabreTools.Helper/Tools/Style.cs
index 532e2a83..e20195ec 100644
--- a/SabreTools.Helper/Tools/Style.cs
+++ b/SabreTools.Helper/Tools/Style.cs
@@ -13,11 +13,11 @@ using SabreTools.Helper.Dats;
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
-#endif
 
 using FileAccess = System.IO.FileAccess;
 using FileMode = System.IO.FileMode;
 using FileStream = System.IO.FileStream;
+#endif
 
 namespace SabreTools.Helper.Tools
 {
diff --git a/SabreTools/Partials/SabreTools_Inits.cs b/SabreTools/Partials/SabreTools_Inits.cs
index 3de8adf6..c44a17ed 100644
--- a/SabreTools/Partials/SabreTools_Inits.cs
+++ b/SabreTools/Partials/SabreTools_Inits.cs
@@ -10,9 +10,9 @@ using SabreTools.Helper.Tools;
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
-#endif
 
 using SearchOption = System.IO.SearchOption;
+#endif
 
 namespace SabreTools
 {