diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index 77bedb1c422..5f9ad63756e 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -519,8 +519,7 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *d
     H5VL_loc_params_t loc_params1;
     H5VL_object_t    *vol_obj2 = NULL; /* Object of dst_id */
     H5VL_loc_params_t loc_params2;
-    H5I_type_t        src_id_type = H5I_BADID,
-                      dst_id_type = H5I_BADID;
+    H5I_type_t        src_id_type = H5I_BADID, dst_id_type = H5I_BADID;
     herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
diff --git a/src/H5L.c b/src/H5L.c
index a8d96c1936c..3616cb75a59 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -94,9 +94,8 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *ds
     H5VL_object_t    *vol_obj2 = NULL; /* Object of dst_id */
     H5VL_loc_params_t loc_params1;
     H5VL_loc_params_t loc_params2;
-    H5VL_object_t     tmp_vol_obj;         /* Temporary object */
-    H5I_type_t        src_id_type = H5I_BADID,
-                      dst_id_type = H5I_BADID;
+    H5VL_object_t     tmp_vol_obj; /* Temporary object */
+    H5I_type_t        src_id_type = H5I_BADID, dst_id_type = H5I_BADID;
     herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
@@ -209,9 +208,8 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *ds
     H5VL_loc_params_t loc_params1;
     H5VL_object_t    *vol_obj2 = NULL; /* Object of dst_id */
     H5VL_loc_params_t loc_params2;
-    H5VL_object_t     tmp_vol_obj;         /* Temporary object */
-    H5I_type_t        src_id_type = H5I_BADID,
-                      dst_id_type = H5I_BADID;
+    H5VL_object_t     tmp_vol_obj; /* Temporary object */
+    H5I_type_t        src_id_type = H5I_BADID, dst_id_type = H5I_BADID;
     herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
diff --git a/test/links.c b/test/links.c
index 5c129a9d238..ad9948af04d 100644
--- a/test/links.c
+++ b/test/links.c
@@ -1938,7 +1938,7 @@ test_move_preserves(hid_t fapl_id, bool new_format)
  *-------------------------------------------------------------------------
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-#define NUM_OBJS    3   /* number of groups in FILENAME[0] file */
+#define NUM_OBJS 3 /* number of groups in FILENAME[0] file */
 static int
 test_deprec(hid_t fapl, bool new_format)
 {