diff --git a/Source/Core/DiscIO/BannerLoaderGC.cpp b/Source/Core/DiscIO/BannerLoaderGC.cpp
index 960cf70a40..bc6ba3470b 100644
--- a/Source/Core/DiscIO/BannerLoaderGC.cpp
+++ b/Source/Core/DiscIO/BannerLoaderGC.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common/CommonTypes.h"
 #include "Common/ColorUtil.h"
+#include "Common/CommonTypes.h"
 #include "DiscIO/BannerLoaderGC.h"
 
 namespace DiscIO
diff --git a/Source/Core/DiscIO/BannerLoaderWii.cpp b/Source/Core/DiscIO/BannerLoaderWii.cpp
index d530cfbf65..a037a830bd 100644
--- a/Source/Core/DiscIO/BannerLoaderWii.cpp
+++ b/Source/Core/DiscIO/BannerLoaderWii.cpp
@@ -5,8 +5,8 @@
 #include <algorithm>
 #include <cstdio>
 
-#include "Common/CommonTypes.h"
 #include "Common/ColorUtil.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 
 #include "DiscIO/BannerLoaderWii.h"
diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp
index 7e58c15092..f3dd250b78 100644
--- a/Source/Core/DiscIO/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/CompressedBlob.cpp
@@ -10,13 +10,13 @@
 #endif
 
 #include <cinttypes>
+#include <zlib.h>
 
 #include "Common/FileUtil.h"
 #include "Common/Hash.h"
 #include "DiscIO/CompressedBlob.h"
 #include "DiscIO/DiscScrubber.h"
 
-#include "zlib.h"
 
 namespace DiscIO
 {
diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp
index cd8e7c98c6..35d51a56e1 100644
--- a/Source/Core/DiscIO/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/NANDContentLoader.cpp
@@ -7,8 +7,8 @@
 #include <polarssl/aes.h>
 
 #include "Common/FileUtil.h"
-#include "Common/MathUtil.h"
 #include "Common/Log.h"
+#include "Common/MathUtil.h"
 #include "Common/StringUtil.h"
 
 #include "DiscIO/NANDContentLoader.h"
diff --git a/Source/Core/DiscIO/WiiWad.cpp b/Source/Core/DiscIO/WiiWad.cpp
index 09c9808588..8c6cda77bd 100644
--- a/Source/Core/DiscIO/WiiWad.cpp
+++ b/Source/Core/DiscIO/WiiWad.cpp
@@ -2,7 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "NANDContentLoader.h"
 
 #include <algorithm>
 #include <cctype>
@@ -10,6 +9,7 @@
 #include "Common/FileUtil.h"
 #include "Common/Log.h"
 #include "Common/MathUtil.h"
+#include "DiscIO/NANDContentLoader.h"
 #include "DiscIO/WiiWad.h"
 
 namespace DiscIO