diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 00d2d3f4..a5000e77 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,6 +20,24 @@ concurrency:
   cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 
 jobs:
+  CheckClangFormat:
+    name: Check clang-format
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            llvm-19
+      - name: Clone tree
+        uses: actions/checkout@v4
+      - name: Run clang-format
+        run: |
+          find src \
+              -iname "*.h" -o -iname "*.cpp" \
+              -exec clang-format -n -Werror {} \+;
+
   BuildISO:
     name: Build ISO
     runs-on: ubuntu-latest
diff --git a/src/dds_image.cpp b/src/dds_image.cpp
index d7c50829..b596fc33 100644
--- a/src/dds_image.cpp
+++ b/src/dds_image.cpp
@@ -9,7 +9,7 @@
 
 #include "debug_output.h"
 
-#define FOURCC(a, b, c, d) (((a)&0xFF) | (((b)&0xFF) << 8) | (((c)&0xFF) << 16) | (((d)&0xFF) << 24))
+#define FOURCC(a, b, c, d) (((a) & 0xFF) | (((b) & 0xFF) << 8) | (((c) & 0xFF) << 16) | (((d) & 0xFF) << 24))
 
 constexpr uint32_t kDDSMagic = FOURCC('D', 'D', 'S', ' ');
 constexpr uint32_t kDX10Magic = FOURCC('D', 'X', '1', '0');
diff --git a/src/shaders/pixel_shader_program.cpp b/src/shaders/pixel_shader_program.cpp
index f5826695..868e3df2 100644
--- a/src/shaders/pixel_shader_program.cpp
+++ b/src/shaders/pixel_shader_program.cpp
@@ -5,7 +5,7 @@
 void PixelShaderProgram::LoadTexturedPixelShader() {
   uint32_t *p = pb_begin();
 
-// clang-format off
+  // clang-format off
 #include "textured_pixelshader.inl"
   // clang-format on
 
@@ -15,7 +15,7 @@ void PixelShaderProgram::LoadTexturedPixelShader() {
 void PixelShaderProgram::LoadUntexturedPixelShader() {
   uint32_t *p = pb_begin();
 
-// clang-format off
+  // clang-format off
 #include "untextured_pixelshader.inl"
   // clang-format on
 
diff --git a/src/shaders/precalculated_vertex_shader.h b/src/shaders/precalculated_vertex_shader.h
index d8e8e744..5967a6b3 100644
--- a/src/shaders/precalculated_vertex_shader.h
+++ b/src/shaders/precalculated_vertex_shader.h
@@ -11,7 +11,7 @@ using namespace XboxMath;
 class PrecalculatedVertexShader : public VertexShaderProgram {
  public:
   explicit PrecalculatedVertexShader(bool use_4c_texcoords = false)
-      : VertexShaderProgram(), use_4_component_texcoords_(use_4c_texcoords){};
+      : VertexShaderProgram(), use_4_component_texcoords_(use_4c_texcoords) {};
 
  protected:
   void OnLoadShader() override;
diff --git a/src/shaders/vertex_shader_program.h b/src/shaders/vertex_shader_program.h
index 10c2e5f9..835dafe6 100644
--- a/src/shaders/vertex_shader_program.h
+++ b/src/shaders/vertex_shader_program.h
@@ -33,7 +33,7 @@ class VertexShaderProgram {
  protected:
   virtual void OnActivate() {}
   virtual void OnLoadShader() {}
-  virtual void OnLoadConstants(){};
+  virtual void OnLoadConstants() {};
 
   void LoadShaderProgram(const uint32_t *shader, uint32_t shader_size) const;