diff --git a/Source/Android/jni/ButtonManager.cpp b/Source/Android/jni/ButtonManager.cpp
index c6bcb262ab..fafc2ebe4d 100644
--- a/Source/Android/jni/ButtonManager.cpp
+++ b/Source/Android/jni/ButtonManager.cpp
@@ -730,4 +730,4 @@ float InputDevice::AxisValue(int padID, ButtonType axis)
   else
     return _buttons[binding->second->_buttontype] == BUTTON_PRESSED ? 1.0f : 0.0f;
 }
-}
+}  // namespace ButtonManager
diff --git a/Source/Android/jni/ButtonManager.h b/Source/Android/jni/ButtonManager.h
index 82f64e6d4d..b7fd2f7647 100644
--- a/Source/Android/jni/ButtonManager.h
+++ b/Source/Android/jni/ButtonManager.h
@@ -256,4 +256,4 @@ float GetAxisValue(int padID, ButtonType axis);
 bool GamepadEvent(const std::string& dev, int button, int action);
 void GamepadAxisEvent(const std::string& dev, int axis, float value);
 void Shutdown();
-}
+}  // namespace ButtonManager
diff --git a/Source/Core/AudioCommon/AudioCommon.h b/Source/Core/AudioCommon/AudioCommon.h
index 37f1e63eb8..6925fe3d7b 100644
--- a/Source/Core/AudioCommon/AudioCommon.h
+++ b/Source/Core/AudioCommon/AudioCommon.h
@@ -31,4 +31,4 @@ void StopAudioDump();
 void IncreaseVolume(unsigned short offset);
 void DecreaseVolume(unsigned short offset);
 void ToggleMuteVolume();
-}
+}  // namespace AudioCommon
diff --git a/Source/Core/AudioCommon/AudioStretcher.h b/Source/Core/AudioCommon/AudioStretcher.h
index b914fb924b..4f62733850 100644
--- a/Source/Core/AudioCommon/AudioStretcher.h
+++ b/Source/Core/AudioCommon/AudioStretcher.h
@@ -25,4 +25,4 @@ private:
   double m_stretch_ratio = 1.0;
 };
 
-}  // AudioCommon
+}  // namespace AudioCommon
diff --git a/Source/Core/AudioCommon/SurroundDecoder.h b/Source/Core/AudioCommon/SurroundDecoder.h
index 699be74278..76f16db518 100644
--- a/Source/Core/AudioCommon/SurroundDecoder.h
+++ b/Source/Core/AudioCommon/SurroundDecoder.h
@@ -33,4 +33,4 @@ private:
   FixedSizeQueue<float, 32768> m_decoded_fifo;
 };
 
-}  // AudioCommon
+}  // namespace AudioCommon
diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp
index 957c3d4215..b7f65ce281 100644
--- a/Source/Core/Common/Arm64Emitter.cpp
+++ b/Source/Core/Common/Arm64Emitter.cpp
@@ -4380,4 +4380,4 @@ void ARM64FloatEmitter::MOVI2FDUP(ARM64Reg Rd, float value, ARM64Reg scratch)
   DUP(32, Rd, Rd, 0);
 }
 
-}  // namespace
+}  // namespace Arm64Gen
diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h
index 46ec6e9349..7d88ab5fa1 100644
--- a/Source/Core/Common/Arm64Emitter.h
+++ b/Source/Core/Common/Arm64Emitter.h
@@ -1143,4 +1143,4 @@ private:
     }
   }
 };
-}
+}  // namespace Arm64Gen
diff --git a/Source/Core/Common/Atomic_GCC.h b/Source/Core/Common/Atomic_GCC.h
index d1f4626a1c..1094c197b4 100644
--- a/Source/Core/Common/Atomic_GCC.h
+++ b/Source/Core/Common/Atomic_GCC.h
@@ -83,4 +83,4 @@ inline T* AtomicExchangeAcquire(T* volatile& loc, U newval)
 {
   return __atomic_exchange_n(&loc, newval, __ATOMIC_ACQ_REL);
 }
-}
+}  // namespace Common
diff --git a/Source/Core/Common/Atomic_Win32.h b/Source/Core/Common/Atomic_Win32.h
index 37ea49fe93..d0c5a95ebf 100644
--- a/Source/Core/Common/Atomic_Win32.h
+++ b/Source/Core/Common/Atomic_Win32.h
@@ -91,4 +91,4 @@ inline T* AtomicExchangeAcquire(T* volatile& loc, U newval)
 {
   return (T*)_InterlockedExchangePointer_acq((void* volatile*)&loc, (void*)newval);
 }
-}
+}  // namespace Common
diff --git a/Source/Core/Common/BlockingLoop.h b/Source/Core/Common/BlockingLoop.h
index 7f6c42ca70..d4be80fe19 100644
--- a/Source/Core/Common/BlockingLoop.h
+++ b/Source/Core/Common/BlockingLoop.h
@@ -253,4 +253,4 @@ private:
   Flag m_may_sleep;  // If this is set, we fall back from the busy loop to an event based
                      // synchronization.
 };
-}
+}  // namespace Common
diff --git a/Source/Core/Common/Config/ConfigInfo.cpp b/Source/Core/Common/Config/ConfigInfo.cpp
index 47d2e25c84..1d4084c3c6 100644
--- a/Source/Core/Common/Config/ConfigInfo.cpp
+++ b/Source/Core/Common/Config/ConfigInfo.cpp
@@ -32,4 +32,4 @@ bool ConfigLocation::operator<(const ConfigLocation& other) const
   const int key_compare = strcasecmp(key.c_str(), other.key.c_str());
   return key_compare < 0;
 }
-}
+}  // namespace Config
diff --git a/Source/Core/Common/Config/ConfigInfo.h b/Source/Core/Common/Config/ConfigInfo.h
index c5c4cc49a1..ecea74a04b 100644
--- a/Source/Core/Common/Config/ConfigInfo.h
+++ b/Source/Core/Common/Config/ConfigInfo.h
@@ -50,4 +50,4 @@ struct ConfigInfo
   ConfigLocation location;
   T default_value;
 };
-}
+}  // namespace Config
diff --git a/Source/Core/Common/Config/Enums.h b/Source/Core/Common/Config/Enums.h
index 0dffff7f17..1363c78913 100644
--- a/Source/Core/Common/Config/Enums.h
+++ b/Source/Core/Common/Config/Enums.h
@@ -41,4 +41,4 @@ constexpr std::array<LayerType, 7> SEARCH_ORDER{{
     LayerType::GlobalGame,
     LayerType::Base,
 }};
-}
+}  // namespace Config
diff --git a/Source/Core/Common/Config/Layer.cpp b/Source/Core/Common/Config/Layer.cpp
index 8eba0d7c1a..0e201001be 100644
--- a/Source/Core/Common/Config/Layer.cpp
+++ b/Source/Core/Common/Config/Layer.cpp
@@ -97,4 +97,4 @@ const LayerMap& Layer::GetLayerMap() const
 {
   return m_map;
 }
-}
+}  // namespace Config
diff --git a/Source/Core/Common/Config/Layer.h b/Source/Core/Common/Config/Layer.h
index 2e84d6c3d1..dec08ab2f6 100644
--- a/Source/Core/Common/Config/Layer.h
+++ b/Source/Core/Common/Config/Layer.h
@@ -42,7 +42,7 @@ inline std::optional<std::string> TryParse(const std::string& str_value)
 {
   return str_value;
 }
-}
+}  // namespace detail
 
 template <typename T>
 struct ConfigInfo;
@@ -154,4 +154,4 @@ protected:
   const LayerType m_layer;
   std::unique_ptr<ConfigLayerLoader> m_loader;
 };
-}
+}  // namespace Config
diff --git a/Source/Core/Common/ENetUtil.cpp b/Source/Core/Common/ENetUtil.cpp
index 8ad19fb0bf..0781e1764b 100644
--- a/Source/Core/Common/ENetUtil.cpp
+++ b/Source/Core/Common/ENetUtil.cpp
@@ -36,4 +36,4 @@ int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event)
   }
   return 0;
 }
-}
+}  // namespace ENetUtil
diff --git a/Source/Core/Common/ENetUtil.h b/Source/Core/Common/ENetUtil.h
index 7b3ee9e7a4..c8d126abc2 100644
--- a/Source/Core/Common/ENetUtil.h
+++ b/Source/Core/Common/ENetUtil.h
@@ -10,4 +10,4 @@ namespace ENetUtil
 {
 void WakeupThread(ENetHost* host);
 int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event);
-}
+}  // namespace ENetUtil
diff --git a/Source/Core/Common/FPURoundMode.h b/Source/Core/Common/FPURoundMode.h
index a2270c6d5b..ac99478982 100644
--- a/Source/Core/Common/FPURoundMode.h
+++ b/Source/Core/Common/FPURoundMode.h
@@ -43,4 +43,4 @@ void SetSIMDMode(int rounding_mode, bool non_ieee_mode);
 void SaveSIMDState();
 void LoadSIMDState();
 void LoadDefaultSIMDState();
-}
+}  // namespace FPURoundMode
diff --git a/Source/Core/Common/GL/GLInterface/AGL.mm b/Source/Core/Common/GL/GLInterface/AGL.mm
index 7216946dae..e10e52b311 100644
--- a/Source/Core/Common/GL/GLInterface/AGL.mm
+++ b/Source/Core/Common/GL/GLInterface/AGL.mm
@@ -106,8 +106,8 @@ bool GLContextAGL::Initialize(void* display_handle, void* window_handle, bool st
 
 std::unique_ptr<GLContext> GLContextAGL::CreateSharedContext()
 {
-  NSOpenGLContext* new_agl_context =
-      [[NSOpenGLContext alloc] initWithFormat:m_pixel_format shareContext:m_context];
+  NSOpenGLContext* new_agl_context = [[NSOpenGLContext alloc] initWithFormat:m_pixel_format
+                                                                shareContext:m_context];
   if (new_agl_context == nil)
   {
     ERROR_LOG(VIDEO, "failed to create shared context");
diff --git a/Source/Core/Common/GekkoDisassembler.cpp b/Source/Core/Common/GekkoDisassembler.cpp
index acf5e9f9a4..f9f1a701ae 100644
--- a/Source/Core/Common/GekkoDisassembler.cpp
+++ b/Source/Core/Common/GekkoDisassembler.cpp
@@ -969,7 +969,7 @@ void GekkoDisassembler::mtfsb(u32 in, int n)
   }
 }
 
-  // Paired instructions
+// Paired instructions
 
 #define RA ((inst >> 16) & 0x1f)
 #define RB ((inst >> 11) & 0x1f)
diff --git a/Source/Core/Common/GenericFPURoundMode.cpp b/Source/Core/Common/GenericFPURoundMode.cpp
index 91c02841e7..e8bbbb7e48 100644
--- a/Source/Core/Common/GenericFPURoundMode.cpp
+++ b/Source/Core/Common/GenericFPURoundMode.cpp
@@ -26,4 +26,4 @@ void LoadSIMDState()
 void LoadDefaultSIMDState()
 {
 }
-}
+}  // namespace FPURoundMode
diff --git a/Source/Core/Common/JitRegister.cpp b/Source/Core/Common/JitRegister.cpp
index 08b93e39da..089eb1cd08 100644
--- a/Source/Core/Common/JitRegister.cpp
+++ b/Source/Core/Common/JitRegister.cpp
@@ -110,4 +110,4 @@ void RegisterV(const void* base_address, u32 code_size, const char* format, va_l
     s_perf_map_file.WriteBytes(entry.data(), entry.size());
   }
 }
-}
+}  // namespace JitRegister
diff --git a/Source/Core/Common/JitRegister.h b/Source/Core/Common/JitRegister.h
index 3d142ec530..775e776673 100644
--- a/Source/Core/Common/JitRegister.h
+++ b/Source/Core/Common/JitRegister.h
@@ -30,4 +30,4 @@ inline void Register(const void* start, const void* end, const char* format, ...
   RegisterV(start, code_size, format, args);
   va_end(args);
 }
-}
+}  // namespace JitRegister
diff --git a/Source/Core/Common/Lazy.h b/Source/Core/Common/Lazy.h
index 3e9a79147a..35478e7bea 100644
--- a/Source/Core/Common/Lazy.h
+++ b/Source/Core/Common/Lazy.h
@@ -46,4 +46,4 @@ private:
 
   mutable std::variant<T, std::function<T()>> m_value;
 };
-}
+}  // namespace Common
diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h
index 54c9bc6d1f..37add7eefe 100644
--- a/Source/Core/Common/Logging/Log.h
+++ b/Source/Core/Common/Logging/Log.h
@@ -72,7 +72,7 @@ enum LOG_LEVELS
 
 static const char LOG_LEVEL_TO_CHAR[7] = "-NEWID";
 
-}  // namespace
+}  // namespace LogTypes
 
 void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line,
                 const char* fmt, ...)
diff --git a/Source/Core/Common/MD5.cpp b/Source/Core/Common/MD5.cpp
index 13fd3ed0d1..5809fffcba 100644
--- a/Source/Core/Common/MD5.cpp
+++ b/Source/Core/Common/MD5.cpp
@@ -49,4 +49,4 @@ std::string MD5Sum(const std::string& file_path, std::function<bool(int)> report
 
   return output_string;
 }
-}
\ No newline at end of file
+}  // namespace MD5
diff --git a/Source/Core/Common/Profiler.cpp b/Source/Core/Common/Profiler.cpp
index ab575b9d86..1ad0f29069 100644
--- a/Source/Core/Common/Profiler.cpp
+++ b/Source/Core/Common/Profiler.cpp
@@ -161,4 +161,4 @@ std::string Profiler::Read()
 
   return buffer.str();
 }
