diff --git a/.clang-format b/.clang-format
index a5f9bf0bb..9f8b391e3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -2,3 +2,4 @@
 BasedOnStyle: Google
 DerivePointerAlignment: false
 PointerAlignment: Left
+SortIncludes: true
diff --git a/src/xenia/base/memory_test.cc b/src/xenia/base/memory_test.cc
index ca35ea2b3..427f132a3 100644
--- a/src/xenia/base/memory_test.cc
+++ b/src/xenia/base/memory_test.cc
@@ -7,9 +7,10 @@
  ******************************************************************************
  */
 
-#include "third_party/catch/include/catch.hpp"
 #include "xenia/base/memory.h"
 
+#include "third_party/catch/include/catch.hpp"
+
 TEST_CASE("copy_and_swap_16_aligned", "Copy and Swap") {
   // TODO(benvanik): tests.
   REQUIRE(true == true);
diff --git a/src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc b/src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc
index 345509b05..895e85455 100644
--- a/src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc
+++ b/src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc
@@ -7,6 +7,8 @@
  ******************************************************************************
  */
 
+#include "xenia/kernel/xboxkrnl/xboxkrnl_video.h"
+
 #include "xenia/base/logging.h"
 #include "xenia/emulator.h"
 #include "xenia/gpu/graphics_system.h"
@@ -15,7 +17,6 @@
 #include "xenia/kernel/util/shim_utils.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_private.h"
 #include "xenia/kernel/xboxkrnl/xboxkrnl_rtl.h"
-#include "xenia/kernel/xboxkrnl/xboxkrnl_video.h"
 #include "xenia/xbox.h"
 
 namespace xe {
diff --git a/src/xenia/kernel/xevent.cc b/src/xenia/kernel/xevent.cc
index 5b5ee61cd..079272b7b 100644
--- a/src/xenia/kernel/xevent.cc
+++ b/src/xenia/kernel/xevent.cc
@@ -7,9 +7,10 @@
  ******************************************************************************
  */
 
-#include "xenia/base/logging.h"
 #include "xenia/kernel/xevent.h"
 
+#include "xenia/base/logging.h"
+
 namespace xe {
 namespace kernel {