diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5fd41d7416f..3ff58c7d01e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -71,7 +71,7 @@ repos:
                 .*/testsuite/.*
           )
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v20.1.8
+    rev: v21.1.8
     hooks:
       - id: clang-format
         types_or: [c, c++, javascript, json, objective-c]
diff --git a/imagery/i.maxlik/invert.c b/imagery/i.maxlik/invert.c
index f5545c077a6..8ff556d1135 100644
--- a/imagery/i.maxlik/invert.c
+++ b/imagery/i.maxlik/invert.c
@@ -59,9 +59,10 @@ int invert(struct One_Sig *s, int nbands, int *ik, int *jk, double *det)
     double dx, dy, v;
 
     /* copy lower half to upper half */
-    for (k = 0; k < nbands; k++)
+    for (k = 0; k < nbands; k++) {
         for (j = 0; j < k; j++)
             s->var[j][k] = s->var[k][j];
+    }
 
     /* invert */
     *det = 1.0;
@@ -79,48 +80,54 @@ int invert(struct One_Sig *s, int nbands, int *ik, int *jk, double *det)
                     max = v;
                 }
             }
-            /*330 */ }
-            if (max == 0.0)
-                return -1; /* ill conditioned matrix */
-
-            if (ik[k] != k) { /* 351 */
-                int kk = ik[k];
-
-                for (j = 0; j < nbands; j++) { /* 350 */
-                    v = s->var[k][j];
-                    s->var[k][j] = s->var[kk][j];
-                    s->var[kk][j] = -v;
-                /*350 */ }
-            /*351 */ }
-            if (jk[k] != k) { /* 361 */
-                int jj = jk[k];
-
-                for (i = 0; i < nbands; i++) { /* 360 */
-                    v = s->var[i][k];
-                    s->var[i][k] = s->var[i][jj];
-                    s->var[i][jj] = -v;
-                /*360 */ }
-            /*361 */ }
-            for (j = 0; j < nbands; j++)
-                if (j != k)
-                    s->var[j][k] /= -max;
-
-            for (j = 0; j < nbands; j++)
-                if (j != k) {
-                    v = s->var[j][k];
-                    for (i = 0; i < nbands; i++)
-                        if (i != k)
-                            s->var[j][i] += v * s->var[k][i];
+        } /*330 */
+
+        if (max == 0.0)
+            return -1; /* ill conditioned matrix */
+
+        if (ik[k] != k) { /* 351 */
+            int kk = ik[k];
+
+            for (j = 0; j < nbands; j++) { /* 350 */
+                v = s->var[k][j];
+                s->var[k][j] = s->var[kk][j];
+                s->var[kk][j] = -v;
+            } /*350 */
+
+        } /*351 */
+        if (jk[k] != k) { /* 361 */
+            int jj = jk[k];
+
+            for (i = 0; i < nbands; i++) { /* 360 */
+                v = s->var[i][k];
+                s->var[i][k] = s->var[i][jj];
+                s->var[i][jj] = -v;
+            } /*360 */
+        } /*361 */
+        for (j = 0; j < nbands; j++) {
+            if (j != k)
+                s->var[j][k] /= -max;
+        }
+
+        for (j = 0; j < nbands; j++) {
+
+            if (j != k) {
+                v = s->var[j][k];
+                for (i = 0; i < nbands; i++) {
+                    if (i != k)
+                        s->var[j][i] += v * s->var[k][i];
                 }
+            }
+        }
 
-            for (j = 0; j < nbands; j++)
-                if (j != k)
-                    s->var[k][j] /= max;
+        for (j = 0; j < nbands; j++) {
+            if (j != k)
+                s->var[k][j] /= max;
+        }
 
-            *det *= max;
-            s->var[k][k] = 1.0 / max;
-            /*30 */
-    }
+        *det *= max;
+        s->var[k][k] = 1.0 / max;
+    } /*30 */
 
     /* zero means non-invertible */
     if (*det == 0.0)
@@ -137,23 +144,25 @@ int invert(struct One_Sig *s, int nbands, int *ik, int *jk, double *det)
     for (k = nbands - 1; k >= 0; k--) { /* 530 */
         j = ik[k];
 
-        if (j > k)
+        if (j > k) {
+
             for (i = 0; i < nbands; i++) { /* 510 */
                 v = s->var[i][k];
                 s->var[i][k] = -(s->var[i][j]);
                 s->var[i][j] = v;
-                /*510 */ }
+            } /*510 */
+        }
 
         i = jk[k];
 
-        if (i > k)
+        if (i > k) {
             for (j = 0; j < nbands; j++) { /* 520 */
                 v = s->var[k][j];
                 s->var[k][j] = -(s->var[i][j]);
                 s->var[i][j] = v;
-                /*520 */ }
-        /*530 */
-    }
+            } /*520 */
+        }
+    } /*530 */
 
     return 1;
 }
diff --git a/lib/gis/lz4.c b/lib/gis/lz4.c
index b2540a90438..d18d0c957ee 100644
--- a/lib/gis/lz4.c
+++ b/lib/gis/lz4.c
@@ -631,8 +631,8 @@ LZ4_FORCE_INLINE void LZ4_memcpy_using_offset(BYTE *dstPtr, const BYTE *srcPtr,
 #if defined(_MSC_VER) && (_MSC_VER <= 1937) /* MSVC 2022 ver 17.7 or earlier \
                                              */
 #pragma warning(push)
-#pragma warning( \
-    disable : 6385) /* warning C6385: Reading invalid data from 'v'. */
+#pragma warning(disable \
+                : 6385) /* warning C6385: Reading invalid data from 'v'. */
 #endif
         LZ4_memcpy(&v[4], v, 4);
 #if defined(_MSC_VER) && (_MSC_VER <= 1937) /* MSVC 2022 ver 17.7 or earlier \
diff --git a/lib/lidar/raster.c b/lib/lidar/raster.c
index 190f082da47..b64aefe5c57 100644
--- a/lib/lidar/raster.c
+++ b/lib/lidar/raster.c
@@ -188,7 +188,7 @@ void P_Sparse_Points(struct Map_info *Out, struct Cell_head *Elaboration,
                 }
             }
         }
-    /*IF*/}
+    /*IF*/ }
     /*FOR*/ db_commit_transaction(driver);
     Vect_destroy_line_struct(point);
 
diff --git a/raster/r.cost/cost.h b/raster/r.cost/cost.h
index 46fb1b8a8af..e3c09db034f 100644
--- a/raster/r.cost/cost.h
+++ b/raster/r.cost/cost.h
@@ -1,3 +1,4 @@
+// clang-format Language: C
 /***************************************************************/
 /*                                                             */
 /*        cost.h    in   ~/src/Gcost                           */
diff --git a/raster/r.walk/cost.h b/raster/r.walk/cost.h
index 46fb1b8a8af..e3c09db034f 100644
--- a/raster/r.walk/cost.h
+++ b/raster/r.walk/cost.h
@@ -1,3 +1,4 @@
+// clang-format Language: C
 /***************************************************************/
 /*                                                             */
 /*        cost.h    in   ~/src/Gcost                           */