-}
+}  // namespace Common
diff --git a/Source/Core/Common/Profiler.h b/Source/Core/Common/Profiler.h
index 7e0dcb85bd..3aa6aff021 100644
--- a/Source/Core/Common/Profiler.h
+++ b/Source/Core/Common/Profiler.h
@@ -55,7 +55,7 @@ public:
 private:
   Profiler* m_p;
 };
-};
+};  // namespace Common
 
 // Warning: This profiler isn't thread safe. Only profile functions which doesn't run simultaneously
 #define PROFILE(name)                                                                              \
diff --git a/Source/Core/Common/SPSCQueue.h b/Source/Core/Common/SPSCQueue.h
index 3e761d936e..0430a386b4 100644
--- a/Source/Core/Common/SPSCQueue.h
+++ b/Source/Core/Common/SPSCQueue.h
@@ -107,4 +107,4 @@ private:
   ElementPtr* m_read_ptr;
   std::atomic<u32> m_size;
 };
-}
+}  // namespace Common
diff --git a/Source/Core/Common/TraversalServer.cpp b/Source/Core/Common/TraversalServer.cpp
index 40c439f6b4..1ff228c515 100644
--- a/Source/Core/Common/TraversalServer.cpp
+++ b/Source/Core/Common/TraversalServer.cpp
@@ -112,7 +112,7 @@ struct hash<TraversalHostId>
     return p[0] ^ ((p[1] << 13) | (p[1] >> 19));
   }
 };
-}
+}  // namespace std
 
 static int sock;
 static std::unordered_map<TraversalRequestId, OutgoingPacketInfo> outgoingPackets;
diff --git a/Source/Core/Common/UPnP.h b/Source/Core/Common/UPnP.h
index d4d9191fb1..0c8e8bae06 100644
--- a/Source/Core/Common/UPnP.h
+++ b/Source/Core/Common/UPnP.h
@@ -12,6 +12,6 @@ namespace UPnP
 {
 void TryPortmapping(u16 port);
 void StopPortmapping();
-}
+}  // namespace UPnP
 
 #endif
diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp
index eb756c3793..20c39f4fa9 100644
--- a/Source/Core/Common/x64Emitter.cpp
+++ b/Source/Core/Common/x64Emitter.cpp
@@ -3389,4 +3389,4 @@ void XEmitter::RDTSC()
   Write8(0x0F);
   Write8(0x31);
 }
-}
+}  // namespace Gen
diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h
index e6593ca69f..4b16fada91 100644
--- a/Source/Core/Common/x64Emitter.h
+++ b/Source/Core/Common/x64Emitter.h
@@ -1177,4 +1177,4 @@ private:
   }
 };
 
-}  // namespace
+}  // namespace Gen
diff --git a/Source/Core/Common/x64FPURoundMode.cpp b/Source/Core/Common/x64FPURoundMode.cpp
index 66fe60a0d8..a12f99efd2 100644
--- a/Source/Core/Common/x64FPURoundMode.cpp
+++ b/Source/Core/Common/x64FPURoundMode.cpp
@@ -61,4 +61,4 @@ void LoadDefaultSIMDState()
 {
   _mm_setcsr(default_sse_state);
 }
-}
+}  // namespace FPURoundMode
diff --git a/Source/Core/Core/ARDecrypt.h b/Source/Core/Core/ARDecrypt.h
index 4179bae95c..96fbe56729 100644
--- a/Source/Core/Core/ARDecrypt.h
+++ b/Source/Core/Core/ARDecrypt.h
@@ -14,4 +14,4 @@ namespace ActionReplay
 {
 void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry>* ops);
 
-}  // namespace
+}  // namespace ActionReplay
diff --git a/Source/Core/Core/ActionReplay.h b/Source/Core/Core/ActionReplay.h
index 1266304742..b42e2f08b0 100644
--- a/Source/Core/Core/ActionReplay.h
+++ b/Source/Core/Core/ActionReplay.h
@@ -48,4 +48,4 @@ void EnableSelfLogging(bool enable);
 std::vector<std::string> GetSelfLog();
 void ClearSelfLog();
 bool IsSelfLogging();
-}  // namespace
+}  // namespace ActionReplay
diff --git a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.h b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.h
index 4f34197c7c..2082e405b3 100644
--- a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.h
+++ b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.h
@@ -10,10 +10,10 @@ namespace Config
 {
 class ConfigLayerLoader;
 enum class LayerType;
-}
+}  // namespace Config
 
 namespace ConfigLoaders
 {
 void SaveToSYSCONF(Config::LayerType layer);
 std::unique_ptr<Config::ConfigLayerLoader> GenerateBaseConfigLoader();
-}
+}  // namespace ConfigLoaders
diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.h b/Source/Core/Core/ConfigLoaders/GameConfigLoader.h
index 9f19c08f6f..85df30eda2 100644
--- a/Source/Core/Core/ConfigLoaders/GameConfigLoader.h
+++ b/Source/Core/Core/ConfigLoaders/GameConfigLoader.h
@@ -25,4 +25,4 @@ std::unique_ptr<Config::ConfigLayerLoader> GenerateGlobalGameConfigLoader(const
                                                                           u16 revision);
 std::unique_ptr<Config::ConfigLayerLoader> GenerateLocalGameConfigLoader(const std::string& id,
                                                                          u16 revision);
-}
+}  // namespace ConfigLoaders
diff --git a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.h b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.h
index 86a7939c5d..b0d52863fb 100644
--- a/Source/Core/Core/ConfigLoaders/IsSettingSaveable.h
+++ b/Source/Core/Core/ConfigLoaders/IsSettingSaveable.h
@@ -15,4 +15,4 @@ namespace ConfigLoaders
 // systems to co-exist without trampling on each other while saving.
 // This function shall be removed when the old configuration system retires.
 bool IsSettingSaveable(const Config::ConfigLocation& config_location);
-}  // namespace ConfigLoader
+}  // namespace ConfigLoaders
diff --git a/Source/Core/Core/ConfigLoaders/MovieConfigLoader.h b/Source/Core/Core/ConfigLoaders/MovieConfigLoader.h
index 22d102a742..4e07dd806d 100644
--- a/Source/Core/Core/ConfigLoaders/MovieConfigLoader.h
+++ b/Source/Core/Core/ConfigLoaders/MovieConfigLoader.h
@@ -32,4 +32,4 @@ private:
 
 void SaveToDTM(Movie::DTMHeader* header);
 std::unique_ptr<Config::ConfigLayerLoader> GenerateMovieConfigLoader(Movie::DTMHeader* header);
-}
+}  // namespace ConfigLoaders
diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp
index 018f1410cb..d1c2d463ff 100644
--- a/Source/Core/Core/CoreTiming.cpp
+++ b/Source/Core/Core/CoreTiming.cpp
@@ -442,4 +442,4 @@ void SetFakeTBStartTicks(u64 val)
   g.fake_TB_start_ticks = val;
 }
 
-}  // namespace
+}  // namespace CoreTiming
diff --git a/Source/Core/Core/CoreTiming.h b/Source/Core/Core/CoreTiming.h
index 33a0fc91c5..6af7f03c7c 100644
--- a/Source/Core/Core/CoreTiming.h
+++ b/Source/Core/Core/CoreTiming.h
@@ -108,4 +108,4 @@ void SetFakeTBStartTicks(u64 val);
 
 void ForceExceptionCheck(s64 cycles);
 
-}  // end of namespace
+}  // namespace CoreTiming
diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.cpp
index 0850b65f38..d1add0785a 100644
--- a/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.cpp
+++ b/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.cpp
@@ -495,7 +495,7 @@ void nop(const UDSPInstruction opc)
 }
 
 }  // namespace Ext
-}  // namespace Interpeter
+}  // namespace Interpreter
 
 // The ext ops are calculated in parallel with the actual op. That means that
 // both the main op and the ext op see the same register state as input. The
diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.h b/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.h
index b62a0a5048..dfc99e0bea 100644
--- a/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.h
+++ b/Source/Core/Core/DSP/Interpreter/DSPIntExtOps.h
@@ -44,5 +44,5 @@ void nr(UDSPInstruction opc);
 void nop(UDSPInstruction opc);
 
 }  // namespace Ext
-}  // namespace Interpeter
+}  // namespace Interpreter
 }  // namespace DSP
diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
index b76427e36a..4dea4dfc32 100644
--- a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
+++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
@@ -159,4 +159,4 @@ void PrintDataBuffer(LogTypes::LOG_TYPE type, const u8* data, size_t size, const
   }
 }
 
-}  // end of namespace Debugger
+}  // namespace Dolphin_Debugger
diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Debugger/Debugger_SymbolMap.h
index aa1f3e7452..53e2067281 100644
--- a/Source/Core/Core/Debugger/Debugger_SymbolMap.h
+++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.h
@@ -25,4 +25,4 @@ void PrintDataBuffer(LogTypes::LOG_TYPE type, const u8* data, size_t size,
                      const std::string& title);
 void AddAutoBreakpoints();
 
-}  // end of namespace Debugger
+}  // namespace Dolphin_Debugger
diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp
index d1302f24fc..58d76fe0fd 100644
--- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp
@@ -290,4 +290,4 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory& cpMe
     vtxDescHex >>= 2;
   }
 }
-}
+}  // namespace FifoAnalyzer
diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h
index b6dd917792..2a4642f3e5 100644
--- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h
+++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h
@@ -38,4 +38,4 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory& cpMe
 
 extern bool s_DrawingObject;
 extern FifoAnalyzer::CPMemory s_CpMem;
-}
+}  // namespace FifoAnalyzer
diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp
index e1d522ba1b..d9ab36a48c 100644
--- a/Source/Core/Core/GeckoCodeConfig.cpp
+++ b/Source/Core/Core/GeckoCodeConfig.cpp
@@ -253,4 +253,4 @@ void SaveCodes(IniFile& inifile, const std::vector<GeckoCode>& gcodes)
   inifile.SetLines("Gecko", lines);
   inifile.SetLines("Gecko_Enabled", enabledLines);
 }
-}
+}  // namespace Gecko
diff --git a/Source/Core/Core/GeckoCodeConfig.h b/Source/Core/Core/GeckoCodeConfig.h
index 66781fc224..90f89816ea 100644
--- a/Source/Core/Core/GeckoCodeConfig.h
+++ b/Source/Core/Core/GeckoCodeConfig.h
@@ -15,4 +15,4 @@ namespace Gecko
 std::vector<GeckoCode> LoadCodes(const IniFile& globalIni, const IniFile& localIni);
 std::vector<GeckoCode> DownloadCodes(std::string gametdb_id, bool* succeeded);
 void SaveCodes(IniFile& inifile, const std::vector<GeckoCode>& gcodes);
-}
+}  // namespace Gecko
diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp
index 5893c3f4a8..85d5b5e699 100644
--- a/Source/Core/Core/HLE/HLE_Misc.cpp
+++ b/Source/Core/Core/HLE/HLE_Misc.cpp
@@ -68,4 +68,4 @@ void GeckoReturnTrampoline()
                    PowerPC::HostRead_U64(SP + 24 + (2 * i + 1) * sizeof(u64)));
   }
 }
-}
+}  // namespace HLE_Misc
diff --git a/Source/Core/Core/HLE/HLE_Misc.h b/Source/Core/Core/HLE/HLE_Misc.h
index fcfc9c968e..e407dde0cb 100644
--- a/Source/Core/Core/HLE/HLE_Misc.h
+++ b/Source/Core/Core/HLE/HLE_Misc.h
@@ -10,4 +10,4 @@ void UnimplementedFunction();
 void HBReload();
 void GeckoCodeHandlerICacheFlush();
 void GeckoReturnTrampoline();
-}
+}  // namespace HLE_Misc
diff --git a/Source/Core/Core/HLE/HLE_OS.h b/Source/Core/Core/HLE/HLE_OS.h
index af3abb3139..7a9d29d1df 100644
--- a/Source/Core/Core/HLE/HLE_OS.h
+++ b/Source/Core/Core/HLE/HLE_OS.h
@@ -14,4 +14,4 @@ void HLE_LogDPrint();
 void HLE_LogVDPrint();
 void HLE_LogFPrint();
 void HLE_LogVFPrint();
-}
+}  // namespace HLE_OS
diff --git a/Source/Core/Core/HW/AudioInterface.h b/Source/Core/Core/HW/AudioInterface.h
index 7be8c5e4fd..092399d67c 100644
--- a/Source/Core/Core/HW/AudioInterface.h
+++ b/Source/Core/Core/HW/AudioInterface.h
@@ -28,4 +28,4 @@ unsigned int GetAIDSampleRate();
 
 void GenerateAISInterrupt();
 
-}  // namespace
+}  // namespace AudioInterface
diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp
index 97ad890c29..5e3ebfe145 100644
--- a/Source/Core/Core/HW/CPU.cpp
+++ b/Source/Core/Core/HW/CPU.cpp
@@ -328,4 +328,4 @@ bool PauseAndLock(bool do_lock, bool unpause_on_unlock, bool control_adjacent)
   }
   return was_unpaused;
 }
-}
+}  // namespace CPU
diff --git a/Source/Core/Core/HW/CPU.h b/Source/Core/Core/HW/CPU.h
index 9f50afd611..408b82ace2 100644
--- a/Source/Core/Core/HW/CPU.h
+++ b/Source/Core/Core/HW/CPU.h
@@ -74,4 +74,4 @@ const State* GetStatePtr();
 // "control_adjacent" causes PauseAndLock to behave like EnableStepping by modifying the
 //   state of the Audio and FIFO subsystems as well.
 bool PauseAndLock(bool do_lock, bool unpause_on_unlock = true, bool control_adjacent = false);
