diff --git a/Source/DSPSpy/ConsoleHelper.h b/Source/DSPSpy/ConsoleHelper.h
index e616db6a16..1f4285fc70 100644
--- a/Source/DSPSpy/ConsoleHelper.h
+++ b/Source/DSPSpy/ConsoleHelper.h
@@ -4,10 +4,10 @@
 
 #pragma once
 
+#include <iostream>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
-#include <iostream>
 
 #define CON_BLACK 		0
 #define CON_RED			1
diff --git a/Source/DSPSpy/Stubs.cpp b/Source/DSPSpy/Stubs.cpp
index 2f738f8c51..335586a066 100644
--- a/Source/DSPSpy/Stubs.cpp
+++ b/Source/DSPSpy/Stubs.cpp
@@ -18,8 +18,8 @@
 // Stubs to make DSPCore compile as part of DSPSpy.
 
 /*
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <string>
 
diff --git a/Source/DSPSpy/main_spy.cpp b/Source/DSPSpy/main_spy.cpp
index 26e18dc0a5..665e7bb1b8 100644
--- a/Source/DSPSpy/main_spy.cpp
+++ b/Source/DSPSpy/main_spy.cpp
@@ -9,17 +9,17 @@
 // Use Dolphin's dsptool to generate a new dsp_code.h.
 // Originally written by duddie and modified by FIRES. Then further modified by ector.
 
+#include <debug.h>
+#include <fat.h>
+#include <fcntl.h>
 #include <gccore.h>
 #include <malloc.h>
+#include <network.h>
+#include <ogcsys.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <network.h>
-#include <ogcsys.h>
 #include <time.h>
-#include <fat.h>
-#include <fcntl.h>
-#include <debug.h>
 
 #include <unistd.h>
 #include <ogc/color.h>
diff --git a/Source/PCH/pch.h b/Source/PCH/pch.h
index 5402a27a44..04331e664e 100644
--- a/Source/PCH/pch.h
+++ b/Source/PCH/pch.h
@@ -27,14 +27,14 @@
 #endif
 #include <iomanip>
 #include <iostream>
-#include <limits.h>
 #include <limits>
+#include <limits.h>
 #include <list>
 #include <locale.h>
 #include <map>
 #include <math.h>
-#include <memory.h>
 #include <memory>
+#include <memory.h>
 #include <mutex>
 #include <numeric>
 #ifndef _WIN32
diff --git a/Source/UnitTests/Common/EventTest.cpp b/Source/UnitTests/Common/EventTest.cpp
index 41949a893d..6194dcb9dd 100644
--- a/Source/UnitTests/Common/EventTest.cpp
+++ b/Source/UnitTests/Common/EventTest.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <gtest/gtest.h>
 #include <thread>
+#include <gtest/gtest.h>
 
 #include "Common/Event.h"
 
diff --git a/Source/UnitTests/Common/FifoQueueTest.cpp b/Source/UnitTests/Common/FifoQueueTest.cpp
index 6530e15ddd..042cf57983 100644
--- a/Source/UnitTests/Common/FifoQueueTest.cpp
+++ b/Source/UnitTests/Common/FifoQueueTest.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <gtest/gtest.h>
 #include <thread>
+#include <gtest/gtest.h>
 
 #include "Common/FifoQueue.h"
 
diff --git a/Source/UnitTests/Common/FlagTest.cpp b/Source/UnitTests/Common/FlagTest.cpp
index 2c087fd739..a4e3865252 100644
--- a/Source/UnitTests/Common/FlagTest.cpp
+++ b/Source/UnitTests/Common/FlagTest.cpp
@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <array>
-#include <gtest/gtest.h>
 #include <thread>
+#include <gtest/gtest.h>
 
 #include "Common/Flag.h"
 
diff --git a/Source/UnitTests/Common/MathUtilTest.cpp b/Source/UnitTests/Common/MathUtilTest.cpp
index 9549039304..0f27ed1ea1 100644
--- a/Source/UnitTests/Common/MathUtilTest.cpp
+++ b/Source/UnitTests/Common/MathUtilTest.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <gtest/gtest.h>
 #include <limits>
 #include <random>
+#include <gtest/gtest.h>
 
 #include "Common/MathUtil.h"
 
diff --git a/Source/UnitTests/Common/x64EmitterTest.cpp b/Source/UnitTests/Common/x64EmitterTest.cpp
index 977b19a9bc..614847e955 100644
--- a/Source/UnitTests/Common/x64EmitterTest.cpp
+++ b/Source/UnitTests/Common/x64EmitterTest.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <cstring>
 #include <cctype>
+#include <cstring>
 #include <disasm.h>  // From Bochs, fallback included in Externals.
 #include <map>
 #include <memory>
diff --git a/Source/UnitTests/Core/PageFaultTest.cpp b/Source/UnitTests/Core/PageFaultTest.cpp
index 62a3e4bffa..8db624809c 100644
--- a/Source/UnitTests/Core/PageFaultTest.cpp
+++ b/Source/UnitTests/Core/PageFaultTest.cpp
@@ -6,7 +6,7 @@
 #include "Core/PowerPC/JitCommon/JitBase.h"
 
 // include order is important
-#include <gtest/gtest.h>
+#include <gtest/gtest.h> // NOLINT
 
 #if _M_X86_64 || _M_ARM_32
 enum