diff --git a/.clang-format b/.clang-format
index b51da2ad353..050a8247123 100644
--- a/.clang-format
+++ b/.clang-format
@@ -65,28 +65,35 @@ ObjCBlockIndentWidth: 4
 ReflowComments:  true
 SortIncludes:    false
 StatementMacros:
+  - CATCH
+  - END_MEMBERS
   - FUNC_ENTER_API
-  - FUNC_LEAVE_API
+  - FUNC_ENTER_NOAPI
+  - FUNC_ENTER_NOAPI_NOERR
+  - FUNC_ENTER_NOAPI_NOINIT
   - FUNC_ENTER_NOAPI_NOINIT_NOERR
+  - FUNC_ENTER_PACKAGE
+  - FUNC_LEAVE_API
   - FUNC_LEAVE_NOAPI
+  - FUNC_LEAVE_NOAPI_NOFS
+  - H5E_END_TRY
+  - H5E_PRINTF
+  - H5E_THROW
   - H5_BEGIN_TAG
-  - HGOTO_DONE_TAG
   - H5_END_TAG
-  - HSYS_DONE_ERROR
-  - HSYS_GOTO_ERROR
+  - H5_GCC_DIAG_OFF
+  - H5_GCC_DIAG_ON
+  - H5_LEAVE
   - HDONE_ERROR
   - HERROR
-  - H5_LEAVE
-  - H5E_PRINTF
-  - H5E_THROW
   - HGOTO_DONE
+  - HGOTO_DONE_TAG
   - HGOTO_ERROR
-  - HMPI_ERROR
   - HMPI_DONE_ERROR
+  - HMPI_ERROR
   - HMPI_GOTO_ERROR
-  - H5_GCC_DIAG_OFF
-  - H5_GCC_DIAG_ON
-  - CATCH
+  - HSYS_DONE_ERROR
+  - HSYS_GOTO_ERROR
 #llvm10: TypenameMacros:
 #llvm10:   - STACK_OF
 #llvm10:   - LIST