-}
+}  // namespace CPU
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
index 490a000b85..96ab3a504f 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h
@@ -460,8 +460,8 @@ void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl
     pb.lpf.yn1 = LowPassFilter(samples, count, pb.lpf.yn1, pb.lpf.a0, pb.lpf.b0);
   }
 
-    // Mix LRS, AUXA and AUXB depending on mixer_control
-    // TODO: Handle DPL2 on AUXB.
+  // Mix LRS, AUXA and AUXB depending on mixer_control
+  // TODO: Handle DPL2 on AUXB.
 
 #define MIX_ON(C) (0 != (mctrl & MIX_##C))
 #define RAMP_ON(C) (0 != (mctrl & MIX_##C##_RAMP))
diff --git a/Source/Core/Core/HW/DVD/DVDInterface.h b/Source/Core/Core/HW/DVD/DVDInterface.h
index e345dd07a6..3c37ba5534 100644
--- a/Source/Core/Core/HW/DVD/DVDInterface.h
+++ b/Source/Core/Core/HW/DVD/DVDInterface.h
@@ -16,7 +16,7 @@ namespace DiscIO
 {
 class Volume;
 struct Partition;
-}
+}  // namespace DiscIO
 namespace MMIO
 {
 class Mapping;
diff --git a/Source/Core/Core/HW/DVD/DVDThread.cpp b/Source/Core/Core/HW/DVD/DVDThread.cpp
index 27f6df8be6..a75f7a4306 100644
--- a/Source/Core/Core/HW/DVD/DVDThread.cpp
+++ b/Source/Core/Core/HW/DVD/DVDThread.cpp
@@ -388,4 +388,4 @@ static void DVDThread()
     }
   }
 }
-}
+}  // namespace DVDThread
diff --git a/Source/Core/Core/HW/DVD/DVDThread.h b/Source/Core/Core/HW/DVD/DVDThread.h
index cdf066cc46..4bb1b6263e 100644
--- a/Source/Core/Core/HW/DVD/DVDThread.h
+++ b/Source/Core/Core/HW/DVD/DVDThread.h
@@ -23,15 +23,15 @@ namespace DiscIO
 {
 enum class Platform;
 class Volume;
-}
+}  // namespace DiscIO
 namespace IOS
 {
 namespace ES
 {
 class TMDReader;
 class TicketReader;
-}
-}
+}  // namespace ES
+}  // namespace IOS
 
 namespace DVDThread
 {
@@ -60,4 +60,4 @@ void StartRead(u64 dvd_offset, u32 length, const DiscIO::Partition& partition,
 void StartReadToEmulatedRAM(u32 output_address, u64 dvd_offset, u32 length,
                             const DiscIO::Partition& partition, DVDInterface::ReplyType reply_type,
                             s64 ticks_until_completion);
-}
+}  // namespace DVDThread
diff --git a/Source/Core/Core/HW/DVD/FileMonitor.h b/Source/Core/Core/HW/DVD/FileMonitor.h
index 2b170f5082..58dbd5de7f 100644
--- a/Source/Core/Core/HW/DVD/FileMonitor.h
+++ b/Source/Core/Core/HW/DVD/FileMonitor.h
@@ -10,7 +10,7 @@ namespace DiscIO
 {
 struct Partition;
 class Volume;
-}
+}  // namespace DiscIO
 
 namespace FileMonitor
 {
diff --git a/Source/Core/Core/HW/GCKeyboard.h b/Source/Core/Core/HW/GCKeyboard.h
index 1cd8409015..26ebb9d33e 100644
--- a/Source/Core/Core/HW/GCKeyboard.h
+++ b/Source/Core/Core/HW/GCKeyboard.h
@@ -25,4 +25,4 @@ InputConfig* GetConfig();
 ControllerEmu::ControlGroup* GetGroup(int port, KeyboardGroup group);
 
 KeyboardStatus GetStatus(int port);
-}
+}  // namespace Keyboard
diff --git a/Source/Core/Core/HW/GCKeyboardEmu.h b/Source/Core/Core/HW/GCKeyboardEmu.h
index ea347a51c7..222113e680 100644
--- a/Source/Core/Core/HW/GCKeyboardEmu.h
+++ b/Source/Core/Core/HW/GCKeyboardEmu.h
@@ -14,7 +14,7 @@ namespace ControllerEmu
 {
 class ControlGroup;
 class Buttons;
-}
+}  // namespace ControllerEmu
 
 enum class KeyboardGroup
 {
diff --git a/Source/Core/Core/HW/GCPad.h b/Source/Core/Core/HW/GCPad.h
index 1594fc9b5d..e23fc6dd4e 100644
--- a/Source/Core/Core/HW/GCPad.h
+++ b/Source/Core/Core/HW/GCPad.h
@@ -31,4 +31,4 @@ void Rumble(int pad_num, ControlState strength);
 void ResetRumble(int pad_num);
 
 bool GetMicButton(int pad_num);
-}
+}  // namespace Pad
diff --git a/Source/Core/Core/HW/GPFifo.h b/Source/Core/Core/HW/GPFifo.h
index d5779d73ea..1728a61d94 100644
--- a/Source/Core/Core/HW/GPFifo.h
+++ b/Source/Core/Core/HW/GPFifo.h
@@ -40,4 +40,4 @@ void FastWrite8(u8 value);
 void FastWrite16(u16 value);
 void FastWrite32(u32 value);
 void FastWrite64(u64 value);
-}
+}  // namespace GPFifo
diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp
index 4e1732792f..2cf194d9da 100644
--- a/Source/Core/Core/HW/HW.cpp
+++ b/Source/Core/Core/HW/HW.cpp
@@ -108,4 +108,4 @@ void DoState(PointerWrap& p)
 
   p.DoMarker("WIIHW");
 }
-}
+}  // namespace HW
diff --git a/Source/Core/Core/HW/HW.h b/Source/Core/Core/HW/HW.h
index cf947abd82..e8d0ca5f80 100644
--- a/Source/Core/Core/HW/HW.h
+++ b/Source/Core/Core/HW/HW.h
@@ -11,4 +11,4 @@ namespace HW
 void Init();
 void Shutdown();
 void DoState(PointerWrap& p);
-}
+}  // namespace HW
diff --git a/Source/Core/Core/HW/MMIO.cpp b/Source/Core/Core/HW/MMIO.cpp
index 52e6579a2c..3803262211 100644
--- a/Source/Core/Core/HW/MMIO.cpp
+++ b/Source/Core/Core/HW/MMIO.cpp
@@ -387,4 +387,4 @@ void WriteHandler<T>::ResetMethod(WriteHandlingMethod<T>* method)
 #define MaybeExtern
 MMIO_PUBLIC_SPECIALIZATIONS()
 #undef MaybeExtern
-}
+}  // namespace MMIO
diff --git a/Source/Core/Core/HW/MMIO.h b/Source/Core/Core/HW/MMIO.h
index c49e360534..bb76cefced 100644
--- a/Source/Core/Core/HW/MMIO.h
+++ b/Source/Core/Core/HW/MMIO.h
@@ -91,7 +91,7 @@ inline u16* HighPart(volatile u32* ptr)
 {
   return LowPart(ptr) + 1;
 }
-}
+}  // namespace Utils
 
 class Mapping
 {
@@ -220,4 +220,4 @@ inline void Mapping::Write(u32 addr, u64 val)
 {
   DEBUG_ASSERT(0);
 }
-}
+}  // namespace MMIO
diff --git a/Source/Core/Core/HW/MMIOHandlers.h b/Source/Core/Core/HW/MMIOHandlers.h
index 40d71753df..c9b6017554 100644
--- a/Source/Core/Core/HW/MMIOHandlers.h
+++ b/Source/Core/Core/HW/MMIOHandlers.h
@@ -237,4 +237,4 @@ private:
 #define MaybeExtern extern
 MMIO_PUBLIC_SPECIALIZATIONS()
 #undef MaybeExtern
-}
+}  // namespace MMIO
diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp
index 493849c7f3..e2dca3581c 100644
--- a/Source/Core/Core/HW/Memmap.cpp
+++ b/Source/Core/Core/HW/Memmap.cpp
@@ -461,4 +461,4 @@ void Write_U64_Swap(u64 value, u32 address)
   std::memcpy(GetPointer(address), &value, sizeof(u64));
 }
 
-}  // namespace
+}  // namespace Memory
diff --git a/Source/Core/Core/HW/Memmap.h b/Source/Core/Core/HW/Memmap.h
index d928f8c69f..4cd5cfd5b3 100644
--- a/Source/Core/Core/HW/Memmap.h
+++ b/Source/Core/Core/HW/Memmap.h
@@ -110,4 +110,4 @@ void CopyToEmuSwapped(u32 address, const T* data, size_t size)
   for (size_t i = 0; i < size / sizeof(T); i++)
     dest[i] = Common::FromBigEndian(data[i]);
 }
-}
+}  // namespace Memory
diff --git a/Source/Core/Core/HW/StreamADPCM.cpp b/Source/Core/Core/HW/StreamADPCM.cpp
index e112023a32..9bf360d6d5 100644
--- a/Source/Core/Core/HW/StreamADPCM.cpp
+++ b/Source/Core/Core/HW/StreamADPCM.cpp
@@ -70,4 +70,4 @@ void ADPCMDecoder::DecodeBlock(s16* pcm, const u8* adpcm)
                                      m_histr1, m_histr2);
   }
 }
-}
+}  // namespace StreamADPCM
diff --git a/Source/Core/Core/HW/StreamADPCM.h b/Source/Core/Core/HW/StreamADPCM.h
index e960a0a60e..d3d037464e 100644
--- a/Source/Core/Core/HW/StreamADPCM.h
+++ b/Source/Core/Core/HW/StreamADPCM.h
@@ -31,4 +31,4 @@ private:
   s32 m_histr1 = 0;
   s32 m_histr2 = 0;
 };
-}
+}  // namespace StreamADPCM
diff --git a/Source/Core/Core/HW/WiiSave.h b/Source/Core/Core/HW/WiiSave.h
index cace7ba896..4b00c183ae 100644
--- a/Source/Core/Core/HW/WiiSave.h
+++ b/Source/Core/Core/HW/WiiSave.h
@@ -20,8 +20,8 @@ namespace FS
 class FileSystem;
 }
 class IOSC;
-}
-}  // namespace IOS::HLE
+}  // namespace HLE
+}  // namespace IOS
 
 namespace WiiSave
 {
diff --git a/Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp b/Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp
index aa5eec79eb..b7f2e92076 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp
@@ -125,4 +125,4 @@ void InitAdapterClass()
   jclass adapter_class = env->FindClass("org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter");
   s_adapter_class = reinterpret_cast<jclass>(env->NewGlobalRef(adapter_class));
 }
-}
+}  // namespace WiimoteReal
diff --git a/Source/Core/Core/HW/WiimoteReal/IOAndroid.h b/Source/Core/Core/HW/WiimoteReal/IOAndroid.h
index c916e4eb94..1802002a42 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOAndroid.h
+++ b/Source/Core/Core/HW/WiimoteReal/IOAndroid.h
@@ -49,7 +49,7 @@ public:
   void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&) override;
   void Update() override {}
 };
-}
+}  // namespace WiimoteReal
 
 #else
 #include "Core/HW/WiimoteReal/IODummy.h"
diff --git a/Source/Core/Core/HW/WiimoteReal/IODummy.h b/Source/Core/Core/HW/WiimoteReal/IODummy.h
index 97cd5b1e88..3d85fb94c9 100644
--- a/Source/Core/Core/HW/WiimoteReal/IODummy.h
+++ b/Source/Core/Core/HW/WiimoteReal/IODummy.h
@@ -17,4 +17,4 @@ public:
   void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&) override {}
   void Update() override {}
 };
-}
+}  // namespace WiimoteReal
diff --git a/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp b/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp
index 141c6c4bbe..757d31e1b6 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp
@@ -275,4 +275,4 @@ int WiimoteLinux::IOWrite(u8 const* buf, size_t len)
   return write(m_int_sock, buf, (int)len);
 }
 
-};  // WiimoteReal
+};  // namespace WiimoteReal
diff --git a/Source/Core/Core/HW/WiimoteReal/IOLinux.h b/Source/Core/Core/HW/WiimoteReal/IOLinux.h
index cd9bde8066..665e91bd4d 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOLinux.h
+++ b/Source/Core/Core/HW/WiimoteReal/IOLinux.h
@@ -51,7 +51,7 @@ private:
   int m_device_id;
   int m_device_sock;
 };
-}
+}  // namespace WiimoteReal
 
 #else
 #include "Core/HW/WiimoteReal/IODummy.h"
diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.h b/Source/Core/Core/HW/WiimoteReal/IOWin.h
index b0bf9d4883..86623d3919 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOWin.h
+++ b/Source/Core/Core/HW/WiimoteReal/IOWin.h
@@ -53,7 +53,7 @@ public:
   void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&) override;
   void Update() override;
 };
-}
+}  // namespace WiimoteReal
 
 #else
 #include "Core/HW/WiimoteReal/IODummy.h"
diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.h b/Source/Core/Core/HW/WiimoteReal/IOdarwin.h
index d15f85481d..ee0b4b9273 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOdarwin.h
+++ b/Source/Core/Core/HW/WiimoteReal/IOdarwin.h
@@ -20,7 +20,7 @@ public:
 private:
   bool stopScanning = false;
 };
-}
+}  // namespace WiimoteReal
 
 #else
 #include "Core/HW/WiimoteReal/IODummy.h"
