diff --git a/src/citra_qt/citra_qt.cpp b/src/citra_qt/citra_qt.cpp
index 2c310c8fe..bc77e73ce 100644
--- a/src/citra_qt/citra_qt.cpp
+++ b/src/citra_qt/citra_qt.cpp
@@ -3467,7 +3467,8 @@ bool GMainWindow::ConfirmChangeGame() {
     }
 
     auto answer = QMessageBox::question(
-        this, tr("Azahar"), tr("The application is still running. Would you like to stop emulation?"),
+        this, tr("Azahar"),
+        tr("The application is still running. Would you like to stop emulation?"),
         QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
     return answer != QMessageBox::No;
 }
diff --git a/src/core/arm/skyeye_common/vfp/vfp_helper.h b/src/core/arm/skyeye_common/vfp/vfp_helper.h
index 19d7dae56..c7e034f7d 100644
--- a/src/core/arm/skyeye_common/vfp/vfp_helper.h
+++ b/src/core/arm/skyeye_common/vfp/vfp_helper.h
@@ -37,7 +37,9 @@
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
 
 #define do_div(n, base)                                                                            \
-    { n /= base; }
+    {                                                                                              \
+        n /= base;                                                                                 \
+    }
 
 enum : u32 {
     FOP_MASK = 0x00b00040,
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 4db13d8a6..bc822ac09 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -715,7 +715,7 @@ void System::serialize(Archive& ar, const unsigned int file_version) {
     if (Archive::is_saving::value) {
         num_cores = this->GetNumCores();
     }
-    ar& num_cores;
+    ar & num_cores;
 
     if (Archive::is_loading::value) {
         // When loading, we want to make sure any lingering state gets cleared out before we begin.
@@ -751,7 +751,7 @@ void System::serialize(Archive& ar, const unsigned int file_version) {
     ar&* memory.get();
     ar&* kernel.get();
     ar&* gpu.get();
-    ar& movie;
+    ar & movie;
 
     // This needs to be set from somewhere - might as well be here!
     if (Archive::is_loading::value) {
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index d8356f966..8d8c064b9 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -2316,9 +2316,10 @@ void Module::Interface::GetNumImportTitleContextsImpl(IPC::RequestParser& rp,
     u32 count = 0;
     for (auto it = am->import_title_contexts.begin(); it != am->import_title_contexts.end(); it++) {
         if ((include_installing &&
-                (it->second.state == ImportTitleContextState::WAITING_FOR_IMPORT ||
-                 it->second.state == ImportTitleContextState::RESUMABLE)) ||
-            (include_finalizing && it->second.state == ImportTitleContextState::WAITING_FOR_COMMIT)) {
+             (it->second.state == ImportTitleContextState::WAITING_FOR_IMPORT ||
+              it->second.state == ImportTitleContextState::RESUMABLE)) ||
+            (include_finalizing &&
+             it->second.state == ImportTitleContextState::WAITING_FOR_COMMIT)) {
             count++;
         }
     }
@@ -2336,10 +2337,10 @@ void Module::Interface::GetImportTitleContextListImpl(IPC::RequestParser& rp,
 
     for (auto& key_value : am->import_content_contexts) {
         if ((include_installing &&
-                (key_value.second.state == ImportTitleContextState::WAITING_FOR_IMPORT ||
-                 key_value.second.state == ImportTitleContextState::RESUMABLE)) ||
+             (key_value.second.state == ImportTitleContextState::WAITING_FOR_IMPORT ||
+              key_value.second.state == ImportTitleContextState::RESUMABLE)) ||
             (include_finalizing &&
-                key_value.second.state == ImportTitleContextState::WAITING_FOR_COMMIT)) {
+             key_value.second.state == ImportTitleContextState::WAITING_FOR_COMMIT)) {
 
             out_buf.Write(&key_value.first, written * sizeof(u64), sizeof(u64));
             written++;
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index d6f1b5269..380a18abb 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -28,8 +28,8 @@
 #include "core/hle/service/cfg/cfg_nor.h"
 #include "core/hle/service/cfg/cfg_s.h"
 #include "core/hle/service/cfg/cfg_u.h"
-#include "core/loader/loader.h"
 #include "core/hw/unique_data.h"
+#include "core/loader/loader.h"
 
 SERVICE_CONSTRUCT_IMPL(Service::CFG::Module)
 SERIALIZE_EXPORT_IMPL(Service::CFG::Module)
diff --git a/src/core/hle/service/gsp/gsp_gpu.cpp b/src/core/hle/service/gsp/gsp_gpu.cpp
index 4a7d310f6..5e3e5e420 100644
--- a/src/core/hle/service/gsp/gsp_gpu.cpp
+++ b/src/core/hle/service/gsp/gsp_gpu.cpp
@@ -717,11 +717,11 @@ SessionData* GSP_GPU::FindRegisteredThreadData(u32 thread_id) {
 template <class Archive>
 void GSP_GPU::serialize(Archive& ar, const unsigned int) {
     ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
-    ar& shared_memory;
-    ar& active_thread_id;
-    ar& first_initialization;
-    ar& used_thread_ids;
-    ar& saved_vram;
+    ar & shared_memory;
+    ar & active_thread_id;
+    ar & first_initialization;
+    ar & used_thread_ids;
+    ar & saved_vram;
 }
 SERIALIZE_IMPL(GSP_GPU)
 
@@ -780,10 +780,10 @@ std::unique_ptr<Kernel::SessionRequestHandler::SessionDataBase> GSP_GPU::MakeSes
 template <class Archive>
 void SessionData::serialize(Archive& ar, const unsigned int) {
     ar& boost::serialization::base_object<Kernel::SessionRequestHandler::SessionDataBase>(*this);
-    ar& gsp;
-    ar& interrupt_event;
-    ar& thread_id;
-    ar& registered;
+    ar & gsp;
+    ar & interrupt_event;
+    ar & thread_id;
+    ar & registered;
 }
 SERIALIZE_IMPL(SessionData)
 
diff --git a/src/core/hle/service/http/ctr-common-1-cert.h b/src/core/hle/service/http/ctr-common-1-cert.h
index 2f75e665b..b8799d89a 100644
--- a/src/core/hle/service/http/ctr-common-1-cert.h
+++ b/src/core/hle/service/http/ctr-common-1-cert.h
@@ -81,5 +81,4 @@ const unsigned char ctr_common_1_cert_bin[1264] = {
     0xBC, 0x7E, 0xDD, 0xAB, 0x9D, 0xB9, 0x56, 0xCB, 0xDC, 0xFB, 0x3F, 0x32, 0xCF, 0xC3, 0x17, 0x1B,
     0x25, 0x6E, 0xFF, 0xE8, 0xBD, 0x32, 0x57, 0xA3, 0x8B, 0x06, 0x9B, 0x1F, 0xA7, 0xFC, 0xE7, 0x3A,
     0x89, 0x54, 0xFA, 0x8E, 0x1B, 0xAD, 0xBF, 0x3C, 0xDD, 0x00, 0x49, 0xA3, 0xC1, 0x8D, 0xC8, 0x6D,
-    0x8D, 0x43, 0xCC, 0x4E, 0xE5, 0xAE, 0xC9, 0x6C, 0x0C, 0x20, 0x09, 0x77, 0xDA, 0x8C, 0xE7, 0xAC
-};
+    0x8D, 0x43, 0xCC, 0x4E, 0xE5, 0xAE, 0xC9, 0x6C, 0x0C, 0x20, 0x09, 0x77, 0xDA, 0x8C, 0xE7, 0xAC};
diff --git a/src/core/hle/service/http/ctr-common-1-key.h b/src/core/hle/service/http/ctr-common-1-key.h
index cd5a36799..fd6bb1cf0 100644
--- a/src/core/hle/service/http/ctr-common-1-key.h
+++ b/src/core/hle/service/http/ctr-common-1-key.h
@@ -79,5 +79,4 @@ const unsigned char ctr_common_1_key_bin[1232] = {
     0x65, 0xD8, 0xF2, 0xB1, 0x79, 0x12, 0x10, 0x09, 0x5D, 0xFD, 0x63, 0x3A, 0xD7, 0xBE, 0xF3, 0xB2,
     0x9C, 0x0B, 0xCA, 0x0C, 0xE7, 0x4E, 0xE0, 0xBC, 0xFE, 0xB1, 0x0D, 0xB5, 0x87, 0x46, 0xD8, 0x3B,
     0x0B, 0xF1, 0x35, 0xD5, 0x0E, 0x92, 0xB2, 0xD3, 0x04, 0x72, 0x28, 0xA4, 0xC2, 0xB0, 0xA8, 0xD6,
-    0xB9, 0xC4, 0x85, 0x97, 0x96, 0xA8, 0xED, 0xA2, 0xE6, 0x5D, 0x22, 0x5C, 0x30, 0x67, 0xA8, 0x8C
-};
+    0xB9, 0xC4, 0x85, 0x97, 0x96, 0xA8, 0xED, 0xA2, 0xE6, 0x5D, 0x22, 0x5C, 0x30, 0x67, 0xA8, 0x8C};
diff --git a/src/core/hle/service/mvd/mvd_std.cpp b/src/core/hle/service/mvd/mvd_std.cpp
index 64a5314df..998fb3fd8 100644
--- a/src/core/hle/service/mvd/mvd_std.cpp
+++ b/src/core/hle/service/mvd/mvd_std.cpp
@@ -24,8 +24,7 @@ MVD_STD::MVD_STD() : ServiceFramework("mvd:std", 1) {
         {0x001D, nullptr, "GetConfig"},
         {0x001E, nullptr, "SetConfig"},
         {0x001F, nullptr, "SetOutputBuffer"},
-        {0x0021, nullptr, "OverrideOutputBuffers"}
-        // clang-format on
+        {0x0021, nullptr, "OverrideOutputBuffers"} // clang-format on
     };
 
     RegisterHandlers(functions);
diff --git a/src/core/hle/service/nfc/nfc_m.cpp b/src/core/hle/service/nfc/nfc_m.cpp
index c4c7e89f7..fab20c80e 100644
--- a/src/core/hle/service/nfc/nfc_m.cpp
+++ b/src/core/hle/service/nfc/nfc_m.cpp
@@ -47,8 +47,7 @@ NFC_M::NFC_M(std::shared_ptr<Module> nfc) : Module::Interface(std::move(nfc), "n
         {0x0404, &NFC_M::SetRegisterInfo, "SetRegisterInfo"},
         {0x0405, &NFC_M::DeleteRegisterInfo, "DeleteRegisterInfo"},
         {0x0406, &NFC_M::DeleteApplicationArea, "DeleteApplicationArea"},
-        {0x0407, &NFC_M::ExistsApplicationArea, "ExistsApplicationArea"}
-        // clang-format on
+        {0x0407, &NFC_M::ExistsApplicationArea, "ExistsApplicationArea"} // clang-format on
     };
     RegisterHandlers(functions);
 }
diff --git a/src/core/hw/rsa/rsa.cpp b/src/core/hw/rsa/rsa.cpp
index 4ec90da3f..4181144f6 100644
--- a/src/core/hw/rsa/rsa.cpp
+++ b/src/core/hw/rsa/rsa.cpp
@@ -12,8 +12,8 @@
 #include <fmt/format.h>
 #include "common/common_paths.h"
 #include "common/file_util.h"
-#include "common/string_util.h"
 #include "common/logging/log.h"
+#include "common/string_util.h"
 #include "core/hw/aes/key.h"
 #include "core/hw/rsa/rsa.h"
 #include "cryptopp/osrng.h"
diff --git a/src/tests/audio_core/merryhime_3ds_audio/merry_audio/merry_audio.cpp b/src/tests/audio_core/merryhime_3ds_audio/merry_audio/merry_audio.cpp
index 7004149f0..02ae174e9 100644
--- a/src/tests/audio_core/merryhime_3ds_audio/merry_audio/merry_audio.cpp
+++ b/src/tests/audio_core/merryhime_3ds_audio/merry_audio/merry_audio.cpp
@@ -209,7 +209,9 @@ void MerryAudioFixture::initSharedMem(AudioState& state) {
             config.sync_count_dirty.Assign(true);
         }
 
-        { config.reset_flag.Assign(true); }
+        {
+            config.reset_flag.Assign(true);
+        }
     }
 
     {
diff --git a/src/video_core/pica/pica_core.cpp b/src/video_core/pica/pica_core.cpp
index d49db6268..e610b42fb 100644
--- a/src/video_core/pica/pica_core.cpp
+++ b/src/video_core/pica/pica_core.cpp
@@ -636,8 +636,8 @@ PicaCore::RenderPropertiesGuess PicaCore::GuessCmdRenderProperties(PAddr list, u
             find_info.paddr = value * 8;
             find_info.paddr_found = true;
             break;
-        [[unlikely]] case PICA_REG_INDEX(pipeline.command_buffer.trigger[0]) :
-        [[unlikely]] case PICA_REG_INDEX(pipeline.command_buffer.trigger[1]) : {
+        [[unlikely]] case PICA_REG_INDEX(pipeline.command_buffer.trigger[0]):
+        [[unlikely]] case PICA_REG_INDEX(pipeline.command_buffer.trigger[1]): {
             const u32 index =
                 static_cast<u32>(cmd_id - PICA_REG_INDEX(pipeline.command_buffer.trigger[0]));
             const PAddr addr = regs.internal.pipeline.command_buffer.GetPhysicalAddress(index);
@@ -683,9 +683,9 @@ PicaCore::RenderPropertiesGuess PicaCore::GuessCmdRenderProperties(PAddr list, u
 
 template <class Archive>
 void PicaCore::CommandList::serialize(Archive& ar, const u32 file_version) {
-    ar& addr;
-    ar& length;
-    ar& current_index;
+    ar & addr;
+    ar & length;
+    ar & current_index;
     if (Archive::is_loading::value) {
         const u8* ptr = Core::System::GetInstance().Memory().GetPhysicalPointer(addr);
         head = reinterpret_cast<const u32*>(ptr);
diff --git a/src/video_core/pica/pica_core.h b/src/video_core/pica/pica_core.h
index 5eb4e9239..579bb2109 100644
--- a/src/video_core/pica/pica_core.h
+++ b/src/video_core/pica/pica_core.h
@@ -110,10 +110,10 @@ public:
         friend class boost::serialization::access;
         template <class Archive>
         void serialize(Archive& ar, const u32 file_version) {
-            ar& input_vertex;
-            ar& current_attribute;
-            ar& reset_geometry_pipeline;
-            ar& queue;
+            ar & input_vertex;
+            ar & current_attribute;
+            ar & reset_geometry_pipeline;
+            ar & queue;
         }
     };
 
@@ -200,7 +200,7 @@ public:
 
             template <class Archive>
             void serialize(Archive& ar, const u32 file_version) {
-                ar& raw;
+                ar & raw;
             }
         };
 
@@ -257,19 +257,19 @@ private:
     friend class boost::serialization::access;
     template <class Archive>
     void serialize(Archive& ar, const u32 file_version) {
-        ar& regs_lcd;
-        ar& regs.reg_array;
-        ar& gs_unit;
-        ar& vs_setup;
-        ar& gs_setup;
-        ar& proctex;
-        ar& lighting;
-        ar& fog;
-        ar& input_default_attributes;
-        ar& immediate;
-        ar& geometry_pipeline;
-        ar& primitive_assembler;
-        ar& cmd_list;
+        ar & regs_lcd;
+        ar & regs.reg_array;
+        ar & gs_unit;
+        ar & vs_setup;
+        ar & gs_setup;
+        ar & proctex;
+        ar & lighting;
+        ar & fog;
+        ar & input_default_attributes;
+        ar & immediate;
+        ar & geometry_pipeline;
+        ar & primitive_assembler;
+        ar & cmd_list;
     }
 
 public:
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index b16d239e2..65e080994 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -970,10 +970,9 @@ void RasterizerOpenGL::SyncAndUploadLUTsLF() {
     if (fs_uniform_block_data.fog_lut_dirty || invalidate) {
         std::array<Common::Vec2f, 128> new_data;
 
-        std::transform(pica.fog.lut.begin(), pica.fog.lut.end(), new_data.begin(),
-                       [](const auto& entry) {
-                           return Common::Vec2f{entry.ToFloat(), entry.DiffToFloat()};
-                       });
+        std::transform(
+            pica.fog.lut.begin(), pica.fog.lut.end(), new_data.begin(),
+            [](const auto& entry) { return Common::Vec2f{entry.ToFloat(), entry.DiffToFloat()}; });
 
         if (new_data != fog_lut_data || invalidate) {
             fog_lut_data = new_data;
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
index 1c481c98d..91c800437 100644
--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
@@ -963,10 +963,9 @@ void RasterizerVulkan::SyncAndUploadLUTsLF() {
     if (fs_uniform_block_data.fog_lut_dirty || invalidate) {
         std::array<Common::Vec2f, 128> new_data;
 
-        std::transform(pica.fog.lut.begin(), pica.fog.lut.end(), new_data.begin(),
-                       [](const auto& entry) {
-                           return Common::Vec2f{entry.ToFloat(), entry.DiffToFloat()};
-                       });
+        std::transform(
+            pica.fog.lut.begin(), pica.fog.lut.end(), new_data.begin(),
+            [](const auto& entry) { return Common::Vec2f{entry.ToFloat(), entry.DiffToFloat()}; });
 
         if (new_data != fog_lut_data || invalidate) {
             fog_lut_data = new_data;