diff --git a/src/core/pcsxlua.cc b/src/core/pcsxlua.cc
index 1c9b50a37..ef03b1d89 100644
--- a/src/core/pcsxlua.cc
+++ b/src/core/pcsxlua.cc
@@ -34,7 +34,7 @@ struct LuaBreakpoint {
     PCSX::Debug::BreakpointUserListType wrapper;
 };
 
-uint64_t getCPUCycles() { return PCSX::g_emulator->m_cpu->m_regs.cycle;  }
+uint64_t getCPUCycles() { return PCSX::g_emulator->m_cpu->m_regs.cycle; }
 void* getMemPtr() { return PCSX::g_emulator->m_mem->m_wram; }
 void* getParPtr() { return PCSX::g_emulator->m_mem->m_exp1; }
 void* getRomPtr() { return PCSX::g_emulator->m_mem->m_bios; }
diff --git a/src/core/psxemulator.cc b/src/core/psxemulator.cc
index 6276328f5..97ce821bc 100644
--- a/src/core/psxemulator.cc
+++ b/src/core/psxemulator.cc
@@ -128,7 +128,7 @@ void PCSX::Emulator::setLua() {
     L.pop();
     L.pop();
     L.pop();
-    
+
     m_pads->setLua(L);
 
     assert(L.gettop() == 0);
diff --git a/src/mips/common/crt0/cxxglue.c b/src/mips/common/crt0/cxxglue.c
index 80610b742..9d3a7a539 100644
--- a/src/mips/common/crt0/cxxglue.c
+++ b/src/mips/common/crt0/cxxglue.c
@@ -43,9 +43,9 @@ extern fptr __preinit_array_end[] __attribute__((weak));
 extern fptr __init_array_start[] __attribute__((weak));
 extern fptr __init_array_end[] __attribute__((weak));
 
-int main(int argc, char ** argv);
+int main(int argc, char** argv);
 
-void cxxmain(int argc, char ** argv) {
+void cxxmain(int argc, char** argv) {
     size_t count, i;
 
     count = __preinit_array_end - __preinit_array_start;
@@ -69,7 +69,7 @@ void cxxmain(int argc, char ** argv) {
 
 // These two technically aren't part of the standard library requirements, but can
 // be invoked by the freestanding libstdc++, so might as well.
-__attribute__((weak)) size_t strlen(const char * s) {
+__attribute__((weak)) size_t strlen(const char* s) {
     size_t r = 0;
 
     while (*s++) r++;
@@ -77,8 +77,8 @@ __attribute__((weak)) size_t strlen(const char * s) {
     return r;
 }
 
-__attribute__((weak)) const void * memchr(const void * _s, int c, size_t n) {
-    const uint8_t * s = (uint8_t *) _s;
+__attribute__((weak)) const void* memchr(const void* _s, int c, size_t n) {
+    const uint8_t* s = (uint8_t*)_s;
     size_t i;
 
     for (i = 0; i < n; i++, s++) {
diff --git a/src/mips/psyqo/bump-allocator.h b/src/mips/psyqo/bump-allocator.h
index 074c9fa93..29b3679e4 100644
--- a/src/mips/psyqo/bump-allocator.h
+++ b/src/mips/psyqo/bump-allocator.h
@@ -52,15 +52,15 @@ namespace psyqo {
 template <size_t N>
 class BumpAllocator {
   public:
-    template <Primitive P, typename ...Args>
-    Fragments::SimpleFragment<P> &allocateFragment(Args ...args) {
+    template <Primitive P, typename... Args>
+    Fragments::SimpleFragment<P> &allocateFragment(Args... args) {
         static constexpr size_t size = sizeof(Fragments::SimpleFragment<P>);
         uint8_t *ptr = m_current;
         m_current += size;
         return *new (ptr) Fragments::SimpleFragment<P>(args...);
     }
-    template <typename T, typename ...Args>
-    T &allocate(Args ...args) {
+    template <typename T, typename... Args>
+    T &allocate(Args... args) {
         size_t size = sizeof(T);
         uint8_t *ptr = m_current;
         if constexpr (alignof(T) > 1) {
diff --git a/src/mips/psyqo/examples/cube/cube.cpp b/src/mips/psyqo/examples/cube/cube.cpp
index 395f9fe04..93237b027 100644
--- a/src/mips/psyqo/examples/cube/cube.cpp
+++ b/src/mips/psyqo/examples/cube/cube.cpp
@@ -175,7 +175,7 @@ void CubeScene::frame() {
 
         // Read the result of nclip and skip rendering this face if it's not facing us
         int32_t mac0 = 0;
-        psyqo::GTE::read<psyqo::GTE::Register::MAC0>(reinterpret_cast<uint32_t *>(&mac0));
+        psyqo::GTE::read<psyqo::GTE::Register::MAC0>(reinterpret_cast<uint32_t*>(&mac0));
         if (mac0 <= 0) continue;
 
         // Since the GTE can only handle 3 vertices at a time, we need to store our first vertex
@@ -191,7 +191,7 @@ void CubeScene::frame() {
         // Calculate the average Z for the z-Index to be put in the ordering table
         psyqo::GTE::Kernels::avsz4();
         int32_t zIndex = 0;
-        psyqo::GTE::read<psyqo::GTE::Register::OTZ>(reinterpret_cast<uint32_t *>(&zIndex));
+        psyqo::GTE::read<psyqo::GTE::Register::OTZ>(reinterpret_cast<uint32_t*>(&zIndex));
 
         // If the Z-index is out of bounds for our ordering table, we skip rendering this face.
         if (zIndex < 0 || zIndex >= ORDERING_TABLE_SIZE) continue;
diff --git a/src/mips/psyqo/iso9660-parser.hh b/src/mips/psyqo/iso9660-parser.hh
index ec4d9e166..eef602575 100644
--- a/src/mips/psyqo/iso9660-parser.hh
+++ b/src/mips/psyqo/iso9660-parser.hh
@@ -26,12 +26,12 @@ SOFTWARE.
 
 #pragma once
 
-#include <coroutine>
-
 #include <EASTL/fixed_string.h>
 #include <EASTL/functional.h>
 #include <EASTL/string_view.h>
 
+#include <coroutine>
+
 #include "psyqo/cdrom.hh"
 #include "psyqo/task.hh"
 
diff --git a/src/mips/psyqo/primitives/common.hh b/src/mips/psyqo/primitives/common.hh
index 993ff1fbd..737e834c8 100644
--- a/src/mips/psyqo/primitives/common.hh
+++ b/src/mips/psyqo/primitives/common.hh
@@ -102,7 +102,7 @@ enum ColorMode { Tex4Bits, Tex8Bits, Tex16Bits };
 }  // namespace Prim::TPageAttr
 
 namespace Prim {
-    enum class Transparency { Auto, Opaque, SemiTransparent };
+enum class Transparency { Auto, Opaque, SemiTransparent };
 }
 
 namespace PrimPieces {