diff --git a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm
index 6e35ddb808..41a09ce363 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm
+++ b/Source/Core/Core/HW/WiimoteReal/IOdarwin.mm
@@ -257,13 +257,12 @@ void WiimoteDarwin::DisablePowerAssertionInternal()
 @implementation SearchBT
 - (void)deviceInquiryComplete:(IOBluetoothDeviceInquiry*)sender
                         error:(IOReturn)error
-                      aborted:(BOOL)aborted
-{
+                      aborted:(BOOL)aborted {
   done = true;
 }
 
-- (void)deviceInquiryDeviceFound:(IOBluetoothDeviceInquiry*)sender device:(IOBluetoothDevice*)device
-{
+- (void)deviceInquiryDeviceFound:(IOBluetoothDeviceInquiry*)sender
+                          device:(IOBluetoothDevice*)device {
   NOTICE_LOG(WIIMOTE, "Discovered Bluetooth device at %s: %s", [[device addressString] UTF8String],
              [[device name] UTF8String]);
 
@@ -275,8 +274,7 @@ void WiimoteDarwin::DisablePowerAssertionInternal()
 @implementation ConnectBT
 - (void)l2capChannelData:(IOBluetoothL2CAPChannel*)l2capChannel
                     data:(unsigned char*)data
-                  length:(NSUInteger)length
-{
+                  length:(NSUInteger)length {
   IOBluetoothDevice* device = [l2capChannel device];
   WiimoteReal::WiimoteDarwin* wm = nullptr;
 
@@ -316,8 +314,7 @@ void WiimoteDarwin::DisablePowerAssertionInternal()
   CFRunLoopStop(CFRunLoopGetCurrent());
 }
 
-- (void)l2capChannelClosed:(IOBluetoothL2CAPChannel*)l2capChannel
-{
+- (void)l2capChannelClosed:(IOBluetoothL2CAPChannel*)l2capChannel {
   IOBluetoothDevice* device = [l2capChannel device];
   WiimoteReal::WiimoteDarwin* wm = nullptr;
 
diff --git a/Source/Core/Core/HW/WiimoteReal/IOhidapi.h b/Source/Core/Core/HW/WiimoteReal/IOhidapi.h
index e83fcf3777..d414acdf8a 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOhidapi.h
+++ b/Source/Core/Core/HW/WiimoteReal/IOhidapi.h
@@ -40,7 +40,7 @@ public:
   void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&) override;
   void Update() override {}  // not needed for hidapi
 };
-}
+}  // namespace WiimoteReal
 
 #else
 #include "Core/HW/WiimoteReal/IODummy.h"
diff --git a/Source/Core/Core/IOS/IOS.h b/Source/Core/Core/IOS/IOS.h
index dc39cd1330..4f283f4c9b 100644
--- a/Source/Core/Core/IOS/IOS.h
+++ b/Source/Core/Core/IOS/IOS.h
@@ -32,7 +32,7 @@ namespace Device
 {
 class Device;
 class ES;
-}
+}  // namespace Device
 
 struct Request;
 struct OpenRequest;
diff --git a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
index 381ac0fc64..c35d094061 100644
--- a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
@@ -642,16 +642,16 @@ void WiimoteDevice::SendConfigurationRequest(u16 scid, u16 mtu, u16 flush_time_o
   SendCommandToACL(L2CAP_CONFIG_REQ, L2CAP_CONFIG_REQ, offset, buffer);
 }
 
-  //
-  //
-  //
-  //
-  // ---  SDP
-  //
-  //
-  //
-  //
-  //
+//
+//
+//
+//
+// ---  SDP
+//
+//
+//
+//
+//
 
 #define SDP_UINT8 0x08
 #define SDP_UINT16 0x09
@@ -935,4 +935,4 @@ void Callback_WiimoteInterruptChannel(int number, u16 channel_id, const u8* data
   if (bt)
     bt->AccessWiimoteByIndex(number)->ReceiveL2capData(channel_id, data, size);
 }
-}
+}  // namespace Core
diff --git a/Source/Core/Core/IOS/USB/Bluetooth/hci.h b/Source/Core/Core/IOS/USB/Bluetooth/hci.h
index cfe196ade2..794b9af0d7 100644
--- a/Source/Core/Core/IOS/USB/Bluetooth/hci.h
+++ b/Source/Core/Core/IOS/USB/Bluetooth/hci.h
@@ -2530,11 +2530,11 @@ static __inline int hci_filter_test(uint8_t bit, const struct hci_filter* filter
   return (filter->mask[off] & (1 << ((bit - 1) & 0x1f)));
 }
 
-  /*
-   * HCI socket ioctl's
-   *
-   * Apart from GBTINFOA, these are all indexed on the unit name
-   */
+/*
+ * HCI socket ioctl's
+ *
+ * Apart from GBTINFOA, these are all indexed on the unit name
+ */
 
 #define SIOCGBTINFO _IOWR('b', 5, struct btreq)  /* get unit info */
 #define SIOCGBTINFOA _IOWR('b', 6, struct btreq) /* get info by address */
diff --git a/Source/Core/Core/IOS/USB/USBV5.cpp b/Source/Core/Core/IOS/USB/USBV5.cpp
index 38f32dd858..09eb3d6718 100644
--- a/Source/Core/Core/IOS/USB/USBV5.cpp
+++ b/Source/Core/Core/IOS/USB/USBV5.cpp
@@ -76,7 +76,7 @@ struct DeviceEntry
   u8 num_altsettings;
 };
 #pragma pack(pop)
-}
+}  // namespace
 
 USBV5ResourceManager::~USBV5ResourceManager()
 {
diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp
index d47b618bc5..41328efc3b 100644
--- a/Source/Core/Core/MemTools.cpp
+++ b/Source/Core/Core/MemTools.cpp
@@ -349,4 +349,4 @@ void UninstallExceptionHandler()
 
 #endif
 
-}  // namespace
+}  // namespace EMM
diff --git a/Source/Core/Core/MemTools.h b/Source/Core/Core/MemTools.h
index b9258eb0a9..ad675bbc4c 100644
--- a/Source/Core/Core/MemTools.h
+++ b/Source/Core/Core/MemTools.h
@@ -8,4 +8,4 @@ namespace EMM
 {
 void InstallExceptionHandler();
 void UninstallExceptionHandler();
-}
+}  // namespace EMM
diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp
index 8b048d4807..c416996d25 100644
--- a/Source/Core/Core/PatchEngine.cpp
+++ b/Source/Core/Core/PatchEngine.cpp
@@ -272,4 +272,4 @@ void Reload()
   LoadPatches();
 }
 
-}  // namespace
+}  // namespace PatchEngine
diff --git a/Source/Core/Core/PowerPC/GDBStub.h b/Source/Core/Core/PowerPC/GDBStub.h
index b09648b2ff..ab03c460cc 100644
--- a/Source/Core/Core/PowerPC/GDBStub.h
+++ b/Source/Core/Core/PowerPC/GDBStub.h
@@ -12,12 +12,14 @@
 #define MSG_WAITALL (8)
 #endif
 
-typedef enum {
+typedef enum
+{
   GDB_SIGTRAP = 5,
   GDB_SIGTERM = 15,
 } gdb_signals;
 
-typedef enum {
+typedef enum
+{
   GDB_BP_TYPE_NONE = 0,
   GDB_BP_TYPE_X,
   GDB_BP_TYPE_R,
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp
index c10de1092c..e622d48e9a 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp
@@ -16,7 +16,7 @@ struct GekkoOPTemplate
   Interpreter::Instruction Inst;
   GekkoOPInfo opinfo;
 };
-}
+}  // namespace
 
 // clang-format off
 static GekkoOPInfo unknownopinfo = { "unknown_instruction", OpType::Unknown, FL_ENDBLOCK, 0, 0, 0, 0 };
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp
index 82086a8d4b..9dc1380dba 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp
@@ -39,7 +39,7 @@ struct GekkoOPTemplate
   int opcode;
   Jit64::Instruction Inst;
 };
-}
+}  // namespace
 
 const GekkoOPTemplate primarytable[] = {
     {4, &Jit64::DynaRunTable4},    // RunTable4
diff --git a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp
index 9b7fc14cd9..52f9ae6802 100644
--- a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp
@@ -226,7 +226,7 @@ void RCX64Reg::Realize()
   }
 }
 
-RCX64Reg::operator X64Reg() const &
+RCX64Reg::operator X64Reg() const&
 {
   if (const preg_t* preg = std::get_if<preg_t>(&contents))
   {
@@ -241,7 +241,7 @@ RCX64Reg::operator X64Reg() const &
   return {};
 }
 
-RCX64Reg::operator OpArg() const &
+RCX64Reg::operator OpArg() const&
 {
   return Gen::R(RCX64Reg::operator X64Reg());
 }
diff --git a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h
index 522eb513bb..dae0e8d046 100644
--- a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h
+++ b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h
@@ -42,8 +42,8 @@ public:
 
   void Realize();
   Gen::OpArg Location() const;
-  operator Gen::OpArg() const & { return Location(); }
-  operator Gen::OpArg() const && = delete;
+  operator Gen::OpArg() const& { return Location(); }
+  operator Gen::OpArg() const&& = delete;
   bool IsSimpleReg() const { return Location().IsSimpleReg(); }
   bool IsSimpleReg(Gen::X64Reg reg) const { return Location().IsSimpleReg(reg); }
   Gen::X64Reg GetSimpleReg() const { return Location().GetSimpleReg(); }
@@ -81,10 +81,10 @@ public:
   RCX64Reg& operator=(const RCX64Reg&) = delete;
 
   void Realize();
-  operator Gen::OpArg() const &;
-  operator Gen::X64Reg() const &;
-  operator Gen::OpArg() const && = delete;
-  operator Gen::X64Reg() const && = delete;
+  operator Gen::OpArg() const&;
+  operator Gen::X64Reg() const&;
+  operator Gen::OpArg() const&& = delete;
+  operator Gen::X64Reg() const&& = delete;
 
   void Unlock();
 
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
index 031dfa6985..88c0da4d86 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
@@ -47,7 +47,7 @@ struct GekkoOPTemplate
   _Instruction Inst;
   // GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out
 };
-}
+}  // namespace
 
 constexpr GekkoOPTemplate primarytable[] = {
     {4, &JitArm64::DynaRunTable4},    // RunTable4
diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp
index d692657add..10ebd1ac9f 100644
--- a/Source/Core/Core/PowerPC/JitInterface.cpp
+++ b/Source/Core/Core/PowerPC/JitInterface.cpp
@@ -272,4 +272,4 @@ void Shutdown()
     g_jit = nullptr;
   }
 }
-}
+}  // namespace JitInterface
diff --git a/Source/Core/Core/PowerPC/JitInterface.h b/Source/Core/Core/PowerPC/JitInterface.h
index c81bfb31ae..a5eb212478 100644
--- a/Source/Core/Core/PowerPC/JitInterface.h
+++ b/Source/Core/Core/PowerPC/JitInterface.h
@@ -70,4 +70,4 @@ void CompileExceptionCheck(ExceptionType type);
 void SetJit(JitBase* jit);
 
 void Shutdown();
-}
+}  // namespace JitInterface
diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp
index 40ab5e2169..3d99386533 100644
--- a/Source/Core/Core/PowerPC/MMU.cpp
+++ b/Source/Core/Core/PowerPC/MMU.cpp
@@ -845,35 +845,35 @@ TranslateResult JitCache_TranslateAddress(u32 address)
   return TranslateResult{true, from_bat, tlb_addr.address};
 }
 
-  // *********************************************************************************
-  // Warning: Test Area
-  //
-  // This code is for TESTING and it works in interpreter mode ONLY. Some games (like
-  // COD iirc) work thanks to this basic TLB emulation.
-  // It is just a small hack and we have never spend enough time to finalize it.
-  // Cheers PearPC!
-  //
-  // *********************************************************************************
+// *********************************************************************************
+// Warning: Test Area
+//
+// This code is for TESTING and it works in interpreter mode ONLY. Some games (like
+// COD iirc) work thanks to this basic TLB emulation.
+// It is just a small hack and we have never spend enough time to finalize it.
+// Cheers PearPC!
+//
+// *********************************************************************************
 
