From 35d1030dec028c8c9be73abbeb9d0bd13b641149 Mon Sep 17 00:00:00 2001
From: Franco <francomaro@gmail.com>
Date: Mon, 18 Sep 2023 01:55:53 -0300
Subject: [PATCH] Fixed includes

---
 src/common/input.h                                            | 2 +-
 src/core/arm/dynarmic/arm_dynarmic_32.h                       | 2 +-
 src/core/hid/emulated_controller.h                            | 2 +-
 src/core/hid/emulated_devices.h                               | 2 +-
 src/core/hle/kernel/kernel.cpp                                | 2 +-
 src/core/hle/kernel/kernel.h                                  | 2 +-
 src/core/hle/service/am/applets/applet_web_browser_types.h    | 2 +-
 src/core/hle/service/ldn/lan_discovery.h                      | 2 +-
 src/core/hle/service/lm/lm.cpp                                | 2 +-
 src/core/hle/service/nvdrv/core/container.h                   | 2 +-
 src/core/hle/service/nvdrv/core/nvmap.h                       | 3 ++-
 src/core/hle/service/nvdrv/devices/nvmap.h                    | 3 ++-
 src/core/hle/service/nvdrv/nvdrv.h                            | 2 +-
 src/core/hle/service/nvnflinger/hos_binder_driver_server.h    | 2 +-
 src/core/hle/service/sm/sm.h                                  | 2 +-
 src/input_common/drivers/sdl_driver.h                         | 2 +-
 src/input_common/input_engine.h                               | 2 +-
 src/input_common/main.h                                       | 3 ++-
 .../frontend/maxwell/structured_control_flow.cpp              | 3 ++-
 src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp             | 2 +-
 src/tests/common/fibers.cpp                                   | 2 +-
 src/tests/video_core/memory_tracker.cpp                       | 2 +-
 src/video_core/buffer_cache/buffer_cache_base.h               | 2 +-
 src/video_core/buffer_cache/memory_tracker_base.h             | 2 +-
 src/video_core/control/channel_state_cache.h                  | 2 +-
 src/video_core/control/scheduler.h                            | 2 +-
 src/video_core/engines/sw_blitter/converter.cpp               | 2 +-
 src/video_core/macro/macro.h                                  | 2 +-
 src/video_core/query_cache.h                                  | 4 ++--
 src/video_core/renderer_opengl/gl_shader_cache.h              | 2 +-
 src/video_core/renderer_vulkan/vk_pipeline_cache.h            | 2 +-
 src/video_core/renderer_vulkan/vk_render_pass_cache.h         | 3 +--
 src/video_core/shader_cache.h                                 | 2 +-
 src/video_core/shader_environment.h                           | 2 +-
 src/video_core/texture_cache/texture_cache.h                  | 2 +-
 src/video_core/texture_cache/texture_cache_base.h             | 4 ++--
 src/video_core/vulkan_common/vulkan_device.cpp                | 2 +-
 src/video_core/vulkan_common/vulkan_device.h                  | 2 +-
 src/yuzu/compatibility_list.h                                 | 2 +-
 src/yuzu/loading_screen.cpp                                   | 2 +-
 src/yuzu/multiplayer/chat_room.h                              | 4 ++--
 41 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/src/common/input.h b/src/common/input.h
index a3497011ec..5fa7722a03 100644
--- a/src/common/input.h
+++ b/src/common/input.h
@@ -6,9 +6,9 @@
 #include <functional>
 #include <memory>
 #include <string>
-#include <tsl/robin_map.h>
 #include <utility>
 #include <vector>
+#include <tsl/robin_map.h>
 
 #include "common/logging/log.h"
 #include "common/param_package.h"
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.h b/src/core/arm/dynarmic/arm_dynarmic_32.h
index 57a68bf29c..322ab28535 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.h
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.h
@@ -5,8 +5,8 @@
 
 #include <atomic>
 #include <memory>
-#include <tsl/robin_map.h>
 
+#include <tsl/robin_map.h>
 #include <dynarmic/interface/A32/a32.h>
 #include <dynarmic/interface/A64/a64.h>
 #include "common/common_types.h"
diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h
index 1cf84d9a49..6f857d4914 100644
--- a/src/core/hid/emulated_controller.h
+++ b/src/core/hid/emulated_controller.h
@@ -7,9 +7,9 @@
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "common/input.h"
 #include "common/param_package.h"
