diff --git a/src/xenia/apu/xaudio2/xaudio2_audio_driver.cc b/src/xenia/apu/xaudio2/xaudio2_audio_driver.cc
index 307c29680..e2edda9cf 100644
--- a/src/xenia/apu/xaudio2/xaudio2_audio_driver.cc
+++ b/src/xenia/apu/xaudio2/xaudio2_audio_driver.cc
@@ -10,8 +10,10 @@
 #include "xenia/apu/xaudio2/xaudio2_audio_driver.h"
 
 // Must be included before xaudio2.h so we get the right windows.h include.
+// clang-format off
 #include "xenia/base/platform_win.h"
 #include <xaudio2.h>  // NOLINT(build/include_order)
+// clang-format on
 
 #include "xenia/apu/apu_flags.h"
 #include "xenia/base/clock.h"
diff --git a/src/xenia/base/platform_win.h b/src/xenia/base/platform_win.h
index ff423e5af..23209d991 100644
--- a/src/xenia/base/platform_win.h
+++ b/src/xenia/base/platform_win.h
@@ -20,14 +20,14 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 #define NOMINMAX
-#include <SDKDDKVer.h>
-#include <windows.h>
 #include <ObjBase.h>
+#include <SDKDDKVer.h>
+#include <dwmapi.h>
 #include <shellapi.h>
 #include <shlwapi.h>
 #include <shobjidl.h>
-#include <dwmapi.h>
 #include <tpcshrd.h>
+#include <windows.h>
 #include <windowsx.h>
 #undef DeleteBitmap
 #undef DeleteFile
diff --git a/src/xenia/base/socket_win.cc b/src/xenia/base/socket_win.cc
index a7b13b509..39be78811 100644
--- a/src/xenia/base/socket_win.cc
+++ b/src/xenia/base/socket_win.cc
@@ -15,10 +15,12 @@
 #include "xenia/base/logging.h"
 
 // winsock includes must come after platform_win.h:
+// clang-format off
 #include "xenia/base/platform_win.h"
 #include <mstcpip.h>   // NOLINT(build/include_order)
 #include <winsock2.h>  // NOLINT(build/include_order)
 #include <ws2tcpip.h>  // NOLINT(build/include_order)
+// clang-format on
 
 namespace xe {
 
diff --git a/src/xenia/cpu/testing/sandbox_main.cc b/src/xenia/cpu/testing/sandbox_main.cc
index f87f6833e..a6d8d20fc 100644
--- a/src/xenia/cpu/testing/sandbox_main.cc
+++ b/src/xenia/cpu/testing/sandbox_main.cc
@@ -8,8 +8,8 @@
  */
 
 #include "xenia/base/main.h"
-#include "xenia/cpu/cpu.h"
 #include "xenia/cpu/backend/x64/x64_backend.h"
+#include "xenia/cpu/cpu.h"
 #include "xenia/cpu/frontend/ppc_context.h"
 #include "xenia/cpu/frontend/ppc_frontend.h"
 #include "xenia/cpu/raw_module.h"
diff --git a/src/xenia/hid/xinput/xinput_input_driver.cc b/src/xenia/hid/xinput/xinput_input_driver.cc
index ca4951dfd..c0496cfb3 100644
--- a/src/xenia/hid/xinput/xinput_input_driver.cc
+++ b/src/xenia/hid/xinput/xinput_input_driver.cc
@@ -10,8 +10,10 @@
 #include "xenia/hid/xinput/xinput_input_driver.h"
 
 // Must be included before xinput.h to avoid windows.h conflicts:
+// clang-format off
 #include "xenia/base/platform_win.h"
 #include <xinput.h>  // NOLINT(build/include_order)
+// clang-format on
 
 #include "xenia/hid/hid_flags.h"
 
diff --git a/src/xenia/kernel/util/xex2.cc b/src/xenia/kernel/util/xex2.cc
index 49b47578b..5a8620907 100644
--- a/src/xenia/kernel/util/xex2.cc
+++ b/src/xenia/kernel/util/xex2.cc
@@ -15,7 +15,6 @@
 #include <cstring>
 #include <vector>
 
-#include "third_party/crypto/rijndael-alg-fst.h"
 #include "third_party/crypto/rijndael-alg-fst.c"
 #include "third_party/mspack/lzx.h"
 #include "third_party/mspack/lzxd.c"
diff --git a/src/xenia/ui/gl/gl_context.cc b/src/xenia/ui/gl/gl_context.cc
index e59177020..926658d33 100644
--- a/src/xenia/ui/gl/gl_context.cc
+++ b/src/xenia/ui/gl/gl_context.cc
@@ -17,12 +17,12 @@
 #include "xenia/base/assert.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/math.h"
+#include "xenia/base/platform_win.h"
 #include "xenia/base/profiling.h"
 #include "xenia/ui/gl/gl_immediate_drawer.h"
 #include "xenia/ui/window.h"
 
 // TODO(benvanik): move win32 code to _win?
-#include "xenia/base/platform_win.h"
 #include "third_party/GL/wglew.h"
 
 DEFINE_bool(thread_safe_gl, false,