diff --git a/src/H5.c b/src/H5.c
index c923316fc7c..4d65c0c9771 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -1257,4 +1257,3 @@ H5is_library_terminating(bool *is_terminating /*out*/)
 
     FUNC_LEAVE_API_NOINIT(ret_value)
 } /* end H5is_library_terminating() */
-
diff --git a/src/H5TSonce.c b/src/H5TSonce.c
index a0ee376c105..49481dbd4df 100644
--- a/src/H5TSonce.c
+++ b/src/H5TSonce.c
@@ -118,4 +118,3 @@ H5TS_once(H5TS_once_t *once, H5TS_once_init_func_t func)
 #endif
 
 #endif /* H5_HAVE_THREADSAFE */
-
diff --git a/src/H5TSprivate.h b/src/H5TSprivate.h
index b2d26950aac..437e70a998b 100644
--- a/src/H5TSprivate.h
+++ b/src/H5TSprivate.h
@@ -40,8 +40,14 @@
 
 /* Static initialization values */
 #ifdef H5_HAVE_WIN_THREADS
-#define H5TS_KEY_INITIALIZER { NULL, 0, NULL }
-#define H5TS_MUTEX_INITIALIZER { NULL }
+#define H5TS_KEY_INITIALIZER                                                                                 \
+    {                                                                                                        \
+        NULL, 0, NULL                                                                                        \
+    }
+#define H5TS_MUTEX_INITIALIZER                                                                               \
+    {                                                                                                        \
+        NULL                                                                                                 \
+    }
 #define H5TS_COND_INITIALIZER CONDITION_VARIABLE_INIT
 #define H5TS_ONCE_INITIALIZER INIT_ONCE_STATIC_INIT
 #else
@@ -75,7 +81,7 @@ typedef DWORD                  H5TS_key_t;
 typedef CRITICAL_SECTION       H5TS_CAPABILITY("mutex") H5TS_mutex_t;
 typedef CONDITION_VARIABLE     H5TS_cond_t;
 typedef PINIT_ONCE             H5TS_once_t;
-typedef PINIT_ONCE_FN          H5TS_once_init_func_t
+typedef PINIT_ONCE_FN H5TS_once_init_func_t
 #else
 typedef pthread_t H5TS_thread_t;
 typedef void *(*H5TS_thread_start_func_t)(void *);
@@ -86,16 +92,17 @@ typedef pthread_once_t  H5TS_once_t;
 typedef void (*H5TS_once_init_func_t)(void);
 #endif
 
-/*****************************/
-/* Library-private Variables */
-/*****************************/
+    /*****************************/
+    /* Library-private Variables */
+    /*****************************/
 
-/***************************************/
-/* Library-private Function Prototypes */
-/***************************************/
+    /***************************************/
+    /* Library-private Function Prototypes */
+    /***************************************/
 
-/* Library/thread init/term operations */
-H5_DLL void H5TS_term_package(void);
+    /* Library/thread init/term operations */
+    H5_DLL void
+    H5TS_term_package(void);
 #ifdef H5_HAVE_WIN_THREADS
 H5_DLL herr_t H5TS_win32_thread_enter(void);
 H5_DLL herr_t H5TS_win32_thread_exit(void);
diff --git a/src/H5TSwin.c b/src/H5TSwin.c
index 814f23746c1..4ce2ddd764e 100644
--- a/src/H5TSwin.c
+++ b/src/H5TSwin.c
@@ -104,20 +104,17 @@ H5TS__win32_process_enter(PINIT_ONCE InitOnce, PVOID Parameter, PVOID *lpContex)
  *--------------------------------------------------------------------------
  */
 herr_t
-H5TS_win32_thread_enter(void)
-{
-    FUNC_ENTER_NOAPI_NAMECHECK_ONLY
+H5TS_win32_thread_enter(void){FUNC_ENTER_NOAPI_NAMECHECK_ONLY
 
-    /* Currently a placeholder function.  TLS setup is performed
-     * elsewhere in the library.
-     *
-     * WARNING: Do NOT use C standard library functions here.
-     * CRT functions are not allowed in DllMain, which is where this code
-     * is used.
-     */
+                                  /* Currently a placeholder function.  TLS setup is performed
+                                   * elsewhere in the library.
+                                   *
+                                   * WARNING: Do NOT use C standard library functions here.
+                                   * CRT functions are not allowed in DllMain, which is where this code
+                                   * is used.
+                                   */
 
-    FUNC_LEAVE_NOAPI_NAMECHECK_ONLY(SUCCEED)
-} /* H5TS_win32_thread_enter() */
+                                  FUNC_LEAVE_NOAPI_NAMECHECK_ONLY(SUCCEED)} /* H5TS_win32_thread_enter() */
 
 /*--------------------------------------------------------------------------
  * Function:    H5TS_win32_thread_exit