diff --git a/src/core/hid/emulated_devices.h b/src/core/hid/emulated_devices.h
index d470936d37..51d6810950 100644
--- a/src/core/hid/emulated_devices.h
+++ b/src/core/hid/emulated_devices.h
@@ -7,9 +7,9 @@
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "common/input.h"
 #include "common/param_package.h"
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 6d293d6a8e..22e98f784e 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -7,9 +7,9 @@
 #include <functional>
 #include <memory>
 #include <thread>
-#include <tsl/robin_set.h>
 #include <utility>
 
+#include <tsl/robin_set.h>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/microprofile.h"
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 94df91fe06..de37390d11 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -7,9 +7,9 @@
 #include <functional>
 #include <memory>
 #include <string>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include "common/polyfill_thread.h"
 #include "core/hardware_properties.h"
 #include "core/hle/kernel/k_auto_object.h"
diff --git a/src/core/hle/service/am/applets/applet_web_browser_types.h b/src/core/hle/service/am/applets/applet_web_browser_types.h
index d1d7efaac0..b10e21ad7f 100644
--- a/src/core/hle/service/am/applets/applet_web_browser_types.h
+++ b/src/core/hle/service/am/applets/applet_web_browser_types.h
@@ -4,9 +4,9 @@
 #pragma once
 
 #include <array>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
diff --git a/src/core/hle/service/ldn/lan_discovery.h b/src/core/hle/service/ldn/lan_discovery.h
index e5dcb957d2..302eacd8a9 100644
--- a/src/core/hle/service/ldn/lan_discovery.h
+++ b/src/core/hle/service/ldn/lan_discovery.h
@@ -12,8 +12,8 @@
 #include <random>
 #include <span>
 #include <thread>
-#include <tsl/robin_map.h>
 
+#include <tsl/robin_map.h>
 #include "common/logging/log.h"
 #include "common/socket_types.h"
 #include "core/hle/result.h"
diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp
index e41c7b36fc..c3a5c195e4 100644
--- a/src/core/hle/service/lm/lm.cpp
+++ b/src/core/hle/service/lm/lm.cpp
@@ -4,8 +4,8 @@
 #include <string>
 
 #include <optional>
-#include <tsl/robin_map.h>
 #include <boost/container_hash/hash.hpp>
+#include <tsl/robin_map.h>
 
 #include "common/logging/log.h"
 #include "core/core.h"
diff --git a/src/core/hle/service/nvdrv/core/container.h b/src/core/hle/service/nvdrv/core/container.h
index 50f87d7721..fa113b433a 100644
--- a/src/core/hle/service/nvdrv/core/container.h
+++ b/src/core/hle/service/nvdrv/core/container.h
@@ -6,8 +6,8 @@
 
 #include <deque>
 #include <memory>
-#include <tsl/robin_map.h>
 
