diff --git a/src/H5.c b/src/H5.c
index 51cc27d352a..c56ac025d19 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -733,7 +733,7 @@ H5__debug_mask(const char *s)
                         H5_debug_g.pkg[i].stream = clear ? NULL : stream;
                         break;
                     } /* end if */
-                } /* end for */
+                }     /* end for */
                 if (i >= (size_t)H5_NPKGS)
                     fprintf(stderr, "HDF5_DEBUG: ignored %s\n", pkg_name);
             } /* end if-else */
@@ -761,7 +761,7 @@ H5__debug_mask(const char *s)
         else {
             s++;
         } /* end if-else */
-    } /* end while */
+    }     /* end while */
 } /* end H5__debug_mask() */
 
 #ifdef H5_HAVE_PARALLEL
diff --git a/src/H5TSthread.c b/src/H5TSthread.c
index c2d6a4eb154..1791bcc2105 100644
--- a/src/H5TSthread.c
+++ b/src/H5TSthread.c
@@ -153,12 +153,14 @@ H5TS_thread_detach(H5TS_thread_t thread)
  *--------------------------------------------------------------------------
  */
 herr_t
-H5TS_thread_setcancelstate(int H5_ATTR_UNUSED state, int H5_ATTR_UNUSED *oldstate){
+H5TS_thread_setcancelstate(int H5_ATTR_UNUSED state, int H5_ATTR_UNUSED *oldstate)
+{
     FUNC_ENTER_NOAPI_NAMECHECK_ONLY
 
-        /* Windows threads are not cancelable, so this is a noop */
+    /* Windows threads are not cancelable, so this is a noop */
 
-        FUNC_LEAVE_NOAPI_NAMECHECK_ONLY(SUCCEED)} /* H5TS_thread_setcancelstate() */
+    FUNC_LEAVE_NOAPI_NAMECHECK_ONLY(SUCCEED)
+} /* H5TS_thread_setcancelstate() */
 #else
 /*--------------------------------------------------------------------------
  * Function: H5TS_thread_create
diff --git a/src/H5private.h b/src/H5private.h
index f69f52284ee..8203938a3d9 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -331,7 +331,7 @@
 /* Check if a read of size bytes starting at ptr would overflow past
  * the last valid byte, pointed to by buffer_end.
  */
-#define H5_IS_BUFFER_OVERFLOW(ptr, size, buffer_end) (((ptr) + (size) - 1) > (buffer_end))
+#define H5_IS_BUFFER_OVERFLOW(ptr, size, buffer_end) (((ptr) + (size)-1) > (buffer_end))
 
 /* Variant of H5_IS_BUFFER_OVERFLOW, used with functions such as H5Tdecode()
  * that don't take a size parameter, where we need to skip the bounds checks.
@@ -340,7 +340,7 @@
  * the entire library.
  */
 #define H5_IS_KNOWN_BUFFER_OVERFLOW(skip, ptr, size, buffer_end)                                             \
-    (skip ? false : ((ptr) + (size) - 1) > (buffer_end))
+    (skip ? false : ((ptr) + (size)-1) > (buffer_end))
 
 /*
  * HDF Boolean type.
@@ -903,7 +903,7 @@ H5_DLL H5_ATTR_CONST int Nflock(int fd, int operation);
 #ifdef H5_HAVE_VASPRINTF
 #define HDvasprintf(RET, FMT, A) vasprintf(RET, FMT, A)
 #else
-H5_DLL int HDvasprintf(char **bufp, const char *fmt, va_list _ap);
+H5_DLL int       HDvasprintf(char **bufp, const char *fmt, va_list _ap);
 #endif
 #endif
 
@@ -1356,8 +1356,8 @@ H5_DLL herr_t H5CX_pop(bool update_dxpl_props);
             /* Don't check again */                                                                          \
             func_check = true;                                                                               \
         } /* end if */                                                                                       \
-    } /* end scope */
-#else /* NDEBUG */
+    }     /* end scope */
+#else     /* NDEBUG */
 #define FUNC_ENTER_CHECK_NAME(asrt)
 #endif /* NDEBUG */