-  /*
-   * PearPC
-   * ppc_mmu.cc
-   *
-   * Copyright (C) 2003, 2004 Sebastian Biallas (sb@biallas.net)
-   *
-   * This program is free software; you can redistribute it and/or modify
-   * it under the terms of the GNU General Public License version 2 as
-   * published by the Free Software Foundation.
-   *
-   * This program is distributed in the hope that it will be useful,
-   * but WITHOUT ANY WARRANTY; without even the implied warranty of
-   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   * GNU General Public License for more details.
-   *
-   * You should have received a copy of the GNU General Public License
-   * along with this program; if not, write to the Free Software
-   * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-   */
+/*
+ * PearPC
+ * ppc_mmu.cc
+ *
+ * Copyright (C) 2003, 2004 Sebastian Biallas (sb@biallas.net)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 
 #define PPC_EXC_DSISR_PAGE (1 << 30)
 #define PPC_EXC_DSISR_PROT (1 << 27)
diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/PowerPC/PPCAnalyst.cpp
index 7b18aa378f..01a8224456 100644
--- a/Source/Core/Core/PowerPC/PPCAnalyst.cpp
+++ b/Source/Core/Core/PowerPC/PPCAnalyst.cpp
@@ -1021,4 +1021,4 @@ u32 PPCAnalyzer::Analyze(u32 address, CodeBlock* block, CodeBuffer* buffer, std:
   return address;
 }
 
-}  // namespace
+}  // namespace PPCAnalyst
diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.h b/Source/Core/Core/PowerPC/PPCAnalyst.h
index b74d1d0167..89de35c739 100644
--- a/Source/Core/Core/PowerPC/PPCAnalyst.h
+++ b/Source/Core/Core/PowerPC/PPCAnalyst.h
@@ -225,4 +225,4 @@ void FindFunctions(u32 startAddr, u32 endAddr, PPCSymbolDB* func_db);
 bool AnalyzeFunction(u32 startAddr, Common::Symbol& func, u32 max_size = 0);
 bool ReanalyzeFunction(u32 start_addr, Common::Symbol& func, u32 max_size = 0);
 
-}  // namespace
+}  // namespace PPCAnalyst
diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp
index f559e0f59b..428f6cfcaa 100644
--- a/Source/Core/Core/PowerPC/PPCTables.cpp
+++ b/Source/Core/Core/PowerPC/PPCTables.cpp
@@ -198,4 +198,4 @@ void LogCompiledInstructions()
   ++time;
 }
 
-}  // namespace
+}  // namespace PPCTables
diff --git a/Source/Core/Core/State.h b/Source/Core/Core/State.h
index 23b3b92ac5..d8c4b0e8ed 100644
--- a/Source/Core/Core/State.h
+++ b/Source/Core/Core/State.h
@@ -61,4 +61,4 @@ void Flush();
 // for calling back into UI code without introducing a dependency on it in core
 using AfterLoadCallbackFunc = std::function<void()>;
 void SetOnAfterLoadCallback(AfterLoadCallbackFunc callback);
-}
+}  // namespace State
diff --git a/Source/Core/Core/SysConf.h b/Source/Core/Core/SysConf.h
index 241254e749..0e8557f451 100644
--- a/Source/Core/Core/SysConf.h
+++ b/Source/Core/Core/SysConf.h
@@ -19,7 +19,7 @@ namespace IOS::HLE::FS
 {
 class FileHandle;
 class FileSystem;
-}
+}  // namespace IOS::HLE::FS
 
 class SysConf final
 {
diff --git a/Source/Core/Core/WiiUtils.cpp b/Source/Core/Core/WiiUtils.cpp
index bad07a9767..3986b6fb8c 100644
--- a/Source/Core/Core/WiiUtils.cpp
+++ b/Source/Core/Core/WiiUtils.cpp
@@ -849,4 +849,4 @@ bool RepairNAND(IOS::HLE::Kernel& ios)
 {
   return !CheckNAND(ios, true).bad;
 }
-}
+}  // namespace WiiUtils
diff --git a/Source/Core/Core/WiiUtils.h b/Source/Core/Core/WiiUtils.h
index 8427901f71..f922983209 100644
--- a/Source/Core/Core/WiiUtils.h
+++ b/Source/Core/Core/WiiUtils.h
@@ -23,7 +23,7 @@ namespace HLE
 {
 class Kernel;
 }
-}
+}  // namespace IOS
 
 namespace WiiUtils
 {
@@ -83,4 +83,4 @@ struct NANDCheckResult
 };
 NANDCheckResult CheckNAND(IOS::HLE::Kernel& ios);
 bool RepairNAND(IOS::HLE::Kernel& ios);
-}
+}  // namespace WiiUtils
diff --git a/Source/Core/DiscIO/Blob.cpp b/Source/Core/DiscIO/Blob.cpp
index 7db5748ae3..a53c908eaf 100644
--- a/Source/Core/DiscIO/Blob.cpp
+++ b/Source/Core/DiscIO/Blob.cpp
@@ -210,4 +210,4 @@ std::unique_ptr<BlobReader> CreateBlobReader(const std::string& filename)
   }
 }
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/Blob.h b/Source/Core/DiscIO/Blob.h
index 8c13354963..d152f50f28 100644
--- a/Source/Core/DiscIO/Blob.h
+++ b/Source/Core/DiscIO/Blob.h
@@ -166,4 +166,4 @@ bool CompressFileToBlob(const std::string& infile_path, const std::string& outfi
 bool DecompressBlobToFile(const std::string& infile_path, const std::string& outfile_path,
                           CompressCB callback = nullptr, void* arg = nullptr);
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/CISOBlob.cpp b/Source/Core/DiscIO/CISOBlob.cpp
index 7964b5a7a8..8de921e8e1 100644
--- a/Source/Core/DiscIO/CISOBlob.cpp
+++ b/Source/Core/DiscIO/CISOBlob.cpp
@@ -79,4 +79,4 @@ bool CISOFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
   return true;
 }
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/CISOBlob.h b/Source/Core/DiscIO/CISOBlob.h
index c2de890495..dc606bb4a5 100644
--- a/Source/Core/DiscIO/CISOBlob.h
+++ b/Source/Core/DiscIO/CISOBlob.h
@@ -57,4 +57,4 @@ private:
   MapType m_ciso_map[CISO_MAP_SIZE];
 };
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp
index 3dc9f86709..20584cf845 100644
--- a/Source/Core/DiscIO/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/CompressedBlob.cpp
@@ -425,4 +425,4 @@ bool IsGCZBlob(File::IOFile& file)
   return is_gcz;
 }
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/CompressedBlob.h b/Source/Core/DiscIO/CompressedBlob.h
index 1d53353ba8..0e290542c6 100644
--- a/Source/Core/DiscIO/CompressedBlob.h
+++ b/Source/Core/DiscIO/CompressedBlob.h
@@ -68,4 +68,4 @@ private:
   std::string m_file_name;
 };
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/DirectoryBlob.cpp b/Source/Core/DiscIO/DirectoryBlob.cpp
index 8628c50fc0..3865cf30e9 100644
--- a/Source/Core/DiscIO/DirectoryBlob.cpp
+++ b/Source/Core/DiscIO/DirectoryBlob.cpp
@@ -826,4 +826,4 @@ static std::string ASCIIToUppercase(std::string str)
   return str;
 }
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/DirectoryBlob.h b/Source/Core/DiscIO/DirectoryBlob.h
index 614afe77ac..0b15c3f807 100644
--- a/Source/Core/DiscIO/DirectoryBlob.h
+++ b/Source/Core/DiscIO/DirectoryBlob.h
@@ -21,7 +21,7 @@ namespace File
 {
 struct FSTEntry;
 class IOFile;
-}
+}  // namespace File
 
 namespace DiscIO
 {
@@ -186,4 +186,4 @@ private:
   u64 m_data_size;
 };
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/DriveBlob.cpp b/Source/Core/DiscIO/DriveBlob.cpp
index b406954114..e31bae1ea2 100644
--- a/Source/Core/DiscIO/DriveBlob.cpp
+++ b/Source/Core/DiscIO/DriveBlob.cpp
@@ -96,7 +96,10 @@ DriveReader::DriveReader(const std::string& drive)
 #endif
 #endif
   }
-  else { NOTICE_LOG(DISCIO, "Load from DVD backup failed or no disc in drive %s", drive.c_str()); }
+  else
+  {
+    NOTICE_LOG(DISCIO, "Load from DVD backup failed or no disc in drive %s", drive.c_str());
+  }
 }
 
 DriveReader::~DriveReader()
@@ -156,4 +159,4 @@ bool DriveReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8* o
 #endif
 }
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/DriveBlob.h b/Source/Core/DiscIO/DriveBlob.h
index 3d3997af1f..fddfbee7a2 100644
--- a/Source/Core/DiscIO/DriveBlob.h
+++ b/Source/Core/DiscIO/DriveBlob.h
@@ -44,4 +44,4 @@ private:
   u64 m_size = 0;
 };
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/Enums.cpp b/Source/Core/DiscIO/Enums.cpp
index f3f1f3bf71..507616e32c 100644
--- a/Source/Core/DiscIO/Enums.cpp
+++ b/Source/Core/DiscIO/Enums.cpp
@@ -672,4 +672,4 @@ const std::string& GetCompanyFromID(const std::string& company_id)
   else
     return EMPTY_STRING;
 }
-}
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/Enums.h b/Source/Core/DiscIO/Enums.h
index 020f608bfb..9b1425a14b 100644
--- a/Source/Core/DiscIO/Enums.h
+++ b/Source/Core/DiscIO/Enums.h
@@ -88,4 +88,4 @@ Region GetSysMenuRegion(u16 title_version);
 std::string GetSysMenuVersionString(u16 title_version);
 
 const std::string& GetCompanyFromID(const std::string& company_id);
-}
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/FileBlob.cpp b/Source/Core/DiscIO/FileBlob.cpp
index 3547ef658d..9e0486d969 100644
--- a/Source/Core/DiscIO/FileBlob.cpp
+++ b/Source/Core/DiscIO/FileBlob.cpp
@@ -36,4 +36,4 @@ bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
   }
 }
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/FileBlob.h b/Source/Core/DiscIO/FileBlob.h
index 30a707f746..a0703c7a46 100644
--- a/Source/Core/DiscIO/FileBlob.h
+++ b/Source/Core/DiscIO/FileBlob.h
@@ -32,4 +32,4 @@ private:
   s64 m_size;
 };
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp
index e243d0ec72..a7826c9ab1 100644
--- a/Source/Core/DiscIO/FileSystemGCWii.cpp
+++ b/Source/Core/DiscIO/FileSystemGCWii.cpp
@@ -330,4 +330,4 @@ std::unique_ptr<FileInfo> FileSystemGCWii::FindFileInfo(u64 disc_offset) const
   return nullptr;
 }
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/FileSystemGCWii.h b/Source/Core/DiscIO/FileSystemGCWii.h
index 847bf2e639..753d9ee7f0 100644
--- a/Source/Core/DiscIO/FileSystemGCWii.h
+++ b/Source/Core/DiscIO/FileSystemGCWii.h
@@ -103,4 +103,4 @@ private:
   std::unique_ptr<FileInfo> FindFileInfo(const std::string& path, const FileInfo& file_info) const;
 };
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/NANDImporter.cpp b/Source/Core/DiscIO/NANDImporter.cpp
index 901f34fc37..9c161bcc02 100644
--- a/Source/Core/DiscIO/NANDImporter.cpp
+++ b/Source/Core/DiscIO/NANDImporter.cpp
@@ -272,4 +272,4 @@ void NANDImporter::ExportKeys(const std::string& nand_root)
   if (!file.WriteBytes(m_nand_keys.data(), NAND_KEYS_SIZE))
     PanicAlertT("Unable to write to file %s", file_path.c_str());
 }
-}
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/NANDImporter.h b/Source/Core/DiscIO/NANDImporter.h
index 4cef7973c1..3a500b9217 100644
--- a/Source/Core/DiscIO/NANDImporter.h
+++ b/Source/Core/DiscIO/NANDImporter.h
@@ -58,4 +58,4 @@ private:
   std::function<void()> m_update_callback;
   size_t m_nand_root_length = 0;
 };
-}
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/TGCBlob.cpp b/Source/Core/DiscIO/TGCBlob.cpp
index 6ee5fd5bb3..8533e38df7 100644
--- a/Source/Core/DiscIO/TGCBlob.cpp
+++ b/Source/Core/DiscIO/TGCBlob.cpp
@@ -58,7 +58,7 @@ void Replace32(u64 offset, u64 nbytes, u8* out_ptr, u64 replace_offset, u32 repl
   for (size_t i = 0; i < sizeof(u32); ++i)
     Replace8(offset, nbytes, out_ptr, replace_offset + i, reinterpret_cast<u8*>(&replace_value)[i]);
 }
-}
+}  // namespace
 
 namespace DiscIO
 {
diff --git a/Source/Core/DiscIO/Volume.cpp b/Source/Core/DiscIO/Volume.cpp
index 8aba2c981b..e699e46a93 100644
--- a/Source/Core/DiscIO/Volume.cpp
+++ b/Source/Core/DiscIO/Volume.cpp
@@ -69,4 +69,4 @@ std::unique_ptr<Volume> CreateVolumeFromFilename(const std::string& filename)
   return nullptr;
 }
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/VolumeFileBlobReader.cpp b/Source/Core/DiscIO/VolumeFileBlobReader.cpp
index a228005436..0dd7ebf290 100644
--- a/Source/Core/DiscIO/VolumeFileBlobReader.cpp
+++ b/Source/Core/DiscIO/VolumeFileBlobReader.cpp
@@ -48,4 +48,4 @@ bool VolumeFileBlobReader::Read(u64 offset, u64 length, u8* out_ptr)
 
   return m_volume.Read(m_file_info->GetOffset() + offset, length, out_ptr, m_partition);
 }
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/VolumeFileBlobReader.h b/Source/Core/DiscIO/VolumeFileBlobReader.h
index b3a8c2c3aa..2696790829 100644
--- a/Source/Core/DiscIO/VolumeFileBlobReader.h
+++ b/Source/Core/DiscIO/VolumeFileBlobReader.h
@@ -36,4 +36,4 @@ private:
   const Partition& m_partition;
   std::unique_ptr<FileInfo> m_file_info;
 };
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
index 6d9a48cd0e..8e4a33d099 100644
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -287,4 +287,4 @@ VolumeGC::ConvertedGCBanner VolumeGC::ExtractBannerInformation(const GCBanner& b
 
 VolumeGC::ConvertedGCBanner::ConvertedGCBanner() = default;
 VolumeGC::ConvertedGCBanner::~ConvertedGCBanner() = default;
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h
index fbbdad56e5..55ca206d7f 100644
--- a/Source/Core/DiscIO/VolumeGC.h
+++ b/Source/Core/DiscIO/VolumeGC.h
@@ -108,4 +108,4 @@ private:
   std::unique_ptr<BlobReader> m_reader;
 };
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/VolumeVerifier.h b/Source/Core/DiscIO/VolumeVerifier.h
index 7e70ecec32..c0e6072651 100644
--- a/Source/Core/DiscIO/VolumeVerifier.h
+++ b/Source/Core/DiscIO/VolumeVerifier.h
@@ -33,7 +33,7 @@ namespace IOS::ES
 {
 struct Content;
 class SignedBlobReader;
-}
+}  // namespace IOS::ES
 
 namespace DiscIO
 {
diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp
index 40516df6b6..911708b7c8 100644
--- a/Source/Core/DiscIO/VolumeWad.cpp
+++ b/Source/Core/DiscIO/VolumeWad.cpp
@@ -218,4 +218,4 @@ u64 VolumeWAD::GetRawSize() const
   return m_reader->GetRawSize();
 }
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/VolumeWad.h b/Source/Core/DiscIO/VolumeWad.h
index 4971e813f0..0052338edb 100644
--- a/Source/Core/DiscIO/VolumeWad.h
+++ b/Source/Core/DiscIO/VolumeWad.h
@@ -79,4 +79,4 @@ private:
   u32 m_data_size = 0;
 };
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/VolumeWii.h b/Source/Core/DiscIO/VolumeWii.h
index edfa75d21e..538c52a0b9 100644
--- a/Source/Core/DiscIO/VolumeWii.h
+++ b/Source/Core/DiscIO/VolumeWii.h
@@ -98,4 +98,4 @@ private:
   mutable u8 m_last_decrypted_block_data[BLOCK_DATA_SIZE];
 };
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp
index be7403fa1f..8fa4ea2cd4 100644
--- a/Source/Core/DiscIO/WbfsBlob.cpp
+++ b/Source/Core/DiscIO/WbfsBlob.cpp
@@ -180,4 +180,4 @@ std::unique_ptr<WbfsFileReader> WbfsFileReader::Create(File::IOFile file, const
   return reader;
 }
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/WbfsBlob.h b/Source/Core/DiscIO/WbfsBlob.h
index dacdb43b50..36de02f62d 100644
--- a/Source/Core/DiscIO/WbfsBlob.h
+++ b/Source/Core/DiscIO/WbfsBlob.h
@@ -81,4 +81,4 @@ private:
   bool m_good;
 };
 
-}  // namespace
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/WiiSaveBanner.h b/Source/Core/DiscIO/WiiSaveBanner.h
index aa0c47393d..d6bdf01f56 100644
--- a/Source/Core/DiscIO/WiiSaveBanner.h
+++ b/Source/Core/DiscIO/WiiSaveBanner.h
@@ -38,4 +38,4 @@ private:
   bool m_valid = true;
   std::string m_path;
 };
-}
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/WiiWad.h b/Source/Core/DiscIO/WiiWad.h
index 1bdd40f698..3e23392c52 100644
--- a/Source/Core/DiscIO/WiiWad.h
+++ b/Source/Core/DiscIO/WiiWad.h
@@ -46,4 +46,4 @@ private:
   std::vector<u8> m_data_app;
   std::vector<u8> m_footer;
 };
-}
+}  // namespace DiscIO
diff --git a/Source/Core/DolphinQt/Config/NewPatchDialog.h b/Source/Core/DolphinQt/Config/NewPatchDialog.h
index 6714d0de14..d77005cc1d 100644
--- a/Source/Core/DolphinQt/Config/NewPatchDialog.h
+++ b/Source/Core/DolphinQt/Config/NewPatchDialog.h
@@ -13,7 +13,7 @@ namespace PatchEngine
 {
 struct Patch;
 struct PatchEntry;
-}
+}  // namespace PatchEngine
 
 class QDialogButtonBox;
 class QGroupBox;
diff --git a/Source/Core/DolphinQt/GameList/GameList.cpp b/Source/Core/DolphinQt/GameList/GameList.cpp
index 4a6288e715..629bf2cb5c 100644
--- a/Source/Core/DolphinQt/GameList/GameList.cpp
+++ b/Source/Core/DolphinQt/GameList/GameList.cpp
@@ -322,7 +322,7 @@ void GameList::ShowContextMenu(const QPoint&)
     if (platform == DiscIO::Platform::WiiDisc)
     {
       auto* perform_disc_update = menu->addAction(tr("Perform System Update"), this,
-                                                  [ this, file_path = game->GetFilePath() ] {
+                                                  [this, file_path = game->GetFilePath()] {
                                                     WiiUpdate::PerformDiscUpdate(file_path, this);
                                                   });
       perform_disc_update->setEnabled(!Core::IsRunning() || !SConfig::GetInstance().bWii);
diff --git a/Source/Core/DolphinQt/Resources.h b/Source/Core/DolphinQt/Resources.h
index bb01d7ea5d..2dccac1f5f 100644
--- a/Source/Core/DolphinQt/Resources.h
+++ b/Source/Core/DolphinQt/Resources.h
@@ -11,7 +11,7 @@ namespace DiscIO
 {
 enum class Country;
 enum class Platform;
-}
+}  // namespace DiscIO
 
 // Store for various QPixmaps that will be used repeatedly.
 class Resources final
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
index 398b273e0f..807e4c57c5 100644
--- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h
+++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
@@ -66,5 +66,5 @@ enum class ParseStatus
 };
 
 std::pair<ParseStatus, std::unique_ptr<Expression>> ParseExpression(const std::string& expr);
-}
-}
+}  // namespace ExpressionParser
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
index 44dcbf234a..0ff62ab48d 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
@@ -242,5 +242,5 @@ void Touchscreen::Motor::Rumble(int padID, double state)
   env->CallStaticVoidMethod(IDCache::GetNativeLibraryClass(), IDCache::GetDoRumble(), padID, state);
   IDCache::GetJavaVM()->DetachCurrentThread();
 }
-}
-}
+}  // namespace Android
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
index 59919982ef..b917222864 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.h
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
@@ -65,5 +65,5 @@ public:
 private:
   const int _padID;
 };
-}
-}
+}  // namespace Android
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
index d9b0bdc0a9..1772b32817 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
@@ -21,5 +21,5 @@ BOOL CALLBACK DIEnumDevicesCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef);
 std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device);
 
 void PopulateDevices(HWND hwnd);
-}
-}
+}  // namespace DInput
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp
index c873a304d5..9e704e9420 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp
@@ -76,5 +76,5 @@ std::unordered_set<DWORD> GetXInputGUIDS()
   SetupDiDestroyDeviceInfoList(setup_enum);
   return guids;
 }
-}
-}
+}  // namespace DInput
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h
index 232887404c..f31e9fb5a2 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.h
@@ -13,4 +13,4 @@ namespace DInput
 {
 std::unordered_set<DWORD> GetXInputGUIDS();
 }
-}
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
index 84bd3bc4a5..0e684251e7 100644
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h
@@ -196,5 +196,5 @@ public:
     return FFDeviceSetForceFeedbackProperty(m_device, property, &value);
   }
 };
-}
-}
+}  // namespace ForceFeedback
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
index ac1db3e89a..64a715b246 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.h
@@ -13,5 +13,5 @@ void PopulateDevices(void* window);
 void DeInit();
 
 void DeviceElementDebugPrint(const void*, void*);
-}
-}
+}  // namespace OSX
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
index d3393218c6..d6579dc0c8 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
@@ -90,5 +90,5 @@ private:
 
   ForceFeedback::FFDeviceAdapterReference m_ff_device;
 };
-}
-}
+}  // namespace OSX
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h b/Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h
index 298dcd4a80..0d37098a21 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/RunLoopStopper.h
@@ -41,5 +41,5 @@ public:
   }
 };
 
-}  // namespace ciface
 }  // namespace OSX
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
index 1cb76b2d25..a0e17da549 100644
--- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
@@ -161,5 +161,5 @@ void PipeDevice::ParseCommand(const std::string& command)
     }
   }
 }
-}
-}
+}  // namespace Pipes
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
index a986f120c1..86202a20f4 100644
--- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
+++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
@@ -58,5 +58,5 @@ private:
   std::map<std::string, PipeInput*> m_buttons;
   std::map<std::string, PipeInput*> m_axes;
 };
-}
-}
+}  // namespace Pipes
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h
index 03f6ca9993..ca1bbc7725 100644
--- a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h
+++ b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.h
@@ -10,5 +10,5 @@ namespace Quartz
 {
 void PopulateDevices(void* window);
 void DeInit();
-}
-}
+}  // namespace Quartz
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
index e51ec5238b..77acf8d1d3 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
@@ -369,5 +369,5 @@ ControlState KeyboardMouse::Axis::GetState() const
 {
   return std::max(0.0f, *m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY));
 }
-}
-}
+}  // namespace XInput2
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
index 5c5124cb3b..72ea347461 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
@@ -113,5 +113,5 @@ private:
   const int pointer_deviceid, keyboard_deviceid;
   std::string name;
 };
-}
-}
+}  // namespace XInput2
+}  // namespace ciface
diff --git a/Source/Core/InputCommon/InputProfile.cpp b/Source/Core/InputCommon/InputProfile.cpp
index c78c1fbfd6..65f4069cf9 100644
--- a/Source/Core/InputCommon/InputProfile.cpp
+++ b/Source/Core/InputCommon/InputProfile.cpp
@@ -207,4 +207,4 @@ void ProfileCycler::PreviousWiimoteProfileForGame(int controller_index)
   CycleProfileForGame(CycleDirection::Backward, Wiimote::GetConfig(), m_wiimote_profile_index,
                       GetWiimoteInputProfilesForGame(controller_index), controller_index);
 }
-}
+}  // namespace InputProfile
diff --git a/Source/Core/InputCommon/InputProfile.h b/Source/Core/InputCommon/InputProfile.h
index ccb4fbf4db..0f784d7a04 100644
--- a/Source/Core/InputCommon/InputProfile.h
+++ b/Source/Core/InputCommon/InputProfile.h
@@ -50,4 +50,4 @@ private:
 
   int m_wiimote_profile_index = 0;
 };
-}
+}  // namespace InputProfile
diff --git a/Source/Core/MacUpdater/AppDelegate.mm b/Source/Core/MacUpdater/AppDelegate.mm
index d260a2122a..95b03322a0 100644
--- a/Source/Core/MacUpdater/AppDelegate.mm
+++ b/Source/Core/MacUpdater/AppDelegate.mm
@@ -16,8 +16,7 @@
 
 @implementation AppDelegate
 
-- (void)applicationDidFinishLaunching:(NSNotification*)aNotification
-{
+- (void)applicationDidFinishLaunching:(NSNotification*)aNotification {
   NSArray* arguments = [[NSProcessInfo processInfo] arguments];
 
   __block std::vector<std::string> args;
@@ -33,8 +32,7 @@
   });
 }
 
-- (void)applicationWillTerminate:(NSNotification*)aNotification
-{
+- (void)applicationWillTerminate:(NSNotification*)aNotification {
 }
 
 @end
diff --git a/Source/Core/MacUpdater/MacUI.mm b/Source/Core/MacUpdater/MacUI.mm
index fd7d8492be..a4f9de6fd8 100644
--- a/Source/Core/MacUpdater/MacUI.mm
+++ b/Source/Core/MacUpdater/MacUI.mm
@@ -44,8 +44,8 @@ void UI::Error(const std::string& text)
     NSAlert* alert = [[[NSAlert alloc] init] autorelease];
 
     [alert setMessageText:@"Fatal error"];
-    [alert
-        setInformativeText:[NSString stringWithCString:text.c_str() encoding:NSUTF8StringEncoding]];
+    [alert setInformativeText:[NSString stringWithCString:text.c_str()
+                                                 encoding:NSUTF8StringEncoding]];
     [alert setAlertStyle:NSAlertStyleCritical];
 
     [alert beginSheetModalForWindow:GetWindow()
@@ -73,8 +73,8 @@ void UI::SetVisible(bool visible)
 void UI::SetDescription(const std::string& text)
 {
   run_on_main([&] {
-    [GetView()
-        SetDescription:[NSString stringWithCString:text.c_str() encoding:NSUTF8StringEncoding]];
+    [GetView() SetDescription:[NSString stringWithCString:text.c_str()
+                                                 encoding:NSUTF8StringEncoding]];
   });
 }
 
diff --git a/Source/Core/UICommon/CommandLineParse.cpp b/Source/Core/UICommon/CommandLineParse.cpp
index 46838f05c3..1a7f2bb82d 100644
--- a/Source/Core/UICommon/CommandLineParse.cpp
+++ b/Source/Core/UICommon/CommandLineParse.cpp
@@ -135,4 +135,4 @@ optparse::Values& ParseArguments(optparse::OptionParser* parser,
   AddConfigLayer(options);
   return options;
 }
-}
+}  // namespace CommandLineParse
diff --git a/Source/Core/UICommon/CommandLineParse.h b/Source/Core/UICommon/CommandLineParse.h
index 98a7da981a..d1d52c19b0 100644
--- a/Source/Core/UICommon/CommandLineParse.h
+++ b/Source/Core/UICommon/CommandLineParse.h
@@ -10,7 +10,7 @@ namespace optparse
 {
 class OptionParser;
 class Values;
-}
+}  // namespace optparse
 
 namespace CommandLineParse
 {
@@ -24,4 +24,4 @@ std::unique_ptr<optparse::OptionParser> CreateParser(ParserOptions options);
 optparse::Values& ParseArguments(optparse::OptionParser* parser, int argc, char** argv);
 optparse::Values& ParseArguments(optparse::OptionParser* parser,
                                  const std::vector<std::string>& arguments);
-}
+}  // namespace CommandLineParse
diff --git a/Source/Core/UICommon/GameFileCache.cpp b/Source/Core/UICommon/GameFileCache.cpp
index 2782ec2751..fa83ed66e0 100644
--- a/Source/Core/UICommon/GameFileCache.cpp
+++ b/Source/Core/UICommon/GameFileCache.cpp
@@ -273,4 +273,4 @@ void GameFileCache::DoState(PointerWrap* p, u64 size)
   });
 }
 
-}  // namespace DiscIO
+}  // namespace UICommon
diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp
index 0f937f5413..117acdf254 100644
--- a/Source/Core/UICommon/UICommon.cpp
+++ b/Source/Core/UICommon/UICommon.cpp
@@ -372,8 +372,8 @@ void EnableScreenSaver(Window win, bool enable)
 void EnableScreenSaver(bool enable)
 #endif
 {
-// Inhibit the screensaver. Depending on the operating system this may also
-// disable low-power states and/or screen dimming.
+  // Inhibit the screensaver. Depending on the operating system this may also
+  // disable low-power states and/or screen dimming.
 
 #if defined(HAVE_X11) && HAVE_X11
   if (Config::Get(Config::MAIN_DISABLE_SCREENSAVER))
diff --git a/Source/Core/UICommon/VideoUtils.cpp b/Source/Core/UICommon/VideoUtils.cpp
index 3656f53209..3a9dcbd428 100644
--- a/Source/Core/UICommon/VideoUtils.cpp
+++ b/Source/Core/UICommon/VideoUtils.cpp
@@ -74,4 +74,4 @@ std::vector<std::string> GetAvailableAntialiasingModes(int& msaa_modes)
 
   return modes;
 }
-}
+}  // namespace VideoUtils
diff --git a/Source/Core/UICommon/VideoUtils.h b/Source/Core/UICommon/VideoUtils.h
index 096abbe7b1..7953e03732 100644
--- a/Source/Core/UICommon/VideoUtils.h
+++ b/Source/Core/UICommon/VideoUtils.h
@@ -19,4 +19,4 @@ std::vector<std::string> GetAvailableResolutions(X11Utils::XRRConfiguration* xrr
 #endif
 
 std::vector<std::string> GetAvailableAntialiasingModes(int& m_msaa_modes);
-}
+}  // namespace VideoUtils
diff --git a/Source/Core/UICommon/X11Utils.cpp b/Source/Core/UICommon/X11Utils.cpp
index d85121cda8..e1ed221530 100644
--- a/Source/Core/UICommon/X11Utils.cpp
+++ b/Source/Core/UICommon/X11Utils.cpp
@@ -275,4 +275,4 @@ void XRRConfiguration::AddResolutions(std::vector<std::string>& resos)
 }
 
 #endif
-}
+}  // namespace X11Utils
diff --git a/Source/Core/UICommon/X11Utils.h b/Source/Core/UICommon/X11Utils.h
index 363a7df95a..33b2fa2d0e 100644
--- a/Source/Core/UICommon/X11Utils.h
+++ b/Source/Core/UICommon/X11Utils.h
@@ -51,4 +51,4 @@ private:
   bool bIsFullscreen;
 };
 #endif
-}
+}  // namespace X11Utils
diff --git a/Source/Core/VideoBackends/D3D/BoundingBox.h b/Source/Core/VideoBackends/D3D/BoundingBox.h
index 4d78af2346..5cf1da41e2 100644
--- a/Source/Core/VideoBackends/D3D/BoundingBox.h
+++ b/Source/Core/VideoBackends/D3D/BoundingBox.h
@@ -17,4 +17,4 @@ public:
   static void Set(int index, int value);
   static int Get(int index);
 };
-};
+};  // namespace DX11
diff --git a/Source/Core/VideoBackends/D3D12/DXVertexFormat.h b/Source/Core/VideoBackends/D3D12/DXVertexFormat.h
index 02f27d544b..a2bdfc1c4b 100644
--- a/Source/Core/VideoBackends/D3D12/DXVertexFormat.h
+++ b/Source/Core/VideoBackends/D3D12/DXVertexFormat.h
@@ -30,4 +30,4 @@ private:
   std::array<D3D12_INPUT_ELEMENT_DESC, MAX_VERTEX_ATTRIBUTES> m_attribute_descriptions = {};
   u32 m_num_attributes = 0;
 };
-}  // namespace Vulkan
+}  // namespace DX12
diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.h b/Source/Core/VideoBackends/D3D12/VideoBackend.h
index f3fe4c4f89..aaf4830d31 100644
--- a/Source/Core/VideoBackends/D3D12/VideoBackend.h
+++ b/Source/Core/VideoBackends/D3D12/VideoBackend.h
@@ -22,4 +22,4 @@ public:
 private:
   void FillBackendInfo();
 };
-}
+}  // namespace DX12
diff --git a/Source/Core/VideoBackends/Null/PerfQuery.h b/Source/Core/VideoBackends/Null/PerfQuery.h
index ce6ba7263e..91d13d4722 100644
--- a/Source/Core/VideoBackends/Null/PerfQuery.h
+++ b/Source/Core/VideoBackends/Null/PerfQuery.h
@@ -21,4 +21,4 @@ public:
   bool IsFlushed() const override { return true; }
 };
 
-}  // namespace
+}  // namespace Null
diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.h b/Source/Core/VideoBackends/OGL/PerfQuery.h
index 8becce755d..8a2bf94a5f 100644
--- a/Source/Core/VideoBackends/OGL/PerfQuery.h
+++ b/Source/Core/VideoBackends/OGL/PerfQuery.h
@@ -81,4 +81,4 @@ private:
   void FlushOne();
 };
 
-}  // namespace
+}  // namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h
index 7b437e326b..8c7ee5ca7b 100644
--- a/Source/Core/VideoBackends/OGL/SamplerCache.h
+++ b/Source/Core/VideoBackends/OGL/SamplerCache.h
@@ -43,4 +43,4 @@ private:
 };
 
 extern std::unique_ptr<SamplerCache> g_sampler_cache;
-}
+}  // namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp
index d50bc38ed3..b59d08b4f1 100644
--- a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp
+++ b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp
@@ -392,4 +392,4 @@ std::unique_ptr<StreamBuffer> StreamBuffer::Create(u32 type, u32 size)
   // default fallback, should work everywhere, but isn't the best way to do this job
   return std::make_unique<MapAndOrphan>(type, size);
 }
-}
+}  // namespace OGL
diff --git a/Source/Core/VideoBackends/Software/Clipper.cpp b/Source/Core/VideoBackends/Software/Clipper.cpp
index 8fb66ab070..f7c7d2dbe8 100644
--- a/Source/Core/VideoBackends/Software/Clipper.cpp
+++ b/Source/Core/VideoBackends/Software/Clipper.cpp
@@ -453,4 +453,4 @@ void PerspectiveDivide(OutputVertexData* vertex)
   screen.y = projected.y * wInverse * xfmem.viewport.ht + xfmem.viewport.yOrig - 342;
   screen.z = projected.z * wInverse * xfmem.viewport.zRange + xfmem.viewport.farZ;
 }
-}
+}  // namespace Clipper
diff --git a/Source/Core/VideoBackends/Software/Clipper.h b/Source/Core/VideoBackends/Software/Clipper.h
index 319b88552d..d19bbedf7b 100644
--- a/Source/Core/VideoBackends/Software/Clipper.h
+++ b/Source/Core/VideoBackends/Software/Clipper.h
@@ -18,4 +18,4 @@ bool CullTest(const OutputVertexData* v0, const OutputVertexData* v1, const Outp
               bool& backface);
 
 void PerspectiveDivide(OutputVertexData* vertex);
-}
+}  // namespace Clipper
diff --git a/Source/Core/VideoBackends/Software/CopyRegion.h b/Source/Core/VideoBackends/Software/CopyRegion.h
index fd695b8d3a..c275dcb38d 100644
--- a/Source/Core/VideoBackends/Software/CopyRegion.h
+++ b/Source/Core/VideoBackends/Software/CopyRegion.h
@@ -30,4 +30,4 @@ void CopyRegion(const T* const source, const MathUtil::Rectangle<int>& srcrect,
     }
   }
 }
-}
+}  // namespace SW
diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp
index 54fe476f16..7f8edcc909 100644
--- a/Source/Core/VideoBackends/Software/DebugUtil.cpp
+++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp
@@ -219,4 +219,4 @@ void OnObjectEnd()
 
   stats.thisFrame.numDrawnObjects++;
 }
-}
+}  // namespace DebugUtil
diff --git a/Source/Core/VideoBackends/Software/DebugUtil.h b/Source/Core/VideoBackends/Software/DebugUtil.h
index 1b95b2b222..494ce1c9e9 100644
--- a/Source/Core/VideoBackends/Software/DebugUtil.h
+++ b/Source/Core/VideoBackends/Software/DebugUtil.h
@@ -23,4 +23,4 @@ void DrawObjectBuffer(s16 x, s16 y, const u8* color, int bufferBase, int subBuff
 
 void DrawTempBuffer(const u8* color, int buffer);
 void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char* name);
-}
+}  // namespace DebugUtil
diff --git a/Source/Core/VideoBackends/Software/EfbCopy.cpp b/Source/Core/VideoBackends/Software/EfbCopy.cpp
index bba64ee7c1..d9b9790486 100644
--- a/Source/Core/VideoBackends/Software/EfbCopy.cpp
+++ b/Source/Core/VideoBackends/Software/EfbCopy.cpp
@@ -33,4 +33,4 @@ void ClearEfb()
     }
   }
 }
-}
+}  // namespace EfbCopy
diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp
index 0f74d4ebde..d64c519385 100644
--- a/Source/Core/VideoBackends/Software/EfbInterface.cpp
+++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp
@@ -710,4 +710,4 @@ void IncPerfCounterQuadCount(PerfQueryType type)
   quad[type] = 0;
   ++perf_values[type];
 }
-}
+}  // namespace EfbInterface
diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp
index e530e80e54..f35ccea26f 100644
--- a/Source/Core/VideoBackends/Software/Rasterizer.cpp
+++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp
@@ -467,4 +467,4 @@ void DrawTriangleFrontFace(const OutputVertexData* v0, const OutputVertexData* v
     }
   }
 }
-}
+}  // namespace Rasterizer
diff --git a/Source/Core/VideoBackends/Software/Rasterizer.h b/Source/Core/VideoBackends/Software/Rasterizer.h
index 215525be8c..9740371d19 100644
--- a/Source/Core/VideoBackends/Software/Rasterizer.h
+++ b/Source/Core/VideoBackends/Software/Rasterizer.h
@@ -40,4 +40,4 @@ struct RasterBlock
   s32 TextureLod[16];
   bool TextureLinear[16];
 };
-}
+}  // namespace Rasterizer
diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.cpp b/Source/Core/VideoBackends/Software/TextureEncoder.cpp
index d3e76aa997..6ed13a0229 100644
--- a/Source/Core/VideoBackends/Software/TextureEncoder.cpp
+++ b/Source/Core/VideoBackends/Software/TextureEncoder.cpp
@@ -1468,7 +1468,7 @@ void EncodeEfbCopy(u8* dst, const EFBCopyParams& params, u32 native_width, u32 b
     }
   }
 }
-}
+}  // namespace
 
 void Encode(AbstractStagingTexture* dst, const EFBCopyParams& params, u32 native_width,
             u32 bytes_per_row, u32 num_blocks_y, u32 memory_stride,
@@ -1493,4 +1493,4 @@ void Encode(AbstractStagingTexture* dst, const EFBCopyParams& params, u32 native
                   bytes_per_row, num_blocks_y, memory_stride, src_rect, scale_by_half);
   }
 }
-}
+}  // namespace TextureEncoder
diff --git a/Source/Core/VideoBackends/Software/TextureSampler.cpp b/Source/Core/VideoBackends/Software/TextureSampler.cpp
index 2d9e2d19ae..93ff4ba44e 100644
--- a/Source/Core/VideoBackends/Software/TextureSampler.cpp
+++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp
@@ -247,4 +247,4 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8* sample)
                                           imageWidth);
   }
 }
-}
+}  // namespace TextureSampler
diff --git a/Source/Core/VideoBackends/Software/TextureSampler.h b/Source/Core/VideoBackends/Software/TextureSampler.h
index a7e8a136f5..5b82fcfb6e 100644
--- a/Source/Core/VideoBackends/Software/TextureSampler.h
+++ b/Source/Core/VideoBackends/Software/TextureSampler.h
@@ -19,4 +19,4 @@ enum
   BLU_SMP,
   ALP_SMP
 };
-}
+}  // namespace TextureSampler
diff --git a/Source/Core/VideoBackends/Software/TransformUnit.cpp b/Source/Core/VideoBackends/Software/TransformUnit.cpp
index d8b7763669..4a55d1842f 100644
--- a/Source/Core/VideoBackends/Software/TransformUnit.cpp
+++ b/Source/Core/VideoBackends/Software/TransformUnit.cpp
@@ -455,4 +455,4 @@ void TransformTexCoord(const InputVertexData* src, OutputVertexData* dst, bool s
     dst->texCoords[coordNum][1] *= (bpmem.texcoords[coordNum].t.scale_minus_1 + 1);
   }
 }
-}
+}  // namespace TransformUnit
diff --git a/Source/Core/VideoBackends/Software/TransformUnit.h b/Source/Core/VideoBackends/Software/TransformUnit.h
index fea42c8104..41f8645b3a 100644
--- a/Source/Core/VideoBackends/Software/TransformUnit.h
+++ b/Source/Core/VideoBackends/Software/TransformUnit.h
@@ -13,4 +13,4 @@ void TransformPosition(const InputVertexData* src, OutputVertexData* dst);
 void TransformNormal(const InputVertexData* src, bool nbt, OutputVertexData* dst);
 void TransformColor(const InputVertexData* src, OutputVertexData* dst);
 void TransformTexCoord(const InputVertexData* src, OutputVertexData* dst, bool specialCase);
-}
+}  // namespace TransformUnit
diff --git a/Source/Core/VideoCommon/BPFunctions.h b/Source/Core/VideoCommon/BPFunctions.h
index 93fd5b0d78..9f8625233a 100644
--- a/Source/Core/VideoCommon/BPFunctions.h
+++ b/Source/Core/VideoCommon/BPFunctions.h
@@ -23,4 +23,4 @@ void SetBlendMode();
 void ClearScreen(const MathUtil::Rectangle<int>& rc);
 void OnPixelFormatChange();
 void SetInterlacingMode(const BPCmd& bp);
-}
+}  // namespace BPFunctions
diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp
index c0cbf234ab..36a9ee7307 100644
--- a/Source/Core/VideoCommon/Fifo.cpp
+++ b/Source/Core/VideoCommon/Fifo.cpp
@@ -585,4 +585,4 @@ void Prepare()
   s_event_sync_gpu = CoreTiming::RegisterEvent("SyncGPUCallback", SyncGPUCallback);
   s_syncing_suspended = true;
 }
-}
+}  // namespace Fifo
diff --git a/Source/Core/VideoCommon/NativeVertexFormat.h b/Source/Core/VideoCommon/NativeVertexFormat.h
index b7c3477a60..415ee965d9 100644
--- a/Source/Core/VideoCommon/NativeVertexFormat.h
+++ b/Source/Core/VideoCommon/NativeVertexFormat.h
@@ -94,7 +94,7 @@ struct hash<PortableVertexDeclaration>
     return Common::HashFletcher(reinterpret_cast<const u8*>(&decl), sizeof(decl));
   }
 };
-}
+}  // namespace std
 
 // The implementation of this class is specific for GL/DX, so NativeVertexFormat.cpp
 // is in the respective backend, not here in VideoCommon.
diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp
index d6f9b38a3e..9df93cfc16 100644
--- a/Source/Core/VideoCommon/OnScreenDisplay.cpp
+++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp
@@ -125,4 +125,4 @@ void ClearMessages()
   std::lock_guard<std::mutex> lock(s_messages_mutex);
   s_messages.clear();
 }
-}
+}  // namespace OSD
diff --git a/Source/Core/VideoCommon/OnScreenDisplay.h b/Source/Core/VideoCommon/OnScreenDisplay.h
index 51358aff19..20d563d7ba 100644
--- a/Source/Core/VideoCommon/OnScreenDisplay.h
+++ b/Source/Core/VideoCommon/OnScreenDisplay.h
@@ -27,14 +27,14 @@ constexpr u32 CYAN = 0xFF00FFFF;
 constexpr u32 GREEN = 0xFF00FF00;
 constexpr u32 RED = 0xFFFF0000;
 constexpr u32 YELLOW = 0xFFFFFF30;
-};
+};  // namespace Color
 
 namespace Duration
 {
 constexpr u32 SHORT = 2000;
 constexpr u32 NORMAL = 5000;
 constexpr u32 VERY_LONG = 10000;
-};
+};  // namespace Duration
 
 // On-screen message display (colored yellow by default)
 void AddMessage(const std::string& message, u32 ms = Duration::SHORT, u32 rgba = Color::YELLOW);
diff --git a/Source/Core/VideoCommon/PixelShaderManager.cpp b/Source/Core/VideoCommon/PixelShaderManager.cpp
index 7799a0abcb..50b58b3c9e 100644
--- a/Source/Core/VideoCommon/PixelShaderManager.cpp
+++ b/Source/Core/VideoCommon/PixelShaderManager.cpp
@@ -158,9 +158,8 @@ void PixelShaderManager::SetConstants()
               bpmem.tevindref.getTexCoord(stage) | bpmem.tevindref.getTexMap(stage) << 8 | 1 << 16;
         // Note: a tevind of zero just happens to be a passthrough, so no need
         // to set an extra bit.
-        constants.pack1[i][2] =
-            bpmem.tevind[i].hex;  // TODO: This match shadergen, but videosw will
-                                  // always wrap.
+        constants.pack1[i][2] = bpmem.tevind[i].hex;  // TODO: This match shadergen, but videosw
+                                                      // will always wrap.
 
         // The ubershader uses tevind != 0 as a condition whether to calculate texcoords,
         // even when texture is disabled, instead of the stage < bpmem.genMode.numindstages.
diff --git a/Source/Core/VideoCommon/SamplerCommon.h b/Source/Core/VideoCommon/SamplerCommon.h
index f0fdcf5767..a16ba0fcd4 100644
--- a/Source/Core/VideoCommon/SamplerCommon.h
+++ b/Source/Core/VideoCommon/SamplerCommon.h
@@ -25,4 +25,4 @@ constexpr bool AreBpTexMode0MipmapsEnabled(const T& tm0)
 {
   return (tm0.min_filter & 3) != 0;
 }
-}
+}  // namespace SamplerCommon
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp
index f6c9fdc407..fcf4c945f9 100644
--- a/Source/Core/VideoCommon/TextureCacheBase.cpp
+++ b/Source/Core/VideoCommon/TextureCacheBase.cpp
@@ -1934,14 +1934,13 @@ void TextureCacheBase::ReleaseEFBCopyStagingTexture(std::unique_ptr<AbstractStag
 void TextureCacheBase::UninitializeXFBMemory(u8* dst, u32 stride, u32 bytes_per_row,
                                              u32 num_blocks_y)
 {
-// Originally, we planned on using a 'key color'
-// for alpha to address partial xfbs (Mario Strikers / Chicken Little).
-// This work was removed since it was unfinished but there
-// was still a desire to differentiate between the old and the new approach
-// which is why we still set uninitialized xfb memory to fuchsia
-// (Y=1,U=254,V=254) instead of dark green (Y=0,U=0,V=0) in YUV
-// like is done in the EFB path.
-// This comment is indented wrong because of the silly linter, btw.
+  // Originally, we planned on using a 'key color'
+  // for alpha to address partial xfbs (Mario Strikers / Chicken Little).
+  // This work was removed since it was unfinished but there
+  // was still a desire to differentiate between the old and the new approach
+  // which is why we still set uninitialized xfb memory to fuchsia
+  // (Y=1,U=254,V=254) instead of dark green (Y=0,U=0,V=0) in YUV
+  // like is done in the EFB path.
 
 #if defined(_M_X86) || defined(_M_X86_64)
   __m128i sixteenBytes = _mm_set1_epi16((s16)(u16)0xFE01);
diff --git a/Source/Core/VideoCommon/UberShaderCommon.cpp b/Source/Core/VideoCommon/UberShaderCommon.cpp
index 65299200f8..b815e13c16 100644
--- a/Source/Core/VideoCommon/UberShaderCommon.cpp
+++ b/Source/Core/VideoCommon/UberShaderCommon.cpp
@@ -197,4 +197,4 @@ void WriteVertexLighting(ShaderCode& out, APIType api_type, const char* world_po
             "}\n"
             "\n");
 }
-}
+}  // namespace UberShader
diff --git a/Source/Core/VideoCommon/UberShaderPixel.h b/Source/Core/VideoCommon/UberShaderPixel.h
index 344cc4e032..7b96d7952f 100644
--- a/Source/Core/VideoCommon/UberShaderPixel.h
+++ b/Source/Core/VideoCommon/UberShaderPixel.h
@@ -31,4 +31,4 @@ ShaderCode GenPixelShader(APIType ApiType, const ShaderHostConfig& host_config,
 void EnumeratePixelShaderUids(const std::function<void(const PixelShaderUid&)>& callback);
 void ClearUnusedPixelShaderUidBits(APIType ApiType, const ShaderHostConfig& host_config,
                                    PixelShaderUid* uid);
-}
+}  // namespace UberShader
diff --git a/Source/Core/VideoCommon/UberShaderVertex.h b/Source/Core/VideoCommon/UberShaderVertex.h
index daebaa3f77..cbbcb1459e 100644
--- a/Source/Core/VideoCommon/UberShaderVertex.h
+++ b/Source/Core/VideoCommon/UberShaderVertex.h
@@ -25,4 +25,4 @@ VertexShaderUid GetVertexShaderUid();
 ShaderCode GenVertexShader(APIType api_type, const ShaderHostConfig& host_config,
                            const vertex_ubershader_uid_data* uid_data);
 void EnumerateVertexShaderUids(const std::function<void(const VertexShaderUid&)>& callback);
-}
+}  // namespace UberShader
diff --git a/Source/Core/VideoCommon/VertexLoaderBase.h b/Source/Core/VideoCommon/VertexLoaderBase.h
index 5e1ffc4fd2..29b53d3c58 100644
--- a/Source/Core/VideoCommon/VertexLoaderBase.h
+++ b/Source/Core/VideoCommon/VertexLoaderBase.h
@@ -55,7 +55,7 @@ struct hash<VertexLoaderUID>
 {
   size_t operator()(const VertexLoaderUID& uid) const { return uid.GetHash(); }
 };
-}
+}  // namespace std
 
 class VertexLoaderBase
 {
diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp
index 673569f4d9..4fd7e164d7 100644
--- a/Source/Core/VideoCommon/VertexLoaderManager.cpp
+++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp
@@ -91,7 +91,7 @@ struct entry
   u64 num_verts;
   bool operator<(const entry& other) const { return num_verts > other.num_verts; }
 };
-}
+}  // namespace
 
 std::string VertexLoadersToString()
 {
@@ -295,7 +295,7 @@ NativeVertexFormat* GetCurrentVertexFormat()
   return s_current_vtx_fmt;
 }
 
-}  // namespace
+}  // namespace VertexLoaderManager
 
 void LoadCPReg(u32 sub_cmd, u32 value, bool is_preprocess)
 {
diff --git a/Source/Core/VideoCommon/VertexLoaderManager.h b/Source/Core/VideoCommon/VertexLoaderManager.h
index b46d354e7d..b408d46e10 100644
--- a/Source/Core/VideoCommon/VertexLoaderManager.h
+++ b/Source/Core/VideoCommon/VertexLoaderManager.h
@@ -53,4 +53,4 @@ extern u32 position_matrix_index[4];
 
 // VB_HAS_X. Bitmask telling what vertex components are present.
 extern u32 g_current_components;
-}
+}  // namespace VertexLoaderManager
diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
index b746f4f5d0..06b80c10f3 100644
--- a/Source/Core/VideoCommon/VertexLoader_Normal.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
@@ -102,7 +102,7 @@ struct Normal_Index_Indices3
 
   static const int size = sizeof(I) * 3;
 };
-}
+}  // namespace
 
 void VertexLoader_Normal::Init()
 {
diff --git a/Source/UnitTests/Common/BitFieldTest.cpp b/Source/UnitTests/Common/BitFieldTest.cpp
index d63d860d82..32b587469f 100644
--- a/Source/UnitTests/Common/BitFieldTest.cpp
+++ b/Source/UnitTests/Common/BitFieldTest.cpp
@@ -32,7 +32,10 @@ static u64 table[] = {
     0x8000000000000048ull,  // regular_field = 0b1001
 
     // "random" numbers
-    0x0F7B8B1ABD9B8D3Full, 0xA8B86F73FDAADD2Dull, 0x1B17A557BFEB351Dull, 0xE3354268B0C2395Bull,
+    0x0F7B8B1ABD9B8D3Full,
+    0xA8B86F73FDAADD2Dull,
+    0x1B17A557BFEB351Dull,
+    0xE3354268B0C2395Bull,
 };
 
 // Verify that bitfields in a union have the same underlying data
diff --git a/Source/UnitTests/Core/CoreTimingTest.cpp b/Source/UnitTests/Core/CoreTimingTest.cpp
index 8834a0262b..dfff3adfe3 100644
--- a/Source/UnitTests/Core/CoreTimingTest.cpp
+++ b/Source/UnitTests/Core/CoreTimingTest.cpp
@@ -120,7 +120,7 @@ void FifoCallback(u64 userdata, s64 lateness)
   EXPECT_EQ(s_lateness, lateness);
   ++s_counter;
 }
-}
+}  // namespace SharedSlotTest
 
 TEST(CoreTiming, SharedSlot)
 {
@@ -183,7 +183,7 @@ static void RescheduleCallback(u64 userdata, s64 lateness)
   if (s_reschedules > 0)
     CoreTiming::ScheduleEvent(1000, reinterpret_cast<CoreTiming::EventType*>(userdata), userdata);
 }
-}
+}  // namespace ChainSchedulingTest
 
 TEST(CoreTiming, ChainScheduling)
 {
@@ -235,7 +235,7 @@ static void ChainCallback(u64 userdata, s64 lateness)
 
   CoreTiming::ScheduleEvent(-1000, s_cb_next, userdata - 1);
 }
-}
+}  // namespace ScheduleIntoPastTest
 
 // This can happen when scheduling from outside the CPU Thread.
 // Also, if the callback is very late, it may reschedule itself for the next period which
diff --git a/Source/UnitTests/Core/DSP/DSPAcceleratorTest.cpp b/Source/UnitTests/Core/DSP/DSPAcceleratorTest.cpp
index 5cebc103a8..25dadf58d2 100644
--- a/Source/UnitTests/Core/DSP/DSPAcceleratorTest.cpp
+++ b/Source/UnitTests/Core/DSP/DSPAcceleratorTest.cpp
@@ -22,6 +22,7 @@ public:
   }
 
   bool EndExceptionRaised() const { return m_accov_raised; }
+
 protected:
   void OnEndException() override
   {