+#include <tsl/robin_map.h>
 #include "core/hle/service/nvdrv/nvdata.h"
 
 namespace Tegra::Host1x {
diff --git a/src/core/hle/service/nvdrv/core/nvmap.h b/src/core/hle/service/nvdrv/core/nvmap.h
index f8bfa56c98..ad77feedae 100644
--- a/src/core/hle/service/nvdrv/core/nvmap.h
+++ b/src/core/hle/service/nvdrv/core/nvmap.h
@@ -9,9 +9,10 @@
 #include <memory>
 #include <mutex>
 #include <optional>
-#include <tsl/robin_map.h>
 #include <assert.h>
 
+#include <tsl/robin_map.h>
+
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "core/hle/service/nvdrv/nvdata.h"
diff --git a/src/core/hle/service/nvdrv/devices/nvmap.h b/src/core/hle/service/nvdrv/devices/nvmap.h
index 056bcb49ea..71a617eb11 100644
--- a/src/core/hle/service/nvdrv/devices/nvmap.h
+++ b/src/core/hle/service/nvdrv/devices/nvmap.h
@@ -4,9 +4,10 @@
 #pragma once
 
 #include <memory>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
+
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h
index 1139215a68..f816946782 100644
--- a/src/core/hle/service/nvdrv/nvdrv.h
+++ b/src/core/hle/service/nvdrv/nvdrv.h
@@ -9,9 +9,9 @@
 #include <memory>
 #include <span>
 #include <string>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "core/hle/service/kernel_helpers.h"
 #include "core/hle/service/nvdrv/core/container.h"
diff --git a/src/core/hle/service/nvnflinger/hos_binder_driver_server.h b/src/core/hle/service/nvnflinger/hos_binder_driver_server.h
index f7ab30e68e..b354621964 100644
--- a/src/core/hle/service/nvnflinger/hos_binder_driver_server.h
+++ b/src/core/hle/service/nvnflinger/hos_binder_driver_server.h
@@ -5,8 +5,8 @@
 
 #include <memory>
 #include <mutex>
-#include <tsl/robin_map.h>
 
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "core/hle/service/kernel_helpers.h"
 #include "core/hle/service/nvnflinger/binder.h"
diff --git a/src/core/hle/service/sm/sm.h b/src/core/hle/service/sm/sm.h
index bfc31a357e..432f784ccd 100644
--- a/src/core/hle/service/sm/sm.h
+++ b/src/core/hle/service/sm/sm.h
@@ -6,8 +6,8 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <tsl/robin_map.h>
 
+#include <tsl/robin_map.h>
 #include "common/concepts.h"
 #include "core/hle/kernel/k_port.h"
 #include "core/hle/result.h"
diff --git a/src/input_common/drivers/sdl_driver.h b/src/input_common/drivers/sdl_driver.h
index 86406e36cd..0b39f72a1c 100644
--- a/src/input_common/drivers/sdl_driver.h
+++ b/src/input_common/drivers/sdl_driver.h
@@ -6,9 +6,9 @@
 #include <atomic>
 #include <mutex>
 #include <thread>
-#include <tsl/robin_map.h>
 #include <SDL.h>
 
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "common/threadsafe_queue.h"
 #include "input_common/input_engine.h"
diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.h
index adfcab165c..ba5354ec24 100644
--- a/src/input_common/input_engine.h
+++ b/src/input_common/input_engine.h
@@ -5,8 +5,8 @@
 
 #include <functional>
 #include <mutex>
-#include <tsl/robin_map.h>
 
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "common/input.h"
 #include "common/param_package.h"
diff --git a/src/input_common/main.h b/src/input_common/main.h
index d14cf29334..010ac73ce7 100644
--- a/src/input_common/main.h
+++ b/src/input_common/main.h
@@ -5,9 +5,10 @@
 
 #include <memory>
 #include <string>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
+
 namespace Common {
 class ParamPackage;
 }
diff --git a/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp b/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp
index 8db123cbd7..c83c7b6d17 100644
--- a/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp
+++ b/src/shader_recompiler/frontend/maxwell/structured_control_flow.cpp
@@ -4,10 +4,11 @@
 #include <algorithm>
 #include <memory>
 #include <string>
-#include <tsl/robin_map.h>
 #include <utility>
 #include <vector>
 
+#include <tsl/robin_map.h>
+
 #include <fmt/format.h>
 
 #include <boost/intrusive/list.hpp>
diff --git a/src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp b/src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp
index b37da787e2..218a547ebf 100644
--- a/src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp
+++ b/src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp
@@ -16,10 +16,10 @@
 #include <deque>
 #include <map>
 #include <span>
-#include <tsl/robin_map.h>
 #include <variant>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include "shader_recompiler/frontend/ir/basic_block.h"
 #include "shader_recompiler/frontend/ir/opcodes.h"
 #include "shader_recompiler/frontend/ir/pred.h"
diff --git a/src/tests/common/fibers.cpp b/src/tests/common/fibers.cpp
index 186a7fec6d..d01d8d6727 100644
--- a/src/tests/common/fibers.cpp
+++ b/src/tests/common/fibers.cpp
@@ -8,9 +8,9 @@
 #include <mutex>
 #include <stdexcept>
 #include <thread>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include <catch2/catch_test_macros.hpp>
 
 #include "common/common_types.h"
diff --git a/src/tests/video_core/memory_tracker.cpp b/src/tests/video_core/memory_tracker.cpp
index 985429af61..1d8b3da227 100644
--- a/src/tests/video_core/memory_tracker.cpp
+++ b/src/tests/video_core/memory_tracker.cpp
@@ -3,8 +3,8 @@
 
 #include <memory>
 #include <stdexcept>
-#include <tsl/robin_map.h>
 
+#include <tsl/robin_map.h>
 #include <catch2/catch_test_macros.hpp>
 
 #include "common/alignment.h"
diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.h
index a8e63813d6..b4a01d053d 100644
--- a/src/video_core/buffer_cache/buffer_cache_base.h
+++ b/src/video_core/buffer_cache/buffer_cache_base.h
@@ -10,9 +10,9 @@
 #include <mutex>
 #include <numeric>
 #include <span>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include <boost/container/small_vector.hpp>
 #define BOOST_NO_MT
 #include <boost/pool/detail/mutex.hpp>
diff --git a/src/video_core/buffer_cache/memory_tracker_base.h b/src/video_core/buffer_cache/memory_tracker_base.h
index f0c86d2d88..c1af3e1a58 100644
--- a/src/video_core/buffer_cache/memory_tracker_base.h
+++ b/src/video_core/buffer_cache/memory_tracker_base.h
@@ -8,9 +8,9 @@
 #include <deque>
 #include <limits>
 #include <type_traits>
-#include <tsl/robin_set.h>
 #include <utility>
 
+#include <tsl/robin_set.h>
 #include "common/alignment.h"
 #include "common/common_types.h"
 #include "video_core/buffer_cache/word_manager.h"
diff --git a/src/video_core/control/channel_state_cache.h b/src/video_core/control/channel_state_cache.h
index e12cc81ca4..9d3698776f 100644
--- a/src/video_core/control/channel_state_cache.h
+++ b/src/video_core/control/channel_state_cache.h
@@ -7,9 +7,9 @@
 #include <limits>
 #include <mutex>
 #include <optional>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 
 namespace Tegra {
diff --git a/src/video_core/control/scheduler.h b/src/video_core/control/scheduler.h
index b3b4a352c2..c4a451b3b6 100644
--- a/src/video_core/control/scheduler.h
+++ b/src/video_core/control/scheduler.h
@@ -5,8 +5,8 @@
 
 #include <memory>
 #include <mutex>
-#include <tsl/robin_map.h>
 
+#include <tsl/robin_map.h>
 #include "video_core/dma_pusher.h"
 
 namespace Tegra {
diff --git a/src/video_core/engines/sw_blitter/converter.cpp b/src/video_core/engines/sw_blitter/converter.cpp
index 0c3066db57..778f3a44b2 100644
--- a/src/video_core/engines/sw_blitter/converter.cpp
+++ b/src/video_core/engines/sw_blitter/converter.cpp
@@ -4,8 +4,8 @@
 #include <array>
 #include <cmath>
 #include <span>
-#include <tsl/robin_map.h>
 
+#include <tsl/robin_map.h>
 #include "common/assert.h"
 #include "common/bit_cast.h"
 #include "video_core/engines/sw_blitter/converter.h"
diff --git a/src/video_core/macro/macro.h b/src/video_core/macro/macro.h
index ed31ab9b36..4407994e8c 100644
--- a/src/video_core/macro/macro.h
+++ b/src/video_core/macro/macro.h
@@ -5,9 +5,9 @@
 
 #include <memory>
 #include <unordered_map>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 
diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h
index 4d7445ba30..3904b929e8 100644
--- a/src/video_core/query_cache.h
+++ b/src/video_core/query_cache.h
@@ -12,10 +12,10 @@
 #include <memory>
 #include <mutex>
 #include <optional>
-#include <tsl/robin_map.h>
-#include <tsl/robin_set.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
+#include <tsl/robin_set.h>
 #include "common/assert.h"
 #include "common/settings.h"
 #include "core/memory.h"
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.h b/src/video_core/renderer_opengl/gl_shader_cache.h
index 61baf9bb3b..2f85210073 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.h
+++ b/src/video_core/renderer_opengl/gl_shader_cache.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include <filesystem>
-#include <tsl/robin_map.h>
 
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "common/thread_worker.h"
 #include "shader_recompiler/host_translate_info.h"
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.h b/src/video_core/renderer_vulkan/vk_pipeline_cache.h
index 96aab30ae5..51b486d1c3 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.h
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.h
@@ -8,9 +8,9 @@
 #include <filesystem>
 #include <memory>
 #include <type_traits>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "common/thread_worker.h"
 #include "shader_recompiler/frontend/ir/basic_block.h"
diff --git a/src/video_core/renderer_vulkan/vk_render_pass_cache.h b/src/video_core/renderer_vulkan/vk_render_pass_cache.h
index e2b6262b8f..5966778db9 100644
--- a/src/video_core/renderer_vulkan/vk_render_pass_cache.h
+++ b/src/video_core/renderer_vulkan/vk_render_pass_cache.h
@@ -4,9 +4,8 @@
 #pragma once
 
 #include <mutex>
-#include <unordered_map>
-#include <tsl/robin_map.h>
 
+#include <tsl/robin_map.h>
 #include "video_core/surface.h"
 #include "video_core/vulkan_common/vulkan_wrapper.h"
 
diff --git a/src/video_core/shader_cache.h b/src/video_core/shader_cache.h
index 8bd2de379f..d9c4b74a0f 100644
--- a/src/video_core/shader_cache.h
+++ b/src/video_core/shader_cache.h
@@ -7,10 +7,10 @@
 #include <memory>
 #include <mutex>
 #include <span>
-#include <tsl/robin_map.h>
 #include <utility>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "common/polyfill_ranges.h"
 #include "video_core/control/channel_state_cache.h"
diff --git a/src/video_core/shader_environment.h b/src/video_core/shader_environment.h
index f7d34be27a..e4bb000efc 100644
--- a/src/video_core/shader_environment.h
+++ b/src/video_core/shader_environment.h
@@ -11,9 +11,9 @@
 #include <optional>
 #include <span>
 #include <type_traits>
-#include <tsl/robin_map.h>
 #include <vector>
 
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "common/polyfill_thread.h"
 #include "common/unique_function.h"
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 20a4ad4ce1..d20a4436a0 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <tsl/robin_set.h>
 #include <boost/container/small_vector.hpp>
 
+#include <tsl/robin_set.h>
 #include "common/alignment.h"
 #include "common/settings.h"
 #include "core/memory.h"
diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h
index f14203bdfa..cb15468010 100644
--- a/src/video_core/texture_cache/texture_cache_base.h
+++ b/src/video_core/texture_cache/texture_cache_base.h
@@ -9,12 +9,12 @@
 #include <mutex>
 #include <span>
 #include <type_traits>
-#include <tsl/robin_map.h>
-#include <tsl/robin_set.h>
 #include <vector>
 #include <boost/container/small_vector.hpp>
 #include <queue>
 
+#include <tsl/robin_map.h>
+#include <tsl/robin_set.h>
 #include "common/common_types.h"
 #include "common/hash.h"
 #include "common/literals.h"
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index 4504c3043f..463b961fd5 100644
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -6,9 +6,9 @@
 #include <chrono>
 #include <optional>
 #include <thread>
-#include <tsl/robin_set.h>
 #include <utility>
 #include <vector>
+#include <tsl/robin_set.h>
 
 #include "common/assert.h"
 #include "common/literals.h"
diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h
index d65d1d71fe..63db00139e 100644
--- a/src/video_core/vulkan_common/vulkan_device.h
+++ b/src/video_core/vulkan_common/vulkan_device.h
@@ -6,8 +6,8 @@
 #include <set>
 #include <span>
 #include <string>
-#include <tsl/robin_map.h>
 #include <vector>
+#include <tsl/robin_map.h>
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/settings.h"
diff --git a/src/yuzu/compatibility_list.h b/src/yuzu/compatibility_list.h
index c803597671..46158b3c3b 100644
--- a/src/yuzu/compatibility_list.h
+++ b/src/yuzu/compatibility_list.h
@@ -4,8 +4,8 @@
 #pragma once
 
 #include <string>
-#include <tsl/robin_map.h>
 #include <QString>
+#include <tsl/robin_map.h>
 
 #include "common/common_types.h"
 
diff --git a/src/yuzu/loading_screen.cpp b/src/yuzu/loading_screen.cpp
index 29df15ab8a..f84fa955e2 100644
--- a/src/yuzu/loading_screen.cpp
+++ b/src/yuzu/loading_screen.cpp
@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <tsl/robin_map.h>
 #include <QBuffer>
 #include <QByteArray>
 #include <QGraphicsOpacityEffect>
@@ -11,6 +10,7 @@
 #include <QPixmap>
 #include <QPropertyAnimation>
 #include <QStyleOption>
+#include <tsl/robin_map.h>
 #include "core/frontend/framebuffer_layout.h"
 #include "core/loader/loader.h"
 #include "ui_loading_screen.h"
diff --git a/src/yuzu/multiplayer/chat_room.h b/src/yuzu/multiplayer/chat_room.h
index 8d3d38fe19..7ee3c99d69 100644
--- a/src/yuzu/multiplayer/chat_room.h
+++ b/src/yuzu/multiplayer/chat_room.h
@@ -4,12 +4,12 @@
 #pragma once
 
 #include <memory>
-#include <tsl/robin_map.h>
-#include <tsl/robin_set.h>
 #include <QDialog>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 #include <QVariant>
+#include <tsl/robin_map.h>
+#include <tsl/robin_set.h>
 #include "network/network.h"
 
 namespace Ui {