Rename HD(f)printf() to (f)printf() (#3194)

349 files changed, 18690 insertions, 19025 deletions

diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp
index 5d20f80..70eb25f 100644
--- a/c++/test/titerate.cpp
+++ b/c++/test/titerate.cpp
@@ -179,7 +179,7 @@ test_iter_group(FileAccPropList &fapl)
         check_values(lnames[NDATASETS], "HDstrdup returns NULL", __LINE__, __FILE__);
 
         /* Sort the dataset names */
-        HDqsort(lnames, NDATASETS + 2, sizeof(char *), iter_strcmp);
+        qsort(lnames, NDATASETS + 2, sizeof(char *), iter_strcmp);
 
         /* Iterate through the datasets in the root group in various ways */
 
diff --git a/src/H5.c b/src/H5.c
index 1e63387..cfc106d 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -475,8 +475,8 @@ H5_term_library(void)
     if (pending) {
         /* Only display the error message if the user is interested in them. */
         if (func) {
-            HDfprintf(stderr, "HDF5: infinite loop closing library\n");
-            HDfprintf(stderr, "      %s\n", loop);
+            fprintf(stderr, "HDF5: infinite loop closing library\n");
+            fprintf(stderr, "      %s\n", loop);
 #ifndef NDEBUG
             HDabort();
 #endif    /* NDEBUG */
@@ -741,7 +741,7 @@ H5__debug_mask(const char *s)
                     } /* end if */
                 }     /* end for */
                 if (i >= (size_t)H5_NPKGS)
-                    HDfprintf(stderr, "HDF5_DEBUG: ignored %s\n", pkg_name);
+                    fprintf(stderr, "HDF5_DEBUG: ignored %s\n", pkg_name);
             } /* end if-else */
         }
         else if (HDisdigit(*s)) {
@@ -896,15 +896,15 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
     if (H5_VERS_MAJOR != majnum || H5_VERS_MINOR != minnum) {
         switch (disable_version_check) {
             case 0:
-                HDfprintf(stderr, "%s%s", version_mismatch_warning,
-                          "You can, at your own risk, disable this warning by setting the environment\n"
-                          "variable 'HDF5_DISABLE_VERSION_CHECK' to a value of '1'.\n"
-                          "Setting it to 2 or higher will suppress the warning messages totally.\n");
+                fprintf(stderr, "%s%s", version_mismatch_warning,
+                        "You can, at your own risk, disable this warning by setting the environment\n"
+                        "variable 'HDF5_DISABLE_VERSION_CHECK' to a value of '1'.\n"
+                        "Setting it to 2 or higher will suppress the warning messages totally.\n");
                 /* Mention the versions we are referring to */
-                HDfprintf(stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n", majnum, minnum, relnum,
-                          (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR, (unsigned)H5_VERS_RELEASE);
+                fprintf(stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n", majnum, minnum, relnum,
+                        (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR, (unsigned)H5_VERS_RELEASE);
                 /* Show library build settings if available */
-                HDfprintf(stderr, "%s", H5build_settings);
+                fprintf(stderr, "%s", H5build_settings);
 
                 /* Bail out now. */
                 HDfputs("Bye...\n", stderr);
@@ -912,16 +912,16 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
             case 1:
                 /* continue with a warning */
                 /* Note that the warning message is embedded in the format string.*/
-                HDfprintf(stderr,
-                          "%s'HDF5_DISABLE_VERSION_CHECK' "
-                          "environment variable is set to %d, application will\n"
-                          "continue at your own risk.\n",
-                          version_mismatch_warning, disable_version_check);
+                fprintf(stderr,
+                        "%s'HDF5_DISABLE_VERSION_CHECK' "
+                        "environment variable is set to %d, application will\n"
+                        "continue at your own risk.\n",
+                        version_mismatch_warning, disable_version_check);
                 /* Mention the versions we are referring to */
-                HDfprintf(stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n", majnum, minnum, relnum,
-                          (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR, (unsigned)H5_VERS_RELEASE);
+                fprintf(stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n", majnum, minnum, relnum,
+                        (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR, (unsigned)H5_VERS_RELEASE);
                 /* Show library build settings if available */
-                HDfprintf(stderr, "%s", H5build_settings);
+                fprintf(stderr, "%s", H5build_settings);
                 break;
             default:
                 /* 2 or higher: continue silently */
@@ -938,15 +938,13 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
             if (VERS_RELEASE_EXCEPTIONS[i] == relnum || VERS_RELEASE_EXCEPTIONS[i] == H5_VERS_RELEASE) {
                 switch (disable_version_check) {
                     case 0:
-                        HDfprintf(
-                            stderr, "%s%s", release_mismatch_warning,
-                            "You can, at your own risk, disable this warning by setting the environment\n"
-                            "variable 'HDF5_DISABLE_VERSION_CHECK' to a value of '1'.\n"
-                            "Setting it to 2 or higher will suppress the warning messages totally.\n");
+                        fprintf(stderr, "%s%s", release_mismatch_warning,
+                                "You can, at your own risk, disable this warning by setting the environment\n"
+                                "variable 'HDF5_DISABLE_VERSION_CHECK' to a value of '1'.\n"
+                                "Setting it to 2 or higher will suppress the warning messages totally.\n");
                         /* Mention the versions we are referring to */
-                        HDfprintf(stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n", majnum, minnum,
-                                  relnum, (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR,
-                                  (unsigned)H5_VERS_RELEASE);
+                        fprintf(stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n", majnum, minnum, relnum,
+                                (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR, (unsigned)H5_VERS_RELEASE);
 
                         /* Bail out now. */
                         HDfputs("Bye...\n", stderr);
@@ -954,15 +952,14 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
                     case 1:
                         /* continue with a warning */
                         /* Note that the warning message is embedded in the format string.*/
-                        HDfprintf(stderr,
-                                  "%s'HDF5_DISABLE_VERSION_CHECK' "
-                                  "environment variable is set to %d, application will\n"
-                                  "continue at your own risk.\n",
-                                  release_mismatch_warning, disable_version_check);
+                        fprintf(stderr,
+                                "%s'HDF5_DISABLE_VERSION_CHECK' "
+                                "environment variable is set to %d, application will\n"
+                                "continue at your own risk.\n",
+                                release_mismatch_warning, disable_version_check);
                         /* Mention the versions we are referring to */
-                        HDfprintf(stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n", majnum, minnum,
-                                  relnum, (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR,
-                                  (unsigned)H5_VERS_RELEASE);
+                        fprintf(stderr, "Headers are %u.%u.%u, library is %u.%u.%u\n", majnum, minnum, relnum,
+                                (unsigned)H5_VERS_MAJOR, (unsigned)H5_VERS_MINOR, (unsigned)H5_VERS_RELEASE);
                         break;
                     default:
                         /* 2 or higher: continue silently */
@@ -995,11 +992,11 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
                     "variable 'HDF5_DISABLE_VERSION_CHECK' to a value of 1 "
                     "will suppress\nthis warning.\n",
                     stderr);
-            HDfprintf(stderr,
-                      "Library version information are:\n"
-                      "H5_VERS_MAJOR=%d, H5_VERS_MINOR=%d, H5_VERS_RELEASE=%d, "
-                      "H5_VERS_SUBRELEASE=%s,\nH5_VERS_INFO=%s\n",
-                      H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE, H5_VERS_SUBRELEASE, H5_VERS_INFO);
+            fprintf(stderr,
+                    "Library version information are:\n"
+                    "H5_VERS_MAJOR=%d, H5_VERS_MINOR=%d, H5_VERS_RELEASE=%d, "
+                    "H5_VERS_SUBRELEASE=%s,\nH5_VERS_INFO=%s\n",
+                    H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE, H5_VERS_SUBRELEASE, H5_VERS_INFO);
         } /* end if */
     }
 
diff --git a/src/H5ACmpio.c b/src/H5ACmpio.c
index 34c408a..03ad79c 100644
--- a/src/H5ACmpio.c
+++ b/src/H5ACmpio.c
@@ -2086,11 +2086,11 @@ H5AC__run_sync_point(H5F_t *f, int sync_point_op)
            (sync_point_op == H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED));
 
 #ifdef H5AC_DEBUG_DIRTY_BYTES_CREATION
-    HDfprintf(stdout, "%d:%s...:%u: (u/uu/i/iu/m/mu) = %zu/%u/%zu/%u/%zu/%u\n", aux_ptr->mpi_rank,
-              __func__ aux_ptr->dirty_bytes_propagations, aux_ptr->unprotect_dirty_bytes,
-              aux_ptr->unprotect_dirty_bytes_updates, aux_ptr->insert_dirty_bytes,
-              aux_ptr->insert_dirty_bytes_updates, aux_ptr->move_dirty_bytes,
-              aux_ptr->move_dirty_bytes_updates);
+    fprintf(stdout, "%d:%s...:%u: (u/uu/i/iu/m/mu) = %zu/%u/%zu/%u/%zu/%u\n", aux_ptr->mpi_rank,
+            __func__ aux_ptr->dirty_bytes_propagations, aux_ptr->unprotect_dirty_bytes,
+            aux_ptr->unprotect_dirty_bytes_updates, aux_ptr->insert_dirty_bytes,
+            aux_ptr->insert_dirty_bytes_updates, aux_ptr->move_dirty_bytes,
+            aux_ptr->move_dirty_bytes_updates);
 #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
 
     /* Clear collective access flag on half of the entries in the cache and
diff --git a/src/H5Abtree2.c b/src/H5Abtree2.c
index 9dde3ef..bdf53cd 100644
--- a/src/H5Abtree2.c
+++ b/src/H5Abtree2.c
@@ -363,8 +363,8 @@ H5A__dense_btree2_name_debug(FILE *stream, int indent, int fwidth, const void *_
 
     FUNC_ENTER_PACKAGE_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%016" PRIx64 ", %02" PRIx8 ", %u, %08" PRIx32 "}\n", indent, "", fwidth,
-              "Record:", nrecord->id.val, nrecord->flags, (unsigned)nrecord->corder, nrecord->hash);
+    fprintf(stream, "%*s%-*s {%016" PRIx64 ", %02" PRIx8 ", %u, %08" PRIx32 "}\n", indent, "", fwidth,
+            "Record:", nrecord->id.val, nrecord->flags, (unsigned)nrecord->corder, nrecord->hash);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A__dense_btree2_name_debug() */
@@ -514,8 +514,8 @@ H5A__dense_btree2_corder_debug(FILE *stream, int indent, int fwidth, const void
 
     FUNC_ENTER_PACKAGE_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%016" PRIx64 ", %02" PRIx8 ", %u}\n", indent, "", fwidth,
-              "Record:", nrecord->id.val, nrecord->flags, (unsigned)nrecord->corder);
+    fprintf(stream, "%*s%-*s {%016" PRIx64 ", %02" PRIx8 ", %u}\n", indent, "", fwidth,
+            "Record:", nrecord->id.val, nrecord->flags, (unsigned)nrecord->corder);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A__dense_btree2_corder_debug() */
diff --git a/src/H5B.c b/src/H5B.c
index 94b108e..c3c4fb6 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -422,8 +422,8 @@ H5B__split(H5F_t *f, H5B_ins_ud_t *bt_ud, unsigned idx, void *udata, H5B_ins_ud_
             side = "LEFT";
         else
             side = "MIDDLE";
-        HDfprintf(H5DEBUG(B), "H5B__split: %3u {%5.3f,%5.3f,%5.3f} %6s", shared->two_k, split_ratios[0],
-                  split_ratios[1], split_ratios[2], side);
+        fprintf(H5DEBUG(B), "H5B__split: %3u {%5.3f,%5.3f,%5.3f} %6s", shared->two_k, split_ratios[0],
+                split_ratios[1], split_ratios[2], side);
     }
 #endif
 
@@ -450,7 +450,7 @@ H5B__split(H5F_t *f, H5B_ins_ud_t *bt_ud, unsigned idx, void *udata, H5B_ins_ud_
     nright = shared->two_k - nleft;
 #ifdef H5B_DEBUG
     if (H5DEBUG(B))
-        HDfprintf(H5DEBUG(B), " split %3d/%-3d\n", nleft, nright);
+        fprintf(H5DEBUG(B), " split %3d/%-3d\n", nleft, nright);
 #endif
 
     /*
diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c
index a94bc76..c352f26 100644
--- a/src/H5B2dbg.c
+++ b/src/H5B2dbg.c
@@ -105,34 +105,33 @@ H5B2__hdr_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
     hdr->f = f;
 
     /* Print opening message */
-    HDfprintf(stream, "%*sv2 B-tree Header...\n", indent, "");
+    fprintf(stream, "%*sv2 B-tree Header...\n", indent, "");
 
     /*
      * Print the values.
      */
-    HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Tree type ID:", hdr->cls->name,
-              (unsigned)hdr->cls->id);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Size of node:", (unsigned)hdr->node_size);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Size of raw (disk) record:", (unsigned)hdr->rrec_size);
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Dirty flag:", hdr->cache_info.is_dirty ? "True" : "False");
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Depth:", hdr->depth);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Number of records in tree:", hdr->root.all_nrec);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Number of records in root node:", hdr->root.node_nrec);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "Address of root node:", hdr->root.addr);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Split percent:", hdr->split_percent);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Merge percent:", hdr->merge_percent);
+    fprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Tree type ID:", hdr->cls->name,
+            (unsigned)hdr->cls->id);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Size of node:", (unsigned)hdr->node_size);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Size of raw (disk) record:", (unsigned)hdr->rrec_size);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Dirty flag:", hdr->cache_info.is_dirty ? "True" : "False");
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Depth:", hdr->depth);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Number of records in tree:", hdr->root.all_nrec);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Number of records in root node:", hdr->root.node_nrec);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Address of root node:", hdr->root.addr);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Split percent:", hdr->split_percent);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Merge percent:", hdr->merge_percent);
 
     /* Print relevant node info */
-    HDfprintf(stream, "%*sNode Info: (max_nrec/split_nrec/merge_nrec)\n", indent, "");
+    fprintf(stream, "%*sNode Info: (max_nrec/split_nrec/merge_nrec)\n", indent, "");
     for (u = 0; u < (unsigned)(hdr->depth + 1); u++) {
         HDsnprintf(temp_str, sizeof(temp_str), "Depth %u:", u);
-        HDfprintf(stream, "%*s%-*s (%u/%u/%u)\n", indent + 3, "", MAX(0, fwidth - 3), temp_str,
-                  hdr->node_info[u].max_nrec, hdr->node_info[u].split_nrec, hdr->node_info[u].merge_nrec);
+        fprintf(stream, "%*s%-*s (%u/%u/%u)\n", indent + 3, "", MAX(0, fwidth - 3), temp_str,
+                hdr->node_info[u].max_nrec, hdr->node_info[u].split_nrec, hdr->node_info[u].merge_nrec);
     } /* end for */
 
 done:
@@ -198,31 +197,31 @@ H5B2__int_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, co
         HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node")
 
     /* Print opening message */
-    HDfprintf(stream, "%*sv2 B-tree Internal Node...\n", indent, "");
+    fprintf(stream, "%*sv2 B-tree Internal Node...\n", indent, "");
 
     /*
      * Print the values.
      */
-    HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Tree type ID:", hdr->cls->name,
-              (unsigned)hdr->cls->id);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Size of node:", (unsigned)hdr->node_size);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Size of raw (disk) record:", (unsigned)hdr->rrec_size);
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Dirty flag:", internal->cache_info.is_dirty ? "True" : "False");
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of records in node:", internal->nrec);
+    fprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Tree type ID:", hdr->cls->name,
+            (unsigned)hdr->cls->id);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Size of node:", (unsigned)hdr->node_size);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Size of raw (disk) record:", (unsigned)hdr->rrec_size);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Dirty flag:", internal->cache_info.is_dirty ? "True" : "False");
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of records in node:", internal->nrec);
 
     /* Print all node pointers and records */
     for (u = 0; u < internal->nrec; u++) {
         /* Print node pointer */
         HDsnprintf(temp_str, sizeof(temp_str), "Node pointer #%u: (all/node/addr)", u);
-        HDfprintf(stream, "%*s%-*s (%" PRIuHSIZE "/%u/%" PRIuHADDR ")\n", indent + 3, "", MAX(0, fwidth - 3),
-                  temp_str, internal->node_ptrs[u].all_nrec, internal->node_ptrs[u].node_nrec,
-                  internal->node_ptrs[u].addr);
+        fprintf(stream, "%*s%-*s (%" PRIuHSIZE "/%u/%" PRIuHADDR ")\n", indent + 3, "", MAX(0, fwidth - 3),
+                temp_str, internal->node_ptrs[u].all_nrec, internal->node_ptrs[u].node_nrec,
+                internal->node_ptrs[u].addr);
 
         /* Print record */
         HDsnprintf(temp_str, sizeof(temp_str), "Record #%u:", u);
-        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), temp_str);
+        fprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), temp_str);
         assert(H5B2_INT_NREC(internal, hdr, u));
         (void)(type->debug)(stream, indent + 6, MAX(0, fwidth - 6), H5B2_INT_NREC(internal, hdr, u),
                             hdr->cb_ctx);
@@ -230,9 +229,9 @@ H5B2__int_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, co
 
     /* Print final node pointer */
     HDsnprintf(temp_str, sizeof(temp_str), "Node pointer #%u: (all/node/addr)", u);
-    HDfprintf(stream, "%*s%-*s (%" PRIuHSIZE "/%u/%" PRIuHADDR ")\n", indent + 3, "", MAX(0, fwidth - 3),
-              temp_str, internal->node_ptrs[u].all_nrec, internal->node_ptrs[u].node_nrec,
-              internal->node_ptrs[u].addr);
+    fprintf(stream, "%*s%-*s (%" PRIuHSIZE "/%u/%" PRIuHADDR ")\n", indent + 3, "", MAX(0, fwidth - 3),
+            temp_str, internal->node_ptrs[u].all_nrec, internal->node_ptrs[u].node_nrec,
+            internal->node_ptrs[u].addr);
 
 done:
     if (hdr && H5B2__hdr_unprotect(hdr, H5AC__NO_FLAGS_SET) < 0)
@@ -298,25 +297,25 @@ H5B2__leaf_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, c
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node")
 
     /* Print opening message */
-    HDfprintf(stream, "%*sv2 B-tree Leaf Node...\n", indent, "");
+    fprintf(stream, "%*sv2 B-tree Leaf Node...\n", indent, "");
 
     /*
      * Print the values.
      */
-    HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Tree type ID:", hdr->cls->name,
-              (unsigned)hdr->cls->id);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Size of node:", (unsigned)hdr->node_size);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Size of raw (disk) record:", (unsigned)hdr->rrec_size);
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Dirty flag:", leaf->cache_info.is_dirty ? "True" : "False");
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of records in node:", leaf->nrec);
+    fprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Tree type ID:", hdr->cls->name,
+            (unsigned)hdr->cls->id);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Size of node:", (unsigned)hdr->node_size);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Size of raw (disk) record:", (unsigned)hdr->rrec_size);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Dirty flag:", leaf->cache_info.is_dirty ? "True" : "False");
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of records in node:", leaf->nrec);
 
     /* Print all node pointers and records */
     for (u = 0; u < leaf->nrec; u++) {
         /* Print record */
         HDsnprintf(temp_str, sizeof(temp_str), "Record #%u:", u);
-        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), temp_str);
+        fprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), temp_str);
         assert(H5B2_LEAF_NREC(leaf, hdr, u));
         (void)(type->debug)(stream, indent + 6, MAX(0, fwidth - 6), H5B2_LEAF_NREC(leaf, hdr, u),
                             hdr->cb_ctx);
diff --git a/src/H5B2test.c b/src/H5B2test.c
index 9a72d59..751fd6a 100644
--- a/src/H5B2test.c
+++ b/src/H5B2test.c
@@ -306,7 +306,7 @@ H5B2__test_debug(FILE *stream, int indent, int fwidth, const void *record, const
 
     assert(record);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth, "Record:", *(const hsize_t *)record);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth, "Record:", *(const hsize_t *)record);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2__test_debug() */
@@ -436,8 +436,8 @@ H5B2__test2_debug(FILE *stream, int indent, int fwidth, const void *record, cons
 
     assert(record);
 
-    HDfprintf(stream, "%*s%-*s (%" PRIuHSIZE ", %" PRIuHSIZE ")\n", indent, "", fwidth,
-              "Record:", ((const H5B2_test_rec_t *)record)->key, ((const H5B2_test_rec_t *)record)->val);
+    fprintf(stream, "%*s%-*s (%" PRIuHSIZE ", %" PRIuHSIZE ")\n", indent, "", fwidth,
+            "Record:", ((const H5B2_test_rec_t *)record)->key, ((const H5B2_test_rec_t *)record)->val);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5B2__test2_debug() */
diff --git a/src/H5Bdbg.c b/src/H5Bdbg.c
index 46ed7f4..cfba91f 100644
--- a/src/H5Bdbg.c
+++ b/src/H5Bdbg.c
@@ -90,37 +90,37 @@ H5B_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, const H5
     /*
      * Print the values.
      */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Tree type ID:",
-              ((shared->type->id) == H5B_SNODE_ID
-                   ? "H5B_SNODE_ID"
-                   : ((shared->type->id) == H5B_CHUNK_ID ? "H5B_CHUNK_ID" : "Unknown!")));
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Size of node:", shared->sizeof_rnode);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Size of raw (disk) key:", shared->sizeof_rkey);
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Dirty flag:", bt->cache_info.is_dirty ? "True" : "False");
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Level:", bt->level);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Address of left sibling:", bt->left);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Address of right sibling:", bt->right);
-    HDfprintf(stream, "%*s%-*s %u (%u)\n", indent, "", fwidth, "Number of children (max):", bt->nchildren,
-              shared->two_k);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Tree type ID:",
+            ((shared->type->id) == H5B_SNODE_ID
+                 ? "H5B_SNODE_ID"
+                 : ((shared->type->id) == H5B_CHUNK_ID ? "H5B_CHUNK_ID" : "Unknown!")));
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Size of node:", shared->sizeof_rnode);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Size of raw (disk) key:", shared->sizeof_rkey);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Dirty flag:", bt->cache_info.is_dirty ? "True" : "False");
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Level:", bt->level);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Address of left sibling:", bt->left);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Address of right sibling:", bt->right);
+    fprintf(stream, "%*s%-*s %u (%u)\n", indent, "", fwidth, "Number of children (max):", bt->nchildren,
+            shared->two_k);
 
     /*
      * Print the child addresses
      */
     for (u = 0; u < bt->nchildren; u++) {
-        HDfprintf(stream, "%*sChild %d...\n", indent, "", u);
-        HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", MAX(3, fwidth) - 3,
-                  "Address:", bt->child[u]);
+        fprintf(stream, "%*sChild %d...\n", indent, "", u);
+        fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", MAX(3, fwidth) - 3,
+                "Address:", bt->child[u]);
 
         /* If there is a key debugging routine, use it to display the left & right keys */
         if (type->debug_key) {
             /* Decode the 'left' key & print it */
-            HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(3, fwidth) - 3, "Left Key:");
+            fprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(3, fwidth) - 3, "Left Key:");
             assert(H5B_NKEY(bt, shared, u));
             (void)(type->debug_key)(stream, indent + 6, MAX(6, fwidth) - 6, H5B_NKEY(bt, shared, u), udata);
 
             /* Decode the 'right' key & print it */
-            HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(3, fwidth) - 3, "Right Key:");
+            fprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(3, fwidth) - 3, "Right Key:");
             assert(H5B_NKEY(bt, shared, u + 1));
             (void)(type->debug_key)(stream, indent + 6, MAX(6, fwidth) - 6, H5B_NKEY(bt, shared, u + 1),
                                     udata);
@@ -172,7 +172,7 @@ H5B__assert(H5F_t *f, haddr_t addr, const H5B_class_t *type, void *udata)
 
     if (0 == ncalls++) {
         if (H5DEBUG(B))
-            HDfprintf(H5DEBUG(B), "H5B: debugging B-trees (expensive)\n");
+            fprintf(H5DEBUG(B), "H5B: debugging B-trees (expensive)\n");
     } /* end if */
 
     /* Get shared info for B-tree */
diff --git a/src/H5C.c b/src/H5C.c
index 6a71308..95de291 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -538,8 +538,8 @@ H5C_dest(H5F_t *f)
 
 #ifdef H5C_DO_SANITY_CHECKS
     if (cache_ptr->get_entry_ptr_from_addr_counter > 0)
-        HDfprintf(stdout, "*** %" PRId64 " calls to H5C_get_entry_ptr_from_add(). ***\n",
-                  cache_ptr->get_entry_ptr_from_addr_counter);
+        fprintf(stdout, "*** %" PRId64 " calls to H5C_get_entry_ptr_from_add(). ***\n",
+                cache_ptr->get_entry_ptr_from_addr_counter);
 #endif /* H5C_DO_SANITY_CHECKS */
 
     cache_ptr = H5FL_FREE(H5C_t, cache_ptr);
diff --git a/src/H5CS.c b/src/H5CS.c
index 4f625af..43c5bc3 100644
--- a/src/H5CS.c
+++ b/src/H5CS.c
@@ -139,15 +139,15 @@ H5CS_print_stack(const H5CS_t *fstack, FILE *stream)
     if (!stream)
         stream = stderr;
 
-    HDfprintf(stream, "HDF5-DIAG: Function stack from %s ", H5_lib_vers_info_g);
+    fprintf(stream, "HDF5-DIAG: Function stack from %s ", H5_lib_vers_info_g);
     /* try show the process or thread id in multiple processes cases*/
-    HDfprintf(stream, "thread %" PRIu64 ".", H5TS_thread_id());
+    fprintf(stream, "thread %" PRIu64 ".", H5TS_thread_id());
     if (fstack && fstack->nused > 0)
-        HDfprintf(stream, "  Back trace follows.");
+        fprintf(stream, "  Back trace follows.");
     HDfputc('\n', stream);
 
     for (i = fstack->nused - 1; i >= 0; --i)
-        HDfprintf(stream, "%*s#%03d: Routine: %s\n", indent, "", i, fstack->rec[i]);
+        fprintf(stream, "%*s#%03d: Routine: %s\n", indent, "", i, fstack->rec[i]);
 
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED)
 } /* end H5CS_print_stack() */
diff --git a/src/H5Cdbg.c b/src/H5Cdbg.c
index 7fe00cf..62704e6 100644
--- a/src/H5Cdbg.c
+++ b/src/H5Cdbg.c
@@ -111,38 +111,38 @@ H5C_dump_cache(H5C_t *cache_ptr, const char *cache_name)
      * skip list -- scan the skip list generating the desired output.
      */
 
-    HDfprintf(stdout, "\n\nDump of metadata cache \"%s\"\n", cache_name);
+    fprintf(stdout, "\n\nDump of metadata cache \"%s\"\n", cache_name);
 
     /* Print header */
-    HDfprintf(stdout, "Entry ");
-    HDfprintf(stdout, "|       Address      ");
-    HDfprintf(stdout, "|         Tag        ");
-    HDfprintf(stdout, "|  Size ");
-    HDfprintf(stdout, "| Ring ");
-    HDfprintf(stdout, "|              Type              ");
-    HDfprintf(stdout, "| Prot/Pin/Dirty");
-    HDfprintf(stdout, "\n");
-
-    HDfprintf(stdout, "--------------------------------------------------------------------------------------"
-                      "--------------------------\n");
+    fprintf(stdout, "Entry ");
+    fprintf(stdout, "|       Address      ");
+    fprintf(stdout, "|         Tag        ");
+    fprintf(stdout, "|  Size ");
+    fprintf(stdout, "| Ring ");
+    fprintf(stdout, "|              Type              ");
+    fprintf(stdout, "| Prot/Pin/Dirty");
+    fprintf(stdout, "\n");
+
+    fprintf(stdout, "--------------------------------------------------------------------------------------"
+                    "--------------------------\n");
 
     i         = 0;
     entry_ptr = (H5C_cache_entry_t *)H5SL_remove_first(slist_ptr);
     while (entry_ptr != NULL) {
         /* Print entry */
-        HDfprintf(stdout, "%s%5d ", cache_ptr->prefix, i);
-        HDfprintf(stdout, "  0x%16llx ", (long long)(entry_ptr->addr));
+        fprintf(stdout, "%s%5d ", cache_ptr->prefix, i);
+        fprintf(stdout, "  0x%16llx ", (long long)(entry_ptr->addr));
         if (NULL == entry_ptr->tag_info)
-            HDfprintf(stdout, "    %16s ", "N/A");
+            fprintf(stdout, "    %16s ", "N/A");
         else
-            HDfprintf(stdout, "  0x%16llx ", (long long)(entry_ptr->tag_info->tag));
-        HDfprintf(stdout, "  %5lld ", (long long)(entry_ptr->size));
-        HDfprintf(stdout, "    %d  ", (int)(entry_ptr->ring));
-        HDfprintf(stdout, "  %2d %-32s ", (int)(entry_ptr->type->id), (entry_ptr->type->name));
-        HDfprintf(stdout, " %d", (int)(entry_ptr->is_protected));
-        HDfprintf(stdout, " %d", (int)(entry_ptr->is_pinned));
-        HDfprintf(stdout, " %d", (int)(entry_ptr->is_dirty));
-        HDfprintf(stdout, "\n");
+            fprintf(stdout, "  0x%16llx ", (long long)(entry_ptr->tag_info->tag));
+        fprintf(stdout, "  %5lld ", (long long)(entry_ptr->size));
+        fprintf(stdout, "    %d  ", (int)(entry_ptr->ring));
+        fprintf(stdout, "  %2d %-32s ", (int)(entry_ptr->type->id), (entry_ptr->type->name));
+        fprintf(stdout, " %d", (int)(entry_ptr->is_protected));
+        fprintf(stdout, " %d", (int)(entry_ptr->is_pinned));
+        fprintf(stdout, " %d", (int)(entry_ptr->is_dirty));
+        fprintf(stdout, "\n");
 
         /* remove the next (first) item in the skip list */
         entry_ptr = (H5C_cache_entry_t *)H5SL_remove_first(slist_ptr);
@@ -150,7 +150,7 @@ H5C_dump_cache(H5C_t *cache_ptr, const char *cache_name)
         i++;
     } /* end while */
 
-    HDfprintf(stdout, "\n\n");
+    fprintf(stdout, "\n\n");
 
     /* Verify that all the entries were removed from the skip list */
     assert(H5SL_count(slist_ptr) == 0);
@@ -191,49 +191,49 @@ H5C_dump_cache_LRU(H5C_t *cache_ptr, const char *cache_name)
     assert(cache_ptr != NULL);
     assert(cache_name != NULL);
 
-    HDfprintf(stdout, "\n\nDump of metadata cache LRU \"%s\"\n", cache_name);
-    HDfprintf(stdout, "LRU len = %d, LRU size = %d\n", cache_ptr->LRU_list_len,
-              (int)(cache_ptr->LRU_list_size));
-    HDfprintf(stdout, "index_size = %d, max_cache_size = %d, delta = %d\n\n", (int)(cache_ptr->index_size),
-              (int)(cache_ptr->max_cache_size),
-              (int)(cache_ptr->max_cache_size) - (int)(cache_ptr->index_size));
+    fprintf(stdout, "\n\nDump of metadata cache LRU \"%s\"\n", cache_name);
+    fprintf(stdout, "LRU len = %d, LRU size = %d\n", cache_ptr->LRU_list_len,
+            (int)(cache_ptr->LRU_list_size));
+    fprintf(stdout, "index_size = %d, max_cache_size = %d, delta = %d\n\n", (int)(cache_ptr->index_size),
+            (int)(cache_ptr->max_cache_size),
+            (int)(cache_ptr->max_cache_size) - (int)(cache_ptr->index_size));
 
     /* Print header */
-    HDfprintf(stdout, "Entry ");
-    HDfprintf(stdout, "|       Address      ");
-    HDfprintf(stdout, "|         Tag        ");
-    HDfprintf(stdout, "|  Size ");
-    HDfprintf(stdout, "| Ring ");
-    HDfprintf(stdout, "|              Type              ");
-    HDfprintf(stdout, "| Dirty");
-    HDfprintf(stdout, "\n");
-
-    HDfprintf(stdout, "--------------------------------------------------------------------------------------"
-                      "--------------------------\n");
+    fprintf(stdout, "Entry ");
+    fprintf(stdout, "|       Address      ");
+    fprintf(stdout, "|         Tag        ");
+    fprintf(stdout, "|  Size ");
+    fprintf(stdout, "| Ring ");
+    fprintf(stdout, "|              Type              ");
+    fprintf(stdout, "| Dirty");
+    fprintf(stdout, "\n");
+
+    fprintf(stdout, "--------------------------------------------------------------------------------------"
+                    "--------------------------\n");
 
     entry_ptr = cache_ptr->LRU_head_ptr;
     while (entry_ptr != NULL) {
         /* Print entry */
-        HDfprintf(stdout, "%s%5d ", cache_ptr->prefix, i);
-        HDfprintf(stdout, "  0x%16llx ", (long long)(entry_ptr->addr));
+        fprintf(stdout, "%s%5d ", cache_ptr->prefix, i);
+        fprintf(stdout, "  0x%16llx ", (long long)(entry_ptr->addr));
 
         if (NULL == entry_ptr->tag_info)
-            HDfprintf(stdout, "    %16s ", "N/A");
+            fprintf(stdout, "    %16s ", "N/A");
         else
-            HDfprintf(stdout, "  0x%16llx ", (long long)(entry_ptr->tag_info->tag));
+            fprintf(stdout, "  0x%16llx ", (long long)(entry_ptr->tag_info->tag));
 
-        HDfprintf(stdout, "  %5lld ", (long long)(entry_ptr->size));
-        HDfprintf(stdout, "    %d  ", (int)(entry_ptr->ring));
-        HDfprintf(stdout, "  %2d %-32s ", (int)(entry_ptr->type->id), (entry_ptr->type->name));
-        HDfprintf(stdout, " %d", (int)(entry_ptr->is_dirty));
-        HDfprintf(stdout, "\n");
+        fprintf(stdout, "  %5lld ", (long long)(entry_ptr->size));
+        fprintf(stdout, "    %d  ", (int)(entry_ptr->ring));
+        fprintf(stdout, "  %2d %-32s ", (int)(entry_ptr->type->id), (entry_ptr->type->name));
+        fprintf(stdout, " %d", (int)(entry_ptr->is_dirty));
+        fprintf(stdout, "\n");
 
         i++;
         entry_ptr = entry_ptr->next;
     } /* end while */
 
-    HDfprintf(stdout, "--------------------------------------------------------------------------------------"
-                      "--------------------------\n");
+    fprintf(stdout, "--------------------------------------------------------------------------------------"
+                    "--------------------------\n");
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5C_dump_cache_LRU() */
@@ -267,17 +267,17 @@ H5C_dump_cache_skip_list(H5C_t *cache_ptr, char *calling_fcn)
     assert(cache_ptr != NULL);
     assert(calling_fcn != NULL);
 
-    HDfprintf(stdout, "\n\nDumping metadata cache skip list from %s.\n", calling_fcn);
-    HDfprintf(stdout, " slist %s.\n", cache_ptr->slist_enabled ? "enabled" : "disabled");
-    HDfprintf(stdout, "	slist len = %" PRIu32 ".\n", cache_ptr->slist_len);
-    HDfprintf(stdout, "	slist size = %zu.\n", cache_ptr->slist_size);
+    fprintf(stdout, "\n\nDumping metadata cache skip list from %s.\n", calling_fcn);
+    fprintf(stdout, " slist %s.\n", cache_ptr->slist_enabled ? "enabled" : "disabled");
+    fprintf(stdout, "	slist len = %" PRIu32 ".\n", cache_ptr->slist_len);
+    fprintf(stdout, "	slist size = %zu.\n", cache_ptr->slist_size);
 
     if (cache_ptr->slist_len > 0) {
 
         /* If we get this far, all entries in the cache are listed in the
          * skip list -- scan the skip list generating the desired output.
          */
-        HDfprintf(stdout, "Num:    Addr:               Len: Prot/Pind: Dirty: Type:\n");
+        fprintf(stdout, "Num:    Addr:               Len: Prot/Pind: Dirty: Type:\n");
 
         i = 0;
 
@@ -288,11 +288,11 @@ H5C_dump_cache_skip_list(H5C_t *cache_ptr, char *calling_fcn)
             entry_ptr = NULL;
 
         while (entry_ptr != NULL) {
-            HDfprintf(stdout, "%s%d       0x%016llx  %4lld    %d/%d       %d    %s\n", cache_ptr->prefix, i,
-                      (long long)(entry_ptr->addr), (long long)(entry_ptr->size),
-                      (int)(entry_ptr->is_protected), (int)(entry_ptr->is_pinned), (int)(entry_ptr->is_dirty),
-                      entry_ptr->type->name);
-            HDfprintf(stdout, "		node_ptr = %p, item = %p\n", (void *)node_ptr, H5SL_item(node_ptr));
+            fprintf(stdout, "%s%d       0x%016llx  %4lld    %d/%d       %d    %s\n", cache_ptr->prefix, i,
+                    (long long)(entry_ptr->addr), (long long)(entry_ptr->size),
+                    (int)(entry_ptr->is_protected), (int)(entry_ptr->is_pinned), (int)(entry_ptr->is_dirty),
+                    entry_ptr->type->name);
+            fprintf(stdout, "		node_ptr = %p, item = %p\n", (void *)node_ptr, H5SL_item(node_ptr));
 
             /* increment node_ptr before we delete its target */
             node_ptr = H5SL_next(node_ptr);
@@ -305,7 +305,7 @@ H5C_dump_cache_skip_list(H5C_t *cache_ptr, char *calling_fcn)
         } /* end while */
     }     /* end if */
 
-    HDfprintf(stdout, "\n\n");
+    fprintf(stdout, "\n\n");
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C_dump_cache_skip_list() */
@@ -465,157 +465,154 @@ H5C_stats(H5C_t *cache_ptr, const char *cache_name,
         average_failed_search_depth =
             ((double)(cache_ptr->total_failed_ht_search_depth)) / ((double)(cache_ptr->failed_ht_searches));
 
-    HDfprintf(stdout, "\n%sH5C: cache statistics for %s\n", cache_ptr->prefix, cache_name);
+    fprintf(stdout, "\n%sH5C: cache statistics for %s\n", cache_ptr->prefix, cache_name);
 
-    HDfprintf(stdout, "\n");
+    fprintf(stdout, "\n");
 
-    HDfprintf(stdout, "%s  hash table insertion / deletions   = %ld / %ld\n", cache_ptr->prefix,
-              (long)(cache_ptr->total_ht_insertions), (long)(cache_ptr->total_ht_deletions));
+    fprintf(stdout, "%s  hash table insertion / deletions   = %ld / %ld\n", cache_ptr->prefix,
+            (long)(cache_ptr->total_ht_insertions), (long)(cache_ptr->total_ht_deletions));
 
-    HDfprintf(stdout, "%s  HT successful / failed searches    = %ld / %ld\n", cache_ptr->prefix,
-              (long)(cache_ptr->successful_ht_searches), (long)(cache_ptr->failed_ht_searches));
+    fprintf(stdout, "%s  HT successful / failed searches    = %ld / %ld\n", cache_ptr->prefix,
+            (long)(cache_ptr->successful_ht_searches), (long)(cache_ptr->failed_ht_searches));
 
-    HDfprintf(stdout, "%s  Av. HT suc / failed search depth   = %f / %f\n", cache_ptr->prefix,
-              average_successful_search_depth, average_failed_search_depth);
+    fprintf(stdout, "%s  Av. HT suc / failed search depth   = %f / %f\n", cache_ptr->prefix,
+            average_successful_search_depth, average_failed_search_depth);
 
-    HDfprintf(stdout, "%s  current (max) index size / length  = %ld (%ld) / %lu (%lu)\n", cache_ptr->prefix,
-              (long)(cache_ptr->index_size), (long)(cache_ptr->max_index_size),
-              (unsigned long)(cache_ptr->index_len), (unsigned long)(cache_ptr->max_index_len));
+    fprintf(stdout, "%s  current (max) index size / length  = %ld (%ld) / %lu (%lu)\n", cache_ptr->prefix,
+            (long)(cache_ptr->index_size), (long)(cache_ptr->max_index_size),
+            (unsigned long)(cache_ptr->index_len), (unsigned long)(cache_ptr->max_index_len));
 
-    HDfprintf(stdout, "%s  current (max) clean/dirty idx size = %ld (%ld) / %ld (%ld)\n", cache_ptr->prefix,
-              (long)(cache_ptr->clean_index_size), (long)(cache_ptr->max_clean_index_size),
-              (long)(cache_ptr->dirty_index_size), (long)(cache_ptr->max_dirty_index_size));
+    fprintf(stdout, "%s  current (max) clean/dirty idx size = %ld (%ld) / %ld (%ld)\n", cache_ptr->prefix,
+            (long)(cache_ptr->clean_index_size), (long)(cache_ptr->max_clean_index_size),
+            (long)(cache_ptr->dirty_index_size), (long)(cache_ptr->max_dirty_index_size));
 
-    HDfprintf(stdout, "%s  current (max) slist size / length  = %ld (%ld) / %lu (%lu)\n", cache_ptr->prefix,
-              (long)(cache_ptr->slist_size), (long)(cache_ptr->max_slist_size),
-              (unsigned long)(cache_ptr->slist_len), (unsigned long)(cache_ptr->max_slist_len));
+    fprintf(stdout, "%s  current (max) slist size / length  = %ld (%ld) / %lu (%lu)\n", cache_ptr->prefix,
+            (long)(cache_ptr->slist_size), (long)(cache_ptr->max_slist_size),
+            (unsigned long)(cache_ptr->slist_len), (unsigned long)(cache_ptr->max_slist_len));
 
-    HDfprintf(stdout, "%s  current (max) PL size / length     = %ld (%ld) / %lu (%lu)\n", cache_ptr->prefix,
-              (long)(cache_ptr->pl_size), (long)(cache_ptr->max_pl_size), (unsigned long)(cache_ptr->pl_len),
-              (unsigned long)(cache_ptr->max_pl_len));
+    fprintf(stdout, "%s  current (max) PL size / length     = %ld (%ld) / %lu (%lu)\n", cache_ptr->prefix,
+            (long)(cache_ptr->pl_size), (long)(cache_ptr->max_pl_size), (unsigned long)(cache_ptr->pl_len),
+            (unsigned long)(cache_ptr->max_pl_len));
 
-    HDfprintf(stdout, "%s  current (max) PEL size / length    = %ld (%ld) / %lu (%lu)\n", cache_ptr->prefix,
-              (long)(cache_ptr->pel_size), (long)(cache_ptr->max_pel_size),
-              (unsigned long)(cache_ptr->pel_len), (unsigned long)(cache_ptr->max_pel_len));
+    fprintf(stdout, "%s  current (max) PEL size / length    = %ld (%ld) / %lu (%lu)\n", cache_ptr->prefix,
+            (long)(cache_ptr->pel_size), (long)(cache_ptr->max_pel_size), (unsigned long)(cache_ptr->pel_len),
+            (unsigned long)(cache_ptr->max_pel_len));
 
-    HDfprintf(stdout, "%s  current LRU list size / length     = %ld / %lu\n", cache_ptr->prefix,
-              (long)(cache_ptr->LRU_list_size), (unsigned long)(cache_ptr->LRU_list_len));
+    fprintf(stdout, "%s  current LRU list size / length     = %ld / %lu\n", cache_ptr->prefix,
+            (long)(cache_ptr->LRU_list_size), (unsigned long)(cache_ptr->LRU_list_len));
 
 #if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
-    HDfprintf(stdout, "%s  current clean LRU size / length    = %ld / %lu\n", cache_ptr->prefix,
-              (long)(cache_ptr->cLRU_list_size), (unsigned long)(cache_ptr->cLRU_list_len));
+    fprintf(stdout, "%s  current clean LRU size / length    = %ld / %lu\n", cache_ptr->prefix,
+            (long)(cache_ptr->cLRU_list_size), (unsigned long)(cache_ptr->cLRU_list_len));
 
-    HDfprintf(stdout, "%s  current dirty LRU size / length    = %ld / %lu\n", cache_ptr->prefix,
-              (long)(cache_ptr->dLRU_list_size), (unsigned long)(cache_ptr->dLRU_list_len));
+    fprintf(stdout, "%s  current dirty LRU size / length    = %ld / %lu\n", cache_ptr->prefix,
+            (long)(cache_ptr->dLRU_list_size), (unsigned long)(cache_ptr->dLRU_list_len));
 #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-    HDfprintf(stdout, "%s  Total hits / misses / hit_rate     = %ld / %ld / %f\n", cache_ptr->prefix,
-              (long)total_hits, (long)total_misses, hit_rate);
+    fprintf(stdout, "%s  Total hits / misses / hit_rate     = %ld / %ld / %f\n", cache_ptr->prefix,
+            (long)total_hits, (long)total_misses, hit_rate);
 
-    HDfprintf(stdout, "%s  Total write / read (max) protects  = %ld / %ld (%ld)\n", cache_ptr->prefix,
-              (long)total_write_protects, (long)total_read_protects, (long)max_read_protects);
+    fprintf(stdout, "%s  Total write / read (max) protects  = %ld / %ld (%ld)\n", cache_ptr->prefix,
+            (long)total_write_protects, (long)total_read_protects, (long)max_read_protects);
 
-    HDfprintf(stdout, "%s  Total clears / flushes             = %ld / %ld\n", cache_ptr->prefix,
-              (long)total_clears, (long)total_flushes);
+    fprintf(stdout, "%s  Total clears / flushes             = %ld / %ld\n", cache_ptr->prefix,
+            (long)total_clears, (long)total_flushes);
 
-    HDfprintf(stdout, "%s  Total evictions / take ownerships  = %ld / %ld\n", cache_ptr->prefix,
-              (long)total_evictions, (long)total_take_ownerships);
+    fprintf(stdout, "%s  Total evictions / take ownerships  = %ld / %ld\n", cache_ptr->prefix,
+            (long)total_evictions, (long)total_take_ownerships);
 
-    HDfprintf(stdout, "%s  Total insertions(pinned) / moves   = %ld(%ld) / %ld\n", cache_ptr->prefix,
-              (long)total_insertions, (long)total_pinned_insertions, (long)total_moves);
+    fprintf(stdout, "%s  Total insertions(pinned) / moves   = %ld(%ld) / %ld\n", cache_ptr->prefix,
+            (long)total_insertions, (long)total_pinned_insertions, (long)total_moves);
 
-    HDfprintf(stdout, "%s  Total entry / cache flush moves    = %ld / %ld\n", cache_ptr->prefix,
-              (long)total_entry_flush_moves, (long)total_cache_flush_moves);
+    fprintf(stdout, "%s  Total entry / cache flush moves    = %ld / %ld\n", cache_ptr->prefix,
+            (long)total_entry_flush_moves, (long)total_cache_flush_moves);
 
-    HDfprintf(stdout, "%s  Total entry size incrs / decrs     = %ld / %ld\n", cache_ptr->prefix,
-              (long)total_size_increases, (long)total_size_decreases);
+    fprintf(stdout, "%s  Total entry size incrs / decrs     = %ld / %ld\n", cache_ptr->prefix,
+            (long)total_size_increases, (long)total_size_decreases);
 
-    HDfprintf(stdout, "%s  Ttl entry/cache flush size changes = %ld / %ld\n", cache_ptr->prefix,
-              (long)total_entry_flush_size_changes, (long)total_cache_flush_size_changes);
+    fprintf(stdout, "%s  Ttl entry/cache flush size changes = %ld / %ld\n", cache_ptr->prefix,
+            (long)total_entry_flush_size_changes, (long)total_cache_flush_size_changes);
 
-    HDfprintf(stdout, "%s  Total entry pins (dirty) / unpins  = %ld (%ld) / %ld\n", cache_ptr->prefix,
-              (long)total_pins, (long)total_dirty_pins, (long)total_unpins);
+    fprintf(stdout, "%s  Total entry pins (dirty) / unpins  = %ld (%ld) / %ld\n", cache_ptr->prefix,
+            (long)total_pins, (long)total_dirty_pins, (long)total_unpins);
 
-    HDfprintf(stdout, "%s  Total pinned flushes / clears      = %ld / %ld\n", cache_ptr->prefix,
-              (long)total_pinned_flushes, (long)total_pinned_clears);
+    fprintf(stdout, "%s  Total pinned flushes / clears      = %ld / %ld\n", cache_ptr->prefix,
+            (long)total_pinned_flushes, (long)total_pinned_clears);
 
-    HDfprintf(stdout, "%s  MSIC: (make space in cache) calls  = %lld\n", cache_ptr->prefix,
-              (long long)(cache_ptr->calls_to_msic));
+    fprintf(stdout, "%s  MSIC: (make space in cache) calls  = %lld\n", cache_ptr->prefix,
+            (long long)(cache_ptr->calls_to_msic));
 
     if (cache_ptr->calls_to_msic > 0)
         average_entries_skipped_per_calls_to_msic =
             (((double)(cache_ptr->total_entries_skipped_in_msic)) / ((double)(cache_ptr->calls_to_msic)));
 
-    HDfprintf(stdout, "%s  MSIC: Average/max entries skipped  = %lf / %ld\n", cache_ptr->prefix,
-              (double)average_entries_skipped_per_calls_to_msic,
-              (long)(cache_ptr->max_entries_skipped_in_msic));
+    fprintf(stdout, "%s  MSIC: Average/max entries skipped  = %lf / %ld\n", cache_ptr->prefix,
+            (double)average_entries_skipped_per_calls_to_msic,
+            (long)(cache_ptr->max_entries_skipped_in_msic));
 
     if (cache_ptr->calls_to_msic > 0)
         average_dirty_pf_entries_skipped_per_call_to_msic =
             (((double)(cache_ptr->total_dirty_pf_entries_skipped_in_msic)) /
              ((double)(cache_ptr->calls_to_msic)));
 
-    HDfprintf(stdout, "%s  MSIC: Average/max dirty pf entries skipped  = %lf / %ld\n", cache_ptr->prefix,
-              average_dirty_pf_entries_skipped_per_call_to_msic,
-              (long)(cache_ptr->max_dirty_pf_entries_skipped_in_msic));
+    fprintf(stdout, "%s  MSIC: Average/max dirty pf entries skipped  = %lf / %ld\n", cache_ptr->prefix,
+            average_dirty_pf_entries_skipped_per_call_to_msic,
+            (long)(cache_ptr->max_dirty_pf_entries_skipped_in_msic));
 
     if (cache_ptr->calls_to_msic > 0)
         average_entries_scanned_per_calls_to_msic =
             (((double)(cache_ptr->total_entries_scanned_in_msic)) / ((double)(cache_ptr->calls_to_msic)));
 
-    HDfprintf(stdout, "%s  MSIC: Average/max entries scanned  = %lf / %ld\n", cache_ptr->prefix,
-              (double)average_entries_scanned_per_calls_to_msic,
-              (long)(cache_ptr->max_entries_scanned_in_msic));
+    fprintf(stdout, "%s  MSIC: Average/max entries scanned  = %lf / %ld\n", cache_ptr->prefix,
+            (double)average_entries_scanned_per_calls_to_msic,
+            (long)(cache_ptr->max_entries_scanned_in_msic));
 
-    HDfprintf(stdout, "%s  MSIC: Scanned to make space(evict) = %lld\n", cache_ptr->prefix,
-              (long long)(cache_ptr->entries_scanned_to_make_space));
+    fprintf(stdout, "%s  MSIC: Scanned to make space(evict) = %lld\n", cache_ptr->prefix,
+            (long long)(cache_ptr->entries_scanned_to_make_space));
 
-    HDfprintf(
-        stdout, "%s  MSIC: Scanned to satisfy min_clean = %lld\n", cache_ptr->prefix,
-        (long long)(cache_ptr->total_entries_scanned_in_msic - cache_ptr->entries_scanned_to_make_space));
+    fprintf(stdout, "%s  MSIC: Scanned to satisfy min_clean = %lld\n", cache_ptr->prefix,
+            (long long)(cache_ptr->total_entries_scanned_in_msic - cache_ptr->entries_scanned_to_make_space));
 
-    HDfprintf(stdout, "%s  slist/LRU/index scan restarts   = %lld / %lld / %lld.\n", cache_ptr->prefix,
-              (long long)(cache_ptr->slist_scan_restarts), (long long)(cache_ptr->LRU_scan_restarts),
-              (long long)(cache_ptr->index_scan_restarts));
+    fprintf(stdout, "%s  slist/LRU/index scan restarts   = %lld / %lld / %lld.\n", cache_ptr->prefix,
+            (long long)(cache_ptr->slist_scan_restarts), (long long)(cache_ptr->LRU_scan_restarts),
+            (long long)(cache_ptr->index_scan_restarts));
 
-    HDfprintf(stdout, "%s  cache image creations/reads/loads/size = %d / %d /%d / %" PRIuHSIZE "\n",
-              cache_ptr->prefix, cache_ptr->images_created, cache_ptr->images_read, cache_ptr->images_loaded,
-              cache_ptr->last_image_size);
+    fprintf(stdout, "%s  cache image creations/reads/loads/size = %d / %d /%d / %" PRIuHSIZE "\n",
+            cache_ptr->prefix, cache_ptr->images_created, cache_ptr->images_read, cache_ptr->images_loaded,
+            cache_ptr->last_image_size);
 
-    HDfprintf(stdout, "%s  prefetches / dirty prefetches      = %lld / %lld\n", cache_ptr->prefix,
-              (long long)(cache_ptr->prefetches), (long long)(cache_ptr->dirty_prefetches));
+    fprintf(stdout, "%s  prefetches / dirty prefetches      = %lld / %lld\n", cache_ptr->prefix,
+            (long long)(cache_ptr->prefetches), (long long)(cache_ptr->dirty_prefetches));
 
-    HDfprintf(stdout, "%s  prefetch hits/flushes/evictions    = %lld / %lld / %lld\n", cache_ptr->prefix,
-              (long long)(cache_ptr->prefetch_hits),
-              (long long)(cache_ptr->flushes[H5AC_PREFETCHED_ENTRY_ID]),
-              (long long)(cache_ptr->evictions[H5AC_PREFETCHED_ENTRY_ID]));
+    fprintf(stdout, "%s  prefetch hits/flushes/evictions    = %lld / %lld / %lld\n", cache_ptr->prefix,
+            (long long)(cache_ptr->prefetch_hits), (long long)(cache_ptr->flushes[H5AC_PREFETCHED_ENTRY_ID]),
+            (long long)(cache_ptr->evictions[H5AC_PREFETCHED_ENTRY_ID]));
 
     if (cache_ptr->prefetches > 0)
         prefetch_use_rate = 100.0 * ((double)(cache_ptr->prefetch_hits)) / ((double)(cache_ptr->prefetches));
     else
         prefetch_use_rate = 0.0;
 
-    HDfprintf(stdout, "%s  prefetched entry use rate          = %lf\n", cache_ptr->prefix, prefetch_use_rate);
+    fprintf(stdout, "%s  prefetched entry use rate          = %lf\n", cache_ptr->prefix, prefetch_use_rate);
 
 #if H5C_COLLECT_CACHE_ENTRY_STATS
 
-    HDfprintf(stdout, "%s  aggregate max / min accesses       = %d / %d\n", cache_ptr->prefix,
-              (int)aggregate_max_accesses, (int)aggregate_min_accesses);
+    fprintf(stdout, "%s  aggregate max / min accesses       = %d / %d\n", cache_ptr->prefix,
+            (int)aggregate_max_accesses, (int)aggregate_min_accesses);
 
-    HDfprintf(stdout, "%s  aggregate max_clears / max_flushes = %d / %d\n", cache_ptr->prefix,
-              (int)aggregate_max_clears, (int)aggregate_max_flushes);
+    fprintf(stdout, "%s  aggregate max_clears / max_flushes = %d / %d\n", cache_ptr->prefix,
+            (int)aggregate_max_clears, (int)aggregate_max_flushes);
 
-    HDfprintf(stdout, "%s  aggregate max_size / max_pins      = %d / %d\n", cache_ptr->prefix,
-              (int)aggregate_max_size, (int)aggregate_max_pins);
+    fprintf(stdout, "%s  aggregate max_size / max_pins      = %d / %d\n", cache_ptr->prefix,
+            (int)aggregate_max_size, (int)aggregate_max_pins);
 
 #endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
 
     if (display_detailed_stats) {
         for (i = 0; i <= cache_ptr->max_type_id; i++) {
-            HDfprintf(stdout, "\n");
+            fprintf(stdout, "\n");
 
-            HDfprintf(stdout, "%s  Stats on %s:\n", cache_ptr->prefix,
-                      ((cache_ptr->class_table_ptr))[i]->name);
+            fprintf(stdout, "%s  Stats on %s:\n", cache_ptr->prefix, ((cache_ptr->class_table_ptr))[i]->name);
 
             if ((cache_ptr->hits[i] > 0) || (cache_ptr->misses[i] > 0))
                 hit_rate = 100.0 * ((double)(cache_ptr->hits[i])) /
@@ -623,56 +620,56 @@ H5C_stats(H5C_t *cache_ptr, const char *cache_name,
             else
                 hit_rate = 0.0;
 
-            HDfprintf(stdout, "%s    hits / misses / hit_rate       = %ld / %ld / %f\n", cache_ptr->prefix,
-                      (long)(cache_ptr->hits[i]), (long)(cache_ptr->misses[i]), hit_rate);
+            fprintf(stdout, "%s    hits / misses / hit_rate       = %ld / %ld / %f\n", cache_ptr->prefix,
+                    (long)(cache_ptr->hits[i]), (long)(cache_ptr->misses[i]), hit_rate);
 
-            HDfprintf(stdout, "%s    write / read (max) protects    = %ld / %ld (%d)\n", cache_ptr->prefix,
-                      (long)(cache_ptr->write_protects[i]), (long)(cache_ptr->read_protects[i]),
-                      (int)(cache_ptr->max_read_protects[i]));
+            fprintf(stdout, "%s    write / read (max) protects    = %ld / %ld (%d)\n", cache_ptr->prefix,
+                    (long)(cache_ptr->write_protects[i]), (long)(cache_ptr->read_protects[i]),
+                    (int)(cache_ptr->max_read_protects[i]));
 
-            HDfprintf(stdout, "%s    clears / flushes               = %ld / %ld\n", cache_ptr->prefix,
-                      (long)(cache_ptr->clears[i]), (long)(cache_ptr->flushes[i]));
+            fprintf(stdout, "%s    clears / flushes               = %ld / %ld\n", cache_ptr->prefix,
+                    (long)(cache_ptr->clears[i]), (long)(cache_ptr->flushes[i]));
 
-            HDfprintf(stdout, "%s    evictions / take ownerships    = %ld / %ld\n", cache_ptr->prefix,
-                      (long)(cache_ptr->evictions[i]), (long)(cache_ptr->take_ownerships[i]));
+            fprintf(stdout, "%s    evictions / take ownerships    = %ld / %ld\n", cache_ptr->prefix,
+                    (long)(cache_ptr->evictions[i]), (long)(cache_ptr->take_ownerships[i]));
 
-            HDfprintf(stdout, "%s    insertions(pinned) / moves     = %ld(%ld) / %ld\n", cache_ptr->prefix,
-                      (long)(cache_ptr->insertions[i]), (long)(cache_ptr->pinned_insertions[i]),
-                      (long)(cache_ptr->moves[i]));
+            fprintf(stdout, "%s    insertions(pinned) / moves     = %ld(%ld) / %ld\n", cache_ptr->prefix,
+                    (long)(cache_ptr->insertions[i]), (long)(cache_ptr->pinned_insertions[i]),
+                    (long)(cache_ptr->moves[i]));
 
-            HDfprintf(stdout, "%s    entry / cache flush moves      = %ld / %ld\n", cache_ptr->prefix,
-                      (long)(cache_ptr->entry_flush_moves[i]), (long)(cache_ptr->cache_flush_moves[i]));
+            fprintf(stdout, "%s    entry / cache flush moves      = %ld / %ld\n", cache_ptr->prefix,
+                    (long)(cache_ptr->entry_flush_moves[i]), (long)(cache_ptr->cache_flush_moves[i]));
 
-            HDfprintf(stdout, "%s    size increases / decreases     = %ld / %ld\n", cache_ptr->prefix,
-                      (long)(cache_ptr->size_increases[i]), (long)(cache_ptr->size_decreases[i]));
+            fprintf(stdout, "%s    size increases / decreases     = %ld / %ld\n", cache_ptr->prefix,
+                    (long)(cache_ptr->size_increases[i]), (long)(cache_ptr->size_decreases[i]));
 
-            HDfprintf(stdout, "%s    entry/cache flush size changes = %ld / %ld\n", cache_ptr->prefix,
-                      (long)(cache_ptr->entry_flush_size_changes[i]),
-                      (long)(cache_ptr->cache_flush_size_changes[i]));
+            fprintf(stdout, "%s    entry/cache flush size changes = %ld / %ld\n", cache_ptr->prefix,
+                    (long)(cache_ptr->entry_flush_size_changes[i]),
+                    (long)(cache_ptr->cache_flush_size_changes[i]));
 
-            HDfprintf(stdout, "%s    entry pins / unpins            = %ld / %ld\n", cache_ptr->prefix,
-                      (long)(cache_ptr->pins[i]), (long)(cache_ptr->unpins[i]));
+            fprintf(stdout, "%s    entry pins / unpins            = %ld / %ld\n", cache_ptr->prefix,
+                    (long)(cache_ptr->pins[i]), (long)(cache_ptr->unpins[i]));
 
-            HDfprintf(stdout, "%s    entry dirty pins/pin'd flushes = %ld / %ld\n", cache_ptr->prefix,
-                      (long)(cache_ptr->dirty_pins[i]), (long)(cache_ptr->pinned_flushes[i]));
+            fprintf(stdout, "%s    entry dirty pins/pin'd flushes = %ld / %ld\n", cache_ptr->prefix,
+                    (long)(cache_ptr->dirty_pins[i]), (long)(cache_ptr->pinned_flushes[i]));
 
 #if H5C_COLLECT_CACHE_ENTRY_STATS
 
-            HDfprintf(stdout, "%s    entry max / min accesses       = %d / %d\n", cache_ptr->prefix,
-                      cache_ptr->max_accesses[i], cache_ptr->min_accesses[i]);
+            fprintf(stdout, "%s    entry max / min accesses       = %d / %d\n", cache_ptr->prefix,
+                    cache_ptr->max_accesses[i], cache_ptr->min_accesses[i]);
 
-            HDfprintf(stdout, "%s    entry max_clears / max_flushes = %d / %d\n", cache_ptr->prefix,
-                      cache_ptr->max_clears[i], cache_ptr->max_flushes[i]);
+            fprintf(stdout, "%s    entry max_clears / max_flushes = %d / %d\n", cache_ptr->prefix,
+                    cache_ptr->max_clears[i], cache_ptr->max_flushes[i]);
 
-            HDfprintf(stdout, "%s    entry max_size / max_pins      = %d / %d\n", cache_ptr->prefix,
-                      (int)(cache_ptr->max_size[i]), (int)(cache_ptr->max_pins[i]));
+            fprintf(stdout, "%s    entry max_size / max_pins      = %d / %d\n", cache_ptr->prefix,
+                    (int)(cache_ptr->max_size[i]), (int)(cache_ptr->max_pins[i]));
 
 #endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
 
         } /* end for */
     }     /* end if */
 
-    HDfprintf(stdout, "\n");
+    fprintf(stdout, "\n");
 
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -1178,7 +1175,7 @@ done:
  *
  * Purpose:     Print results of a automatic cache resize.
  *
- *        This function should only be used where HDprintf() behaves
+ *        This function should only be used where printf() behaves
  *        well -- i.e. not on Windows.
  *
  * Return:      void
@@ -1203,27 +1200,27 @@ H5C_def_auto_resize_rpt_fcn(H5C_t *cache_ptr,
 
     switch (status) {
         case in_spec:
-            HDfprintf(stdout, "%sAuto cache resize -- no change. (hit rate = %lf)\n", cache_ptr->prefix,
-                      hit_rate);
+            fprintf(stdout, "%sAuto cache resize -- no change. (hit rate = %lf)\n", cache_ptr->prefix,
+                    hit_rate);
             break;
 
         case increase:
             assert(hit_rate < cache_ptr->resize_ctl.lower_hr_threshold);
             assert(old_max_cache_size < new_max_cache_size);
 
-            HDfprintf(stdout, "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
-                      cache_ptr->prefix, hit_rate, cache_ptr->resize_ctl.lower_hr_threshold);
-            HDfprintf(stdout, "%scache size increased from (%zu/%zu) to (%zu/%zu).\n", cache_ptr->prefix,
-                      old_max_cache_size, old_min_clean_size, new_max_cache_size, new_min_clean_size);
+            fprintf(stdout, "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
+                    cache_ptr->prefix, hit_rate, cache_ptr->resize_ctl.lower_hr_threshold);
+            fprintf(stdout, "%scache size increased from (%zu/%zu) to (%zu/%zu).\n", cache_ptr->prefix,
+                    old_max_cache_size, old_min_clean_size, new_max_cache_size, new_min_clean_size);
             break;
 
         case flash_increase:
             assert(old_max_cache_size < new_max_cache_size);
 
-            HDfprintf(stdout, "%sflash cache resize(%d) -- size threshold = %zu.\n", cache_ptr->prefix,
-                      (int)(cache_ptr->resize_ctl.flash_incr_mode), cache_ptr->flash_size_increase_threshold);
-            HDfprintf(stdout, "%s cache size increased from (%zu/%zu) to (%zu/%zu).\n", cache_ptr->prefix,
-                      old_max_cache_size, old_min_clean_size, new_max_cache_size, new_min_clean_size);
+            fprintf(stdout, "%sflash cache resize(%d) -- size threshold = %zu.\n", cache_ptr->prefix,
+                    (int)(cache_ptr->resize_ctl.flash_incr_mode), cache_ptr->flash_size_increase_threshold);
+            fprintf(stdout, "%s cache size increased from (%zu/%zu) to (%zu/%zu).\n", cache_ptr->prefix,
+                    old_max_cache_size, old_min_clean_size, new_max_cache_size, new_min_clean_size);
             break;
 
         case decrease:
@@ -1231,73 +1228,73 @@ H5C_def_auto_resize_rpt_fcn(H5C_t *cache_ptr,
 
             switch (cache_ptr->resize_ctl.decr_mode) {
                 case H5C_decr__off:
-                    HDfprintf(stdout, "%sAuto cache resize -- decrease off.  HR = %lf\n", cache_ptr->prefix,
-                              hit_rate);
+                    fprintf(stdout, "%sAuto cache resize -- decrease off.  HR = %lf\n", cache_ptr->prefix,
+                            hit_rate);
                     break;
 
                 case H5C_decr__threshold:
                     assert(hit_rate > cache_ptr->resize_ctl.upper_hr_threshold);
 
-                    HDfprintf(stdout, "%sAuto cache resize -- decrease by threshold.  HR = %lf > %6.5lf\n",
-                              cache_ptr->prefix, hit_rate, cache_ptr->resize_ctl.upper_hr_threshold);
-                    HDfprintf(stdout, "%sout of bounds high (%6.5lf).\n", cache_ptr->prefix,
-                              cache_ptr->resize_ctl.upper_hr_threshold);
+                    fprintf(stdout, "%sAuto cache resize -- decrease by threshold.  HR = %lf > %6.5lf\n",
+                            cache_ptr->prefix, hit_rate, cache_ptr->resize_ctl.upper_hr_threshold);
+                    fprintf(stdout, "%sout of bounds high (%6.5lf).\n", cache_ptr->prefix,
+                            cache_ptr->resize_ctl.upper_hr_threshold);
                     break;
 
                 case H5C_decr__age_out:
-                    HDfprintf(stdout, "%sAuto cache resize -- decrease by ageout.  HR = %lf\n",
-                              cache_ptr->prefix, hit_rate);
+                    fprintf(stdout, "%sAuto cache resize -- decrease by ageout.  HR = %lf\n",
+                            cache_ptr->prefix, hit_rate);
                     break;
 
                 case H5C_decr__age_out_with_threshold:
                     assert(hit_rate > cache_ptr->resize_ctl.upper_hr_threshold);
 
-                    HDfprintf(stdout,
-                              "%sAuto cache resize -- decrease by ageout with threshold. HR = %lf > %6.5lf\n",
-                              cache_ptr->prefix, hit_rate, cache_ptr->resize_ctl.upper_hr_threshold);
+                    fprintf(stdout,
+                            "%sAuto cache resize -- decrease by ageout with threshold. HR = %lf > %6.5lf\n",
+                            cache_ptr->prefix, hit_rate, cache_ptr->resize_ctl.upper_hr_threshold);
                     break;
 
                 default:
-                    HDfprintf(stdout, "%sAuto cache resize -- decrease by unknown mode.  HR = %lf\n",
-                              cache_ptr->prefix, hit_rate);
+                    fprintf(stdout, "%sAuto cache resize -- decrease by unknown mode.  HR = %lf\n",
+                            cache_ptr->prefix, hit_rate);
             }
 
-            HDfprintf(stdout, "%s    cache size decreased from (%zu/%zu) to (%zu/%zu).\n", cache_ptr->prefix,
-                      old_max_cache_size, old_min_clean_size, new_max_cache_size, new_min_clean_size);
+            fprintf(stdout, "%s    cache size decreased from (%zu/%zu) to (%zu/%zu).\n", cache_ptr->prefix,
+                    old_max_cache_size, old_min_clean_size, new_max_cache_size, new_min_clean_size);
             break;
 
         case at_max_size:
-            HDfprintf(stdout, "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
-                      cache_ptr->prefix, hit_rate, cache_ptr->resize_ctl.lower_hr_threshold);
-            HDfprintf(stdout, "%s    cache already at maximum size so no change.\n", cache_ptr->prefix);
+            fprintf(stdout, "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
+                    cache_ptr->prefix, hit_rate, cache_ptr->resize_ctl.lower_hr_threshold);
+            fprintf(stdout, "%s    cache already at maximum size so no change.\n", cache_ptr->prefix);
             break;
 
         case at_min_size:
-            HDfprintf(stdout, "%sAuto cache resize -- hit rate (%lf) -- can't decrease.\n", cache_ptr->prefix,
-                      hit_rate);
-            HDfprintf(stdout, "%s    cache already at minimum size.\n", cache_ptr->prefix);
+            fprintf(stdout, "%sAuto cache resize -- hit rate (%lf) -- can't decrease.\n", cache_ptr->prefix,
+                    hit_rate);
+            fprintf(stdout, "%s    cache already at minimum size.\n", cache_ptr->prefix);
             break;
 
         case increase_disabled:
-            HDfprintf(stdout, "%sAuto cache resize -- increase disabled -- HR = %lf.", cache_ptr->prefix,
-                      hit_rate);
+            fprintf(stdout, "%sAuto cache resize -- increase disabled -- HR = %lf.", cache_ptr->prefix,
+                    hit_rate);
             break;
 
         case decrease_disabled:
-            HDfprintf(stdout, "%sAuto cache resize -- decrease disabled -- HR = %lf.\n", cache_ptr->prefix,
-                      hit_rate);
+            fprintf(stdout, "%sAuto cache resize -- decrease disabled -- HR = %lf.\n", cache_ptr->prefix,
+                    hit_rate);
             break;
 
         case not_full:
             assert(hit_rate < cache_ptr->resize_ctl.lower_hr_threshold);
 
-            HDfprintf(stdout, "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
-                      cache_ptr->prefix, hit_rate, cache_ptr->resize_ctl.lower_hr_threshold);
-            HDfprintf(stdout, "%s    cache not full so no increase in size.\n", cache_ptr->prefix);
+            fprintf(stdout, "%sAuto cache resize -- hit rate (%lf) out of bounds low (%6.5lf).\n",
+                    cache_ptr->prefix, hit_rate, cache_ptr->resize_ctl.lower_hr_threshold);
+            fprintf(stdout, "%s    cache not full so no increase in size.\n", cache_ptr->prefix);
             break;
 
         default:
-            HDfprintf(stdout, "%sAuto cache resize -- unknown status code.\n", cache_ptr->prefix);
+            fprintf(stdout, "%sAuto cache resize -- unknown status code.\n", cache_ptr->prefix);
             break;
     }
 } /* H5C_def_auto_resize_rpt_fcn() */
@@ -1626,16 +1623,15 @@ H5C__image_stats(H5C_t *cache_ptr, hbool_t H5_ATTR_UNUSED print_header)
         prefetch_use_rate = 0.0;
 
     if (print_header) {
-        HDfprintf(stdout, "\nhit     prefetches      prefetch              image  pf hit\n");
-        HDfprintf(stdout, "rate:   total:  dirty:  hits:  flshs:  evct:  size:  rate:\n");
+        fprintf(stdout, "\nhit     prefetches      prefetch              image  pf hit\n");
+        fprintf(stdout, "rate:   total:  dirty:  hits:  flshs:  evct:  size:  rate:\n");
     } /* end if */
 
-    HDfprintf(stdout, "%3.1lf    %5lld   %5lld   %5lld  %5lld   %5lld   %5lld   %3.1lf\n", hit_rate,
-              (long long)(cache_ptr->prefetches), (long long)(cache_ptr->dirty_prefetches),
-              (long long)(cache_ptr->prefetch_hits),
-              (long long)(cache_ptr->flushes[H5AC_PREFETCHED_ENTRY_ID]),
-              (long long)(cache_ptr->evictions[H5AC_PREFETCHED_ENTRY_ID]),
-              (long long)(cache_ptr->last_image_size), prefetch_use_rate);
+    fprintf(stdout, "%3.1lf    %5lld   %5lld   %5lld  %5lld   %5lld   %5lld   %3.1lf\n", hit_rate,
+            (long long)(cache_ptr->prefetches), (long long)(cache_ptr->dirty_prefetches),
+            (long long)(cache_ptr->prefetch_hits), (long long)(cache_ptr->flushes[H5AC_PREFETCHED_ENTRY_ID]),
+            (long long)(cache_ptr->evictions[H5AC_PREFETCHED_ENTRY_ID]),
+            (long long)(cache_ptr->last_image_size), prefetch_use_rate);
 #endif /* H5C_COLLECT_CACHE_STATS */
 
 done:
diff --git a/src/H5Clog_json.c b/src/H5Clog_json.c
index cffd10a..b2542a9 100644
--- a/src/H5Clog_json.c
+++ b/src/H5Clog_json.c
@@ -172,7 +172,7 @@ H5C__json_write_log_message(H5C_log_json_udata_t *json_udata)
 
     /* Write the log message and flush */
     n_chars = HDstrlen(json_udata->message);
-    if ((int)n_chars != HDfprintf(json_udata->outfile, "%s", json_udata->message))
+    if ((int)n_chars != fprintf(json_udata->outfile, "%s", json_udata->message))
         HGOTO_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "error writing log message")
     HDmemset((void *)(json_udata->message), 0, (size_t)(n_chars * sizeof(char)));
 
diff --git a/src/H5Clog_trace.c b/src/H5Clog_trace.c
index 72d93f6..be07fa4 100644
--- a/src/H5Clog_trace.c
+++ b/src/H5Clog_trace.c
@@ -167,7 +167,7 @@ H5C__trace_write_log_message(H5C_log_trace_udata_t *trace_udata)
 
     /* Write the log message and flush */
     n_chars = HDstrlen(trace_udata->message);
-    if ((int)n_chars != HDfprintf(trace_udata->outfile, "%s", trace_udata->message))
+    if ((int)n_chars != fprintf(trace_udata->outfile, "%s", trace_udata->message))
         HGOTO_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "error writing log message")
     HDmemset((void *)(trace_udata->message), 0, (size_t)(n_chars * sizeof(char)));
 
@@ -249,7 +249,7 @@ H5C__log_trace_set_up(H5C_log_info_t *log_info, const char log_location[], int m
     HDsetbuf(trace_udata->outfile, NULL);
 
     /* Write the header */
-    HDfprintf(trace_udata->outfile, "### HDF5 metadata cache trace file version 1 ###\n");
+    fprintf(trace_udata->outfile, "### HDF5 metadata cache trace file version 1 ###\n");
 
 done:
     if (file_name)
diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c
index 308a7f3..b9b00fd 100644
--- a/src/H5Cmpio.c
+++ b/src/H5Cmpio.c
@@ -195,7 +195,7 @@ H5C_apply_candidate_list(H5F_t *f, H5C_t *cache_ptr, unsigned num_candidates, ha
     HDmemset(entries_to_clear, 0, sizeof(entries_to_clear));
 
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
-    HDfprintf(stdout, "%s:%d: setting up candidate assignment table.\n", __func__, mpi_rank);
+    fprintf(stdout, "%s:%d: setting up candidate assignment table.\n", __func__, mpi_rank);
 
     HDmemset(tbl_buf, 0, sizeof(tbl_buf));
 
@@ -204,7 +204,7 @@ H5C_apply_candidate_list(H5F_t *f, H5C_t *cache_ptr, unsigned num_candidates, ha
         HDsprintf(&(tbl_buf[HDstrlen(tbl_buf)]), " 0x%llx", (long long)(*(candidates_list_ptr + u)));
     HDsprintf(&(tbl_buf[HDstrlen(tbl_buf)]), "\n");
 
-    HDfprintf(stdout, "%s", tbl_buf);
+    fprintf(stdout, "%s", tbl_buf);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
     if (f->shared->coll_md_write) {
@@ -269,12 +269,12 @@ H5C_apply_candidate_list(H5F_t *f, H5C_t *cache_ptr, unsigned num_candidates, ha
     for (u = 0; u <= (unsigned)mpi_size; u++)
         HDsprintf(&(tbl_buf[HDstrlen(tbl_buf)]), " %u", candidate_assignment_table[u]);
     HDsprintf(&(tbl_buf[HDstrlen(tbl_buf)]), "\n");
-    HDfprintf(stdout, "%s", tbl_buf);
+    fprintf(stdout, "%s", tbl_buf);
 
-    HDfprintf(stdout, "%s:%d: flush entries [%u, %u].\n", __func__, mpi_rank, first_entry_to_flush,
-              last_entry_to_flush);
+    fprintf(stdout, "%s:%d: flush entries [%u, %u].\n", __func__, mpi_rank, first_entry_to_flush,
+            last_entry_to_flush);
 
-    HDfprintf(stdout, "%s:%d: marking entries.\n", __func__, mpi_rank);
+    fprintf(stdout, "%s:%d: marking entries.\n", __func__, mpi_rank);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
     for (u = 0; u < num_candidates; u++) {
@@ -355,8 +355,8 @@ H5C_apply_candidate_list(H5F_t *f, H5C_t *cache_ptr, unsigned num_candidates, ha
 #endif /* H5C_DO_SANITY_CHECKS */
 
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
-    HDfprintf(stdout, "%s:%d: num candidates/to clear/to flush = %u/%u/%u.\n", __func__, mpi_rank,
-              num_candidates, total_entries_to_clear, total_entries_to_flush);
+    fprintf(stdout, "%s:%d: num candidates/to clear/to flush = %u/%u/%u.\n", __func__, mpi_rank,
+            num_candidates, total_entries_to_clear, total_entries_to_flush);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
     /* We have now marked all the entries on the candidate list for
@@ -684,14 +684,13 @@ H5C_mark_entries_as_clean(H5F_t *f, unsigned ce_array_len, haddr_t *ce_array_ptr
 
         if (entry_ptr == NULL) {
 #ifdef H5C_DO_SANITY_CHECKS
-            HDfprintf(stdout, "H5C_mark_entries_as_clean: entry[%u] = %" PRIuHADDR " not in cache.\n", u,
-                      addr);
+            fprintf(stdout, "H5C_mark_entries_as_clean: entry[%u] = %" PRIuHADDR " not in cache.\n", u, addr);
 #endif /* H5C_DO_SANITY_CHECKS */
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Listed entry not in cache?!?!?")
         } /* end if */
         else if (!entry_ptr->is_dirty) {
 #ifdef H5C_DO_SANITY_CHECKS
-            HDfprintf(stdout, "H5C_mark_entries_as_clean: entry %" PRIuHADDR " is not dirty!?!\n", addr);
+            fprintf(stdout, "H5C_mark_entries_as_clean: entry %" PRIuHADDR " is not dirty!?!\n", addr);
 #endif /* H5C_DO_SANITY_CHECKS */
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Listed entry not dirty?!?!?")
         } /* end else-if */
diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c
index a8af152..1b494ab 100644
--- a/src/H5Dbtree.c
+++ b/src/H5Dbtree.c
@@ -733,11 +733,11 @@ H5D__btree_debug_key(FILE *stream, int indent, int fwidth, const void *_key, con
 
     assert(key);
 
-    HDfprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth, "Chunk size:", (unsigned)key->nbytes);
-    HDfprintf(stream, "%*s%-*s 0x%08x\n", indent, "", fwidth, "Filter mask:", key->filter_mask);
-    HDfprintf(stream, "%*s%-*s {", indent, "", fwidth, "Logical offset:");
+    fprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth, "Chunk size:", (unsigned)key->nbytes);
+    fprintf(stream, "%*s%-*s 0x%08x\n", indent, "", fwidth, "Filter mask:", key->filter_mask);
+    fprintf(stream, "%*s%-*s {", indent, "", fwidth, "Logical offset:");
     for (u = 0; u < udata->ndims; u++)
-        HDfprintf(stream, "%s%" PRIuHSIZE, u ? ", " : "", (key->scaled[u] * udata->common.layout->dim[u]));
+        fprintf(stream, "%s%" PRIuHSIZE, u ? ", " : "", (key->scaled[u] * udata->common.layout->dim[u]));
     HDfputs("}\n", stream);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
@@ -1368,7 +1368,7 @@ H5D__btree_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
     assert(storage);
     assert(stream);
 
-    HDfprintf(stream, "    Address: %" PRIuHADDR "\n", storage->idx_addr);
+    fprintf(stream, "    Address: %" PRIuHADDR "\n", storage->idx_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__btree_idx_dump() */
diff --git a/src/H5Dbtree2.c b/src/H5Dbtree2.c
index 69c6629..4a43ae4 100644
--- a/src/H5Dbtree2.c
+++ b/src/H5Dbtree2.c
@@ -440,11 +440,11 @@ H5D__bt2_unfilt_debug(FILE *stream, int indent, int fwidth, const void *_record,
     assert(ctx->chunk_size == record->nbytes);
     assert(0 == record->filter_mask);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Chunk address:", record->chunk_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Chunk address:", record->chunk_addr);
 
-    HDfprintf(stream, "%*s%-*s {", indent, "", fwidth, "Logical offset:");
+    fprintf(stream, "%*s%-*s {", indent, "", fwidth, "Logical offset:");
     for (u = 0; u < ctx->ndims; u++)
-        HDfprintf(stream, "%s%" PRIuHSIZE, u ? ", " : "", record->scaled[u] * ctx->dim[u]);
+        fprintf(stream, "%s%" PRIuHSIZE, u ? ", " : "", record->scaled[u] * ctx->dim[u]);
     HDfputs("}\n", stream);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
@@ -554,13 +554,13 @@ H5D__bt2_filt_debug(FILE *stream, int indent, int fwidth, const void *_record, c
     assert(H5_addr_defined(record->chunk_addr));
     assert(0 != record->nbytes);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Chunk address:", record->chunk_addr);
-    HDfprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth, "Chunk size:", (unsigned)record->nbytes);
-    HDfprintf(stream, "%*s%-*s 0x%08x\n", indent, "", fwidth, "Filter mask:", record->filter_mask);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Chunk address:", record->chunk_addr);
+    fprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth, "Chunk size:", (unsigned)record->nbytes);
+    fprintf(stream, "%*s%-*s 0x%08x\n", indent, "", fwidth, "Filter mask:", record->filter_mask);
 
-    HDfprintf(stream, "%*s%-*s {", indent, "", fwidth, "Logical offset:");
+    fprintf(stream, "%*s%-*s {", indent, "", fwidth, "Logical offset:");
     for (u = 0; u < ctx->ndims; u++)
-        HDfprintf(stream, "%s%" PRIuHSIZE, u ? ", " : "", record->scaled[u] * ctx->dim[u]);
+        fprintf(stream, "%s%" PRIuHSIZE, u ? ", " : "", record->scaled[u] * ctx->dim[u]);
     HDfputs("}\n", stream);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
@@ -1469,7 +1469,7 @@ H5D__bt2_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
     assert(storage);
     assert(stream);
 
-    HDfprintf(stream, "    Address: %" PRIuHADDR "\n", storage->idx_addr);
+    fprintf(stream, "    Address: %" PRIuHADDR "\n", storage->idx_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__bt2_idx_dump() */
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index c40d1d6..64a5a4c 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -7284,20 +7284,19 @@ H5D__chunk_dump_index_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
 
         /* Print header if not already displayed */
         if (!udata->header_displayed) {
-            HDfprintf(udata->stream, "           Flags    Bytes     Address          Logical Offset\n");
-            HDfprintf(udata->stream,
-                      "        ========== ======== ========== ==============================\n");
+            fprintf(udata->stream, "           Flags    Bytes     Address          Logical Offset\n");
+            fprintf(udata->stream, "        ========== ======== ========== ==============================\n");
 
             /* Set flag that the headers has been printed */
             udata->header_displayed = TRUE;
         } /* end if */
 
         /* Print information about this chunk */
-        HDfprintf(udata->stream, "        0x%08x %8" PRIu32 " %10" PRIuHADDR " [", chunk_rec->filter_mask,
-                  chunk_rec->nbytes, chunk_rec->chunk_addr);
+        fprintf(udata->stream, "        0x%08x %8" PRIu32 " %10" PRIuHADDR " [", chunk_rec->filter_mask,
+                chunk_rec->nbytes, chunk_rec->chunk_addr);
         for (u = 0; u < udata->ndims; u++)
-            HDfprintf(udata->stream, "%s%" PRIuHSIZE, (u ? ", " : ""),
-                      (chunk_rec->scaled[u] * udata->chunk_dim[u]));
+            fprintf(udata->stream, "%s%" PRIuHSIZE, (u ? ", " : ""),
+                    (chunk_rec->scaled[u] * udata->chunk_dim[u]));
         HDfputs("]\n", udata->stream);
     } /* end if */
 
@@ -7391,11 +7390,11 @@ H5D__chunk_stats(const H5D_t *dset, hbool_t headers)
         HGOTO_DONE(SUCCEED)
 
     if (headers) {
-        HDfprintf(H5DEBUG(AC), "H5D: raw data cache statistics\n");
-        HDfprintf(H5DEBUG(AC), "   %-18s %8s %8s %8s %8s+%-8s\n", "Layer", "Hits", "Misses", "MissRate",
-                  "Inits", "Flushes");
-        HDfprintf(H5DEBUG(AC), "   %-18s %8s %8s %8s %8s-%-8s\n", "-----", "----", "------", "--------",
-                  "-----", "-------");
+        fprintf(H5DEBUG(AC), "H5D: raw data cache statistics\n");
+        fprintf(H5DEBUG(AC), "   %-18s %8s %8s %8s %8s+%-8s\n", "Layer", "Hits", "Misses", "MissRate",
+                "Inits", "Flushes");
+        fprintf(H5DEBUG(AC), "   %-18s %8s %8s %8s %8s-%-8s\n", "-----", "----", "------", "--------",
+                "-----", "-------");
     }
 
 #ifdef H5AC_DEBUG
@@ -7417,9 +7416,9 @@ H5D__chunk_stats(const H5D_t *dset, hbool_t headers)
             HDsnprintf(ascii, sizeof(ascii), "%7.2f%%", miss_rate);
         }
 
-        HDfprintf(H5DEBUG(AC), "   %-18s %8u %8u %7s %8d+%-9ld\n", "raw data chunks", rdcc->stats.nhits,
-                  rdcc->stats.nmisses, ascii, rdcc->stats.ninits,
-                  (long)(rdcc->stats.nflushes) - (long)(rdcc->stats.ninits));
+        fprintf(H5DEBUG(AC), "   %-18s %8u %8u %7s %8d+%-9ld\n", "raw data chunks", rdcc->stats.nhits,
+                rdcc->stats.nmisses, ascii, rdcc->stats.ninits,
+                (long)(rdcc->stats.nflushes) - (long)(rdcc->stats.ninits));
     }
 
 done:
diff --git a/src/H5Ddbg.c b/src/H5Ddbg.c
index 0dc6bd7..569dad9 100644
--- a/src/H5Ddbg.c
+++ b/src/H5Ddbg.c
@@ -77,8 +77,7 @@ H5Ddebug(hid_t dset_id)
     if (H5D_CHUNKED == dset->shared->layout.type)
         (void)H5D__chunk_dump_index(dset, stdout);
     else if (H5D_CONTIGUOUS == dset->shared->layout.type)
-        HDfprintf(stdout, "    %-10s %" PRIuHADDR "\n",
-                  "Address:", dset->shared->layout.storage.u.contig.addr);
+        fprintf(stdout, "    %-10s %" PRIuHADDR "\n", "Address:", dset->shared->layout.storage.u.contig.addr);
 
 done:
     FUNC_LEAVE_API(ret_value)
diff --git a/src/H5Dearray.c b/src/H5Dearray.c
index 5a98967..87dc377 100644
--- a/src/H5Dearray.c
+++ b/src/H5Dearray.c
@@ -417,7 +417,7 @@ H5D__earray_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void
 
     /* Print element */
     HDsnprintf(temp_str, sizeof(temp_str), "Element #%" PRIuHSIZE ":", idx);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, temp_str, *(const haddr_t *)elmt);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, temp_str, *(const haddr_t *)elmt);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__earray_debug() */
@@ -573,8 +573,8 @@ H5D__earray_filt_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const
 
     /* Print element */
     HDsnprintf(temp_str, sizeof(temp_str), "Element #%" PRIuHSIZE ":", idx);
-    HDfprintf(stream, "%*s%-*s {%" PRIuHADDR ", %u, %0x}\n", indent, "", fwidth, temp_str, elmt->addr,
-              elmt->nbytes, elmt->filter_mask);
+    fprintf(stream, "%*s%-*s {%" PRIuHADDR ", %u, %0x}\n", indent, "", fwidth, temp_str, elmt->addr,
+            elmt->nbytes, elmt->filter_mask);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__earray_filt_debug() */
@@ -1735,7 +1735,7 @@ H5D__earray_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
     assert(storage);
     assert(stream);
 
-    HDfprintf(stream, "    Address: %" PRIuHADDR "\n", storage->idx_addr);
+    fprintf(stream, "    Address: %" PRIuHADDR "\n", storage->idx_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__earray_idx_dump() */
diff --git a/src/H5Dfarray.c b/src/H5Dfarray.c
index 0cd09dd..7caef2c 100644
--- a/src/H5Dfarray.c
+++ b/src/H5Dfarray.c
@@ -415,7 +415,7 @@ H5D__farray_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void
 
     /* Print element */
     HDsnprintf(temp_str, sizeof(temp_str), "Element #%" PRIuHSIZE ":", idx);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, temp_str, *(const haddr_t *)elmt);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, temp_str, *(const haddr_t *)elmt);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_debug() */
@@ -675,8 +675,8 @@ H5D__farray_filt_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const
 
     /* Print element */
     HDsnprintf(temp_str, sizeof(temp_str), "Element #%" PRIuHSIZE ":", idx);
-    HDfprintf(stream, "%*s%-*s {%" PRIuHADDR ", %u, %0x}\n", indent, "", fwidth, temp_str, elmt->addr,
-              elmt->nbytes, elmt->filter_mask);
+    fprintf(stream, "%*s%-*s {%" PRIuHADDR ", %u, %0x}\n", indent, "", fwidth, temp_str, elmt->addr,
+            elmt->nbytes, elmt->filter_mask);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_filt_debug() */
@@ -1590,7 +1590,7 @@ H5D__farray_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
     assert(storage);
     assert(stream);
 
-    HDfprintf(stream, "    Address: %" PRIuHADDR "\n", storage->idx_addr);
+    fprintf(stream, "    Address: %" PRIuHADDR "\n", storage->idx_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_idx_dump() */
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index 7a8b121..ea4d9a4 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -432,7 +432,7 @@ static FILE             *debug_stream             = NULL;
 #define H5D_MPIO_DEBUG(rank, string)                                                                         \
     do {                                                                                                     \
         if (debug_stream && H5D_MPIO_DEBUG_THIS_RANK(rank)) {                                                \
-            HDfprintf(debug_stream, "%*s(Rank %d) " string "\n", debug_indent, "", rank);                    \
+            fprintf(debug_stream, "%*s(Rank %d) " string "\n", debug_indent, "", rank);                      \
             HDfflush(debug_stream);                                                                          \
         }                                                                                                    \
     } while (0)
@@ -441,7 +441,7 @@ static FILE             *debug_stream             = NULL;
 #define H5D_MPIO_DEBUG_VA(rank, string, ...)                                                                 \
     do {                                                                                                     \
         if (debug_stream && H5D_MPIO_DEBUG_THIS_RANK(rank)) {                                                \
-            HDfprintf(debug_stream, "%*s(Rank %d) " string "\n", debug_indent, "", rank, __VA_ARGS__);       \
+            fprintf(debug_stream, "%*s(Rank %d) " string "\n", debug_indent, "", rank, __VA_ARGS__);         \
             HDfflush(debug_stream);                                                                          \
         }                                                                                                    \
     } while (0)
@@ -1150,7 +1150,7 @@ H5D__piece_io(H5D_io_info_t *io_info)
 
         /* Print a short header for this I/O operation */
         time_now = HDtime(NULL);
-        HDfprintf(debug_log_file, "##### %s", HDasctime(HDlocaltime(&time_now)));
+        fprintf(debug_log_file, "##### %s", HDasctime(HDlocaltime(&time_now)));
 
         debug_stream = debug_log_file;
     }
@@ -1356,7 +1356,7 @@ done:
 #ifdef H5Dmpio_DEBUG
     /* Close debugging log file */
     if (debug_log_file) {
-        HDfprintf(debug_log_file, "##############\n\n");
+        fprintf(debug_log_file, "##############\n\n");
         if (EOF == HDfclose(debug_log_file))
             HDONE_ERROR(H5E_IO, H5E_CLOSEERROR, FAIL, "couldn't close debugging log file")
         debug_stream = H5DEBUG(D);
diff --git a/src/H5Dnone.c b/src/H5Dnone.c
index 0ece5b7..2f54fb6 100644
--- a/src/H5Dnone.c
+++ b/src/H5Dnone.c
@@ -469,7 +469,7 @@ H5D__none_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
     assert(storage);
     assert(stream);
 
-    HDfprintf(stream, "    Address: %" PRIuHADDR "\n", storage->idx_addr);
+    fprintf(stream, "    Address: %" PRIuHADDR "\n", storage->idx_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__none_idx_dump() */
diff --git a/src/H5Dsingle.c b/src/H5Dsingle.c
index 2ddd6cf..0ee1834 100644
--- a/src/H5Dsingle.c
+++ b/src/H5Dsingle.c
@@ -526,7 +526,7 @@ H5D__single_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
     assert(storage);
     assert(stream);
 
-    HDfprintf(stream, "    Address: %" PRIuHADDR "\n", storage->idx_addr);
+    fprintf(stream, "    Address: %" PRIuHADDR "\n", storage->idx_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__single_idx_dump() */
diff --git a/src/H5EAdbg.c b/src/H5EAdbg.c
index 218558e..3f677a4 100644
--- a/src/H5EAdbg.c
+++ b/src/H5EAdbg.c
@@ -109,35 +109,35 @@ H5EA__hdr_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, co
         HGOTO_ERROR(H5E_EARRAY, H5E_CANTPROTECT, FAIL, "unable to load extensible array header")
 
     /* Print opening message */
-    HDfprintf(stream, "%*sExtensible Array Header...\n", indent, "");
+    fprintf(stream, "%*sExtensible Array Header...\n", indent, "");
 
     /* Print the values */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Array class ID:", hdr->cparam.cls->name);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Header size:", hdr->size);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Raw Element Size:", (unsigned)hdr->cparam.raw_elmt_size);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-              "Native Element Size (on this platform):", hdr->cparam.cls->nat_elmt_size);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Log2(Max. # of elements in array):", (unsigned)hdr->cparam.max_nelmts_bits);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "# of elements in index block:", (unsigned)hdr->cparam.idx_blk_elmts);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Min. # of elements per data block:", (unsigned)hdr->cparam.data_blk_min_elmts);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Min. # of data block pointers for a super block:",
-              (unsigned)hdr->cparam.sup_blk_min_data_ptrs);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Log2(Max. # of elements in data block page):",
-              (unsigned)hdr->cparam.max_dblk_page_nelmts_bits);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Highest element index stored (+1):", hdr->stats.stored.max_idx_set);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Number of super blocks created:", hdr->stats.stored.nsuper_blks);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Number of data blocks created:", hdr->stats.stored.ndata_blks);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Number of elements 'realized':", hdr->stats.stored.nelmts);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "Index Block Address:", hdr->idx_blk_addr);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Array class ID:", hdr->cparam.cls->name);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Header size:", hdr->size);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Raw Element Size:", (unsigned)hdr->cparam.raw_elmt_size);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
+            "Native Element Size (on this platform):", hdr->cparam.cls->nat_elmt_size);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Log2(Max. # of elements in array):", (unsigned)hdr->cparam.max_nelmts_bits);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "# of elements in index block:", (unsigned)hdr->cparam.idx_blk_elmts);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Min. # of elements per data block:", (unsigned)hdr->cparam.data_blk_min_elmts);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Min. # of data block pointers for a super block:", (unsigned)hdr->cparam.sup_blk_min_data_ptrs);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Log2(Max. # of elements in data block page):", (unsigned)hdr->cparam.max_dblk_page_nelmts_bits);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Highest element index stored (+1):", hdr->stats.stored.max_idx_set);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Number of super blocks created:", hdr->stats.stored.nsuper_blks);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Number of data blocks created:", hdr->stats.stored.ndata_blks);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Number of elements 'realized':", hdr->stats.stored.nelmts);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "Index Block Address:", hdr->idx_blk_addr);
 
 done:
     if (dbg_ctx && cls->dst_dbg_ctx(dbg_ctx) < 0)
@@ -202,22 +202,22 @@ H5EA__iblock_debug(H5F_t *f, haddr_t H5_ATTR_UNUSED addr, FILE *stream, int inde
                     (unsigned long long)hdr->idx_blk_addr)
 
     /* Print opening message */
-    HDfprintf(stream, "%*sExtensible Array Index Block...\n", indent, "");
+    fprintf(stream, "%*sExtensible Array Index Block...\n", indent, "");
 
     /* Print the values */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Array class ID:", hdr->cparam.cls->name);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Index Block size:", iblock->size);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-              "# of data block addresses in index block:", iblock->ndblk_addrs);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-              "# of super block addresses in index block:", iblock->nsblk_addrs);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Array class ID:", hdr->cparam.cls->name);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Index Block size:", iblock->size);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
+            "# of data block addresses in index block:", iblock->ndblk_addrs);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
+            "# of super block addresses in index block:", iblock->nsblk_addrs);
 
     /* Check if there are any elements in index block */
     if (hdr->cparam.idx_blk_elmts > 0) {
         unsigned u; /* Local index variable */
 
         /* Print the elements in the index block */
-        HDfprintf(stream, "%*sElements in Index Block:\n", indent, "");
+        fprintf(stream, "%*sElements in Index Block:\n", indent, "");
         for (u = 0; u < hdr->cparam.idx_blk_elmts; u++) {
             /* Call the class's 'debug' callback */
             if ((hdr->cparam.cls->debug)(stream, (indent + 3), MAX(0, (fwidth - 3)), (hsize_t)u,
@@ -233,12 +233,12 @@ H5EA__iblock_debug(H5F_t *f, haddr_t H5_ATTR_UNUSED addr, FILE *stream, int inde
         unsigned u;             /* Local index variable */
 
         /* Print the data block addresses in the index block */
-        HDfprintf(stream, "%*sData Block Addresses in Index Block:\n", indent, "");
+        fprintf(stream, "%*sData Block Addresses in Index Block:\n", indent, "");
         for (u = 0; u < iblock->ndblk_addrs; u++) {
             /* Print address */
             HDsnprintf(temp_str, sizeof(temp_str), "Address #%u:", u);
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", (indent + 3), "", MAX(0, (fwidth - 3)), temp_str,
-                      iblock->dblk_addrs[u]);
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", (indent + 3), "", MAX(0, (fwidth - 3)), temp_str,
+                    iblock->dblk_addrs[u]);
         } /* end for */
     }     /* end if */
 
@@ -248,12 +248,12 @@ H5EA__iblock_debug(H5F_t *f, haddr_t H5_ATTR_UNUSED addr, FILE *stream, int inde
         unsigned u;             /* Local index variable */
 
         /* Print the super block addresses in the index block */
-        HDfprintf(stream, "%*sSuper Block Addresses in Index Block:\n", indent, "");
+        fprintf(stream, "%*sSuper Block Addresses in Index Block:\n", indent, "");
         for (u = 0; u < iblock->nsblk_addrs; u++) {
             /* Print address */
             HDsnprintf(temp_str, sizeof(temp_str), "Address #%u:", u);
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", (indent + 3), "", MAX(0, (fwidth - 3)), temp_str,
-                      iblock->sblk_addrs[u]);
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", (indent + 3), "", MAX(0, (fwidth - 3)), temp_str,
+                    iblock->sblk_addrs[u]);
         } /* end for */
     }     /* end if */
 
@@ -321,15 +321,15 @@ H5EA__sblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
                     (unsigned long long)addr)
 
     /* Print opening message */
-    HDfprintf(stream, "%*sExtensible Array Super Block...\n", indent, "");
+    fprintf(stream, "%*sExtensible Array Super Block...\n", indent, "");
 
     /* Print the values */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Array class ID:", hdr->cparam.cls->name);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Super Block size:", sblock->size);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-              "# of data block addresses in super block:", sblock->ndblks);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-              "# of elements in data blocks from this super block:", sblock->dblk_nelmts);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Array class ID:", hdr->cparam.cls->name);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Super Block size:", sblock->size);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
+            "# of data block addresses in super block:", sblock->ndblks);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
+            "# of elements in data blocks from this super block:", sblock->dblk_nelmts);
 
     /* Check if there are any data block addresses in super block */
     if (sblock->ndblks > 0) {
@@ -337,12 +337,12 @@ H5EA__sblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
         unsigned u;             /* Local index variable */
 
         /* Print the data block addresses in the super block */
-        HDfprintf(stream, "%*sData Block Addresses in Super Block:\n", indent, "");
+        fprintf(stream, "%*sData Block Addresses in Super Block:\n", indent, "");
         for (u = 0; u < sblock->ndblks; u++) {
             /* Print address */
             HDsnprintf(temp_str, sizeof(temp_str), "Address #%u:", u);
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", (indent + 3), "", MAX(0, (fwidth - 3)), temp_str,
-                      sblock->dblk_addrs[u]);
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", (indent + 3), "", MAX(0, (fwidth - 3)), temp_str,
+                    sblock->dblk_addrs[u]);
         } /* end for */
     }     /* end if */
 
@@ -410,14 +410,14 @@ H5EA__dblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
                     "unable to protect extensible array data block, address = %" PRIuHADDR, addr)
 
     /* Print opening message */
-    HDfprintf(stream, "%*sExtensible Array data Block...\n", indent, "");
+    fprintf(stream, "%*sExtensible Array data Block...\n", indent, "");
 
     /* Print the values */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Array class ID:", hdr->cparam.cls->name);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Data Block size:", dblock->size);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Array class ID:", hdr->cparam.cls->name);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Data Block size:", dblock->size);
 
     /* Print the elements in the index block */
-    HDfprintf(stream, "%*sElements:\n", indent, "");
+    fprintf(stream, "%*sElements:\n", indent, "");
     for (u = 0; u < dblk_nelmts; u++) {
         /* Call the class's 'debug' callback */
         if ((hdr->cparam.cls->debug)(stream, (indent + 3), MAX(0, (fwidth - 3)), (hsize_t)u,
diff --git a/src/H5EAtest.c b/src/H5EAtest.c
index 7e02ed7..6167954 100644
--- a/src/H5EAtest.c
+++ b/src/H5EAtest.c
@@ -322,8 +322,8 @@ H5EA__test_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void *
 
     /* Print element */
     HDsnprintf(temp_str, sizeof(temp_str), "Element #%llu:", (unsigned long long)idx);
-    HDfprintf(stream, "%*s%-*s %llu\n", indent, "", fwidth, temp_str,
-              (unsigned long long)*(const uint64_t *)elmt);
+    fprintf(stream, "%*s%-*s %llu\n", indent, "", fwidth, temp_str,
+            (unsigned long long)*(const uint64_t *)elmt);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5EA__test_debug() */
diff --git a/src/H5Eint.c b/src/H5Eint.c
index 64292f3..2719a41 100644
--- a/src/H5Eint.c
+++ b/src/H5Eint.c
@@ -226,10 +226,10 @@ H5E__walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
         if (cls_ptr->lib_vers)
             eprint->cls.lib_vers = cls_ptr->lib_vers;
 
-        HDfprintf(stream, "%s-DIAG: Error detected in %s (%s) ",
-                  (cls_ptr->cls_name ? cls_ptr->cls_name : "(null)"),
-                  (cls_ptr->lib_name ? cls_ptr->lib_name : "(null)"),
-                  (cls_ptr->lib_vers ? cls_ptr->lib_vers : "(null)"));
+        fprintf(stream, "%s-DIAG: Error detected in %s (%s) ",
+                (cls_ptr->cls_name ? cls_ptr->cls_name : "(null)"),
+                (cls_ptr->lib_name ? cls_ptr->lib_name : "(null)"),
+                (cls_ptr->lib_vers ? cls_ptr->lib_vers : "(null)"));
 
         /* try show the process or thread id in multiple processes cases*/
 #ifdef H5_HAVE_PARALLEL
@@ -241,15 +241,15 @@ H5E__walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
 
             if (mpi_initialized && !mpi_finalized) {
                 MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
-                HDfprintf(stream, "MPI-process %d", mpi_rank);
+                fprintf(stream, "MPI-process %d", mpi_rank);
             } /* end if */
             else
-                HDfprintf(stream, "thread 0");
+                fprintf(stream, "thread 0");
         } /* end block */
 #else
-        HDfprintf(stream, "thread %" PRIu64, H5TS_thread_id());
+        fprintf(stream, "thread %" PRIu64, H5TS_thread_id());
 #endif
-        HDfprintf(stream, ":\n");
+        fprintf(stream, ":\n");
     } /* end if */
 
     /* Check for "real" error description - used to format output more nicely */
@@ -257,11 +257,10 @@ H5E__walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
         have_desc = 0;
 
     /* Print error message */
-    HDfprintf(stream, "%*s#%03d: %s line %u in %s()%s%s\n", H5E_INDENT, "", n, err_desc->file_name,
-              err_desc->line, err_desc->func_name, (have_desc ? ": " : ""),
-              (have_desc ? err_desc->desc : ""));
-    HDfprintf(stream, "%*smajor: %s\n", (H5E_INDENT * 2), "", maj_str);
-    HDfprintf(stream, "%*sminor: %s\n", (H5E_INDENT * 2), "", min_str);
+    fprintf(stream, "%*s#%03d: %s line %u in %s()%s%s\n", H5E_INDENT, "", n, err_desc->file_name,
+            err_desc->line, err_desc->func_name, (have_desc ? ": " : ""), (have_desc ? err_desc->desc : ""));
+    fprintf(stream, "%*smajor: %s\n", (H5E_INDENT * 2), "", maj_str);
+    fprintf(stream, "%*sminor: %s\n", (H5E_INDENT * 2), "", min_str);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -354,10 +353,10 @@ H5E__walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
         if (cls_ptr->lib_vers)
             eprint->cls.lib_vers = cls_ptr->lib_vers;
 
-        HDfprintf(stream, "%s-DIAG: Error detected in %s (%s) ",
-                  (cls_ptr->cls_name ? cls_ptr->cls_name : "(null)"),
-                  (cls_ptr->lib_name ? cls_ptr->lib_name : "(null)"),
-                  (cls_ptr->lib_vers ? cls_ptr->lib_vers : "(null)"));
+        fprintf(stream, "%s-DIAG: Error detected in %s (%s) ",
+                (cls_ptr->cls_name ? cls_ptr->cls_name : "(null)"),
+                (cls_ptr->lib_name ? cls_ptr->lib_name : "(null)"),
+                (cls_ptr->lib_vers ? cls_ptr->lib_vers : "(null)"));
 
         /* try show the process or thread id in multiple processes cases*/
 #ifdef H5_HAVE_PARALLEL
@@ -369,15 +368,15 @@ H5E__walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
 
             if (mpi_initialized && !mpi_finalized) {
                 MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
-                HDfprintf(stream, "MPI-process %d", mpi_rank);
+                fprintf(stream, "MPI-process %d", mpi_rank);
             } /* end if */
             else
-                HDfprintf(stream, "thread 0");
+                fprintf(stream, "thread 0");
         } /* end block */
 #else
-        HDfprintf(stream, "thread %" PRIu64, H5TS_thread_id());
+        fprintf(stream, "thread %" PRIu64, H5TS_thread_id());
 #endif
-        HDfprintf(stream, ":\n");
+        fprintf(stream, ":\n");
     } /* end if */
 
     /* Check for "real" error description - used to format output more nicely */
@@ -385,11 +384,10 @@ H5E__walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
         have_desc = 0;
 
     /* Print error message */
-    HDfprintf(stream, "%*s#%03u: %s line %u in %s()%s%s\n", H5E_INDENT, "", n, err_desc->file_name,
-              err_desc->line, err_desc->func_name, (have_desc ? ": " : ""),
-              (have_desc ? err_desc->desc : ""));
-    HDfprintf(stream, "%*smajor: %s\n", (H5E_INDENT * 2), "", maj_str);
-    HDfprintf(stream, "%*sminor: %s\n", (H5E_INDENT * 2), "", min_str);
+    fprintf(stream, "%*s#%03u: %s line %u in %s()%s%s\n", H5E_INDENT, "", n, err_desc->file_name,
+            err_desc->line, err_desc->func_name, (have_desc ? ": " : ""), (have_desc ? err_desc->desc : ""));
+    fprintf(stream, "%*smajor: %s\n", (H5E_INDENT * 2), "", maj_str);
+    fprintf(stream, "%*sminor: %s\n", (H5E_INDENT * 2), "", min_str);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5FAdbg.c b/src/H5FAdbg.c
index 3ae1aa1..515103f 100644
--- a/src/H5FAdbg.c
+++ b/src/H5FAdbg.c
@@ -109,24 +109,24 @@ H5FA__hdr_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, co
         HGOTO_ERROR(H5E_FARRAY, H5E_CANTPROTECT, FAIL, "unable to load fixed array header")
 
     /* Print opening message */
-    HDfprintf(stream, "%*sFixed Array Header...\n", indent, "");
+    fprintf(stream, "%*sFixed Array Header...\n", indent, "");
 
     /* Print the values */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Array class ID:", hdr->cparam.cls->name);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Header size:", hdr->size);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Raw Element Size:", (unsigned)hdr->cparam.raw_elmt_size);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-              "Native Element Size (on this platform):", hdr->cparam.cls->nat_elmt_size);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Array class ID:", hdr->cparam.cls->name);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Header size:", hdr->size);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Raw Element Size:", (unsigned)hdr->cparam.raw_elmt_size);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
+            "Native Element Size (on this platform):", hdr->cparam.cls->nat_elmt_size);
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Max. # of elements in data block page:",
-              (unsigned)((size_t)1 << hdr->cparam.max_dblk_page_nelmts_bits));
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Max. # of elements in data block page:",
+            (unsigned)((size_t)1 << hdr->cparam.max_dblk_page_nelmts_bits));
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Number of elements in Fixed Array:", hdr->stats.nelmts);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Number of elements in Fixed Array:", hdr->stats.nelmts);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "Fixed Array Data Block Address:", hdr->dblk_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "Fixed Array Data Block Address:", hdr->dblk_addr);
 
 done:
     if (dbg_ctx && cls->dst_dbg_ctx(dbg_ctx) < 0)
@@ -188,24 +188,24 @@ H5FA__dblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
                     "unable to protect fixed array data block, address = %llu", (unsigned long long)addr)
 
     /* Print opening message */
-    HDfprintf(stream, "%*sFixed Array data Block...\n", indent, "");
+    fprintf(stream, "%*sFixed Array data Block...\n", indent, "");
 
     /* Print the values */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Array class ID:", hdr->cparam.cls->name);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Address of Data Block:", dblock->addr);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth, "Data Block size:", dblock->size);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Number of elements in Data Block:", hdr->cparam.nelmts);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Number of pages in Data Block:", dblock->npages);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-              "Number of elements per Data Block page:", dblock->dblk_page_nelmts);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Array class ID:", hdr->cparam.cls->name);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Address of Data Block:", dblock->addr);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth, "Data Block size:", dblock->size);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Number of elements in Data Block:", hdr->cparam.nelmts);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Number of pages in Data Block:", dblock->npages);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
+            "Number of elements per Data Block page:", dblock->dblk_page_nelmts);
 
     if (dblock->npages) {         /* paging */
         size_t  dblk_page_nelmts; /* # of elements in a data block page */
         haddr_t dblk_page_addr;   /* Address of a data block page */
         size_t  page_idx;         /* Page index within data block */
 
-        HDfprintf(stream, "%*sPaging:\n", indent, "");
+        fprintf(stream, "%*sPaging:\n", indent, "");
 
         /* Iterate over the pages */
         dblk_page_addr   = dblock->addr + H5FA_DBLOCK_PREFIX_SIZE(dblock);
@@ -214,7 +214,7 @@ H5FA__dblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
         /* Read and print each page's elements in the data block */
         for (page_idx = 0; page_idx < dblock->npages; page_idx++) {
             if (!H5VM_bit_get(dblock->dblk_page_init, page_idx)) {
-                HDfprintf(stream, "%*s%-*s %zu %s\n", indent, "", fwidth, "Page %zu:", page_idx, "empty");
+                fprintf(stream, "%*s%-*s %zu %s\n", indent, "", fwidth, "Page %zu:", page_idx, "empty");
 
             }                                  /* end if */
             else {                             /* get the page */
@@ -232,7 +232,7 @@ H5FA__dblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
                                 "unable to protect fixed array data block page, address = %llu",
                                 (unsigned long long)dblk_page_addr)
 
-                HDfprintf(stream, "%*sElements in page %zu:\n", indent, "", page_idx);
+                fprintf(stream, "%*sElements in page %zu:\n", indent, "", page_idx);
                 for (u = 0; u < dblk_page_nelmts; u++) {
                     /* Call the class's 'debug' callback */
                     if ((hdr->cparam.cls->debug)(stream, (indent + 3), MAX(0, (fwidth - 3)), (hsize_t)u,
@@ -251,7 +251,7 @@ H5FA__dblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
     }         /* end if */
     else {    /* not paging */
         /* Print the elements in the data block */
-        HDfprintf(stream, "%*sElements:\n", indent, "");
+        fprintf(stream, "%*sElements:\n", indent, "");
         for (u = 0; u < hdr->cparam.nelmts; u++) {
             /* Call the class's 'debug' callback */
             if ((hdr->cparam.cls->debug)(stream, (indent + 3), MAX(0, (fwidth - 3)), (hsize_t)u,
diff --git a/src/H5FAdblkpage.c b/src/H5FAdblkpage.c
index 04931c9..4930fc2 100644
--- a/src/H5FAdblkpage.c
+++ b/src/H5FAdblkpage.c
@@ -146,7 +146,7 @@ H5FA__dblk_page_create(H5FA_hdr_t *hdr, haddr_t addr, size_t nelmts)
     FUNC_ENTER_PACKAGE
 
 #ifdef H5FA_DEBUG
-    HDfprintf(stderr, "%s: Called, addr = %" PRIuHADDR "\n", __func__, addr);
+    fprintf(stderr, "%s: Called, addr = %" PRIuHADDR "\n", __func__, addr);
 #endif /* H5FA_DEBUG */
 
     /* Sanity check */
@@ -161,7 +161,7 @@ H5FA__dblk_page_create(H5FA_hdr_t *hdr, haddr_t addr, size_t nelmts)
     dblk_page->addr = addr;
     dblk_page->size = H5FA_DBLK_PAGE_SIZE(hdr, nelmts);
 #ifdef H5FA_DEBUG
-    HDfprintf(stderr, "%s: dblk_page->size = %Zu\n", __func__, dblk_page->size);
+    fprintf(stderr, "%s: dblk_page->size = %Zu\n", __func__, dblk_page->size);
 #endif /* H5FA_DEBUG */
 
     /* Clear any elements in data block page to fill value */
@@ -222,7 +222,7 @@ H5FA__dblk_page_protect(H5FA_hdr_t *hdr, haddr_t dblk_page_addr, size_t dblk_pag
     FUNC_ENTER_PACKAGE
 
 #ifdef H5FA_DEBUG
-    HDfprintf(stderr, "%s: Called\n", __func__);
+    fprintf(stderr, "%s: Called\n", __func__);
 #endif /* H5FA_DEBUG */
 
     /* Sanity check */
@@ -292,7 +292,7 @@ H5FA__dblk_page_unprotect(H5FA_dblk_page_t *dblk_page, unsigned cache_flags)
     FUNC_ENTER_PACKAGE
 
 #ifdef H5FA_DEBUG
-    HDfprintf(stderr, "%s: Called\n", __func__);
+    fprintf(stderr, "%s: Called\n", __func__);
 #endif /* H5FA_DEBUG */
 
     /* Sanity check */
diff --git a/src/H5FAstat.c b/src/H5FAstat.c
index a052b79..9603648 100644
--- a/src/H5FAstat.c
+++ b/src/H5FAstat.c
@@ -83,7 +83,7 @@ H5FA_get_stats(const H5FA_t *fa, H5FA_stat_t *stats)
     FUNC_ENTER_NOAPI_NOERR
 
 #ifdef H5FA_DEBUG
-    HDfprintf(stderr, "%s: Called\n", __func__);
+    fprintf(stderr, "%s: Called\n", __func__);
 #endif /* H5FA_DEBUG */
 
     /* Check arguments */
diff --git a/src/H5FAtest.c b/src/H5FAtest.c
index bf723a2..2758d39 100644
--- a/src/H5FAtest.c
+++ b/src/H5FAtest.c
@@ -303,8 +303,8 @@ H5FA__test_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void *
 
     /* Print element */
     HDsnprintf(temp_str, sizeof(temp_str), "Element #%llu:", (unsigned long long)idx);
-    HDfprintf(stream, "%*s%-*s %llu\n", indent, "", fwidth, temp_str,
-              (unsigned long long)*(const uint64_t *)elmt);
+    fprintf(stream, "%*s%-*s %llu\n", indent, "", fwidth, temp_str,
+            (unsigned long long)*(const uint64_t *)elmt);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FA__test_debug() */
diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c
index b461bd4..00b9b92 100644
--- a/src/H5FDhdfs.c
+++ b/src/H5FDhdfs.c
@@ -347,7 +347,7 @@ H5FD_hdfs_init(void)
     FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     if (H5I_VFL != H5I_get_type(H5FD_HDFS_g))
@@ -388,7 +388,7 @@ H5FD__hdfs_term(void)
     FUNC_ENTER_PACKAGE_NOERR
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     /* Reset VFL ID */
@@ -422,7 +422,7 @@ H5FD__hdfs_handle_open(const char *path, const char *namenode_name, const int32_
     FUNC_ENTER_PACKAGE
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     if (path == NULL || path[0] == '\0')
@@ -507,7 +507,7 @@ H5FD__hdfs_handle_close(hdfs_t *handle)
     FUNC_ENTER_PACKAGE
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     if (handle == NULL)
@@ -598,7 +598,7 @@ H5Pset_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa)
     assert(fa != NULL);
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
@@ -639,7 +639,7 @@ H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_dst /*out*/)
     H5TRACE2("e", "ix", fapl_id, fa_dst);
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     if (fa_dst == NULL)
@@ -796,7 +796,7 @@ hdfs__reset_stats(H5FD_hdfs_t *file)
     FUNC_ENTER_PACKAGE
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     if (file == NULL)
@@ -854,7 +854,7 @@ H5FD__hdfs_open(const char *path, unsigned flags, hid_t fapl_id, haddr_t maxaddr
     FUNC_ENTER_PACKAGE
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif /* HDFS_DEBUG */
 
     /* Sanity check on file offsets */
@@ -1025,10 +1025,10 @@ hdfs__fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
      * PRINT OVERVIEW *
      ******************/
 
-    HDfprintf(stream, "TOTAL READS: %llu  (%llu meta, %llu raw)\n", count_raw + count_meta, count_meta,
-              count_raw);
-    HDfprintf(stream, "TOTAL BYTES: %llu  (%llu meta, %llu raw)\n", bytes_raw + bytes_meta, bytes_meta,
-              bytes_raw);
+    fprintf(stream, "TOTAL READS: %llu  (%llu meta, %llu raw)\n", count_raw + count_meta, count_meta,
+            count_raw);
+    fprintf(stream, "TOTAL BYTES: %llu  (%llu meta, %llu raw)\n", bytes_raw + bytes_meta, bytes_meta,
+            bytes_raw);
 
     if (count_raw + count_meta == 0)
         goto done;
@@ -1037,60 +1037,60 @@ hdfs__fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
      * PRINT AGGREGATE STATS *
      *************************/
 
-    HDfprintf(stream, "SIZES     meta      raw\n");
-    HDfprintf(stream, "  min ");
+    fprintf(stream, "SIZES     meta      raw\n");
+    fprintf(stream, "  min ");
     if (count_meta == 0)
-        HDfprintf(stream, "   0.000  ");
+        fprintf(stream, "   0.000  ");
     else {
         re_dub = (double)min_meta;
         for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
             re_dub /= 1024.0;
         assert(suffix_i < sizeof(suffixes));
-        HDfprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
+        fprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
     }
 
     if (count_raw == 0)
-        HDfprintf(stream, "   0.000 \n");
+        fprintf(stream, "   0.000 \n");
     else {
         re_dub = (double)min_raw;
         for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
             re_dub /= 1024.0;
         assert(suffix_i < sizeof(suffixes));
-        HDfprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
+        fprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
     }
 
-    HDfprintf(stream, "  avg ");
+    fprintf(stream, "  avg ");
     re_dub = (double)average_meta;
     for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
         re_dub /= 1024.0;
     assert(suffix_i < sizeof(suffixes));
-    HDfprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
+    fprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
 
     re_dub = (double)average_raw;
     for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
         re_dub /= 1024.0;
     assert(suffix_i < sizeof(suffixes));
-    HDfprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
+    fprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
 
-    HDfprintf(stream, "  max ");
+    fprintf(stream, "  max ");
     re_dub = (double)max_meta;
     for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
         re_dub /= 1024.0;
     assert(suffix_i < sizeof(suffixes));
-    HDfprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
+    fprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
 
     re_dub = (double)max_raw;
     for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
         re_dub /= 1024.0;
     assert(suffix_i < sizeof(suffixes));
-    HDfprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
+    fprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
 
     /******************************
      * PRINT INDIVIDUAL BIN STATS *
      ******************************/
 
-    HDfprintf(stream, "BINS             # of reads      total bytes         average size\n");
-    HDfprintf(stream, "    up-to      meta     raw     meta      raw       meta      raw\n");
+    fprintf(stream, "BINS             # of reads      total bytes         average size\n");
+    fprintf(stream, "    up-to      meta     raw     meta      raw       meta      raw\n");
 
     for (i = 0; i <= HDFS_STATS_BIN_COUNT; i++) {
         const hdfs_statsbin *m;
@@ -1114,10 +1114,10 @@ hdfs__fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
 
         if (i == HDFS_STATS_BIN_COUNT) {
             range_end = hdfs_stats_boundaries[i - 1];
-            HDfprintf(stream, ">");
+            fprintf(stream, ">");
         }
         else
-            HDfprintf(stream, " ");
+            fprintf(stream, " ");
 
         bm_val = (double)m->bytes;
         for (suffix_i = 0; bm_val >= 1024.0; suffix_i++)
@@ -1150,14 +1150,14 @@ hdfs__fprint_stats(FILE *stream, const H5FD_hdfs_t *file)
             re_dub /= 1024.0;
         assert(suffix_i < sizeof(suffixes));
 
-        HDfprintf(stream, " %8.3f%c %7d %7d %8.3f%c %8.3f%c %8.3f%c %8.3f%c\n", re_dub,
-                  suffixes[suffix_i], /* bin ceiling      */
-                  m->count,           /* metadata reads   */
-                  r->count,           /* raw data reads    */
-                  bm_val, bm_suffix,  /* metadata bytes   */
-                  br_val, br_suffix,  /* raw data bytes    */
-                  am_val, am_suffix,  /* metadata average */
-                  ar_val, ar_suffix); /* raw data average  */
+        fprintf(stream, " %8.3f%c %7d %7d %8.3f%c %8.3f%c %8.3f%c %8.3f%c\n", re_dub,
+                suffixes[suffix_i], /* bin ceiling      */
+                m->count,           /* metadata reads   */
+                r->count,           /* raw data reads    */
+                bm_val, bm_suffix,  /* metadata bytes   */
+                br_val, br_suffix,  /* raw data bytes    */
+                am_val, am_suffix,  /* metadata average */
+                ar_val, ar_suffix); /* raw data average  */
         HDfflush(stream);
     }
 
@@ -1192,7 +1192,7 @@ H5FD__hdfs_close(H5FD_t *_file)
     FUNC_ENTER_PACKAGE
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     /* Sanity checks */
@@ -1248,7 +1248,7 @@ H5FD__hdfs_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
     FUNC_ENTER_PACKAGE_NOERR
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif /* HDFS_DEBUG */
 
     assert(f1->hdfs_handle != NULL);
@@ -1321,7 +1321,7 @@ H5FD__hdfs_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags)
     FUNC_ENTER_PACKAGE_NOERR
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     if (flags) {
@@ -1359,7 +1359,7 @@ H5FD__hdfs_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
     FUNC_ENTER_PACKAGE_NOERR
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     FUNC_LEAVE_NOAPI(file->eoa)
@@ -1390,7 +1390,7 @@ H5FD__hdfs_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
     FUNC_ENTER_PACKAGE_NOERR
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     file->eoa = addr;
@@ -1424,7 +1424,7 @@ H5FD__hdfs_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
     FUNC_ENTER_PACKAGE_NOERR
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     assert(file->hdfs_handle != NULL);
@@ -1459,7 +1459,7 @@ H5FD__hdfs_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_hand
     FUNC_ENTER_PACKAGE
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif /* HDFS_DEBUG */
 
     if (!file_handle)
@@ -1509,7 +1509,7 @@ H5FD__hdfs_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
     FUNC_ENTER_PACKAGE
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif /* HDFS_DEBUG */
 
     assert(file != NULL);
@@ -1581,7 +1581,7 @@ H5FD__hdfs_write(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, h
     FUNC_ENTER_PACKAGE
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "cannot write to read-only file")
@@ -1619,7 +1619,7 @@ H5FD__hdfs_truncate(H5FD_t H5_ATTR_UNUSED *_file, hid_t H5_ATTR_UNUSED dxpl_id,
     FUNC_ENTER_PACKAGE
 
 #if HDFS_DEBUG
-    HDfprintf(stdout, "called %s.\n", __func__);
+    fprintf(stdout, "called %s.\n", __func__);
 #endif
 
     HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "cannot truncate read-only file")
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index e7bde20..6dc76cb 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -608,13 +608,13 @@ H5FD__log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
             H5_timevals_t open_times; /* Elapsed time for open() call */
 
             H5_timer_get_times(open_timer, &open_times);
-            HDfprintf(file->logfp, "Open took: (%f s)\n", open_times.elapsed);
+            fprintf(file->logfp, "Open took: (%f s)\n", open_times.elapsed);
         }
         if (file->fa.flags & H5FD_LOG_TIME_STAT) {
             H5_timevals_t stat_times; /* Elapsed time for stat() call */
 
             H5_timer_get_times(stat_timer, &stat_times);
-            HDfprintf(file->logfp, "Stat took: (%f s)\n", stat_times.elapsed);
+            fprintf(file->logfp, "Stat took: (%f s)\n", stat_times.elapsed);
         }
     }
 
@@ -704,89 +704,89 @@ H5FD__log_close(H5FD_t *_file)
             H5_timevals_t close_times; /* Elapsed time for close() call */
 
             H5_timer_get_times(close_timer, &close_times);
-            HDfprintf(file->logfp, "Close took: (%f s)\n", close_times.elapsed);
+            fprintf(file->logfp, "Close took: (%f s)\n", close_times.elapsed);
         }
 
         /* Dump the total number of seek/read/write operations */
         if (file->fa.flags & H5FD_LOG_NUM_READ)
-            HDfprintf(file->logfp, "Total number of read operations: %llu\n", file->total_read_ops);
+            fprintf(file->logfp, "Total number of read operations: %llu\n", file->total_read_ops);
         if (file->fa.flags & H5FD_LOG_NUM_WRITE)
-            HDfprintf(file->logfp, "Total number of write operations: %llu\n", file->total_write_ops);
+            fprintf(file->logfp, "Total number of write operations: %llu\n", file->total_write_ops);
         if (file->fa.flags & H5FD_LOG_NUM_SEEK)
-            HDfprintf(file->logfp, "Total number of seek operations: %llu\n", file->total_seek_ops);
+            fprintf(file->logfp, "Total number of seek operations: %llu\n", file->total_seek_ops);
         if (file->fa.flags & H5FD_LOG_NUM_TRUNCATE)
-            HDfprintf(file->logfp, "Total number of truncate operations: %llu\n", file->total_truncate_ops);
+            fprintf(file->logfp, "Total number of truncate operations: %llu\n", file->total_truncate_ops);
 
         /* Dump the total time in seek/read/write */
         if (file->fa.flags & H5FD_LOG_TIME_READ)
-            HDfprintf(file->logfp, "Total time in read operations: %f s\n", file->total_read_time);
+            fprintf(file->logfp, "Total time in read operations: %f s\n", file->total_read_time);
         if (file->fa.flags & H5FD_LOG_TIME_WRITE)
-            HDfprintf(file->logfp, "Total time in write operations: %f s\n", file->total_write_time);
+            fprintf(file->logfp, "Total time in write operations: %f s\n", file->total_write_time);
         if (file->fa.flags & H5FD_LOG_TIME_SEEK)
-            HDfprintf(file->logfp, "Total time in seek operations: %f s\n", file->total_seek_time);
+            fprintf(file->logfp, "Total time in seek operations: %f s\n", file->total_seek_time);
         if (file->fa.flags & H5FD_LOG_TIME_TRUNCATE)
-            HDfprintf(file->logfp, "Total time in truncate operations: %f s\n", file->total_truncate_time);
+            fprintf(file->logfp, "Total time in truncate operations: %f s\n", file->total_truncate_time);
 
         /* Dump the write I/O information */
         if (file->fa.flags & H5FD_LOG_FILE_WRITE) {
-            HDfprintf(file->logfp, "Dumping write I/O information:\n");
+            fprintf(file->logfp, "Dumping write I/O information:\n");
             last_val  = file->nwrite[0];
             last_addr = 0;
             addr      = 1;
             while (addr < file->eoa) {
                 if (file->nwrite[addr] != last_val) {
-                    HDfprintf(file->logfp,
-                              "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) written to %3d times\n",
-                              last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
+                    fprintf(file->logfp,
+                            "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) written to %3d times\n",
+                            last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
                     last_val  = file->nwrite[addr];
                     last_addr = addr;
                 }
                 addr++;
             }
-            HDfprintf(file->logfp,
-                      "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) written to %3d times\n",
-                      last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
+            fprintf(file->logfp,
+                    "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) written to %3d times\n",
+                    last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
         }
 
         /* Dump the read I/O information */
         if (file->fa.flags & H5FD_LOG_FILE_READ) {
-            HDfprintf(file->logfp, "Dumping read I/O information:\n");
+            fprintf(file->logfp, "Dumping read I/O information:\n");
             last_val  = file->nread[0];
             last_addr = 0;
             addr      = 1;
             while (addr < file->eoa) {
                 if (file->nread[addr] != last_val) {
-                    HDfprintf(file->logfp,
-                              "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) read from %3d times\n",
-                              last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
+                    fprintf(file->logfp,
+                            "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) read from %3d times\n",
+                            last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
                     last_val  = file->nread[addr];
                     last_addr = addr;
                 }
                 addr++;
             }
-            HDfprintf(file->logfp,
-                      "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) read from %3d times\n",
-                      last_addr, (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
+            fprintf(file->logfp,
+                    "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) read from %3d times\n", last_addr,
+                    (addr - 1), (unsigned long)(addr - last_addr), (int)last_val);
         }
 
         /* Dump the I/O flavor information */
         if (file->fa.flags & H5FD_LOG_FLAVOR) {
-            HDfprintf(file->logfp, "Dumping I/O flavor information:\n");
+            fprintf(file->logfp, "Dumping I/O flavor information:\n");
             last_val  = file->flavor[0];
             last_addr = 0;
             addr      = 1;
             while (addr < file->eoa) {
                 if (file->flavor[addr] != last_val) {
-                    HDfprintf(file->logfp,
-                              "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) flavor is %s\n",
-                              last_addr, (addr - 1), (unsigned long)(addr - last_addr), flavors[last_val]);
+                    fprintf(file->logfp,
+                            "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) flavor is %s\n",
+                            last_addr, (addr - 1), (unsigned long)(addr - last_addr), flavors[last_val]);
                     last_val  = file->flavor[addr];
                     last_addr = addr;
                 }
                 addr++;
             }
-            HDfprintf(file->logfp, "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) flavor is %s\n",
-                      last_addr, (addr - 1), (unsigned long)(addr - last_addr), flavors[last_val]);
+            fprintf(file->logfp, "\tAddr %10" PRIuHADDR "-%10" PRIuHADDR " (%10lu bytes) flavor is %s\n",
+                    last_addr, (addr - 1), (unsigned long)(addr - last_addr), flavors[last_val]);
         }
 
         /* Free the logging information */
@@ -956,9 +956,9 @@ H5FD__log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hs
         }
 
         if (file->fa.flags & H5FD_LOG_ALLOC)
-            HDfprintf(file->logfp,
-                      "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Allocated\n", addr,
-                      (haddr_t)((addr + size) - 1), size, flavors[type]);
+            fprintf(file->logfp,
+                    "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Allocated\n", addr,
+                    (haddr_t)((addr + size) - 1), size, flavors[type]);
     }
 
     /* Set return value */
@@ -996,8 +996,8 @@ H5FD__log_free(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
 
         /* Log the file memory freed */
         if (file->fa.flags & H5FD_LOG_FREE)
-            HDfprintf(file->logfp, "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Freed\n",
-                      addr, (haddr_t)((addr + size) - 1), size, flavors[type]);
+            fprintf(file->logfp, "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Freed\n",
+                    addr, (haddr_t)((addr + size) - 1), size, flavors[type]);
     }
 
     FUNC_LEAVE_NOAPI(SUCCEED)
@@ -1063,9 +1063,9 @@ H5FD__log_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr)
 
             /* Log the extension like an allocation */
             if (file->fa.flags & H5FD_LOG_ALLOC)
-                HDfprintf(file->logfp,
-                          "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Allocated\n",
-                          file->eoa, addr, size, flavors[type]);
+                fprintf(file->logfp,
+                        "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Allocated\n",
+                        file->eoa, addr, size, flavors[type]);
         }
 
         /* Check for decreasing file size */
@@ -1081,9 +1081,9 @@ H5FD__log_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr)
 
             /* Log the shrink like a free */
             if (file->fa.flags & H5FD_LOG_FREE)
-                HDfprintf(file->logfp,
-                          "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Freed\n",
-                          file->eoa, addr, size, flavors[type]);
+                fprintf(file->logfp,
+                        "%10" PRIuHADDR "-%10" PRIuHADDR " (%10" PRIuHSIZE " bytes) (%s) Freed\n", file->eoa,
+                        addr, size, flavors[type]);
         }
     }
 
@@ -1235,16 +1235,16 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
 
         /* Emit log string if we're tracking individual seek events. */
         if (file->fa.flags & H5FD_LOG_LOC_SEEK) {
-            HDfprintf(file->logfp, "Seek: From %10" PRIuHADDR " To %10" PRIuHADDR, file->pos, addr);
+            fprintf(file->logfp, "Seek: From %10" PRIuHADDR " To %10" PRIuHADDR, file->pos, addr);
 
             /* Add the seek time, if we're tracking that.
              * Note that the seek time is NOT emitted for when just H5FD_LOG_TIME_SEEK
              * is set.
              */
             if (file->fa.flags & H5FD_LOG_TIME_SEEK)
-                HDfprintf(file->logfp, " (%fs @ %f)\n", seek_times.elapsed, seek_timer.initial.elapsed);
+                fprintf(file->logfp, " (%fs @ %f)\n", seek_times.elapsed, seek_timer.initial.elapsed);
             else
-                HDfprintf(file->logfp, "\n");
+                fprintf(file->logfp, "\n");
         }
     }
 #endif /* H5_HAVE_PREADWRITE */
@@ -1286,8 +1286,8 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
             offset = HDlseek(file->fd, (HDoff_t)0, SEEK_CUR);
 
             if (file->fa.flags & H5FD_LOG_LOC_READ)
-                HDfprintf(file->logfp, "Error! Reading: %10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes)\n",
-                          orig_addr, (orig_addr + orig_size) - 1, orig_size);
+                fprintf(file->logfp, "Error! Reading: %10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes)\n",
+                        orig_addr, (orig_addr + orig_size) - 1, orig_size);
 
             HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL,
                         "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, "
@@ -1328,8 +1328,8 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
 
     /* Log information about the read */
     if (file->fa.flags & H5FD_LOG_LOC_READ) {
-        HDfprintf(file->logfp, "%10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes) (%s) Read", orig_addr,
-                  (orig_addr + orig_size) - 1, orig_size, flavors[type]);
+        fprintf(file->logfp, "%10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes) (%s) Read", orig_addr,
+                (orig_addr + orig_size) - 1, orig_size, flavors[type]);
 
         /* Verify that we are reading in the type of data we allocated in this location */
         if (file->flavor) {
@@ -1345,9 +1345,9 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had
          * is set.
          */
         if (file->fa.flags & H5FD_LOG_TIME_READ)
-            HDfprintf(file->logfp, " (%fs @ %f)\n", read_times.elapsed, read_timer.initial.elapsed);
+            fprintf(file->logfp, " (%fs @ %f)\n", read_times.elapsed, read_timer.initial.elapsed);
         else
-            HDfprintf(file->logfp, "\n");
+            fprintf(file->logfp, "\n");
     }
 
     /* Update current position */
@@ -1457,16 +1457,16 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha
 
         /* Emit log string if we're tracking individual seek events. */
         if (file->fa.flags & H5FD_LOG_LOC_SEEK) {
-            HDfprintf(file->logfp, "Seek: From %10" PRIuHADDR " To %10" PRIuHADDR, file->pos, addr);
+            fprintf(file->logfp, "Seek: From %10" PRIuHADDR " To %10" PRIuHADDR, file->pos, addr);
 
             /* Add the seek time, if we're tracking that.
              * Note that the seek time is NOT emitted for when just H5FD_LOG_TIME_SEEK
              * is set.
              */
             if (file->fa.flags & H5FD_LOG_TIME_SEEK)
-                HDfprintf(file->logfp, " (%fs @ %f)\n", seek_times.elapsed, seek_timer.initial.elapsed);
+                fprintf(file->logfp, " (%fs @ %f)\n", seek_times.elapsed, seek_timer.initial.elapsed);
             else
-                HDfprintf(file->logfp, "\n");
+                fprintf(file->logfp, "\n");
         }
     }
 #endif /* H5_HAVE_PREADWRITE */
@@ -1508,8 +1508,8 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha
             offset = HDlseek(file->fd, (HDoff_t)0, SEEK_CUR);
 
             if (file->fa.flags & H5FD_LOG_LOC_WRITE)
-                HDfprintf(file->logfp, "Error! Writing: %10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes)\n",
-                          orig_addr, (orig_addr + orig_size) - 1, orig_size);
+                fprintf(file->logfp, "Error! Writing: %10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes)\n",
+                        orig_addr, (orig_addr + orig_size) - 1, orig_size);
 
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
                         "file write failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, "
@@ -1544,15 +1544,15 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha
 
     /* Log information about the write */
     if (file->fa.flags & H5FD_LOG_LOC_WRITE) {
-        HDfprintf(file->logfp, "%10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes) (%s) Written", orig_addr,
-                  (orig_addr + orig_size) - 1, orig_size, flavors[type]);
+        fprintf(file->logfp, "%10" PRIuHADDR "-%10" PRIuHADDR " (%10zu bytes) (%s) Written", orig_addr,
+                (orig_addr + orig_size) - 1, orig_size, flavors[type]);
 
         /* Check if this is the first write into a "default" section, grabbed by the metadata aggregation
          * algorithm */
         if (file->fa.flags & H5FD_LOG_FLAVOR) {
             if ((H5FD_mem_t)file->flavor[orig_addr] == H5FD_MEM_DEFAULT) {
                 HDmemset(&file->flavor[orig_addr], (int)type, orig_size);
-                HDfprintf(file->logfp, " (fresh)");
+                fprintf(file->logfp, " (fresh)");
             }
         }
 
@@ -1561,9 +1561,9 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha
          * is set.
          */
         if (file->fa.flags & H5FD_LOG_TIME_WRITE)
-            HDfprintf(file->logfp, " (%fs @ %f)\n", write_times.elapsed, write_timer.initial.elapsed);
+            fprintf(file->logfp, " (%fs @ %f)\n", write_times.elapsed, write_timer.initial.elapsed);
         else
-            HDfprintf(file->logfp, "\n");
+            fprintf(file->logfp, "\n");
     }
 
     /* Update current position and eof */
@@ -1666,16 +1666,16 @@ H5FD__log_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_
 
         /* Emit log string if we're tracking individual truncate events. */
         if (file->fa.flags & H5FD_LOG_TRUNCATE) {
-            HDfprintf(file->logfp, "Truncate: To %10" PRIuHADDR, file->eoa);
+            fprintf(file->logfp, "Truncate: To %10" PRIuHADDR, file->eoa);
 
             /* Add the truncate time, if we're tracking that.
              * Note that the truncate time is NOT emitted for when just H5FD_LOG_TIME_TRUNCATE
              * is set.
              */
             if (file->fa.flags & H5FD_LOG_TIME_TRUNCATE)
-                HDfprintf(file->logfp, " (%fs @ %f)\n", trunc_times.elapsed, trunc_timer.initial.elapsed);
+                fprintf(file->logfp, " (%fs @ %f)\n", trunc_times.elapsed, trunc_timer.initial.elapsed);
             else
-                HDfprintf(file->logfp, "\n");
+                fprintf(file->logfp, "\n");
         }
 
         /* Update the eof value */
diff --git a/src/H5FDmirror.c b/src/H5FDmirror.c
index 25992e8..b6997e4 100644
--- a/src/H5FDmirror.c
+++ b/src/H5FDmirror.c
@@ -81,47 +81,47 @@ typedef struct H5FD_mirror_t {
         ssize_t              bytes_written = 0;                                                              \
         const unsigned char *b             = NULL;                                                           \
                                                                                                              \
-        HDfprintf(stdout, "%s bytes:\n```\n", (label));                                                      \
+        fprintf(stdout, "%s bytes:\n```\n", (label));                                                        \
                                                                                                              \
         /* print whole lines */                                                                              \
         while ((len - bytes_written) >= 32) {                                                                \
             b = (const unsigned char *)(buf) + bytes_written;                                                \
-            HDfprintf(stdout,                                                                                \
-                      "%04zX  %02X%02X%02X%02X %02X%02X%02X%02X"                                             \
-                      " %02X%02X%02X%02X %02X%02X%02X%02X"                                                   \
-                      " %02X%02X%02X%02X %02X%02X%02X%02X"                                                   \
-                      " %02X%02X%02X%02X %02X%02X%02X%02X\n",                                                \
-                      bytes_written, b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8], b[9], b[10],      \
-                      b[11], b[12], b[13], b[14], b[15], b[16], b[17], b[18], b[19], b[20], b[21], b[22],    \
-                      b[23], b[24], b[25], b[26], b[27], b[28], b[29], b[30], b[31]);                        \
+            fprintf(stdout,                                                                                  \
+                    "%04zX  %02X%02X%02X%02X %02X%02X%02X%02X"                                               \
+                    " %02X%02X%02X%02X %02X%02X%02X%02X"                                                     \
+                    " %02X%02X%02X%02X %02X%02X%02X%02X"                                                     \
+                    " %02X%02X%02X%02X %02X%02X%02X%02X\n",                                                  \
+                    bytes_written, b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8], b[9], b[10], b[11], \
+                    b[12], b[13], b[14], b[15], b[16], b[17], b[18], b[19], b[20], b[21], b[22], b[23],      \
+                    b[24], b[25], b[26], b[27], b[28], b[29], b[30], b[31]);                                 \
             bytes_written += 32;                                                                             \
         }                                                                                                    \
                                                                                                              \
         /* start partial line */                                                                             \
         if (len > bytes_written) {                                                                           \
-            HDfprintf(stdout, "%04zX ", bytes_written);                                                      \
+            fprintf(stdout, "%04zX ", bytes_written);                                                        \
         }                                                                                                    \
                                                                                                              \
         /* partial line blocks */                                                                            \
         while ((len - bytes_written) >= 4) {                                                                 \
-            HDfprintf(stdout, " %02X%02X%02X%02X", (buf)[bytes_written], (buf)[bytes_written + 1],           \
-                      (buf)[bytes_written + 2], (buf)[bytes_written + 3]);                                   \
+            fprintf(stdout, " %02X%02X%02X%02X", (buf)[bytes_written], (buf)[bytes_written + 1],             \
+                    (buf)[bytes_written + 2], (buf)[bytes_written + 3]);                                     \
             bytes_written += 4;                                                                              \
         }                                                                                                    \
                                                                                                              \
         /* block separator before partial block */                                                           \
         if (len > bytes_written) {                                                                           \
-            HDfprintf(stdout, " ");                                                                          \
+            fprintf(stdout, " ");                                                                            \
         }                                                                                                    \
                                                                                                              \
         /* partial block individual bytes */                                                                 \
         while (len > bytes_written) {                                                                        \
-            HDfprintf(stdout, "%02X", (buf)[bytes_written++]);                                               \
+            fprintf(stdout, "%02X", (buf)[bytes_written++]);                                                 \
         }                                                                                                    \
                                                                                                              \
         /* end partial line */                                                                               \
-        HDfprintf(stdout, "\n");                                                                             \
-        HDfprintf(stdout, "```\n");                                                                          \
+        fprintf(stdout, "\n");                                                                               \
+        fprintf(stdout, "```\n");                                                                            \
         HDfflush(stdout);                                                                                    \
     } while (0)
 #else
@@ -131,7 +131,7 @@ typedef struct H5FD_mirror_t {
 #if MIRROR_DEBUG_OP_CALLS
 #define LOG_OP_CALL(name)                                                                                    \
     do {                                                                                                     \
-        HDprintf("called %s()\n", (name));                                                                   \
+        printf("called %s()\n", (name));                                                                     \
         HDfflush(stdout);                                                                                    \
     } while (0)
 #else
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 46fc971..47375df 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -750,7 +750,7 @@ H5FD_set_mpio_atomicity(H5FD_t *_file, hbool_t flag)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
 #endif
 
     /* set atomicity value */
@@ -760,7 +760,7 @@ H5FD_set_mpio_atomicity(H5FD_t *_file, hbool_t flag)
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Leaving\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Leaving\n", __func__, file->mpi_rank);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -793,7 +793,7 @@ H5FD_get_mpio_atomicity(H5FD_t *_file, hbool_t *flag)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
 #endif
 
     /* Get atomicity value */
@@ -808,7 +808,7 @@ H5FD_get_mpio_atomicity(H5FD_t *_file, hbool_t *flag)
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Leaving\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Leaving\n", __func__, file->mpi_rank);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -879,8 +879,8 @@ H5FD__mpio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t H5_ATTR
     H5FD_mpio_debug_t_flag = (H5FD_mpio_debug_flags_s[(int)'t'] &&
                               (H5FD_mpio_debug_rank_s < 0 || H5FD_mpio_debug_rank_s == mpi_rank));
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Entering - name = \"%s\", flags = 0x%x, fapl_id = %d, maxaddr = %lu\n",
-                  __func__, mpi_rank, name, flags, (int)fapl_id, (unsigned long)maxaddr);
+        fprintf(stderr, "%s: (%d) Entering - name = \"%s\", flags = 0x%x, fapl_id = %d, maxaddr = %lu\n",
+                __func__, mpi_rank, name, flags, (int)fapl_id, (unsigned long)maxaddr);
 #endif
 
     /* Convert HDF5 flags to MPI-IO flags */
@@ -1017,7 +1017,7 @@ done:
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Leaving\n", __func__, mpi_rank);
+        fprintf(stderr, "%s: (%d) Leaving\n", __func__, mpi_rank);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1050,7 +1050,7 @@ H5FD__mpio_close(H5FD_t *_file)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
 #endif
 
     /* Sanity checks */
@@ -1069,7 +1069,7 @@ H5FD__mpio_close(H5FD_t *_file)
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Leaving\n", __func__, mpi_rank);
+        fprintf(stderr, "%s: (%d) Leaving\n", __func__, mpi_rank);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1289,7 +1289,7 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
 #endif
 
     /* Sanity checks */
@@ -1349,7 +1349,7 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
 
 #ifdef H5FDmpio_DEBUG
         if (H5FD_mpio_debug_r_flag)
-            HDfprintf(stderr, "%s: (%d) using MPIO collective mode\n", __func__, file->mpi_rank);
+            fprintf(stderr, "%s: (%d) using MPIO collective mode\n", __func__, file->mpi_rank);
 #endif
         /* Get the collective_opt property to check whether the application wants to do IO individually. */
         if (H5CX_get_mpio_coll_opt(&coll_opt_mode) < 0)
@@ -1358,13 +1358,13 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
         if (coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
 #ifdef H5FDmpio_DEBUG
             if (H5FD_mpio_debug_r_flag)
-                HDfprintf(stderr, "%s: (%d) doing MPI collective IO\n", __func__, file->mpi_rank);
+                fprintf(stderr, "%s: (%d) doing MPI collective IO\n", __func__, file->mpi_rank);
 #endif
             /* Check whether we should read from rank 0 and broadcast to other ranks */
             if (H5CX_get_mpio_rank0_bcast()) {
 #ifdef H5FDmpio_DEBUG
                 if (H5FD_mpio_debug_r_flag)
-                    HDfprintf(stderr, "%s: (%d) doing read-rank0-and-MPI_Bcast\n", __func__, file->mpi_rank);
+                    fprintf(stderr, "%s: (%d) doing read-rank0-and-MPI_Bcast\n", __func__, file->mpi_rank);
 #endif
                 /* Indicate path we've taken */
                 rank0_bcast = TRUE;
@@ -1390,7 +1390,7 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
         else {
 #ifdef H5FDmpio_DEBUG
             if (H5FD_mpio_debug_r_flag)
-                HDfprintf(stderr, "%s: (%d) doing MPI independent IO\n", __func__, file->mpi_rank);
+                fprintf(stderr, "%s: (%d) doing MPI independent IO\n", __func__, file->mpi_rank);
 #endif
 
             /* Perform independent read operation */
@@ -1424,7 +1424,7 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
 
 #ifdef H5FDmpio_DEBUG
         if (H5FD_mpio_debug_r_flag)
-            HDfprintf(stderr, "%s: (%d) doing MPI independent IO\n", __func__, file->mpi_rank);
+            fprintf(stderr, "%s: (%d) doing MPI independent IO\n", __func__, file->mpi_rank);
 #endif
 
         /* Perform independent read operation */
@@ -1484,8 +1484,8 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_r_flag)
-        HDfprintf(stderr, "%s: (%d) mpi_off = %ld  bytes_read = %lld  type = %s\n", __func__, file->mpi_rank,
-                  (long)mpi_off, (long long)bytes_read, H5FD__mem_t_to_str(type));
+        fprintf(stderr, "%s: (%d) mpi_off = %ld  bytes_read = %lld  type = %s\n", __func__, file->mpi_rank,
+                (long)mpi_off, (long long)bytes_read, H5FD__mem_t_to_str(type));
 #endif
 
     /*
@@ -1500,7 +1500,7 @@ done:
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Leaving\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Leaving\n", __func__, file->mpi_rank);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1559,7 +1559,7 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, h
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
 #endif
 
     /* Sanity checks */
@@ -1617,7 +1617,7 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, h
 
 #ifdef H5FDmpio_DEBUG
         if (H5FD_mpio_debug_w_flag)
-            HDfprintf(stderr, "%s: (%d) using MPIO collective mode\n", __func__, file->mpi_rank);
+            fprintf(stderr, "%s: (%d) using MPIO collective mode\n", __func__, file->mpi_rank);
 #endif
 
         /* Get the collective_opt property to check whether the application wants to do IO individually. */
@@ -1627,7 +1627,7 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, h
         if (coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
 #ifdef H5FDmpio_DEBUG
             if (H5FD_mpio_debug_w_flag)
-                HDfprintf(stderr, "%s: (%d) doing MPI collective IO\n", __func__, file->mpi_rank);
+                fprintf(stderr, "%s: (%d) doing MPI collective IO\n", __func__, file->mpi_rank);
 #endif
             /* Perform collective write operation */
             if (MPI_SUCCESS !=
@@ -1647,7 +1647,7 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, h
 
 #ifdef H5FDmpio_DEBUG
             if (H5FD_mpio_debug_w_flag)
-                HDfprintf(stderr, "%s: (%d) doing MPI independent IO\n", __func__, file->mpi_rank);
+                fprintf(stderr, "%s: (%d) doing MPI independent IO\n", __func__, file->mpi_rank);
 #endif
             /* Perform independent write operation */
             if (MPI_SUCCESS !=
@@ -1678,7 +1678,7 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, h
 
 #ifdef H5FDmpio_DEBUG
         if (H5FD_mpio_debug_w_flag)
-            HDfprintf(stderr, "%s: (%d) doing MPI independent IO\n", __func__, file->mpi_rank);
+            fprintf(stderr, "%s: (%d) doing MPI independent IO\n", __func__, file->mpi_rank);
 #endif
 
         /* Perform independent write operation */
@@ -1711,8 +1711,8 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, h
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_w_flag)
-        HDfprintf(stderr, "%s: (%d) mpi_off = %ld  bytes_written = %lld  type = %s\n", __func__,
-                  file->mpi_rank, (long)mpi_off, (long long)bytes_written, H5FD__mem_t_to_str(type));
+        fprintf(stderr, "%s: (%d) mpi_off = %ld  bytes_written = %lld  type = %s\n", __func__, file->mpi_rank,
+                (long)mpi_off, (long long)bytes_written, H5FD__mem_t_to_str(type));
 #endif
 
     /* Each process will keep track of its perceived EOF value locally, and
@@ -1732,7 +1732,7 @@ done:
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Leaving: ret_value = %d\n", __func__, file->mpi_rank, ret_value);
+        fprintf(stderr, "%s: (%d) Leaving: ret_value = %d\n", __func__, file->mpi_rank, ret_value);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2158,7 +2158,7 @@ H5FD__mpio_read_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t cou
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
 #endif
 
     /* Sanity checks */
@@ -2207,7 +2207,7 @@ H5FD__mpio_read_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t cou
 
 #ifdef H5FDmpio_DEBUG
         if (H5FD_mpio_debug_r_flag)
-            HDfprintf(stdout, "%s: mpi_off = %ld  size_i = %d\n", __func__, (long)mpi_off, size_i);
+            fprintf(stdout, "%s: mpi_off = %ld  size_i = %d\n", __func__, (long)mpi_off, size_i);
 #endif
 
         /* Setup the file view. */
@@ -2228,18 +2228,18 @@ H5FD__mpio_read_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t cou
             /* Read the data. */
 #ifdef H5FDmpio_DEBUG
         if (H5FD_mpio_debug_r_flag)
-            HDfprintf(stdout, "%s: using MPIO collective mode\n", __func__);
+            fprintf(stdout, "%s: using MPIO collective mode\n", __func__);
 #endif
         if (coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
 #ifdef H5FDmpio_DEBUG
             if (H5FD_mpio_debug_r_flag)
-                HDfprintf(stdout, "%s: doing MPI collective IO\n", __func__);
+                fprintf(stdout, "%s: doing MPI collective IO\n", __func__);
 #endif
             /* Check whether we should read from rank 0 and broadcast to other ranks */
             if (H5CX_get_mpio_rank0_bcast()) {
 #ifdef H5FDmpio_DEBUG
                 if (H5FD_mpio_debug_r_flag)
-                    HDfprintf(stdout, "%s: doing read-rank0-and-MPI_Bcast\n", __func__);
+                    fprintf(stdout, "%s: doing read-rank0-and-MPI_Bcast\n", __func__);
 #endif
                 /* Indicate path we've taken */
                 rank0_bcast = TRUE;
@@ -2259,7 +2259,7 @@ H5FD__mpio_read_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t cou
         else if (size_i > 0) {
 #ifdef H5FDmpio_DEBUG
             if (H5FD_mpio_debug_r_flag)
-                HDfprintf(stdout, "%s: doing MPI independent IO\n", __func__);
+                fprintf(stdout, "%s: doing MPI independent IO\n", __func__);
 #endif
 
             if (MPI_SUCCESS !=
@@ -2363,7 +2363,7 @@ H5FD__mpio_read_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t cou
 
 #ifdef H5FDmpio_DEBUG
         if (H5FD_mpio_debug_r_flag)
-            HDfprintf(stdout, "%s: doing MPI independent IO\n", __func__);
+            fprintf(stdout, "%s: doing MPI independent IO\n", __func__);
 #endif
 
         /* Loop over vector elements */
@@ -2473,7 +2473,7 @@ done:
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stdout, "%s: Leaving, proc %d: ret_value = %d\n", __func__, file->mpi_rank, ret_value);
+        fprintf(stdout, "%s: Leaving, proc %d: ret_value = %d\n", __func__, file->mpi_rank, ret_value);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2550,7 +2550,7 @@ H5FD__mpio_write_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t co
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
 #endif
 
     /* Sanity checks */
@@ -2616,7 +2616,7 @@ H5FD__mpio_write_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t co
 
 #ifdef H5FDmpio_DEBUG
         if (H5FD_mpio_debug_w_flag)
-            HDfprintf(stdout, "%s: mpi_off = %ld  size_i = %d\n", __func__, (long)mpi_off, size_i);
+            fprintf(stdout, "%s: mpi_off = %ld  size_i = %d\n", __func__, (long)mpi_off, size_i);
 #endif
 
         /* Setup the file view. */
@@ -2636,13 +2636,13 @@ H5FD__mpio_write_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t co
             /* Write the data. */
 #ifdef H5FDmpio_DEBUG
         if (H5FD_mpio_debug_w_flag)
-            HDfprintf(stdout, "%s: using MPIO collective mode\n", __func__);
+            fprintf(stdout, "%s: using MPIO collective mode\n", __func__);
 #endif
 
         if (coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
 #ifdef H5FDmpio_DEBUG
             if (H5FD_mpio_debug_w_flag)
-                HDfprintf(stdout, "%s: doing MPI collective IO\n", __func__);
+                fprintf(stdout, "%s: doing MPI collective IO\n", __func__);
 #endif
 
             if (MPI_SUCCESS != (mpi_code = MPI_File_write_at_all(file->f, mpi_off, mpi_bufs_base, size_i,
@@ -2658,7 +2658,7 @@ H5FD__mpio_write_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t co
         else if (size_i > 0) {
 #ifdef H5FDmpio_DEBUG
             if (H5FD_mpio_debug_w_flag)
-                HDfprintf(stdout, "%s: doing MPI independent IO\n", __func__);
+                fprintf(stdout, "%s: doing MPI independent IO\n", __func__);
 #endif
 
             if (MPI_SUCCESS !=
@@ -2691,7 +2691,7 @@ H5FD__mpio_write_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t co
 
 #ifdef H5FDmpio_DEBUG
         if (H5FD_mpio_debug_w_flag)
-            HDfprintf(stdout, "%s: doing MPI independent IO\n", __func__);
+            fprintf(stdout, "%s: doing MPI independent IO\n", __func__);
 #endif
 
         /* Loop over vector elements */
@@ -2782,7 +2782,7 @@ done:
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stdout, "%s: Leaving, proc %d: ret_value = %d\n", __func__, file->mpi_rank, ret_value);
+        fprintf(stdout, "%s: Leaving, proc %d: ret_value = %d\n", __func__, file->mpi_rank, ret_value);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2814,7 +2814,7 @@ H5FD__mpio_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
 #endif
 
     /* Sanity checks */
@@ -2829,7 +2829,7 @@ H5FD__mpio_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Leaving\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Leaving\n", __func__, file->mpi_rank);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2871,7 +2871,7 @@ H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
 
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Entering\n", __func__, file->mpi_rank);
 #endif
 
     /* Sanity checks */
@@ -2942,7 +2942,7 @@ H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
 done:
 #ifdef H5FDmpio_DEBUG
     if (H5FD_mpio_debug_t_flag)
-        HDfprintf(stderr, "%s: (%d) Leaving\n", __func__, file->mpi_rank);
+        fprintf(stderr, "%s: (%d) Leaving\n", __func__, file->mpi_rank);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5FDros3.c b/src/H5FDros3.c
index a0c7203..ad9825c 100644
--- a/src/H5FDros3.c
+++ b/src/H5FDros3.c
@@ -306,7 +306,7 @@ H5FD_ros3_init(void)
     FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_init() called.\n");
+    fprintf(stdout, "H5FD_ros3_init() called.\n");
 #endif
 
     if (H5I_VFL != H5I_get_type(H5FD_ROS3_g)) {
@@ -350,7 +350,7 @@ H5FD__ros3_term(void)
     FUNC_ENTER_PACKAGE_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD__ros3_term() called.\n");
+    fprintf(stdout, "H5FD__ros3_term() called.\n");
 #endif
 
     /* Reset VFL ID */
@@ -386,7 +386,7 @@ H5Pset_fapl_ros3(hid_t fapl_id, const H5FD_ros3_fapl_t *fa)
     assert(fa != NULL);
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5Pset_fapl_ros3() called.\n");
+    fprintf(stdout, "H5Pset_fapl_ros3() called.\n");
 #endif
 
     plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
@@ -469,7 +469,7 @@ H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_dst /*out*/)
     H5TRACE2("e", "ix", fapl_id, fa_dst);
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5Pget_fapl_ros3() called.\n");
+    fprintf(stdout, "H5Pget_fapl_ros3() called.\n");
 #endif
 
     if (fa_dst == NULL)
@@ -630,7 +630,7 @@ ros3_reset_stats(H5FD_ros3_t *file)
     FUNC_ENTER_PACKAGE
 
 #if ROS3_DEBUG
-    HDprintf("ros3_reset_stats() called\n");
+    printf("ros3_reset_stats() called\n");
 #endif
 
     if (file == NULL)
@@ -698,7 +698,7 @@ H5FD__ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
     FUNC_ENTER_PACKAGE
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD__ros3_open() called.\n");
+    fprintf(stdout, "H5FD__ros3_open() called.\n");
 #endif
 
     /* Sanity check on file offsets */
@@ -868,20 +868,20 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
      * PRINT FILENAME *
      ******************/
 
-    HDfprintf(stream, "stats for %s://%s", purl->scheme, purl->host);
+    fprintf(stream, "stats for %s://%s", purl->scheme, purl->host);
     if (purl->port != NULL && purl->port[0] != '\0')
-        HDfprintf(stream, ":%s", purl->port);
+        fprintf(stream, ":%s", purl->port);
     if (purl->query != NULL && purl->query[0] != '\0') {
         if (purl->path != NULL && purl->path[0] != '\0')
-            HDfprintf(stream, "/%s", purl->path);
+            fprintf(stream, "/%s", purl->path);
         else
-            HDfprintf(stream, "/");
-        HDfprintf(stream, "?%s", purl->query);
+            fprintf(stream, "/");
+        fprintf(stream, "?%s", purl->query);
     }
     else if (purl->path != NULL && purl->path[0] != '\0') {
-        HDfprintf(stream, "/%s", purl->path);
+        fprintf(stream, "/%s", purl->path);
     }
-    HDfprintf(stream, "\n");
+    fprintf(stream, "\n");
 
     /*******************
      * AGGREGATE STATS *
@@ -914,10 +914,10 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
      * PRINT OVERVIEW *
      ******************/
 
-    HDfprintf(stream, "TOTAL READS: %llu  (%llu meta, %llu raw)\n", count_raw + count_meta, count_meta,
-              count_raw);
-    HDfprintf(stream, "TOTAL BYTES: %llu  (%llu meta, %llu raw)\n", bytes_raw + bytes_meta, bytes_meta,
-              bytes_raw);
+    fprintf(stream, "TOTAL READS: %llu  (%llu meta, %llu raw)\n", count_raw + count_meta, count_meta,
+            count_raw);
+    fprintf(stream, "TOTAL BYTES: %llu  (%llu meta, %llu raw)\n", bytes_raw + bytes_meta, bytes_meta,
+            bytes_raw);
 
     if (count_raw + count_meta == 0)
         goto done;
@@ -926,60 +926,60 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
      * PRINT AGGREGATE STATS *
      *************************/
 
-    HDfprintf(stream, "SIZES     meta      raw\n");
-    HDfprintf(stream, "  min ");
+    fprintf(stream, "SIZES     meta      raw\n");
+    fprintf(stream, "  min ");
     if (count_meta == 0)
-        HDfprintf(stream, "   0.000  ");
+        fprintf(stream, "   0.000  ");
     else {
         re_dub = (double)min_meta;
         for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
             re_dub /= 1024.0;
         assert(suffix_i < sizeof(suffixes));
-        HDfprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
+        fprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
     }
 
     if (count_raw == 0)
-        HDfprintf(stream, "   0.000 \n");
+        fprintf(stream, "   0.000 \n");
     else {
         re_dub = (double)min_raw;
         for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
             re_dub /= 1024.0;
         assert(suffix_i < sizeof(suffixes));
-        HDfprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
+        fprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
     }
 
-    HDfprintf(stream, "  avg ");
+    fprintf(stream, "  avg ");
     re_dub = (double)average_meta;
     for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
         re_dub /= 1024.0;
     assert(suffix_i < sizeof(suffixes));
-    HDfprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
+    fprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
 
     re_dub = (double)average_raw;
     for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
         re_dub /= 1024.0;
     assert(suffix_i < sizeof(suffixes));
-    HDfprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
+    fprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
 
-    HDfprintf(stream, "  max ");
+    fprintf(stream, "  max ");
     re_dub = (double)max_meta;
     for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
         re_dub /= 1024.0;
     assert(suffix_i < sizeof(suffixes));
-    HDfprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
+    fprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
 
     re_dub = (double)max_raw;
     for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
         re_dub /= 1024.0;
     assert(suffix_i < sizeof(suffixes));
-    HDfprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
+    fprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
 
     /******************************
      * PRINT INDIVIDUAL BIN STATS *
      ******************************/
 
-    HDfprintf(stream, "BINS             # of reads      total bytes         average size\n");
-    HDfprintf(stream, "    up-to      meta     raw     meta      raw       meta      raw\n");
+    fprintf(stream, "BINS             # of reads      total bytes         average size\n");
+    fprintf(stream, "    up-to      meta     raw     meta      raw       meta      raw\n");
 
     for (i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
         const ros3_statsbin *m;
@@ -1003,10 +1003,10 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
 
         if (i == ROS3_STATS_BIN_COUNT) {
             range_end = ros3_stats_boundaries[i - 1];
-            HDfprintf(stream, ">");
+            fprintf(stream, ">");
         }
         else
-            HDfprintf(stream, " ");
+            fprintf(stream, " ");
 
         bm_val = (double)m->bytes;
         for (suffix_i = 0; bm_val >= 1024.0; suffix_i++)
@@ -1039,14 +1039,14 @@ ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
             re_dub /= 1024.0;
         assert(suffix_i < sizeof(suffixes));
 
-        HDfprintf(stream, " %8.3f%c %7d %7d %8.3f%c %8.3f%c %8.3f%c %8.3f%c\n", re_dub,
-                  suffixes[suffix_i], /* bin ceiling      */
-                  m->count,           /* metadata reads   */
-                  r->count,           /* raw data reads    */
-                  bm_val, bm_suffix,  /* metadata bytes   */
-                  br_val, br_suffix,  /* raw data bytes    */
-                  am_val, am_suffix,  /* metadata average */
-                  ar_val, ar_suffix); /* raw data average  */
+        fprintf(stream, " %8.3f%c %7d %7d %8.3f%c %8.3f%c %8.3f%c %8.3f%c\n", re_dub,
+                suffixes[suffix_i], /* bin ceiling      */
+                m->count,           /* metadata reads   */
+                r->count,           /* raw data reads    */
+                bm_val, bm_suffix,  /* metadata bytes   */
+                br_val, br_suffix,  /* raw data bytes    */
+                am_val, am_suffix,  /* metadata average */
+                ar_val, ar_suffix); /* raw data average  */
 
         HDfflush(stream);
     }
@@ -1083,7 +1083,7 @@ H5FD__ros3_close(H5FD_t H5_ATTR_UNUSED *_file)
     FUNC_ENTER_PACKAGE
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD__ros3_close() called.\n");
+    fprintf(stdout, "H5FD__ros3_close() called.\n");
 #endif
 
     /* Sanity checks */
@@ -1152,7 +1152,7 @@ H5FD__ros3_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
     FUNC_ENTER_PACKAGE_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD__ros3_cmp() called.\n");
+    fprintf(stdout, "H5FD__ros3_cmp() called.\n");
 #endif
 
     assert(f1->s3r_handle != NULL);
@@ -1264,7 +1264,7 @@ H5FD__ros3_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags)
     FUNC_ENTER_PACKAGE_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD__ros3_query() called.\n");
+    fprintf(stdout, "H5FD__ros3_query() called.\n");
 #endif
 
     /* Set the VFL feature flags that this driver supports */
@@ -1304,7 +1304,7 @@ H5FD__ros3_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
     FUNC_ENTER_PACKAGE_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD__ros3_get_eoa() called.\n");
+    fprintf(stdout, "H5FD__ros3_get_eoa() called.\n");
 #endif
 
     FUNC_LEAVE_NOAPI(file->eoa)
@@ -1335,7 +1335,7 @@ H5FD__ros3_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
     FUNC_ENTER_PACKAGE_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD__ros3_set_eoa() called.\n");
+    fprintf(stdout, "H5FD__ros3_set_eoa() called.\n");
 #endif
 
     file->eoa = addr;
@@ -1369,7 +1369,7 @@ H5FD__ros3_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
     FUNC_ENTER_PACKAGE_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD__ros3_get_eof() called.\n");
+    fprintf(stdout, "H5FD__ros3_get_eof() called.\n");
 #endif
 
     FUNC_LEAVE_NOAPI(H5FD_s3comms_s3r_get_filesize(file->s3r_handle))
@@ -1401,7 +1401,7 @@ H5FD__ros3_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_hand
     FUNC_ENTER_PACKAGE
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD__ros3_get_handle() called.\n");
+    fprintf(stdout, "H5FD__ros3_get_handle() called.\n");
 #endif
 
     if (!file_handle)
@@ -1451,7 +1451,7 @@ H5FD__ros3_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
     FUNC_ENTER_PACKAGE
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD__ros3_read() called.\n");
+    fprintf(stdout, "H5FD__ros3_read() called.\n");
 #endif
 
     assert(file != NULL);
@@ -1521,7 +1521,7 @@ H5FD__ros3_write(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, h
     FUNC_ENTER_PACKAGE
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD__ros3_write() called.\n");
+    fprintf(stdout, "H5FD__ros3_write() called.\n");
 #endif
 
     HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "cannot write to read-only file.")
@@ -1559,7 +1559,7 @@ H5FD__ros3_truncate(H5FD_t H5_ATTR_UNUSED *_file, hid_t H5_ATTR_UNUSED dxpl_id,
     FUNC_ENTER_PACKAGE
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD__ros3_truncate() called.\n");
+    fprintf(stdout, "H5FD__ros3_truncate() called.\n");
 #endif
 
     HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "cannot truncate read-only file.")
diff --git a/src/H5FDs3comms.c b/src/H5FDs3comms.c
index 0d6f202..c088fca 100644
--- a/src/H5FDs3comms.c
+++ b/src/H5FDs3comms.c
@@ -222,13 +222,13 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_hrb_node_set.");
-    HDprintf("NAME: %s\n", name);
-    HDprintf("VALUE: %s\n", value);
-    HDprintf("LIST:\n->");
+    fprintf(stdout, "called H5FD_s3comms_hrb_node_set.");
+    printf("NAME: %s\n", name);
+    printf("VALUE: %s\n", value);
+    printf("LIST:\n->");
     for (node_ptr = (*L); node_ptr != NULL; node_ptr = node_ptr->next)
-        HDfprintf(stdout, "{%s}\n->", node_ptr->cat);
-    HDprintf("(null)\n");
+        fprintf(stdout, "{%s}\n->", node_ptr->cat);
+    printf("(null)\n");
     HDfflush(stdout);
     node_ptr = NULL;
 #endif
@@ -301,7 +301,7 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "trying to remove node from empty list")
         else {
 #if S3COMMS_DEBUG
-            HDprintf("CREATE NEW\n");
+            printf("CREATE NEW\n");
             HDfflush(stdout);
 #endif
             /*******************
@@ -332,7 +332,7 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
 
         if (value == NULL) {
 #if S3COMMS_DEBUG
-            HDprintf("REMOVE HEAD\n");
+            printf("REMOVE HEAD\n");
             HDfflush(stdout);
 #endif
             /***************
@@ -342,39 +342,39 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
             *L = node_ptr->next;
 
 #if S3COMMS_DEBUG
-            HDprintf("FREEING CAT (node)\n");
+            printf("FREEING CAT (node)\n");
             HDfflush(stdout);
 #endif
             H5MM_xfree(node_ptr->cat);
 #if S3COMMS_DEBUG
-            HDprintf("FREEING LOWERNAME (node)\n");
+            printf("FREEING LOWERNAME (node)\n");
             HDfflush(stdout);
 #endif
             H5MM_xfree(node_ptr->lowername);
 #if S3COMMS_DEBUG
-            HDprintf("FREEING NAME (node)\n");
+            printf("FREEING NAME (node)\n");
             HDfflush(stdout);
 #endif
             H5MM_xfree(node_ptr->name);
 #if S3COMMS_DEBUG
-            HDprintf("FREEING VALUE (node)\n");
+            printf("FREEING VALUE (node)\n");
             HDfflush(stdout);
 #endif
             H5MM_xfree(node_ptr->value);
 #if S3COMMS_DEBUG
-            HDprintf("MAGIC OK? %s\n", (node_ptr->magic == S3COMMS_HRB_NODE_MAGIC) ? "YES" : "NO");
+            printf("MAGIC OK? %s\n", (node_ptr->magic == S3COMMS_HRB_NODE_MAGIC) ? "YES" : "NO");
             HDfflush(stdout);
 #endif
             assert(node_ptr->magic == S3COMMS_HRB_NODE_MAGIC);
             node_ptr->magic += 1ul;
 #if S3COMMS_DEBUG
-            HDprintf("FREEING POINTER\n");
+            printf("FREEING POINTER\n");
             HDfflush(stdout);
 #endif
             H5MM_xfree(node_ptr);
 
 #if S3COMMS_DEBUG
-            HDprintf("FREEING WORKING LOWERNAME\n");
+            printf("FREEING WORKING LOWERNAME\n");
             HDfflush(stdout);
 #endif
             H5MM_xfree(lowername);
@@ -382,7 +382,7 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
         }
         else {
 #if S3COMMS_DEBUG
-            HDprintf("MODIFY HEAD\n");
+            printf("MODIFY HEAD\n");
             HDfflush(stdout);
 #endif
             /***************
@@ -412,7 +412,7 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "trying to remove a node 'before' head")
         else {
 #if S3COMMS_DEBUG
-            HDprintf("PREPEND NEW HEAD\n");
+            printf("PREPEND NEW HEAD\n");
             HDfflush(stdout);
 #endif
             /*******************
@@ -441,7 +441,7 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "trying to remove absent node")
             else {
 #if S3COMMS_DEBUG
-                HDprintf("APPEND A NODE\n");
+                printf("APPEND A NODE\n");
                 HDfflush(stdout);
 #endif
                 /*******************
@@ -464,7 +464,7 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "trying to remove absent node")
             else {
 #if S3COMMS_DEBUG
-                HDprintf("INSERT A NODE\n");
+                printf("INSERT A NODE\n");
                 HDfflush(stdout);
 #endif
                 /*******************
@@ -493,7 +493,7 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
                 node_ptr->next  = tmp->next;
 
 #if S3COMMS_DEBUG
-                HDprintf("REMOVE A NODE\n");
+                printf("REMOVE A NODE\n");
                 HDfflush(stdout);
 #endif
                 H5MM_xfree(tmp->cat);
@@ -510,7 +510,7 @@ H5FD_s3comms_hrb_node_set(hrb_node_t **L, const char *name, const char *value)
             }
             else {
 #if S3COMMS_DEBUG
-                HDprintf("MODIFY A NODE\n");
+                printf("MODIFY A NODE\n");
                 HDfflush(stdout);
 #endif
                 /*****************
@@ -609,7 +609,7 @@ H5FD_s3comms_hrb_destroy(hrb_t **_buf)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_hrb_destroy.\n");
+    fprintf(stdout, "called H5FD_s3comms_hrb_destroy.\n");
 #endif
 
     if (_buf != NULL && *_buf != NULL) {
@@ -673,7 +673,7 @@ H5FD_s3comms_hrb_init_request(const char *_verb, const char *_resource, const ch
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_hrb_init_request.\n");
+    fprintf(stdout, "called H5FD_s3comms_hrb_init_request.\n");
 #endif
 
     if (_resource == NULL)
@@ -780,7 +780,7 @@ H5FD_s3comms_s3r_close(s3r_t *handle)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_s3r_close.\n");
+    fprintf(stdout, "called H5FD_s3comms_s3r_close.\n");
 #endif
 
     if (handle == NULL)
@@ -885,7 +885,7 @@ H5FD_s3comms_s3r_getsize(s3r_t *handle)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_s3r_getsize.\n");
+    fprintf(stdout, "called H5FD_s3comms_s3r_getsize.\n");
 #endif
 
     if (handle == NULL)
@@ -934,7 +934,7 @@ H5FD_s3comms_s3r_getsize(s3r_t *handle)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "No HTTP metadata")
 #if S3COMMS_DEBUG
     else
-        HDfprintf(stderr, "GETSIZE: OK\n");
+        fprintf(stderr, "GETSIZE: OK\n");
 #endif
 
     /******************
@@ -1034,7 +1034,7 @@ H5FD_s3comms_s3r_open(const char *url, const char *region, const char *id, const
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_s3r_open.\n");
+    fprintf(stdout, "called H5FD_s3comms_s3r_open.\n");
 #endif
 
     if (url == NULL || url[0] == '\0')
@@ -1221,7 +1221,7 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_s3r_read.\n");
+    fprintf(stdout, "called H5FD_s3comms_s3r_read.\n");
 #endif
 
     /**************************************
@@ -1282,8 +1282,8 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
     }
 
 #if S3COMMS_DEBUG
-    HDfprintf(stderr, "%s: Bytes %" PRIuHADDR " - %" PRIuHADDR ", Request Size: %zu\n", handle->httpverb,
-              offset, offset + len, len);
+    fprintf(stderr, "%s: Bytes %" PRIuHADDR " - %" PRIuHADDR ", Request Size: %zu\n", handle->httpverb,
+            offset, offset + len, len);
 #endif
 
     /*******************
@@ -1465,8 +1465,8 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
         if (p_status != CURLE_OK) {
             if (CURLE_OK != curl_easy_getinfo(curlh, CURLINFO_RESPONSE_CODE, &httpcode))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "problem getting response code")
-            HDfprintf(stderr, "CURL ERROR CODE: %d\nHTTP CODE: %d\n", p_status, httpcode);
-            HDfprintf(stderr, "%s\n", curl_easy_strerror(p_status));
+            fprintf(stderr, "CURL ERROR CODE: %d\nHTTP CODE: %d\n", p_status, httpcode);
+            fprintf(stderr, "%s\n", curl_easy_strerror(p_status));
             HGOTO_ERROR(H5E_VFL, H5E_CANTOPENFILE, FAIL, "problem while performing request.");
         }
         if (CURLE_OK != curl_easy_setopt(curlh, CURLOPT_ERRORBUFFER, NULL))
@@ -1481,19 +1481,19 @@ H5FD_s3comms_s3r_read(s3r_t *handle, haddr_t offset, size_t len, void *dest)
 
 #if S3COMMS_DEBUG
     if (dest != NULL) {
-        HDfprintf(stderr, "len: %d\n", (int)len);
-        HDfprintf(stderr, "CHECKING FOR BUFFER OVERFLOW\n");
+        fprintf(stderr, "len: %d\n", (int)len);
+        fprintf(stderr, "CHECKING FOR BUFFER OVERFLOW\n");
         if (sds == NULL)
-            HDfprintf(stderr, "sds is NULL!\n");
+            fprintf(stderr, "sds is NULL!\n");
         else {
-            HDfprintf(stderr, "sds: 0x%lx\n", (long long)sds);
-            HDfprintf(stderr, "sds->size: %d\n", (int)sds->size);
+            fprintf(stderr, "sds: 0x%lx\n", (long long)sds);
+            fprintf(stderr, "sds->size: %d\n", (int)sds->size);
             if (len > sds->size)
-                HDfprintf(stderr, "buffer overwrite\n");
+                fprintf(stderr, "buffer overwrite\n");
         }
     }
     else
-        HDfprintf(stderr, "performed on entire file\n");
+        fprintf(stderr, "performed on entire file\n");
 #endif
 
 done:
@@ -1639,7 +1639,7 @@ H5FD_s3comms_aws_canonical_request(char *canonical_request_dest, int _cr_size, c
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_aws_canonical_request.\n");
+    fprintf(stdout, "called H5FD_s3comms_aws_canonical_request.\n");
 #endif
 
     if (http_request == NULL)
@@ -1746,7 +1746,7 @@ H5FD_s3comms_bytes_to_hex(char *dest, const unsigned char *msg, size_t msg_len,
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_bytes_to_hex.\n");
+    fprintf(stdout, "called H5FD_s3comms_bytes_to_hex.\n");
 #endif
 
     if (dest == NULL)
@@ -1790,7 +1790,7 @@ H5FD_s3comms_free_purl(parsed_url_t *purl)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
 #if S3COMMS_DEBUG
-    HDprintf("called H5FD_s3comms_free_purl.\n");
+    printf("called H5FD_s3comms_free_purl.\n");
 #endif
 
     if (purl != NULL) {
@@ -1853,7 +1853,7 @@ H5FD_s3comms_HMAC_SHA256(const unsigned char *key, size_t key_len, const char *m
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_HMAC_SHA256.\n");
+    fprintf(stdout, "called H5FD_s3comms_HMAC_SHA256.\n");
 #endif
 
     if (dest == NULL)
@@ -1943,7 +1943,7 @@ H5FD__s3comms_load_aws_creds_from_file(FILE *file, const char *profile_name, cha
     FUNC_ENTER_PACKAGE
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called load_aws_creds_from_file.\n");
+    fprintf(stdout, "called load_aws_creds_from_file.\n");
 #endif
 
     /* format target line for start of profile */
@@ -2063,7 +2063,7 @@ H5FD_s3comms_load_aws_profile(const char *profile_name, char *key_id_out, char *
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_load_aws_profile.\n");
+    fprintf(stdout, "called H5FD_s3comms_load_aws_profile.\n");
 #endif
 
 #ifdef H5_HAVE_WIN32_API
@@ -2148,7 +2148,7 @@ H5FD_s3comms_nlowercase(char *dest, const char *s, size_t len)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_nlowercase.\n");
+    fprintf(stdout, "called H5FD_s3comms_nlowercase.\n");
 #endif
 
     if (dest == NULL)
@@ -2211,7 +2211,7 @@ H5FD_s3comms_parse_url(const char *str, parsed_url_t **_purl)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDprintf("called H5FD_s3comms_parse_url.\n");
+    printf("called H5FD_s3comms_parse_url.\n");
 #endif
 
     if (str == NULL || *str == '\0')
@@ -2427,7 +2427,7 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_percent_encode_char.\n");
+    fprintf(stdout, "called H5FD_s3comms_percent_encode_char.\n");
 #endif
 
     if (repr == NULL)
@@ -2435,8 +2435,8 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
 
 #if S3COMMS_DEBUG
     H5FD_s3comms_bytes_to_hex((char *)hex, s, 1, FALSE);
-    HDfprintf(stdout, "    CHAR: \'%s\'\n", s);
-    HDfprintf(stdout, "    CHAR-HEX: \"%s\"\n", hex);
+    fprintf(stdout, "    CHAR: \'%s\'\n", s);
+    fprintf(stdout, "    CHAR-HEX: \"%s\"\n", hex);
 #endif
 
     if (c <= (unsigned char)0x7f) {
@@ -2444,7 +2444,7 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
          * and single percent-code
          */
 #if S3COMMS_DEBUG
-        HDfprintf(stdout, "    SINGLE-BYTE\n");
+        fprintf(stdout, "    SINGLE-BYTE\n");
 #endif
         *repr_len     = 3;
         chars_written = HDsnprintf(repr, 4, "%%%02X", c);
@@ -2459,7 +2459,7 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
         unsigned int  stack_size = 0;
         unsigned char stack[4]   = {0, 0, 0, 0};
 #if S3COMMS_DEBUG
-        HDfprintf(stdout, "    MULTI-BYTE\n");
+        fprintf(stdout, "    MULTI-BYTE\n");
 #endif
         stack_size = 0;
         k          = (unsigned int)c;
@@ -2479,13 +2479,13 @@ H5FD_s3comms_percent_encode_char(char *repr, const unsigned char c, size_t *repr
          */
 
 #if S3COMMS_DEBUG
-        HDfprintf(stdout, "    STACK:\n    {\n");
+        fprintf(stdout, "    STACK:\n    {\n");
         for (i = 0; i < stack_size; i++) {
             H5FD_s3comms_bytes_to_hex((char *)hex, (&stack[i]), 1, FALSE);
             hex[2] = 0;
-            HDfprintf(stdout, "      %s,\n", hex);
+            fprintf(stdout, "      %s,\n", hex);
         }
-        HDfprintf(stdout, "    }\n");
+        fprintf(stdout, "    }\n");
 #endif
 
         /****************
@@ -2575,7 +2575,7 @@ H5FD_s3comms_signing_key(unsigned char *md, const char *secret, const char *regi
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_signing_key.\n");
+    fprintf(stdout, "called H5FD_s3comms_signing_key.\n");
 #endif
 
     if (md == NULL)
@@ -2667,7 +2667,7 @@ H5FD_s3comms_tostringtosign(char *dest, const char *req, const char *now, const
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_tostringtosign.\n");
+    fprintf(stdout, "called H5FD_s3comms_tostringtosign.\n");
 #endif
 
     if (dest == NULL)
@@ -2754,7 +2754,7 @@ H5FD_s3comms_trim(char *dest, char *s, size_t s_len, size_t *n_written)
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "called H5FD_s3comms_trim.\n");
+    fprintf(stdout, "called H5FD_s3comms_trim.\n");
 #endif
 
     if (dest == NULL)
@@ -2844,7 +2844,7 @@ H5FD_s3comms_uriencode(char *dest, const char *s, size_t s_len, hbool_t encode_s
     FUNC_ENTER_NOAPI_NOINIT
 
 #if S3COMMS_DEBUG
-    HDfprintf(stdout, "H5FD_s3comms_uriencode called.\n");
+    fprintf(stdout, "H5FD_s3comms_uriencode called.\n");
 #endif
 
     if (s == NULL)
diff --git a/src/H5FDspace.c b/src/H5FDspace.c
index 8b75292..99430ce 100644
--- a/src/H5FDspace.c
+++ b/src/H5FDspace.c
@@ -147,7 +147,7 @@ H5FD__alloc_real(H5FD_t *file, H5FD_mem_t type, hsize_t size, haddr_t *frag_addr
 
     FUNC_ENTER_PACKAGE
 #ifdef H5FD_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)type, size);
+    fprintf(stderr, "%s: type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)type, size);
 #endif /* H5FD_ALLOC_DEBUG */
 
     /* check args */
@@ -210,7 +210,7 @@ H5FD__alloc_real(H5FD_t *file, H5FD_mem_t type, hsize_t size, haddr_t *frag_addr
 
 done:
 #ifdef H5FD_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: ret_value = %" PRIuHADDR "\n", __func__, ret_value);
+    fprintf(stderr, "%s: ret_value = %" PRIuHADDR "\n", __func__, ret_value);
 #endif /* H5FD_ALLOC_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__alloc_real() */
@@ -286,8 +286,8 @@ H5FD__free_real(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size)
     assert(size > 0);
 
 #ifdef H5FD_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: type = %u, addr = %" PRIuHADDR ", size = %" PRIuHSIZE "\n", __func__,
-              (unsigned)type, addr, size);
+    fprintf(stderr, "%s: type = %u, addr = %" PRIuHADDR ", size = %" PRIuHSIZE "\n", __func__, (unsigned)type,
+            addr, size);
 #endif /* H5FD_ALLOC_DEBUG */
 
     /* Sanity checking */
@@ -304,7 +304,7 @@ H5FD__free_real(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size)
     /* Check for file driver 'free' callback and call it if available */
     if (file->cls->free) {
 #ifdef H5FD_ALLOC_DEBUG
-        HDfprintf(stderr, "%s: Letting VFD free space\n", __func__);
+        fprintf(stderr, "%s: Letting VFD free space\n", __func__);
 #endif /* H5FD_ALLOC_DEBUG */
         if ((file->cls->free)(file, type, H5CX_get_dxpl(), addr, size) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "driver free request failed")
@@ -317,11 +317,11 @@ H5FD__free_real(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size)
 
         eoa = file->cls->get_eoa(file, type);
 #ifdef H5FD_ALLOC_DEBUG
-        HDfprintf(stderr, "%s: eoa = %" PRIuHADDR "\n", __func__, eoa);
+        fprintf(stderr, "%s: eoa = %" PRIuHADDR "\n", __func__, eoa);
 #endif /* H5FD_ALLOC_DEBUG */
         if (eoa == (addr + size)) {
 #ifdef H5FD_ALLOC_DEBUG
-            HDfprintf(stderr, "%s: Reducing file size to = %" PRIuHADDR "\n", __func__, addr);
+            fprintf(stderr, "%s: Reducing file size to = %" PRIuHADDR "\n", __func__, addr);
 #endif /* H5FD_ALLOC_DEBUG */
             if (file->cls->set_eoa(file, type, addr) < 0)
                 HGOTO_ERROR(H5E_VFL, H5E_CANTSET, FAIL, "set end of space allocation request failed")
@@ -330,8 +330,8 @@ H5FD__free_real(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size)
     else {
         /* leak memory */
 #ifdef H5FD_ALLOC_DEBUG
-        HDfprintf(stderr, "%s: LEAKED MEMORY!!! type = %u, addr = %" PRIuHADDR ", size = %" PRIuHSIZE "\n",
-                  __func__, (unsigned)type, addr, size);
+        fprintf(stderr, "%s: LEAKED MEMORY!!! type = %u, addr = %" PRIuHADDR ", size = %" PRIuHSIZE "\n",
+                __func__, (unsigned)type, addr, size);
 #endif /* H5FD_ALLOC_DEBUG */
     }  /* end else */
 
diff --git a/src/H5FDsplitter.c b/src/H5FDsplitter.c
index 1159694..70a3caf 100644
--- a/src/H5FDsplitter.c
+++ b/src/H5FDsplitter.c
@@ -89,7 +89,7 @@ typedef struct H5FD_splitter_t {
 #if H5FD_SPLITTER_DEBUG_OP_CALLS
 #define H5FD_SPLITTER_LOG_CALL(name)                                                                         \
     do {                                                                                                     \
-        HDprintf("called %s()\n", (name));                                                                   \
+        printf("called %s()\n", (name));                                                                     \
         HDfflush(stdout);                                                                                    \
     } while (0)
 #else
diff --git a/src/H5FDsubfiling/H5FDioc.c b/src/H5FDsubfiling/H5FDioc.c
index 2211e6e..190c8c4 100644
--- a/src/H5FDsubfiling/H5FDioc.c
+++ b/src/H5FDsubfiling/H5FDioc.c
@@ -91,7 +91,7 @@ typedef struct H5FD_ioc_t {
 #ifdef H5FD_IOC_DEBUG
 #define H5FD_IOC_LOG_CALL(name)                                                                              \
     do {                                                                                                     \
-        HDprintf("called %s()\n", (name));                                                                   \
+        printf("called %s()\n", (name));                                                                     \
         HDfflush(stdout);                                                                                    \
     } while (0)
 #else
@@ -1501,7 +1501,7 @@ H5FD__ioc_del(const char *name, hid_t fapl)
         if (NULL == (config_file = HDfopen(tmp_filename, "r"))) {
             if (ENOENT == errno) {
 #ifdef H5FD_IOC_DEBUG
-                HDprintf("** WARNING: couldn't delete Subfiling configuration file '%s'\n", tmp_filename);
+                printf("** WARNING: couldn't delete Subfiling configuration file '%s'\n", tmp_filename);
 #endif
 
                 H5_SUBFILING_GOTO_DONE(SUCCEED);
@@ -1540,7 +1540,7 @@ H5FD__ioc_del(const char *name, hid_t fapl)
 
             if (HDremove(tmp_filename) < 0) {
 #ifdef H5FD_IOC_DEBUG
-                HDprintf("** WARNING: couldn't delete subfile '%s'\n", tmp_filename);
+                printf("** WARNING: couldn't delete subfile '%s'\n", tmp_filename);
 #endif
 
                 if (ENOENT != errno)
diff --git a/src/H5FDsubfiling/H5FDioc_threads.c b/src/H5FDsubfiling/H5FDioc_threads.c
index 579b686..64529b9 100644
--- a/src/H5FDsubfiling/H5FDioc_threads.c
+++ b/src/H5FDsubfiling/H5FDioc_threads.c
@@ -195,7 +195,7 @@ initialize_ioc_threads(void *_sf_context)
 
 #ifdef H5FD_IOC_DEBUG
     if (sf_context->topology->ioc_idx == 0) {
-        HDprintf("%s: time = %lf seconds\n", __func__, (t_end - t_start));
+        printf("%s: time = %lf seconds\n", __func__, (t_end - t_start));
         HDfflush(stdout);
     }
 #endif
@@ -1047,8 +1047,8 @@ ioc_file_write_data(int fd, int64_t file_offset, void *data_buffer, int64_t data
             bytes_remaining -= bytes_written;
 
 #ifdef H5FD_IOC_DEBUG
-            HDprintf("[ioc(%d) %s]: wrote %ld bytes, remaining=%ld, file_offset=%" PRId64 "\n", ioc_idx,
-                     __func__, bytes_written, bytes_remaining, file_offset);
+            printf("[ioc(%d) %s]: wrote %ld bytes, remaining=%ld, file_offset=%" PRId64 "\n", ioc_idx,
+                   __func__, bytes_written, bytes_remaining, file_offset);
 #endif
 
             this_data += bytes_written;
@@ -1099,8 +1099,8 @@ ioc_file_read_data(int fd, int64_t file_offset, void *data_buffer, int64_t data_
             bytes_remaining -= bytes_read;
 
 #ifdef H5FD_IOC_DEBUG
-            HDprintf("[ioc(%d) %s]: read %ld bytes, remaining=%ld, file_offset=%" PRId64 "\n", ioc_idx,
-                     __func__, bytes_read, bytes_remaining, file_offset);
+            printf("[ioc(%d) %s]: read %ld bytes, remaining=%ld, file_offset=%" PRId64 "\n", ioc_idx,
+                   __func__, bytes_read, bytes_remaining, file_offset);
 #endif
 
             this_buffer += bytes_read;
@@ -1116,8 +1116,8 @@ ioc_file_read_data(int fd, int64_t file_offset, void *data_buffer, int64_t data_
         else {
             if (retries == 0) {
 #ifdef H5FD_IOC_DEBUG
-                HDprintf("[ioc(%d) %s]: TIMEOUT: file_offset=%" PRId64 ", data_size=%ld\n", ioc_idx, __func__,
-                         file_offset, data_size);
+                printf("[ioc(%d) %s]: TIMEOUT: file_offset=%" PRId64 ", data_size=%ld\n", ioc_idx, __func__,
+                       file_offset, data_size);
 #endif
 
                 H5_SUBFILING_SYS_GOTO_ERROR(H5E_IO, H5E_READERROR, -1, "HDpread failed");
@@ -1176,8 +1176,8 @@ ioc_file_truncate(sf_work_request_t *msg)
         H5_SUBFILING_MPI_GOTO_ERROR(FAIL, "MPI_Send failed", mpi_code);
 
 #ifdef H5FD_IOC_DEBUG
-    HDprintf("[ioc(%d) %s]: truncated subfile to %lld bytes. ret = %d\n", ioc_idx, __func__,
-             (long long)length, errno);
+    printf("[ioc(%d) %s]: truncated subfile to %lld bytes. ret = %d\n", ioc_idx, __func__, (long long)length,
+           errno);
     HDfflush(stdout);
 #endif
 
diff --git a/src/H5FDsubfiling/H5FDsubfiling.c b/src/H5FDsubfiling/H5FDsubfiling.c
index e75b2f4..59a193e 100644
--- a/src/H5FDsubfiling/H5FDsubfiling.c
+++ b/src/H5FDsubfiling/H5FDsubfiling.c
@@ -393,8 +393,8 @@ H5FD__subfiling_term(void)
             }
 #ifdef H5FD_SUBFILING_DEBUG
             else
-                HDprintf("** WARNING **: HDF5 is terminating the Subfiling VFD after MPI_Finalize() was "
-                         "called - an HDF5 ID was probably left unclosed\n");
+                printf("** WARNING **: HDF5 is terminating the Subfiling VFD after MPI_Finalize() was "
+                       "called - an HDF5 ID was probably left unclosed\n");
 #endif
         }
 
diff --git a/src/H5FDsubfiling/H5subfiling_common.c b/src/H5FDsubfiling/H5subfiling_common.c
index 2874e64..6302b08 100644
--- a/src/H5FDsubfiling/H5subfiling_common.c
+++ b/src/H5FDsubfiling/H5subfiling_common.c
@@ -268,7 +268,7 @@ H5_get_subfiling_object(int64_t object_id)
     }
 #ifdef H5_SUBFILING_DEBUG
     else
-        HDprintf("%s: Unknown subfiling object type for ID %" PRId64 "\n", __func__, object_id);
+        printf("%s: Unknown subfiling object type for ID %" PRId64 "\n", __func__, object_id);
 #endif
 
 done:
@@ -990,7 +990,7 @@ init_app_topology(H5FD_subfiling_params_t *subfiling_config, MPI_Comm comm, MPI_
                     errno          = 0;
                     ioc_select_val = HDstrtol(env_value, NULL, 0);
                     if ((ERANGE == errno)) {
-                        HDprintf("invalid value '%s' for " H5FD_SUBFILING_IOC_PER_NODE "\n", env_value);
+                        printf("invalid value '%s' for " H5FD_SUBFILING_IOC_PER_NODE "\n", env_value);
                         ioc_select_val = 1;
                     }
 
@@ -1017,9 +1017,9 @@ init_app_topology(H5FD_subfiling_params_t *subfiling_config, MPI_Comm comm, MPI_
                 errno          = 0;
                 ioc_select_val = HDstrtol(ioc_sel_str, NULL, 0);
                 if ((ERANGE == errno) || (ioc_select_val <= 0)) {
-                    HDprintf("invalid IOC selection strategy string '%s' for strategy "
-                             "SELECT_IOC_EVERY_NTH_RANK; defaulting to SELECT_IOC_ONE_PER_NODE\n",
-                             ioc_sel_str);
+                    printf("invalid IOC selection strategy string '%s' for strategy "
+                           "SELECT_IOC_EVERY_NTH_RANK; defaulting to SELECT_IOC_ONE_PER_NODE\n",
+                           ioc_sel_str);
 
                     ioc_select_val     = 1;
                     ioc_selection_type = SELECT_IOC_ONE_PER_NODE;
@@ -1053,9 +1053,9 @@ init_app_topology(H5FD_subfiling_params_t *subfiling_config, MPI_Comm comm, MPI_
                 errno          = 0;
                 ioc_select_val = HDstrtol(ioc_sel_str, NULL, 0);
                 if ((ERANGE == errno) || (ioc_select_val <= 0)) {
-                    HDprintf("invalid IOC selection strategy string '%s' for strategy SELECT_IOC_TOTAL; "
-                             "defaulting to SELECT_IOC_ONE_PER_NODE\n",
-                             ioc_sel_str);
+                    printf("invalid IOC selection strategy string '%s' for strategy SELECT_IOC_TOTAL; "
+                           "defaulting to SELECT_IOC_ONE_PER_NODE\n",
+                           ioc_sel_str);
 
                     ioc_select_val     = 1;
                     ioc_selection_type = SELECT_IOC_ONE_PER_NODE;
@@ -3122,7 +3122,7 @@ H5_subfiling_log(int64_t sf_context_id, const char *fmt, ...)
 
     /* Retrieve the subfiling object for the newly-created context ID */
     if (NULL == (sf_context = H5_get_subfiling_object(sf_context_id))) {
-        HDprintf("%s: couldn't get subfiling object from context ID\n", __func__);
+        printf("%s: couldn't get subfiling object from context ID\n", __func__);
         goto done;
     }
 
diff --git a/src/H5FL.c b/src/H5FL.c
index ee68273..46e7b2f 100644
--- a/src/H5FL.c
+++ b/src/H5FL.c
@@ -198,9 +198,9 @@ H5FL_term_package(void)
         /* Dump information about all the outstanding allocations */
         while (trk != NULL) {
             /* Print information about the outstanding block */
-            HDfprintf(stderr, "%s: Outstanding allocation:\n", __func__);
-            HDfprintf(stderr, "\tPtr: %p, File: %s, Function: %s, Line: %d\n",
-                      (((unsigned char *)trk) + sizeof(H5FL_track_t)), trk->file, trk->func, trk->line);
+            fprintf(stderr, "%s: Outstanding allocation:\n", __func__);
+            fprintf(stderr, "\tPtr: %p, File: %s, Function: %s, Line: %d\n",
+                    (((unsigned char *)trk) + sizeof(H5FL_track_t)), trk->file, trk->func, trk->line);
             H5CS_print_stack(trk->stack, stderr);
 
             /* Advance to next node */
@@ -622,8 +622,8 @@ H5FL__reg_term(void)
         tmp = H5FL_reg_gc_head.first->next;
 
 #ifdef H5FL_DEBUG
-        HDprintf("%s: head->name = %s, head->allocated = %d\n", __func__, H5FL_reg_gc_head.first->list->name,
-                 (int)H5FL_reg_gc_head.first->list->allocated);
+        printf("%s: head->name = %s, head->allocated = %d\n", __func__, H5FL_reg_gc_head.first->list->name,
+               (int)H5FL_reg_gc_head.first->list->allocated);
 #endif /* H5FL_DEBUG */
         /* Check if the list has allocations outstanding */
         if (H5FL_reg_gc_head.first->list->allocated > 0) {
@@ -1323,8 +1323,8 @@ H5FL__blk_term(void)
         tmp = H5FL_blk_gc_head.first->next;
 
 #ifdef H5FL_DEBUG
-        HDprintf("%s: head->name = %s, head->allocated = %d\n", __func__, H5FL_blk_gc_head.first->pq->name,
-                 (int)H5FL_blk_gc_head.first->pq->allocated);
+        printf("%s: head->name = %s, head->allocated = %d\n", __func__, H5FL_blk_gc_head.first->pq->name,
+               (int)H5FL_blk_gc_head.first->pq->allocated);
 #endif /* H5FL_DEBUG */
 
         /* Check if the list has allocations outstanding */
@@ -1866,8 +1866,8 @@ H5FL__arr_term(void)
 
         /* Check if the list has allocations outstanding */
 #ifdef H5FL_DEBUG
-        HDprintf("%s: head->name = %s, head->allocated = %d\n", __func__, H5FL_arr_gc_head.first->list->name,
-                 (int)H5FL_arr_gc_head.first->list->allocated);
+        printf("%s: head->name = %s, head->allocated = %d\n", __func__, H5FL_arr_gc_head.first->list->name,
+               (int)H5FL_arr_gc_head.first->list->allocated);
 #endif /* H5FL_DEBUG */
         if (H5FL_arr_gc_head.first->list->allocated > 0) {
             /* Add free list to the list of nodes with allocations open still */
@@ -2457,8 +2457,8 @@ H5FL__fac_term_all(void)
         tmp = H5FL_fac_gc_head.first->next;
 
 #ifdef H5FL_DEBUG
-        HDprintf("%s: head->size = %d, head->allocated = %d\n", __func__,
-                 (int)H5FL_fac_gc_head.first->list->size, (int)H5FL_fac_gc_head.first->list->allocated);
+        printf("%s: head->size = %d, head->allocated = %d\n", __func__,
+               (int)H5FL_fac_gc_head.first->list->size, (int)H5FL_fac_gc_head.first->list->allocated);
 #endif /* H5FL_DEBUG */
 
         /* The list cannot have any allocations outstanding */
diff --git a/src/H5FS.c b/src/H5FS.c
index 5e8c82f..7819694 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -96,7 +96,7 @@ H5FS_create(H5F_t *f, haddr_t *fs_addr, const H5FS_create_t *fs_create, uint16_t
 
     FUNC_ENTER_NOAPI(NULL)
 #ifdef H5FS_DEBUG
-    HDfprintf(stderr, "%s: Creating free space manager, nclasses = %Zu\n", __func__, nclasses);
+    fprintf(stderr, "%s: Creating free space manager, nclasses = %Zu\n", __func__, nclasses);
 #endif /* H5FS_DEBUG */
 
     /* Check arguments. */
@@ -142,8 +142,8 @@ H5FS_create(H5F_t *f, haddr_t *fs_addr, const H5FS_create_t *fs_create, uint16_t
     /* Set the return value */
     ret_value = fspace;
 #ifdef H5FS_DEBUG
-    HDfprintf(stderr, "%s: fspace = %p, fspace->addr = %" PRIuHADDR "\n", __func__, (void *)fspace,
-              fspace->addr);
+    fprintf(stderr, "%s: fspace = %p, fspace->addr = %" PRIuHADDR "\n", __func__, (void *)fspace,
+            fspace->addr);
 #endif /* H5FS_DEBUG */
 
 done:
@@ -152,7 +152,7 @@ done:
             HDONE_ERROR(H5E_FSPACE, H5E_CANTFREE, NULL, "unable to destroy free space header")
 
 #ifdef H5FS_DEBUG
-    HDfprintf(stderr, "%s: Leaving, ret_value = %p\n", __func__, (void *)ret_value);
+    fprintf(stderr, "%s: Leaving, ret_value = %p\n", __func__, (void *)ret_value);
 #endif /* H5FS_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_create() */
@@ -180,8 +180,8 @@ H5FS_open(H5F_t *f, haddr_t fs_addr, uint16_t nclasses, const H5FS_section_class
 
     FUNC_ENTER_NOAPI(NULL)
 #ifdef H5FS_DEBUG
-    HDfprintf(stderr, "%s: Opening free space manager, fs_addr = %" PRIuHADDR ", nclasses = %Zu\n", __func__,
-              fs_addr, nclasses);
+    fprintf(stderr, "%s: Opening free space manager, fs_addr = %" PRIuHADDR ", nclasses = %Zu\n", __func__,
+            fs_addr, nclasses);
 #endif /* H5FS_DEBUG */
 
     /* Check arguments. */
@@ -201,11 +201,11 @@ H5FS_open(H5F_t *f, haddr_t fs_addr, uint16_t nclasses, const H5FS_section_class
         (fspace = (H5FS_t *)H5AC_protect(f, H5AC_FSPACE_HDR, fs_addr, &cache_udata, H5AC__READ_ONLY_FLAG)))
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, NULL, "unable to load free space header")
 #ifdef H5FS_DEBUG
-    HDfprintf(stderr, "%s: fspace->sect_addr = %" PRIuHADDR "\n", __func__, fspace->sect_addr);
-    HDfprintf(stderr, "%s: fspace->sect_size = %" PRIuHSIZE "\n", __func__, fspace->sect_size);
-    HDfprintf(stderr, "%s: fspace->alloc_sect_size = %" PRIuHSIZE "\n", __func__, fspace->alloc_sect_size);
-    HDfprintf(stderr, "%s: fspace->sinfo = %p\n", __func__, (void *)fspace->sinfo);
-    HDfprintf(stderr, "%s: fspace->rc = %u\n", __func__, fspace->rc);
+    fprintf(stderr, "%s: fspace->sect_addr = %" PRIuHADDR "\n", __func__, fspace->sect_addr);
+    fprintf(stderr, "%s: fspace->sect_size = %" PRIuHSIZE "\n", __func__, fspace->sect_size);
+    fprintf(stderr, "%s: fspace->alloc_sect_size = %" PRIuHSIZE "\n", __func__, fspace->alloc_sect_size);
+    fprintf(stderr, "%s: fspace->sinfo = %p\n", __func__, (void *)fspace->sinfo);
+    fprintf(stderr, "%s: fspace->rc = %u\n", __func__, fspace->rc);
 #endif /* H5FS_DEBUG */
 
     /* Increment the reference count on the free space manager header */
@@ -248,7 +248,7 @@ H5FS_delete(H5F_t *f, haddr_t fs_addr)
 
     FUNC_ENTER_NOAPI(FAIL)
 #ifdef H5FS_DEBUG
-    HDfprintf(stderr, "%s: Deleting free space manager, fs_addr = %" PRIuHADDR "\n", __func__, fs_addr);
+    fprintf(stderr, "%s: Deleting free space manager, fs_addr = %" PRIuHADDR "\n", __func__, fs_addr);
 #endif /* H5FS_DEBUG */
 
     /* Check arguments. */
@@ -275,36 +275,36 @@ H5FS_delete(H5F_t *f, haddr_t fs_addr)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL,
                         "unable to check metadata cache status for free space section info")
 
-        HDfprintf(stderr, "%s: fspace_status = %0x: ", __func__, fspace_status);
+        fprintf(stderr, "%s: fspace_status = %0x: ", __func__, fspace_status);
         if (fspace_status) {
             hbool_t printed = FALSE;
 
             if (fspace_status & H5AC_ES__IN_CACHE) {
-                HDfprintf(stderr, "H5AC_ES__IN_CACHE");
+                fprintf(stderr, "H5AC_ES__IN_CACHE");
                 printed = TRUE;
             } /* end if */
             if (fspace_status & H5AC_ES__IS_DIRTY) {
-                HDfprintf(stderr, "%sH5AC_ES__IS_DIRTY", (printed ? " | " : ""));
+                fprintf(stderr, "%sH5AC_ES__IS_DIRTY", (printed ? " | " : ""));
                 printed = TRUE;
             } /* end if */
             if (fspace_status & H5AC_ES__IS_PROTECTED) {
-                HDfprintf(stderr, "%sH5AC_ES__IS_PROTECTED", (printed ? " | " : ""));
+                fprintf(stderr, "%sH5AC_ES__IS_PROTECTED", (printed ? " | " : ""));
                 printed = TRUE;
             } /* end if */
             if (fspace_status & H5AC_ES__IS_PINNED) {
-                HDfprintf(stderr, "%sH5AC_ES__IS_PINNED", (printed ? " | " : ""));
+                fprintf(stderr, "%sH5AC_ES__IS_PINNED", (printed ? " | " : ""));
                 printed = TRUE;
             } /* end if */
             if (fspace_status & H5AC_ES__IS_FLUSH_DEP_PARENT) {
-                HDfprintf(stderr, "%sH5AC_ES__IS_FLUSH_DEP_PARENT", (printed ? " | " : ""));
+                fprintf(stderr, "%sH5AC_ES__IS_FLUSH_DEP_PARENT", (printed ? " | " : ""));
                 printed = TRUE;
             } /* end if */
             if (fspace_status & H5AC_ES__IS_FLUSH_DEP_CHILD) {
-                HDfprintf(stderr, "%sH5AC_ES__IS_FLUSH_DEP_CHILD", (printed ? " | " : ""));
+                fprintf(stderr, "%sH5AC_ES__IS_FLUSH_DEP_CHILD", (printed ? " | " : ""));
                 printed = TRUE;
             } /* end if */
         }     /* end if */
-        HDfprintf(stderr, "\n");
+        fprintf(stderr, "\n");
     }
 #endif /* H5FS_DEBUG */
 
@@ -318,7 +318,7 @@ H5FS_delete(H5F_t *f, haddr_t fs_addr)
 
     /* Delete serialized section storage, if there are any */
 #ifdef H5FS_DEBUG
-    HDfprintf(stderr, "%s: fspace->sect_addr = %" PRIuHADDR "\n", __func__, fspace->sect_addr);
+    fprintf(stderr, "%s: fspace->sect_addr = %" PRIuHADDR "\n", __func__, fspace->sect_addr);
 #endif /* H5FS_DEBUG */
     if (fspace->serial_sect_count > 0) {
         unsigned sinfo_status = 0; /* Free space section info's status in the metadata cache */
@@ -339,7 +339,7 @@ H5FS_delete(H5F_t *f, haddr_t fs_addr)
             assert(!(sinfo_status & H5AC_ES__IS_PROTECTED));
 
 #ifdef H5FS_DEBUG
-            HDfprintf(stderr, "%s: Expunging free space section info from cache\n", __func__);
+            fprintf(stderr, "%s: Expunging free space section info from cache\n", __func__);
 #endif /* H5FS_DEBUG */
             /* Evict the free space section info from the metadata cache */
             /* (Free file space) */
@@ -358,12 +358,12 @@ H5FS_delete(H5F_t *f, haddr_t fs_addr)
             } /* end block */
 
 #ifdef H5FS_DEBUG
-            HDfprintf(stderr, "%s: Done expunging free space section info from cache\n", __func__);
+            fprintf(stderr, "%s: Done expunging free space section info from cache\n", __func__);
 #endif    /* H5FS_DEBUG */
         } /* end if */
         else {
 #ifdef H5FS_DEBUG
-            HDfprintf(stderr, "%s: Deleting free space section info from file\n", __func__);
+            fprintf(stderr, "%s: Deleting free space section info from file\n", __func__);
 #endif /* H5FS_DEBUG */
             /* Release the space in the file */
             if (!H5F_IS_TMP_ADDR(f, fspace->sect_addr))
@@ -404,27 +404,26 @@ H5FS_close(H5F_t *f, H5FS_t *fspace)
     assert(f);
     assert(fspace);
 #ifdef H5FS_DEBUG
-    HDfprintf(stderr, "%s: Entering, fspace = %p, fspace->addr = %" PRIuHADDR ", fspace->sinfo = %p\n",
-              __func__, (void *)fspace, fspace->addr, (void *)fspace->sinfo);
+    fprintf(stderr, "%s: Entering, fspace = %p, fspace->addr = %" PRIuHADDR ", fspace->sinfo = %p\n",
+            __func__, (void *)fspace, fspace->addr, (void *)fspace->sinfo);
 #endif /* H5FS_DEBUG */
 
     /* Check if section info is valid */
     /* (i.e. the header "owns" the section info and it's not in the cache) */
     if (fspace->sinfo) {
 #ifdef H5FS_DEBUG
-        HDfprintf(stderr,
-                  "%s: fspace->tot_sect_count = %" PRIuHSIZE ", fspace->serial_sect_count = %" PRIuHSIZE
-                  ", fspace->sect_addr = %" PRIuHADDR ", fspace->rc = %u\n",
-                  __func__, fspace->tot_sect_count, fspace->serial_sect_count, fspace->sect_addr, fspace->rc);
-        HDfprintf(stderr,
-                  "%s: fspace->alloc_sect_size = %" PRIuHSIZE ", fspace->sect_size = %" PRIuHSIZE "\n",
-                  __func__, fspace->alloc_sect_size, fspace->sect_size);
+        fprintf(stderr,
+                "%s: fspace->tot_sect_count = %" PRIuHSIZE ", fspace->serial_sect_count = %" PRIuHSIZE
+                ", fspace->sect_addr = %" PRIuHADDR ", fspace->rc = %u\n",
+                __func__, fspace->tot_sect_count, fspace->serial_sect_count, fspace->sect_addr, fspace->rc);
+        fprintf(stderr, "%s: fspace->alloc_sect_size = %" PRIuHSIZE ", fspace->sect_size = %" PRIuHSIZE "\n",
+                __func__, fspace->alloc_sect_size, fspace->sect_size);
 #endif /* H5FS_DEBUG */
         /* If there are sections to serialize, update them */
         /* (if the free space manager is persistent) */
         if (fspace->serial_sect_count > 0 && H5_addr_defined(fspace->addr)) {
 #ifdef H5FS_DEBUG
-            HDfprintf(stderr, "%s: Real sections to store in file\n", __func__);
+            fprintf(stderr, "%s: Real sections to store in file\n", __func__);
 #endif /* H5FS_DEBUG */
             if (fspace->sinfo->dirty) {
                 /* Check if the section info is "floating" */
@@ -463,7 +462,7 @@ H5FS_close(H5F_t *f, H5FS_t *fspace)
         } /* end if */
         else {
 #ifdef H5FS_DEBUG
-            HDfprintf(stderr, "%s: NOT storing section info in file\n", __func__);
+            fprintf(stderr, "%s: NOT storing section info in file\n", __func__);
 #endif /* H5FS_DEBUG */
             /* Check if space for the section info is allocated */
             if (H5_addr_defined(fspace->sect_addr)) {
@@ -472,7 +471,7 @@ H5FS_close(H5F_t *f, H5FS_t *fspace)
                 assert(H5_addr_defined(fspace->addr));
 
 #ifdef H5FS_DEBUG
-                HDfprintf(stderr, "%s: Section info allocated though\n", __func__);
+                fprintf(stderr, "%s: Section info allocated though\n", __func__);
 #endif /* H5FS_DEBUG */
                 /* Check if the section info is for the free space in the file */
                 /* (NOTE: This is the "bootstrapping" special case for the
@@ -484,13 +483,12 @@ H5FS_close(H5F_t *f, H5FS_t *fspace)
                     htri_t status; /* "can absorb" status for section into */
 
 #ifdef H5FS_DEBUG
-                    HDfprintf(stderr, "%s: Section info is for file free space\n", __func__);
+                    fprintf(stderr, "%s: Section info is for file free space\n", __func__);
 #endif /* H5FS_DEBUG */
                     /* Try to shrink the file or absorb the section info into a block aggregator */
                     if (H5F_IS_TMP_ADDR(f, fspace->sect_addr)) {
 #ifdef H5FS_DEBUG
-                        HDfprintf(stderr, "%s: Section info in temp. address space went 'go away'\n",
-                                  __func__);
+                        fprintf(stderr, "%s: Section info in temp. address space went 'go away'\n", __func__);
 #endif /* H5FS_DEBUG */
                         /* Reset section info in header */
                         fspace->sect_addr       = HADDR_UNDEF;
@@ -511,13 +509,13 @@ H5FS_close(H5F_t *f, H5FS_t *fspace)
                              *      header to record it
                              */
 #ifdef H5FS_DEBUG
-                            HDfprintf(stderr, "%s: Section info can't 'go away', header will own it\n",
-                                      __func__);
+                            fprintf(stderr, "%s: Section info can't 'go away', header will own it\n",
+                                    __func__);
 #endif                    /* H5FS_DEBUG */
                         } /* end if */
                         else {
 #ifdef H5FS_DEBUG
-                            HDfprintf(stderr, "%s: Section info went 'go away'\n", __func__);
+                            fprintf(stderr, "%s: Section info went 'go away'\n", __func__);
 #endif /* H5FS_DEBUG */
                             /* Reset section info in header */
                             fspace->sect_addr       = HADDR_UNDEF;
@@ -536,7 +534,7 @@ H5FS_close(H5F_t *f, H5FS_t *fspace)
                         fspace->alloc_sect_size; /* Previous size of section info in file */
 
 #ifdef H5FS_DEBUG
-                    HDfprintf(stderr, "%s: Section info is NOT for file free space\n", __func__);
+                    fprintf(stderr, "%s: Section info is NOT for file free space\n", __func__);
 #endif /* H5FS_DEBUG */
                     /* Reset section info in header */
                     fspace->sect_addr       = HADDR_UNDEF;
@@ -576,7 +574,7 @@ H5FS_close(H5F_t *f, H5FS_t *fspace)
 
 done:
 #ifdef H5FS_DEBUG
-    HDfprintf(stderr, "%s: Leaving, ret_value = %d, fspace->rc = %u\n", __func__, ret_value, fspace->rc);
+    fprintf(stderr, "%s: Leaving, ret_value = %d, fspace->rc = %u\n", __func__, ret_value, fspace->rc);
 #endif /* H5FS_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_close() */
@@ -709,8 +707,8 @@ H5FS__incr(H5FS_t *fspace)
 
     FUNC_ENTER_PACKAGE
 #ifdef H5FS_DEBUG
-    HDfprintf(stderr, "%s: Entering, fpace->addr = %" PRIuHADDR ", fspace->rc = %u\n", __func__, fspace->addr,
-              fspace->rc);
+    fprintf(stderr, "%s: Entering, fpace->addr = %" PRIuHADDR ", fspace->rc = %u\n", __func__, fspace->addr,
+            fspace->rc);
 #endif /* H5FS_DEBUG */
 
     /*
@@ -749,8 +747,8 @@ H5FS__decr(H5FS_t *fspace)
 
     FUNC_ENTER_PACKAGE
 #ifdef H5FS_DEBUG
-    HDfprintf(stderr, "%s: Entering, fpace->addr = %" PRIuHADDR ", fspace->rc = %u\n", __func__, fspace->addr,
-              fspace->rc);
+    fprintf(stderr, "%s: Entering, fpace->addr = %" PRIuHADDR ", fspace->rc = %u\n", __func__, fspace->addr,
+            fspace->rc);
 #endif /* H5FS_DEBUG */
 
     /*
diff --git a/src/H5FSdbg.c b/src/H5FSdbg.c
index b1cd0b2..631ed7a 100644
--- a/src/H5FSdbg.c
+++ b/src/H5FSdbg.c
@@ -111,37 +111,37 @@ H5FS_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "unable to load free space header")
 
     /* Print opening message */
-    HDfprintf(stream, "%*sFree Space Header...\n", indent, "");
+    fprintf(stream, "%*sFree Space Header...\n", indent, "");
 
     /*
      * Print the values.
      */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Free space client:",
-              (fspace->client == H5FS_CLIENT_FHEAP_ID
-                   ? "Fractal heap"
-                   : (fspace->client == H5FS_CLIENT_FILE_ID ? "File" : "Unknown")));
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Total free space tracked:", fspace->tot_space);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Total number of free space sections tracked:", fspace->tot_sect_count);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Number of serializable free space sections tracked:", fspace->serial_sect_count);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Number of ghost free space sections tracked:", fspace->ghost_sect_count);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Number of free space section classes:", (unsigned)fspace->nclasses);
-    HDfprintf(stream, "%*s%-*s %u%%\n", indent, "", fwidth, "Shrink percent:", fspace->shrink_percent);
-    HDfprintf(stream, "%*s%-*s %u%%\n", indent, "", fwidth, "Expand percent:", fspace->expand_percent);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "# of bits for section address space:", fspace->max_sect_addr);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Maximum section size:", fspace->max_sect_size);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "Serialized sections address:", fspace->sect_addr);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Serialized sections size used:", fspace->sect_size);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Serialized sections size allocated:", fspace->alloc_sect_size);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Free space client:",
+            (fspace->client == H5FS_CLIENT_FHEAP_ID
+                 ? "Fractal heap"
+                 : (fspace->client == H5FS_CLIENT_FILE_ID ? "File" : "Unknown")));
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Total free space tracked:", fspace->tot_space);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Total number of free space sections tracked:", fspace->tot_sect_count);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Number of serializable free space sections tracked:", fspace->serial_sect_count);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Number of ghost free space sections tracked:", fspace->ghost_sect_count);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Number of free space section classes:", (unsigned)fspace->nclasses);
+    fprintf(stream, "%*s%-*s %u%%\n", indent, "", fwidth, "Shrink percent:", fspace->shrink_percent);
+    fprintf(stream, "%*s%-*s %u%%\n", indent, "", fwidth, "Expand percent:", fspace->expand_percent);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "# of bits for section address space:", fspace->max_sect_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Maximum section size:", fspace->max_sect_size);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "Serialized sections address:", fspace->sect_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Serialized sections size used:", fspace->sect_size);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Serialized sections size allocated:", fspace->alloc_sect_size);
 
 done:
     if (fspace && H5AC_unprotect(f, H5AC_FSPACE_HDR, addr, fspace, H5AC__NO_FLAGS_SET) < 0)
@@ -247,7 +247,7 @@ H5FS_sects_debug(H5F_t *f, haddr_t H5_ATTR_UNUSED addr, FILE *stream, int indent
     fspace = NULL;
 
     /* Print opening message */
-    HDfprintf(stream, "%*sFree Space Sections...\n", indent, "");
+    fprintf(stream, "%*sFree Space Sections...\n", indent, "");
 
     /*
      * Print the values.
@@ -265,7 +265,7 @@ H5FS_sects_debug(H5F_t *f, haddr_t H5_ATTR_UNUSED addr, FILE *stream, int indent
 
         case H5FS_NUM_CLIENT_ID:
         default:
-            HDfprintf(stream, "Unknown client!\n");
+            fprintf(stream, "Unknown client!\n");
             break;
     } /* end switch */
 
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index 920fe88..60d0cc3 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -122,7 +122,7 @@ H5FS__sinfo_new(H5F_t *f, H5FS_t *fspace)
     assert(f);
     assert(fspace);
 #ifdef H5FS_SINFO_DEBUG
-    HDfprintf(stderr, "%s: fspace->addr = %" PRIuHADDR "\n", __func__, fspace->addr);
+    fprintf(stderr, "%s: fspace->addr = %" PRIuHADDR "\n", __func__, fspace->addr);
 #endif /* H5FS_SINFO_DEBUG */
 
     /* Allocate the free space header */
@@ -135,11 +135,11 @@ H5FS__sinfo_new(H5F_t *f, H5FS_t *fspace)
     sinfo->sect_off_size    = (fspace->max_sect_addr + 7) / 8;
     sinfo->sect_len_size    = H5VM_limit_enc_size((uint64_t)fspace->max_sect_size);
 #ifdef H5FS_SINFO_DEBUG
-    HDfprintf(stderr, "%s: fspace->max_sect_size = %" PRIuHSIZE "\n", __func__, fspace->max_sect_size);
-    HDfprintf(stderr, "%s: fspace->max_sect_addr = %u\n", __func__, fspace->max_sect_addr);
-    HDfprintf(stderr, "%s: sinfo->nbins = %u\n", __func__, sinfo->nbins);
-    HDfprintf(stderr, "%s: sinfo->sect_off_size = %u, sinfo->sect_len_size = %u\n", __func__,
-              sinfo->sect_off_size, sinfo->sect_len_size);
+    fprintf(stderr, "%s: fspace->max_sect_size = %" PRIuHSIZE "\n", __func__, fspace->max_sect_size);
+    fprintf(stderr, "%s: fspace->max_sect_addr = %u\n", __func__, fspace->max_sect_addr);
+    fprintf(stderr, "%s: sinfo->nbins = %u\n", __func__, sinfo->nbins);
+    fprintf(stderr, "%s: sinfo->sect_off_size = %u, sinfo->sect_len_size = %u\n", __func__,
+            sinfo->sect_off_size, sinfo->sect_len_size);
 #endif /* H5FS_SINFO_DEBUG */
 
     /* Allocate space for the section size bins */
@@ -199,12 +199,12 @@ H5FS__sinfo_lock(H5F_t *f, H5FS_t *fspace, unsigned accmode)
     FUNC_ENTER_PACKAGE
 
 #ifdef H5FS_SINFO_DEBUG
-    HDfprintf(stderr,
-              "%s: Called, fspace->addr = %" PRIuHADDR ", fspace->sinfo = %p, fspace->sect_addr = %" PRIuHADDR
-              "\n",
-              __func__, fspace->addr, (void *)fspace->sinfo, fspace->sect_addr);
-    HDfprintf(stderr, "%s: fspace->alloc_sect_size = %" PRIuHSIZE ", fspace->sect_size = %" PRIuHSIZE "\n",
-              __func__, fspace->alloc_sect_size, fspace->sect_size);
+    fprintf(stderr,
+            "%s: Called, fspace->addr = %" PRIuHADDR ", fspace->sinfo = %p, fspace->sect_addr = %" PRIuHADDR
+            "\n",
+            __func__, fspace->addr, (void *)fspace->sinfo, fspace->sect_addr);
+    fprintf(stderr, "%s: fspace->alloc_sect_size = %" PRIuHSIZE ", fspace->sect_size = %" PRIuHSIZE "\n",
+            __func__, fspace->alloc_sect_size, fspace->sect_size);
 #endif /* H5FS_SINFO_DEBUG */
 
     /* Check arguments. */
@@ -252,8 +252,8 @@ H5FS__sinfo_lock(H5F_t *f, H5FS_t *fspace, unsigned accmode)
             assert(H5_addr_defined(fspace->addr));
 
 #ifdef H5FS_SINFO_DEBUG
-            HDfprintf(stderr, "%s: Reading in existing sections, fspace->sect_addr = %" PRIuHADDR "\n",
-                      __func__, fspace->sect_addr);
+            fprintf(stderr, "%s: Reading in existing sections, fspace->sect_addr = %" PRIuHADDR "\n",
+                    __func__, fspace->sect_addr);
 #endif /* H5FS_SINFO_DEBUG */
             /* Protect the free space sections */
             cache_udata.f      = f;
@@ -268,7 +268,7 @@ H5FS__sinfo_lock(H5F_t *f, H5FS_t *fspace, unsigned accmode)
         } /* end if */
         else {
 #ifdef H5FS_SINFO_DEBUG
-            HDfprintf(stderr, "%s: Creating new section info\n", __func__);
+            fprintf(stderr, "%s: Creating new section info\n", __func__);
 #endif /* H5FS_SINFO_DEBUG */
             /* Sanity check */
             assert(fspace->tot_sect_count == 0);
@@ -290,12 +290,12 @@ H5FS__sinfo_lock(H5F_t *f, H5FS_t *fspace, unsigned accmode)
 
 done:
 #ifdef H5FS_SINFO_DEBUG
-    HDfprintf(stderr,
-              "%s: Leaving, fspace->addr = %" PRIuHADDR
-              ", fspace->sinfo = %p, fspace->sect_addr = %" PRIuHADDR "\n",
-              __func__, fspace->addr, (void *)fspace->sinfo, fspace->sect_addr);
-    HDfprintf(stderr, "%s: fspace->alloc_sect_size = %" PRIuHSIZE ", fspace->sect_size = %" PRIuHSIZE "\n",
-              __func__, fspace->alloc_sect_size, fspace->sect_size);
+    fprintf(stderr,
+            "%s: Leaving, fspace->addr = %" PRIuHADDR ", fspace->sinfo = %p, fspace->sect_addr = %" PRIuHADDR
+            "\n",
+            __func__, fspace->addr, (void *)fspace->sinfo, fspace->sect_addr);
+    fprintf(stderr, "%s: fspace->alloc_sect_size = %" PRIuHSIZE ", fspace->sect_size = %" PRIuHSIZE "\n",
+            __func__, fspace->alloc_sect_size, fspace->sect_size);
 #endif /* H5FS_SINFO_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS__sinfo_lock() */
@@ -334,16 +334,14 @@ H5FS__sinfo_unlock(H5F_t *f, H5FS_t *fspace, hbool_t modified)
 
     FUNC_ENTER_PACKAGE
 #ifdef H5FS_SINFO_DEBUG
-    HDfprintf(stderr,
-              "%s: Called, modified = %d, fspace->addr = %" PRIuHADDR ", fspace->sect_addr = %" PRIuHADDR
-              "\n",
-              __func__, modified, fspace->addr, fspace->sect_addr);
-    HDfprintf(
-        stderr,
-        "%s: fspace->sinfo_lock_count = %u, fspace->sinfo_modified = %d, fspace->sinfo_protected = %d\n",
-        __func__, fspace->sinfo_lock_count, fspace->sinfo_modified, fspace->sinfo_protected);
-    HDfprintf(stderr, "%s: fspace->alloc_sect_size = %" PRIuHSIZE ", fspace->sect_size = %" PRIuHSIZE "\n",
-              __func__, fspace->alloc_sect_size, fspace->sect_size);
+    fprintf(stderr,
+            "%s: Called, modified = %d, fspace->addr = %" PRIuHADDR ", fspace->sect_addr = %" PRIuHADDR "\n",
+            __func__, modified, fspace->addr, fspace->sect_addr);
+    fprintf(stderr,
+            "%s: fspace->sinfo_lock_count = %u, fspace->sinfo_modified = %d, fspace->sinfo_protected = %d\n",
+            __func__, fspace->sinfo_lock_count, fspace->sinfo_modified, fspace->sinfo_protected);
+    fprintf(stderr, "%s: fspace->alloc_sect_size = %" PRIuHSIZE ", fspace->sect_size = %" PRIuHSIZE "\n",
+            __func__, fspace->alloc_sect_size, fspace->sect_size);
 #endif /* H5FS_SINFO_DEBUG */
 
     /* Check arguments. */
@@ -418,7 +416,7 @@ H5FS__sinfo_unlock(H5F_t *f, H5FS_t *fspace, hbool_t modified)
             /* (Possibly dirty) */
             /* (Possibly taking ownership from the cache) */
 #ifdef H5FS_SINFO_DEBUG
-            HDfprintf(stderr, "%s: Unprotecting section info, cache_flags = %u\n", __func__, cache_flags);
+            fprintf(stderr, "%s: Unprotecting section info, cache_flags = %u\n", __func__, cache_flags);
 #endif /* H5FS_SINFO_DEBUG */
             if (H5AC_unprotect(f, H5AC_FSPACE_SINFO, fspace->sect_addr, fspace->sinfo, cache_flags) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, FAIL, "unable to release free space section info")
@@ -429,14 +427,14 @@ H5FS__sinfo_unlock(H5F_t *f, H5FS_t *fspace, hbool_t modified)
             /* Check if header is taking ownership of section info */
             if ((cache_flags & H5AC__TAKE_OWNERSHIP_FLAG)) {
 #ifdef H5FS_SINFO_DEBUG
-                HDfprintf(stderr, "%s: Taking ownership of section info\n", __func__);
+                fprintf(stderr, "%s: Taking ownership of section info\n", __func__);
 #endif /* H5FS_SINFO_DEBUG */
                 /* Set flag to release section info space in file */
                 release_sinfo_space = TRUE;
             } /* end if */
             else {
 #ifdef H5FS_SINFO_DEBUG
-                HDfprintf(stderr, "%s: Relinquishing section info ownership\n", __func__);
+                fprintf(stderr, "%s: Relinquishing section info ownership\n", __func__);
 #endif /* H5FS_SINFO_DEBUG */
                 /* Free space header relinquished ownership of section info */
                 fspace->sinfo = NULL;
@@ -494,10 +492,10 @@ H5FS__sinfo_unlock(H5F_t *f, H5FS_t *fspace, hbool_t modified)
                                 "unable to mark free space header as dirty")
 
 #ifdef H5FS_SINFO_DEBUG
-            HDfprintf(stderr,
-                      "%s: Freeing section info on disk, old_sect_addr = %" PRIuHADDR
-                      ", old_alloc_sect_size = %" PRIuHSIZE "\n",
-                      __func__, old_sect_addr, old_alloc_sect_size);
+            fprintf(stderr,
+                    "%s: Freeing section info on disk, old_sect_addr = %" PRIuHADDR
+                    ", old_alloc_sect_size = %" PRIuHSIZE "\n",
+                    __func__, old_sect_addr, old_alloc_sect_size);
 #endif /* H5FS_SINFO_DEBUG */
             /* Release space for section info in file */
             if (!H5F_IS_TMP_ADDR(f, old_sect_addr))
@@ -508,7 +506,7 @@ H5FS__sinfo_unlock(H5F_t *f, H5FS_t *fspace, hbool_t modified)
 
 done:
 #ifdef H5FS_SINFO_DEBUG
-    HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", __func__, ret_value);
+    fprintf(stderr, "%s: Leaving, ret_value = %d\n", __func__, ret_value);
 #endif /* H5FS_SINFO_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS__sinfo_unlock() */
@@ -1349,9 +1347,9 @@ H5FS_sect_add(H5F_t *f, H5FS_t *fspace, H5FS_section_info_t *sect, unsigned flag
     FUNC_ENTER_NOAPI(FAIL)
 
 #ifdef H5FS_SINFO_DEBUG
-    HDfprintf(stderr, "%s: *sect = {%" PRIuHADDR ", %" PRIuHSIZE ", %u, %s}\n", __func__, sect->addr,
-              sect->size, sect->type,
-              (sect->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
+    fprintf(stderr, "%s: *sect = {%" PRIuHADDR ", %" PRIuHSIZE ", %u, %s}\n", __func__, sect->addr,
+            sect->size, sect->type,
+            (sect->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
 #endif /* H5FS_SINFO_DEBUG */
 
     /* Check arguments. */
@@ -1374,7 +1372,7 @@ H5FS_sect_add(H5F_t *f, H5FS_t *fspace, H5FS_section_info_t *sect, unsigned flag
     /* Check for merging returned space with existing section node */
     if (flags & H5FS_ADD_RETURNED_SPACE) {
 #ifdef H5FS_SINFO_DEBUG
-        HDfprintf(stderr, "%s: Returning space\n", __func__);
+        fprintf(stderr, "%s: Returning space\n", __func__);
 #endif /* H5FS_SINFO_DEBUG */
 
         /* Attempt to merge returned section with existing sections */
@@ -1391,7 +1389,7 @@ H5FS_sect_add(H5F_t *f, H5FS_t *fspace, H5FS_section_info_t *sect, unsigned flag
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space section into skip list")
 
 #ifdef H5FS_SINFO_DEBUG
-    HDfprintf(stderr, "%s: fspace->tot_space = %" PRIuHSIZE "\n", __func__, fspace->tot_space);
+    fprintf(stderr, "%s: fspace->tot_space = %" PRIuHSIZE "\n", __func__, fspace->tot_space);
 #endif /* H5FS_SINFO_DEBUG */
     /* Mark free space sections as changed */
     /* (if adding sections while deserializing sections, don't set the flag) */
@@ -1408,7 +1406,7 @@ done:
         H5FS__assert(fspace);
 #endif /* H5FS_DEBUG_ASSERT */
 #ifdef H5FS_SINFO_DEBUG
-    HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", __func__, ret_value);
+    fprintf(stderr, "%s: Leaving, ret_value = %d\n", __func__, ret_value);
 #endif /* H5FS_SINFO_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_sect_add() */
@@ -1436,8 +1434,8 @@ H5FS_sect_try_extend(H5F_t *f, H5FS_t *fspace, haddr_t addr, hsize_t size, hsize
     FUNC_ENTER_NOAPI(FAIL)
 
 #ifdef H5FS_SINFO_DEBUG
-    HDfprintf(stderr, "%s: addr = %" PRIuHADDR ", size = %" PRIuHSIZE ", extra_requested = %" PRIuHSIZE "\n",
-              __func__, addr, size, extra_requested);
+    fprintf(stderr, "%s: addr = %" PRIuHADDR ", size = %" PRIuHSIZE ", extra_requested = %" PRIuHSIZE "\n",
+            __func__, addr, size, extra_requested);
 #endif /* H5FS_SINFO_DEBUG */
 
     /* Check arguments. */
@@ -1449,10 +1447,9 @@ H5FS_sect_try_extend(H5F_t *f, H5FS_t *fspace, haddr_t addr, hsize_t size, hsize
 
     /* Check for any sections on free space list */
 #ifdef H5FS_SINFO_DEBUG
-    HDfprintf(stderr, "%s: fspace->tot_sect_count = %" PRIuHSIZE "\n", __func__, fspace->tot_sect_count);
-    HDfprintf(stderr, "%s: fspace->serial_sect_count = %" PRIuHSIZE "\n", __func__,
-              fspace->serial_sect_count);
-    HDfprintf(stderr, "%s: fspace->ghost_sect_count = %" PRIuHSIZE "\n", __func__, fspace->ghost_sect_count);
+    fprintf(stderr, "%s: fspace->tot_sect_count = %" PRIuHSIZE "\n", __func__, fspace->tot_sect_count);
+    fprintf(stderr, "%s: fspace->serial_sect_count = %" PRIuHSIZE "\n", __func__, fspace->serial_sect_count);
+    fprintf(stderr, "%s: fspace->ghost_sect_count = %" PRIuHSIZE "\n", __func__, fspace->ghost_sect_count);
 #endif /* H5FS_SINFO_DEBUG */
     if (fspace->tot_sect_count > 0) {
         H5FS_section_info_t *sect; /* Temporary free space section */
diff --git a/src/H5Fdbg.c b/src/H5Fdbg.c
index f425820..2d22efa 100644
--- a/src/H5Fdbg.c
+++ b/src/H5Fdbg.c
@@ -64,55 +64,55 @@ H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get userblock size")
 
     /* debug */
-    HDfprintf(stream, "%*sFile Super Block...\n", indent, "");
+    fprintf(stream, "%*sFile Super Block...\n", indent, "");
 
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "File name (as opened):", H5F_OPEN_NAME(f));
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "File name (after resolving symlinks):", H5F_ACTUAL_NAME(f));
-    HDfprintf(stream, "%*s%-*s 0x%08x\n", indent, "", fwidth, "File access flags", f->shared->flags);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "File open reference count:", f->shared->nrefs);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR " (abs)\n", indent, "", fwidth,
-              "Address of super block:", f->shared->sblock->base_addr);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " bytes\n", indent, "", fwidth,
-              "Size of userblock:", userblock_size);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "File name (as opened):", H5F_OPEN_NAME(f));
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "File name (after resolving symlinks):", H5F_ACTUAL_NAME(f));
+    fprintf(stream, "%*s%-*s 0x%08x\n", indent, "", fwidth, "File access flags", f->shared->flags);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "File open reference count:", f->shared->nrefs);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR " (abs)\n", indent, "", fwidth,
+            "Address of super block:", f->shared->sblock->base_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " bytes\n", indent, "", fwidth,
+            "Size of userblock:", userblock_size);
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Superblock version number:", f->shared->sblock->super_vers);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Superblock version number:", f->shared->sblock->super_vers);
 
     /* Hard-wired versions */
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Free list version number:", (unsigned)HDF5_FREESPACE_VERSION);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Root group symbol table entry version number:", (unsigned)HDF5_OBJECTDIR_VERSION);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Shared header version number:", (unsigned)HDF5_SHAREDHEADER_VERSION);
-
-    HDfprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth,
-              "Size of file offsets (haddr_t type):", (unsigned)f->shared->sizeof_addr);
-    HDfprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth,
-              "Size of file lengths (hsize_t type):", (unsigned)f->shared->sizeof_size);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Symbol table leaf node 1/2 rank:", f->shared->sblock->sym_leaf_k);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Symbol table internal node 1/2 rank:", f->shared->sblock->btree_k[H5B_SNODE_ID]);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Indexed storage internal node 1/2 rank:", f->shared->sblock->btree_k[H5B_CHUNK_ID]);
-    HDfprintf(stream, "%*s%-*s 0x%02x\n", indent, "", fwidth,
-              "File status flags:", (unsigned)(f->shared->sblock->status_flags));
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR " (rel)\n", indent, "", fwidth,
-              "Superblock extension address:", f->shared->sblock->ext_addr);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR " (rel)\n", indent, "", fwidth,
-              "Shared object header message table address:", f->shared->sohm_addr);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Shared object header message version number:", (unsigned)f->shared->sohm_vers);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Number of shared object header message indexes:", (unsigned)f->shared->sohm_nindexes);
-
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR " (rel)\n", indent, "", fwidth,
-              "Address of driver information block:", f->shared->sblock->driver_addr);
-
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Root group symbol table entry:", f->shared->root_grp ? "" : "(none)");
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Free list version number:", (unsigned)HDF5_FREESPACE_VERSION);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Root group symbol table entry version number:", (unsigned)HDF5_OBJECTDIR_VERSION);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Shared header version number:", (unsigned)HDF5_SHAREDHEADER_VERSION);
+
+    fprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth,
+            "Size of file offsets (haddr_t type):", (unsigned)f->shared->sizeof_addr);
+    fprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth,
+            "Size of file lengths (hsize_t type):", (unsigned)f->shared->sizeof_size);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Symbol table leaf node 1/2 rank:", f->shared->sblock->sym_leaf_k);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Symbol table internal node 1/2 rank:", f->shared->sblock->btree_k[H5B_SNODE_ID]);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Indexed storage internal node 1/2 rank:", f->shared->sblock->btree_k[H5B_CHUNK_ID]);
+    fprintf(stream, "%*s%-*s 0x%02x\n", indent, "", fwidth,
+            "File status flags:", (unsigned)(f->shared->sblock->status_flags));
+    fprintf(stream, "%*s%-*s %" PRIuHADDR " (rel)\n", indent, "", fwidth,
+            "Superblock extension address:", f->shared->sblock->ext_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR " (rel)\n", indent, "", fwidth,
+            "Shared object header message table address:", f->shared->sohm_addr);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Shared object header message version number:", (unsigned)f->shared->sohm_vers);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Number of shared object header message indexes:", (unsigned)f->shared->sohm_nindexes);
+
+    fprintf(stream, "%*s%-*s %" PRIuHADDR " (rel)\n", indent, "", fwidth,
+            "Address of driver information block:", f->shared->sblock->driver_addr);
+
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Root group symbol table entry:", f->shared->root_grp ? "" : "(none)");
     if (f->shared->root_grp) {
         if (f->shared->sblock->root_ent) /* Use real root group symbol table entry */
             H5G__ent_debug(f->shared->sblock->root_ent, stream, indent + 3, MAX(0, fwidth - 3), NULL);
diff --git a/src/H5Gbtree2.c b/src/H5Gbtree2.c
index 3094386..4b5b308 100644
--- a/src/H5Gbtree2.c
+++ b/src/H5Gbtree2.c
@@ -335,9 +335,9 @@ H5G__dense_btree2_name_debug(FILE *stream, int indent, int fwidth, const void *_
 
     FUNC_ENTER_PACKAGE_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%x, ", indent, "", fwidth, "Record:", (unsigned)nrecord->hash);
+    fprintf(stream, "%*s%-*s {%x, ", indent, "", fwidth, "Record:", (unsigned)nrecord->hash);
     for (u = 0; u < H5G_DENSE_FHEAP_ID_LEN; u++)
-        HDfprintf(stderr, "%02x%s", nrecord->id[u], (u < (H5G_DENSE_FHEAP_ID_LEN - 1) ? " " : "}\n"));
+        fprintf(stderr, "%02x%s", nrecord->id[u], (u < (H5G_DENSE_FHEAP_ID_LEN - 1) ? " " : "}\n"));
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G__dense_btree2_name_debug() */
@@ -483,9 +483,9 @@ H5G__dense_btree2_corder_debug(FILE *stream, int indent, int fwidth, const void
 
     FUNC_ENTER_PACKAGE_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%llu, ", indent, "", fwidth, "Record:", (unsigned long long)nrecord->corder);
+    fprintf(stream, "%*s%-*s {%llu, ", indent, "", fwidth, "Record:", (unsigned long long)nrecord->corder);
     for (u = 0; u < H5G_DENSE_FHEAP_ID_LEN; u++)
-        HDfprintf(stderr, "%02x%s", nrecord->id[u], (u < (H5G_DENSE_FHEAP_ID_LEN - 1) ? " " : "}\n"));
+        fprintf(stderr, "%02x%s", nrecord->id[u], (u < (H5G_DENSE_FHEAP_ID_LEN - 1) ? " " : "}\n"));
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G__dense_btree2_corder_debug() */
diff --git a/src/H5Gent.c b/src/H5Gent.c
index 2a4b693..0fdfd84 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -527,47 +527,47 @@ H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth, con
     nested_indent = indent + 3;
     nested_fwidth = MAX(0, fwidth - 3);
 
-    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-              "Name offset into private heap:", (unsigned long)(ent->name_off));
+    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+            "Name offset into private heap:", (unsigned long)(ent->name_off));
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Object header address:", ent->header);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Object header address:", ent->header);
 
-    HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Cache info type:");
+    fprintf(stream, "%*s%-*s ", indent, "", fwidth, "Cache info type:");
     switch (ent->type) {
         case H5G_NOTHING_CACHED:
-            HDfprintf(stream, "Nothing Cached\n");
+            fprintf(stream, "Nothing Cached\n");
             break;
 
         case H5G_CACHED_STAB:
-            HDfprintf(stream, "Symbol Table\n");
+            fprintf(stream, "Symbol Table\n");
 
-            HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Cached entry information:");
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", nested_indent, "", nested_fwidth,
-                      "B-tree address:", ent->cache.stab.btree_addr);
+            fprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Cached entry information:");
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", nested_indent, "", nested_fwidth,
+                    "B-tree address:", ent->cache.stab.btree_addr);
 
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", nested_indent, "", nested_fwidth,
-                      "Heap address:", ent->cache.stab.heap_addr);
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", nested_indent, "", nested_fwidth,
+                    "Heap address:", ent->cache.stab.heap_addr);
             break;
 
         case H5G_CACHED_SLINK:
-            HDfprintf(stream, "Symbolic Link\n");
-            HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Cached information:");
-            HDfprintf(stream, "%*s%-*s %lu\n", nested_indent, "", nested_fwidth,
-                      "Link value offset:", (unsigned long)(ent->cache.slink.lval_offset));
+            fprintf(stream, "Symbolic Link\n");
+            fprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Cached information:");
+            fprintf(stream, "%*s%-*s %lu\n", nested_indent, "", nested_fwidth,
+                    "Link value offset:", (unsigned long)(ent->cache.slink.lval_offset));
             if (heap) {
                 lval = (const char *)H5HL_offset_into(heap, ent->cache.slink.lval_offset);
-                HDfprintf(stream, "%*s%-*s %s\n", nested_indent, "", nested_fwidth,
-                          "Link value:", (lval == NULL) ? "" : lval);
+                fprintf(stream, "%*s%-*s %s\n", nested_indent, "", nested_fwidth,
+                        "Link value:", (lval == NULL) ? "" : lval);
             } /* end if */
             else
-                HDfprintf(stream, "%*s%-*s\n", nested_indent, "", nested_fwidth,
-                          "Warning: Invalid heap address given, name not displayed!");
+                fprintf(stream, "%*s%-*s\n", nested_indent, "", nested_fwidth,
+                        "Warning: Invalid heap address given, name not displayed!");
             break;
 
         case H5G_CACHED_ERROR:
         case H5G_NCACHED:
         default:
-            HDfprintf(stream, "*** Unknown symbol type %d\n", ent->type);
+            fprintf(stream, "*** Unknown symbol type %d\n", ent->type);
             break;
     } /* end switch */
 
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index c68a919..5068498 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -224,18 +224,18 @@ H5G__node_debug_key(FILE *stream, int indent, int fwidth, const void *_key, cons
 
     assert(key);
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Heap offset:", (unsigned)key->offset);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Heap offset:", (unsigned)key->offset);
 
     if (udata->heap) {
         const char *s;
 
-        HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Name:");
+        fprintf(stream, "%*s%-*s ", indent, "", fwidth, "Name:");
 
         if ((s = (const char *)H5HL_offset_into(udata->heap, key->offset)) != NULL)
-            HDfprintf(stream, "%s\n", s);
+            fprintf(stream, "%s\n", s);
     } /* end if */
     else
-        HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Cannot get name; heap address not specified\n");
+        fprintf(stream, "%*s%-*s ", indent, "", fwidth, "Cannot get name; heap address not specified\n");
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5G__node_debug_key() */
@@ -1478,28 +1478,27 @@ H5G_node_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, had
             HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, FAIL, "unable to debug B-tree node");
     } /* end if */
     else {
-        HDfprintf(stream, "%*sSymbol Table Node...\n", indent, "");
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                  "Dirty:", sn->cache_info.is_dirty ? "Yes" : "No");
-        HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-                  "Size of Node (in bytes):", (unsigned)sn->node_size);
-        HDfprintf(stream, "%*s%-*s %u of %u\n", indent, "", fwidth, "Number of Symbols:", sn->nsyms,
-                  (unsigned)(2 * H5F_SYM_LEAF_K(f)));
+        fprintf(stream, "%*sSymbol Table Node...\n", indent, "");
+        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Dirty:", sn->cache_info.is_dirty ? "Yes" : "No");
+        fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+                "Size of Node (in bytes):", (unsigned)sn->node_size);
+        fprintf(stream, "%*s%-*s %u of %u\n", indent, "", fwidth, "Number of Symbols:", sn->nsyms,
+                (unsigned)(2 * H5F_SYM_LEAF_K(f)));
 
         indent += 3;
         fwidth = MAX(0, fwidth - 3);
         for (u = 0; u < sn->nsyms; u++) {
-            HDfprintf(stream, "%*sSymbol %u:\n", indent - 3, "", u);
+            fprintf(stream, "%*sSymbol %u:\n", indent - 3, "", u);
 
             if (heap) {
                 const char *s = (const char *)H5HL_offset_into(heap, sn->entry[u].name_off);
 
                 if (s)
-                    HDfprintf(stream, "%*s%-*s `%s'\n", indent, "", fwidth, "Name:", s);
+                    fprintf(stream, "%*s%-*s `%s'\n", indent, "", fwidth, "Name:", s);
             } /* end if */
             else
-                HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth,
-                          "Warning: Invalid heap address given, name not displayed!");
+                fprintf(stream, "%*s%-*s\n", indent, "", fwidth,
+                        "Warning: Invalid heap address given, name not displayed!");
 
             H5G__ent_debug(sn->entry + u, stream, indent, fwidth, heap);
         } /* end for */
diff --git a/src/H5HF.c b/src/H5HF.c
index 60f19c2..cb651cc 100644
--- a/src/H5HF.c
+++ b/src/H5HF.c
@@ -436,7 +436,7 @@ H5HF_get_obj_len(H5HF_t *fh, const void *_id, size_t *obj_len_p)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't get 'tiny' object's length")
     } /* end if */
     else {
-        HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
+        fprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
         HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
     } /* end else */
 
@@ -496,7 +496,7 @@ H5HF_get_obj_off(H5HF_t *fh, const void *_id, hsize_t *obj_off_p)
         *obj_off_p = (hsize_t)0;
     } /* end if */
     else {
-        HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
+        fprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
         HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
     } /* end else */
 
@@ -559,7 +559,7 @@ H5HF_read(H5HF_t *fh, const void *_id, void *obj /*out*/)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't read 'tiny' object from fractal heap")
     } /* end if */
     else {
-        HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
+        fprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
         HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
     } /* end else */
 
@@ -635,7 +635,7 @@ H5HF_write(H5HF_t *fh, void *_id, hbool_t H5_ATTR_UNUSED *id_changed, const void
         HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "modifying 'tiny' object not supported yet")
     } /* end if */
     else {
-        HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
+        fprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
         HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
     } /* end else */
 
@@ -703,7 +703,7 @@ H5HF_op(H5HF_t *fh, const void *_id, H5HF_operator_t op, void *op_data)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "can't operate on 'tiny' object from fractal heap")
     } /* end if */
     else {
-        HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
+        fprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
         HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
     } /* end else */
 
@@ -766,7 +766,7 @@ H5HF_remove(H5HF_t *fh, const void *_id)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "can't remove 'tiny' object from fractal heap")
     } /* end if */
     else {
-        HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
+        fprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
         HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
     } /* end else */
 
diff --git a/src/H5HFbtree2.c b/src/H5HFbtree2.c
index 41c2322..fc43fe0 100644
--- a/src/H5HFbtree2.c
+++ b/src/H5HFbtree2.c
@@ -434,8 +434,8 @@ H5HF__huge_bt2_indir_debug(FILE *stream, int indent, int fwidth, const void *_nr
 
     FUNC_ENTER_PACKAGE_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%" PRIuHADDR ", %" PRIuHSIZE ", %" PRIuHSIZE "}\n", indent, "", fwidth,
-              "Record:", nrecord->addr, nrecord->len, nrecord->id);
+    fprintf(stream, "%*s%-*s {%" PRIuHADDR ", %" PRIuHSIZE ", %" PRIuHSIZE "}\n", indent, "", fwidth,
+            "Record:", nrecord->addr, nrecord->len, nrecord->id);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF__huge_bt2_indir_debug() */
@@ -636,9 +636,9 @@ H5HF__huge_bt2_filt_indir_debug(FILE *stream, int indent, int fwidth, const void
 
     FUNC_ENTER_PACKAGE_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%" PRIuHADDR ", %" PRIuHSIZE ", %x, %" PRIuHSIZE ", %" PRIuHSIZE "}\n",
-              indent, "", fwidth, "Record:", nrecord->addr, nrecord->len, nrecord->filter_mask,
-              nrecord->obj_size, nrecord->id);
+    fprintf(stream, "%*s%-*s {%" PRIuHADDR ", %" PRIuHSIZE ", %x, %" PRIuHSIZE ", %" PRIuHSIZE "}\n", indent,
+            "", fwidth, "Record:", nrecord->addr, nrecord->len, nrecord->filter_mask, nrecord->obj_size,
+            nrecord->id);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF__huge_bt2_filt_indir_debug() */
@@ -819,8 +819,8 @@ H5HF__huge_bt2_dir_debug(FILE *stream, int indent, int fwidth, const void *_nrec
 
     FUNC_ENTER_PACKAGE_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%" PRIuHADDR ", %" PRIuHSIZE "}\n", indent, "", fwidth,
-              "Record:", nrecord->addr, nrecord->len);
+    fprintf(stream, "%*s%-*s {%" PRIuHADDR ", %" PRIuHSIZE "}\n", indent, "", fwidth,
+            "Record:", nrecord->addr, nrecord->len);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF__huge_bt2_dir_debug() */
@@ -1030,8 +1030,8 @@ H5HF__huge_bt2_filt_dir_debug(FILE *stream, int indent, int fwidth, const void *
 
     FUNC_ENTER_PACKAGE_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%" PRIuHADDR ", %" PRIuHSIZE ", %x, %" PRIuHSIZE "}\n", indent, "", fwidth,
-              "Record:", nrecord->addr, nrecord->len, nrecord->filter_mask, nrecord->obj_size);
+    fprintf(stream, "%*s%-*s {%" PRIuHADDR ", %" PRIuHSIZE ", %x, %" PRIuHSIZE "}\n", indent, "", fwidth,
+            "Record:", nrecord->addr, nrecord->len, nrecord->filter_mask, nrecord->obj_size);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF__huge_bt2_filt_dir_debug() */
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c
index 8fb8b24..541764e 100644
--- a/src/H5HFdbg.c
+++ b/src/H5HFdbg.c
@@ -139,7 +139,7 @@ H5HF_id_print(H5HF_t *fh, const void *_id, FILE *stream, int indent, int fwidth)
         id_type = 'T';
     } /* end if */
     else {
-        HDfprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
+        fprintf(stderr, "%s: Heap ID type not supported yet!\n", __func__);
         HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "heap ID type not supported yet")
     } /* end else */
 
@@ -152,8 +152,8 @@ H5HF_id_print(H5HF_t *fh, const void *_id, FILE *stream, int indent, int fwidth)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve heap ID length")
 
     /* Display the heap ID */
-    HDfprintf(stream, "%*s%-*s (%c, %" PRIuHSIZE " , %zu)\n", indent, "", fwidth,
-              "Heap ID info: (type, offset, length)", id_type, obj_off, obj_len);
+    fprintf(stream, "%*s%-*s (%c, %" PRIuHSIZE " , %zu)\n", indent, "", fwidth,
+            "Heap ID info: (type, offset, length)", id_type, obj_off, obj_len);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -188,31 +188,30 @@ H5HF__dtable_debug(const H5HF_dtable_t *dtable, FILE *stream, int indent, int fw
      * Print the values.
      */
     /* Creation parameter values */
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Doubling table width:", dtable->cparam.width);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-              "Starting block size:", dtable->cparam.start_block_size);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-              "Max. direct block size:", dtable->cparam.max_direct_size);
-    HDfprintf(stream, "%*s%-*s %u (bits)\n", indent, "", fwidth,
-              "Max. index size:", dtable->cparam.max_index);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Starting # of rows in root indirect block:", dtable->cparam.start_root_rows);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Doubling table width:", dtable->cparam.width);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
+            "Starting block size:", dtable->cparam.start_block_size);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
+            "Max. direct block size:", dtable->cparam.max_direct_size);
+    fprintf(stream, "%*s%-*s %u (bits)\n", indent, "", fwidth, "Max. index size:", dtable->cparam.max_index);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Starting # of rows in root indirect block:", dtable->cparam.start_root_rows);
 
     /* Run-time varying parameter values */
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "Table's root address:", dtable->table_addr);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Current # of rows in root indirect block:", dtable->curr_root_rows);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "Table's root address:", dtable->table_addr);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Current # of rows in root indirect block:", dtable->curr_root_rows);
 
     /* Computed values */
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Max. # of rows in root indirect block:", dtable->max_root_rows);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Max. # of direct rows in any indirect block:", dtable->max_direct_rows);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "# of bits for IDs in first row:", dtable->first_row_bits);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "# of IDs in first row:", dtable->num_id_first_row);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Max. # of rows in root indirect block:", dtable->max_root_rows);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Max. # of direct rows in any indirect block:", dtable->max_direct_rows);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "# of bits for IDs in first row:", dtable->first_row_bits);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "# of IDs in first row:", dtable->num_id_first_row);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF__dtable_debug() */
@@ -243,70 +242,70 @@ H5HF_hdr_print(const H5HF_hdr_t *hdr, hbool_t dump_internal, FILE *stream, int i
     assert(fwidth >= 0);
 
     /* Print opening message */
-    HDfprintf(stream, "%*sFractal Heap Header...\n", indent, "");
+    fprintf(stream, "%*sFractal Heap Header...\n", indent, "");
 
     /*
      * Print the values.
      */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Heap is:", hdr->man_dtable.curr_root_rows > 0 ? "Indirect" : "Direct");
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Objects stored in 'debugging' format:", hdr->debug_objs ? "TRUE" : "FALSE");
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "'Write once' flag:", hdr->write_once ? "TRUE" : "FALSE");
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "'Huge' object IDs have wrapped:", hdr->huge_ids_wrapped ? "TRUE" : "FALSE");
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "Free space in managed blocks:", hdr->total_man_free);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "Managed space data block size:", hdr->man_size);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "Total managed space allocated:", hdr->man_alloc_size);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "Offset of managed space iterator:", hdr->man_iter_off);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "Number of managed objects in heap:", hdr->man_nobjs);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "Address of free space manager for managed blocks:", hdr->fs_addr);
-    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-              "Max. size of managed object:", (unsigned long)hdr->max_man_size);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "'Huge' object space used:", hdr->huge_size);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "Number of 'huge' objects in heap:", hdr->huge_nobjs);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "ID of next 'huge' object:", hdr->huge_next_id);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "Address of v2 B-tree for 'huge' objects:", hdr->huge_bt2_addr);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "'Tiny' object space used:", hdr->tiny_size);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "Number of 'tiny' objects in heap:", hdr->tiny_nobjs);
-
-    HDfprintf(stream, "%*sManaged Objects Doubling-Table Info...\n", indent, "");
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Heap is:", hdr->man_dtable.curr_root_rows > 0 ? "Indirect" : "Direct");
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Objects stored in 'debugging' format:", hdr->debug_objs ? "TRUE" : "FALSE");
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "'Write once' flag:", hdr->write_once ? "TRUE" : "FALSE");
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "'Huge' object IDs have wrapped:", hdr->huge_ids_wrapped ? "TRUE" : "FALSE");
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "Free space in managed blocks:", hdr->total_man_free);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "Managed space data block size:", hdr->man_size);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "Total managed space allocated:", hdr->man_alloc_size);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "Offset of managed space iterator:", hdr->man_iter_off);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "Number of managed objects in heap:", hdr->man_nobjs);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "Address of free space manager for managed blocks:", hdr->fs_addr);
+    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+            "Max. size of managed object:", (unsigned long)hdr->max_man_size);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "'Huge' object space used:", hdr->huge_size);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "Number of 'huge' objects in heap:", hdr->huge_nobjs);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "ID of next 'huge' object:", hdr->huge_next_id);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "Address of v2 B-tree for 'huge' objects:", hdr->huge_bt2_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "'Tiny' object space used:", hdr->tiny_size);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "Number of 'tiny' objects in heap:", hdr->tiny_nobjs);
+
+    fprintf(stream, "%*sManaged Objects Doubling-Table Info...\n", indent, "");
     H5HF__dtable_debug(&hdr->man_dtable, stream, indent + 3, MAX(0, fwidth - 3));
 
     /* Print information about I/O filters */
     if (hdr->filter_len > 0) {
-        HDfprintf(stream, "%*sI/O filter Info...\n", indent, "");
+        fprintf(stream, "%*sI/O filter Info...\n", indent, "");
         if (hdr->man_dtable.curr_root_rows == 0) {
-            HDfprintf(stream, "%*s%-*s %zu\n", indent + 3, "", MAX(0, fwidth - 3),
-                      "Compressed size of root direct block:", hdr->pline_root_direct_size);
-            HDfprintf(stream, "%*s%-*s %x\n", indent + 3, "", MAX(0, fwidth - 3),
-                      "Filter mask for root direct block:", hdr->pline_root_direct_filter_mask);
+            fprintf(stream, "%*s%-*s %zu\n", indent + 3, "", MAX(0, fwidth - 3),
+                    "Compressed size of root direct block:", hdr->pline_root_direct_size);
+            fprintf(stream, "%*s%-*s %x\n", indent + 3, "", MAX(0, fwidth - 3),
+                    "Filter mask for root direct block:", hdr->pline_root_direct_filter_mask);
         } /* end if */
         H5O_debug_id(H5O_PLINE_ID, hdr->f, &(hdr->pline), stream, indent + 3, MAX(0, fwidth - 3));
     } /* end if */
 
     /* Print internal (runtime) information, if requested */
     if (dump_internal) {
-        HDfprintf(stream, "%*sFractal Heap Header Internal Information:\n", indent, "");
+        fprintf(stream, "%*sFractal Heap Header Internal Information:\n", indent, "");
 
         /* Dump root iblock, if there is one */
-        HDfprintf(stream, "%*s%-*s %x\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Root indirect block flags:", hdr->root_iblock_flags);
-        HDfprintf(stream, "%*s%-*s %p\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Root indirect block pointer:", (void *)hdr->root_iblock);
+        fprintf(stream, "%*s%-*s %x\n", indent + 3, "", MAX(0, fwidth - 3),
+                "Root indirect block flags:", hdr->root_iblock_flags);
+        fprintf(stream, "%*s%-*s %p\n", indent + 3, "", MAX(0, fwidth - 3),
+                "Root indirect block pointer:", (void *)hdr->root_iblock);
         if (hdr->root_iblock)
             H5HF_iblock_print(hdr->root_iblock, dump_internal, stream, indent + 3, fwidth);
     } /* end if */
@@ -417,8 +416,8 @@ H5HF_dblock_debug_cb(H5FS_section_info_t *_sect, void *_udata)
         len = end - start;
 
         HDsnprintf(temp_str, sizeof(temp_str), "Section #%u:", (unsigned)udata->sect_count);
-        HDfprintf(udata->stream, "%*s%-*s %8zu, %8zu\n", udata->indent + 3, "", MAX(0, udata->fwidth - 9),
-                  temp_str, start, len);
+        fprintf(udata->stream, "%*s%-*s %8zu, %8zu\n", udata->indent + 3, "", MAX(0, udata->fwidth - 9),
+                temp_str, start, len);
         udata->sect_count++;
 
         /* Mark this node's free space & check for overlaps w/other sections */
@@ -431,7 +430,7 @@ H5HF_dblock_debug_cb(H5FS_section_info_t *_sect, void *_udata)
 
         /* Flag overlaps */
         if (overlap)
-            HDfprintf(udata->stream, "***THAT FREE BLOCK OVERLAPPED A PREVIOUS ONE!\n");
+            fprintf(udata->stream, "***THAT FREE BLOCK OVERLAPPED A PREVIOUS ONE!\n");
         else
             udata->amount_free += len;
     } /* end if */
@@ -486,17 +485,17 @@ H5HF_dblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
         HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap direct block")
 
     /* Print opening message */
-    HDfprintf(stream, "%*sFractal Heap Direct Block...\n", indent, "");
+    fprintf(stream, "%*sFractal Heap Direct Block...\n", indent, "");
 
     /*
      * Print the values.
      */
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "Address of fractal heap that owns this block:", hdr->heap_addr);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "Offset of direct block in heap:", dblock->block_off);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "Address of fractal heap that owns this block:", hdr->heap_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "Offset of direct block in heap:", dblock->block_off);
     blk_prefix_size = H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Size of block header:", blk_prefix_size);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Size of block header:", blk_prefix_size);
 
     /* Allocate space for the free space markers */
     if (NULL == (marker = (uint8_t *)H5MM_calloc(dblock->size)))
@@ -521,7 +520,7 @@ H5HF_dblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
         udata.amount_free = 0;
 
         /* Print header */
-        HDfprintf(stream, "%*sFree Blocks (offset, size):\n", indent, "");
+        fprintf(stream, "%*sFree Blocks (offset, size):\n", indent, "");
 
         /* Iterate over the free space sections, to detect overlaps with this block */
         if (H5FS_sect_iterate(f, hdr->fspace, H5HF_dblock_debug_cb, &udata) < 0)
@@ -536,14 +535,14 @@ H5HF_dblock_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
 
         /* Check for no free space */
         if (amount_free == 0)
-            HDfprintf(stream, "%*s<none>\n", indent + 3, "");
+            fprintf(stream, "%*s<none>\n", indent + 3, "");
     } /* end if */
     else
         amount_free = 0;
 
-    HDfprintf(stream, "%*s%-*s %.2f%%\n", indent, "", fwidth, "Percent of available space for data used:",
-              (100.0 * (double)((dblock->size - blk_prefix_size) - amount_free) /
-               (double)(dblock->size - blk_prefix_size)));
+    fprintf(stream, "%*s%-*s %.2f%%\n", indent, "", fwidth, "Percent of available space for data used:",
+            (100.0 * (double)((dblock->size - blk_prefix_size) - amount_free) /
+             (double)(dblock->size - blk_prefix_size)));
 
     /*
      * Print the data in a VMS-style octal dump.
@@ -594,44 +593,44 @@ H5HF_iblock_print(const H5HF_indirect_t *iblock, hbool_t dump_internal, FILE *st
     hdr = iblock->hdr;
 
     /* Print opening message */
-    HDfprintf(stream, "%*sFractal Heap Indirect Block...\n", indent, "");
+    fprintf(stream, "%*sFractal Heap Indirect Block...\n", indent, "");
 
     /*
      * Print the values.
      */
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "Address of fractal heap that owns this block:", hdr->heap_addr);
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
-              "Offset of indirect block in heap:", iblock->block_off);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Size of indirect block:", iblock->size);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Current # of rows:", iblock->nrows);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Max. # of rows:", iblock->max_rows);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Max direct block rows:", hdr->man_dtable.max_direct_rows);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "Address of fractal heap that owns this block:", hdr->heap_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE " \n", indent, "", fwidth,
+            "Offset of indirect block in heap:", iblock->block_off);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Size of indirect block:", iblock->size);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Current # of rows:", iblock->nrows);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Max. # of rows:", iblock->max_rows);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Max direct block rows:", hdr->man_dtable.max_direct_rows);
 
     /* Print the entry tables */
     if (hdr->filter_len > 0)
-        HDfprintf(stream, "%*sDirect Block Entries: (address/compressed size/filter mask)\n", indent, "");
+        fprintf(stream, "%*sDirect Block Entries: (address/compressed size/filter mask)\n", indent, "");
     else
-        HDfprintf(stream, "%*sDirect Block Entries: (address)\n", indent, "");
+        fprintf(stream, "%*sDirect Block Entries: (address)\n", indent, "");
     for (u = 0; u < hdr->man_dtable.max_direct_rows && u < iblock->nrows; u++) {
         HDsnprintf(temp_str, sizeof(temp_str), "Row #%u: (block size: %lu)", (unsigned)u,
                    (unsigned long)hdr->man_dtable.row_block_size[u]);
-        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), temp_str);
+        fprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), temp_str);
         for (v = 0; v < hdr->man_dtable.cparam.width; v++) {
             size_t off = (u * hdr->man_dtable.cparam.width) + v;
 
             HDsnprintf(temp_str, sizeof(temp_str), "Col #%u:", (unsigned)v);
             if (hdr->filter_len > 0)
-                HDfprintf(stream, "%*s%-*s %9" PRIuHADDR "/%6zu/%x\n", indent + 6, "", MAX(0, fwidth - 6),
-                          temp_str, iblock->ents[off].addr, iblock->filt_ents[off].size,
-                          iblock->filt_ents[off].filter_mask);
+                fprintf(stream, "%*s%-*s %9" PRIuHADDR "/%6zu/%x\n", indent + 6, "", MAX(0, fwidth - 6),
+                        temp_str, iblock->ents[off].addr, iblock->filt_ents[off].size,
+                        iblock->filt_ents[off].filter_mask);
             else
-                HDfprintf(stream, "%*s%-*s %9" PRIuHADDR "\n", indent + 6, "", MAX(0, fwidth - 6), temp_str,
-                          iblock->ents[off].addr);
+                fprintf(stream, "%*s%-*s %9" PRIuHADDR "\n", indent + 6, "", MAX(0, fwidth - 6), temp_str,
+                        iblock->ents[off].addr);
         } /* end for */
     }     /* end for */
-    HDfprintf(stream, "%*sIndirect Block Entries:\n", indent, "");
+    fprintf(stream, "%*sIndirect Block Entries:\n", indent, "");
     if (iblock->nrows > hdr->man_dtable.max_direct_rows) {
         unsigned first_row_bits;    /* Number of bits used bit addresses in first row */
         unsigned num_indirect_rows; /* Number of rows of blocks in each indirect block */
@@ -642,30 +641,29 @@ H5HF_iblock_print(const H5HF_indirect_t *iblock, hbool_t dump_internal, FILE *st
             num_indirect_rows = (H5VM_log2_gen(hdr->man_dtable.row_block_size[u]) - first_row_bits) + 1;
             HDsnprintf(temp_str, sizeof(temp_str), "Row #%u: (# of rows: %u)", (unsigned)u,
                        num_indirect_rows);
-            HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), temp_str);
+            fprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), temp_str);
             for (v = 0; v < hdr->man_dtable.cparam.width; v++) {
                 size_t off = (u * hdr->man_dtable.cparam.width) + v;
 
                 HDsnprintf(temp_str, sizeof(temp_str), "Col #%u:", (unsigned)v);
-                HDfprintf(stream, "%*s%-*s %9" PRIuHADDR "\n", indent + 6, "", MAX(0, fwidth - 6), temp_str,
-                          iblock->ents[off].addr);
+                fprintf(stream, "%*s%-*s %9" PRIuHADDR "\n", indent + 6, "", MAX(0, fwidth - 6), temp_str,
+                        iblock->ents[off].addr);
             } /* end for */
         }     /* end for */
     }         /* end if */
     else
-        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), "<none>");
+        fprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), "<none>");
 
     /* Print internal (runtime) information, if requested */
     if (dump_internal) {
-        HDfprintf(stream, "%*sFractal Indirect Block Internal Information:\n", indent, "");
+        fprintf(stream, "%*sFractal Indirect Block Internal Information:\n", indent, "");
 
         /* Print general information */
-        HDfprintf(stream, "%*s%-*s %zu\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Reference count:", iblock->rc);
+        fprintf(stream, "%*s%-*s %zu\n", indent + 3, "", MAX(0, fwidth - 3), "Reference count:", iblock->rc);
 
         /* Print parent's information */
-        HDfprintf(stream, "%*s%-*s %p\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Parent indirect block address:", (void *)iblock->parent);
+        fprintf(stream, "%*s%-*s %p\n", indent + 3, "", MAX(0, fwidth - 3),
+                "Parent indirect block address:", (void *)iblock->parent);
         if (iblock->parent)
             H5HF_iblock_print(iblock->parent, TRUE, stream, indent + 6, fwidth);
     } /* end if */
@@ -758,17 +756,16 @@ H5HF_sects_debug_cb(H5FS_section_info_t *_sect, void *_udata)
     assert(udata);
 
     /* Print generic section information */
-    HDfprintf(
-        udata->stream, "%*s%-*s %s\n", udata->indent, "", udata->fwidth, "Section type:",
-        (sect->sect_info.type == H5HF_FSPACE_SECT_SINGLE
-             ? "single"
-             : (sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW
-                    ? "first row"
-                    : (sect->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW ? "normal row" : "unknown"))));
-    HDfprintf(udata->stream, "%*s%-*s %" PRIuHADDR "\n", udata->indent, "", udata->fwidth,
-              "Section address:", sect->sect_info.addr);
-    HDfprintf(udata->stream, "%*s%-*s %" PRIuHSIZE "\n", udata->indent, "", udata->fwidth,
-              "Section size:", sect->sect_info.size);
+    fprintf(udata->stream, "%*s%-*s %s\n", udata->indent, "", udata->fwidth, "Section type:",
+            (sect->sect_info.type == H5HF_FSPACE_SECT_SINGLE
+                 ? "single"
+                 : (sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW
+                        ? "first row"
+                        : (sect->sect_info.type == H5HF_FSPACE_SECT_NORMAL_ROW ? "normal row" : "unknown"))));
+    fprintf(udata->stream, "%*s%-*s %" PRIuHADDR "\n", udata->indent, "", udata->fwidth,
+            "Section address:", sect->sect_info.addr);
+    fprintf(udata->stream, "%*s%-*s %" PRIuHSIZE "\n", udata->indent, "", udata->fwidth,
+            "Section size:", sect->sect_info.size);
 
     /* Dump section-specific debugging information */
     if (H5FS_sect_debug(udata->fspace, _sect, udata->stream, udata->indent + 3, MAX(0, udata->fwidth - 3)) <
diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c
index 32acc42..191dd3d 100644
--- a/src/H5HFdblock.c
+++ b/src/H5HFdblock.c
@@ -393,10 +393,9 @@ H5HF__man_dblock_new(H5HF_hdr_t *hdr, size_t request, H5HF_free_section_t **ret_
 
         /* Check for skipping over blocks */
         if (min_dblock_size > next_size) {
-            HDfprintf(
-                stderr,
-                "%s: Skipping direct block sizes not supported, min_dblock_size = %zu, next_size = %zu\n",
-                __func__, min_dblock_size, next_size);
+            fprintf(stderr,
+                    "%s: Skipping direct block sizes not supported, min_dblock_size = %zu, next_size = %zu\n",
+                    __func__, min_dblock_size, next_size);
             HGOTO_ERROR(H5E_HEAP, H5E_UNSUPPORTED, FAIL, "skipping direct block sizes not supported yet")
         } /* end if */
 
diff --git a/src/H5HFsection.c b/src/H5HFsection.c
index 6624bdb..89f397e 100644
--- a/src/H5HFsection.c
+++ b/src/H5HFsection.c
@@ -2034,14 +2034,14 @@ H5HF__sect_row_debug(const H5FS_section_info_t *_sect, FILE *stream, int indent,
     assert(sect);
 
     /* Print indirect section information */
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Row:", sect->u.row.row);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Column:", sect->u.row.col);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of entries:", sect->u.row.num_entries);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Row:", sect->u.row.row);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Column:", sect->u.row.col);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of entries:", sect->u.row.num_entries);
 
     /* If this is a first row section display information about underlying indirect section */
     if (sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW) {
         /* Print indirect section header */
-        HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Underlying indirect section:");
+        fprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Underlying indirect section:");
 
         H5HF__sect_indirect_debug(sect->u.row.under, stream, indent + 3, MAX(0, fwidth - 3));
     } /* end if */
@@ -4094,9 +4094,9 @@ H5HF__sect_indirect_debug(const H5HF_free_section_t *sect, FILE *stream, int ind
     assert(sect);
 
     /* Print indirect section information */
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Row:", sect->u.indirect.row);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Column:", sect->u.indirect.col);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of entries:", sect->u.indirect.num_entries);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Row:", sect->u.indirect.row);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Column:", sect->u.indirect.col);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of entries:", sect->u.indirect.num_entries);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF__sect_indirect_debug() */
diff --git a/src/H5HGdbg.c b/src/H5HGdbg.c
index c3a5255..a5b6665 100644
--- a/src/H5HGdbg.c
+++ b/src/H5HGdbg.c
@@ -92,10 +92,10 @@ H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth)
     if (NULL == (h = H5HG__protect(f, addr, H5AC__READ_ONLY_FLAG)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect global heap collection");
 
-    HDfprintf(stream, "%*sGlobal Heap Collection...\n", indent, "");
-    HDfprintf(stream, "%*s%-*s %d\n", indent, "", fwidth, "Dirty:", (int)(h->cache_info.is_dirty));
-    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-              "Total collection size in file:", (unsigned long)(h->size));
+    fprintf(stream, "%*sGlobal Heap Collection...\n", indent, "");
+    fprintf(stream, "%*s%-*s %d\n", indent, "", fwidth, "Dirty:", (int)(h->cache_info.is_dirty));
+    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+            "Total collection size in file:", (unsigned long)(h->size));
 
     for (u = 1, nused = 0, maxobj = 0; u < h->nused; u++)
         if (h->obj[u].begin) {
@@ -103,45 +103,45 @@ H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth)
             if (u > maxobj)
                 maxobj = u;
         }
-    HDfprintf(stream, "%*s%-*s %u/%lu/", indent, "", fwidth, "Objects defined/allocated/max:", nused,
-              (unsigned long)h->nalloc);
+    fprintf(stream, "%*s%-*s %u/%lu/", indent, "", fwidth, "Objects defined/allocated/max:", nused,
+            (unsigned long)h->nalloc);
     if (nused)
-        HDfprintf(stream, "%u\n", maxobj);
+        fprintf(stream, "%u\n", maxobj);
     else
-        HDfprintf(stream, "NA\n");
+        fprintf(stream, "NA\n");
 
-    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth, "Free space:", (unsigned long)(h->obj[0].size));
+    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth, "Free space:", (unsigned long)(h->obj[0].size));
 
     for (u = 1; u < h->nused; u++)
         if (h->obj[u].begin) {
             char buf[64];
 
             HDsnprintf(buf, sizeof(buf), "Object %u", u);
-            HDfprintf(stream, "%*s%s\n", indent, "", buf);
-            HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MIN(fwidth - 3, 0),
-                      "Obffset in block:", (unsigned long)(h->obj[u].begin - h->chunk));
-            HDfprintf(stream, "%*s%-*s %d\n", indent + 3, "", MIN(fwidth - 3, 0),
-                      "Reference count:", h->obj[u].nrefs);
-            HDfprintf(stream, "%*s%-*s %lu/%lu\n", indent + 3, "", MIN(fwidth - 3, 0),
-                      "Size of object body:", (unsigned long)(h->obj[u].size),
-                      (unsigned long)H5HG_ALIGN(h->obj[u].size));
+            fprintf(stream, "%*s%s\n", indent, "", buf);
+            fprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MIN(fwidth - 3, 0),
+                    "Obffset in block:", (unsigned long)(h->obj[u].begin - h->chunk));
+            fprintf(stream, "%*s%-*s %d\n", indent + 3, "", MIN(fwidth - 3, 0),
+                    "Reference count:", h->obj[u].nrefs);
+            fprintf(stream, "%*s%-*s %lu/%lu\n", indent + 3, "", MIN(fwidth - 3, 0),
+                    "Size of object body:", (unsigned long)(h->obj[u].size),
+                    (unsigned long)H5HG_ALIGN(h->obj[u].size));
             p = h->obj[u].begin + H5HG_SIZEOF_OBJHDR(f);
             for (j = 0; j < h->obj[u].size; j += 16) {
-                HDfprintf(stream, "%*s%04u: ", indent + 6, "", j);
+                fprintf(stream, "%*s%04u: ", indent + 6, "", j);
                 for (k = 0; k < 16; k++) {
                     if (8 == k)
-                        HDfprintf(stream, " ");
+                        fprintf(stream, " ");
                     if (j + k < h->obj[u].size)
-                        HDfprintf(stream, "%02x ", p[j + k]);
+                        fprintf(stream, "%02x ", p[j + k]);
                     else
                         HDfputs("   ", stream);
                 }
                 for (k = 0; k < 16 && j + k < h->obj[u].size; k++) {
                     if (8 == k)
-                        HDfprintf(stream, " ");
+                        fprintf(stream, " ");
                     HDfputc(p[j + k] > ' ' && p[j + k] <= '~' ? p[j + k] : '.', stream);
                 }
-                HDfprintf(stream, "\n");
+                fprintf(stream, "\n");
             }
         }
 
diff --git a/src/H5HL.c b/src/H5HL.c
index 9f7bb5f..25eaeb2 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -675,8 +675,8 @@ H5HL_insert(H5F_t *f, H5HL_t *heap, size_t buf_size, const void *buf, size_t *of
             if (last_fl->size < H5HL_SIZEOF_FREE(f)) {
 #ifdef H5HL_DEBUG
                 if (H5DEBUG(HL) && last_fl->size) {
-                    HDfprintf(H5DEBUG(HL), "H5HL: lost %lu bytes at line %d\n",
-                              (unsigned long)(last_fl->size), __LINE__);
+                    fprintf(H5DEBUG(HL), "H5HL: lost %lu bytes at line %d\n", (unsigned long)(last_fl->size),
+                            __LINE__);
                 }
 #endif
                 last_fl = H5HL__remove_free(heap, last_fl);
@@ -702,16 +702,16 @@ H5HL_insert(H5F_t *f, H5HL_t *heap, size_t buf_size, const void *buf, size_t *of
 #ifdef H5HL_DEBUG
             }
             else if (H5DEBUG(HL) && need_more > need_size) {
-                HDfprintf(H5DEBUG(HL), "H5HL_insert: lost %lu bytes at line %d\n",
-                          (unsigned long)(need_more - need_size), __LINE__);
+                fprintf(H5DEBUG(HL), "H5HL_insert: lost %lu bytes at line %d\n",
+                        (unsigned long)(need_more - need_size), __LINE__);
 #endif
             }
         }
 
 #ifdef H5HL_DEBUG
         if (H5DEBUG(HL)) {
-            HDfprintf(H5DEBUG(HL), "H5HL: resize mem buf from %lu to %lu bytes\n",
-                      (unsigned long)(old_dblk_size), (unsigned long)(old_dblk_size + need_more));
+            fprintf(H5DEBUG(HL), "H5HL: resize mem buf from %lu to %lu bytes\n",
+                    (unsigned long)(old_dblk_size), (unsigned long)(old_dblk_size + need_more));
         }
 #endif
         if (NULL == (heap->dblk_image = H5FL_BLK_REALLOC(lheap_chunk, heap->dblk_image, heap->dblk_size)))
@@ -852,7 +852,7 @@ H5HL_remove(H5F_t *f, H5HL_t *heap, size_t offset, size_t size)
     if (size < H5HL_SIZEOF_FREE(f)) {
 #ifdef H5HL_DEBUG
         if (H5DEBUG(HL)) {
-            HDfprintf(H5DEBUG(HL), "H5HL: lost %lu bytes\n", (unsigned long)size);
+            fprintf(H5DEBUG(HL), "H5HL: lost %lu bytes\n", (unsigned long)size);
         }
 #endif
         HGOTO_DONE(SUCCEED)
diff --git a/src/H5HLdbg.c b/src/H5HLdbg.c
index 86e522d..dcf228f 100644
--- a/src/H5HLdbg.c
+++ b/src/H5HLdbg.c
@@ -65,10 +65,10 @@ H5HL_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth)
     if (NULL == (h = (H5HL_t *)H5HL_protect(f, addr, H5AC__READ_ONLY_FLAG)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load/protect local heap")
 
-    HDfprintf(stream, "%*sLocal Heap...\n", indent, "");
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Header size (in bytes):", h->prfx_size);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Address of heap data:", h->dblk_addr);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Data bytes allocated for heap:", h->dblk_size);
+    fprintf(stream, "%*sLocal Heap...\n", indent, "");
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Header size (in bytes):", h->prfx_size);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Address of heap data:", h->dblk_addr);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Data bytes allocated for heap:", h->dblk_size);
 
     /* Traverse the free list and check that all free blocks fall within
      * the heap and that no two free blocks point to the same region of
@@ -77,15 +77,15 @@ H5HL_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth)
     if (NULL == (marker = (uint8_t *)H5MM_calloc(h->dblk_size)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
-    HDfprintf(stream, "%*sFree Blocks (offset, size):\n", indent, "");
+    fprintf(stream, "%*sFree Blocks (offset, size):\n", indent, "");
     for (free_block = 0, freelist = h->freelist; freelist; freelist = freelist->next, free_block++) {
         char temp_str[32];
 
         HDsnprintf(temp_str, sizeof(temp_str), "Block #%d:", free_block);
-        HDfprintf(stream, "%*s%-*s %8zu, %8zu\n", indent + 3, "", MAX(0, fwidth - 9), temp_str,
-                  freelist->offset, freelist->size);
+        fprintf(stream, "%*s%-*s %8zu, %8zu\n", indent + 3, "", MAX(0, fwidth - 9), temp_str,
+                freelist->offset, freelist->size);
         if ((freelist->offset + freelist->size) > h->dblk_size)
-            HDfprintf(stream, "***THAT FREE BLOCK IS OUT OF BOUNDS!\n");
+            fprintf(stream, "***THAT FREE BLOCK IS OUT OF BOUNDS!\n");
         else {
             int    overlap = 0;
             size_t i;
@@ -96,15 +96,15 @@ H5HL_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth)
                 marker[freelist->offset + i] = 1;
             }
             if (overlap)
-                HDfprintf(stream, "***THAT FREE BLOCK OVERLAPPED A PREVIOUS ONE!\n");
+                fprintf(stream, "***THAT FREE BLOCK OVERLAPPED A PREVIOUS ONE!\n");
             else
                 amount_free += freelist->size;
         }
     }
 
     if (h->dblk_size)
-        HDfprintf(stream, "%*s%-*s %.2f%%\n", indent, "", fwidth, "Percent of heap used:",
-                  (100.0 * (double)(h->dblk_size - amount_free) / (double)h->dblk_size));
+        fprintf(stream, "%*s%-*s %.2f%%\n", indent, "", fwidth, "Percent of heap used:",
+                (100.0 * (double)(h->dblk_size - amount_free) / (double)h->dblk_size));
 
     /* Print the data in a VMS-style octal dump */
     H5_buffer_dump(stream, indent, h->dblk_image, marker, (size_t)0, h->dblk_size);
diff --git a/src/H5Idbg.c b/src/H5Idbg.c
index 5fbe29b..4c7d1ec 100644
--- a/src/H5Idbg.c
+++ b/src/H5Idbg.c
@@ -81,10 +81,10 @@ H5I__id_dump_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
 
     FUNC_ENTER_PACKAGE_NOERR
 
-    HDfprintf(stderr, "         id = %" PRIdHID "\n", info->id);
-    HDfprintf(stderr, "         count = %u\n", info->count);
-    HDfprintf(stderr, "         obj   = 0x%8p\n", info->object);
-    HDfprintf(stderr, "         marked = %d\n", info->marked);
+    fprintf(stderr, "         id = %" PRIdHID "\n", info->id);
+    fprintf(stderr, "         count = %u\n", info->count);
+    fprintf(stderr, "         obj   = 0x%8p\n", info->object);
+    fprintf(stderr, "         marked = %d\n", info->marked);
 
     /* Get the group location, so we get get the name */
     switch (type) {
@@ -143,9 +143,9 @@ H5I__id_dump_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
 
     if (path) {
         if (path->user_path_r)
-            HDfprintf(stderr, "                user_path = %s\n", H5RS_get_str(path->user_path_r));
+            fprintf(stderr, "                user_path = %s\n", H5RS_get_str(path->user_path_r));
         if (path->full_path_r)
-            HDfprintf(stderr, "                full_path = %s\n", H5RS_get_str(path->full_path_r));
+            fprintf(stderr, "                full_path = %s\n", H5RS_get_str(path->full_path_r));
     }
 
     FUNC_LEAVE_NOAPI(H5_ITER_CONT)
@@ -167,7 +167,7 @@ H5I_dump_ids_for_type(H5I_type_t type)
 
     FUNC_ENTER_NOAPI_NOERR
 
-    HDfprintf(stderr, "Dumping ID type %d\n", (int)type);
+    fprintf(stderr, "Dumping ID type %d\n", (int)type);
     type_info = H5I_type_info_array_g[type];
 
     if (type_info) {
@@ -176,21 +176,21 @@ H5I_dump_ids_for_type(H5I_type_t type)
         H5I_id_info_t *tmp  = NULL;
 
         /* Header */
-        HDfprintf(stderr, "     init_count = %u\n", type_info->init_count);
-        HDfprintf(stderr, "     reserved   = %u\n", type_info->cls->reserved);
-        HDfprintf(stderr, "     id_count   = %llu\n", (unsigned long long)type_info->id_count);
-        HDfprintf(stderr, "     nextid        = %llu\n", (unsigned long long)type_info->nextid);
+        fprintf(stderr, "     init_count = %u\n", type_info->init_count);
+        fprintf(stderr, "     reserved   = %u\n", type_info->cls->reserved);
+        fprintf(stderr, "     id_count   = %llu\n", (unsigned long long)type_info->id_count);
+        fprintf(stderr, "     nextid        = %llu\n", (unsigned long long)type_info->nextid);
 
         /* List */
         if (type_info->id_count > 0) {
-            HDfprintf(stderr, "     List:\n");
+            fprintf(stderr, "     List:\n");
             /* Normally we care about the callback's return value
              * (H5I_ITER_CONT, etc.), but this is an iteration over all
              * the IDs so we don't care.
              *
              * XXX: Update this to emit an error message on errors?
              */
-            HDfprintf(stderr, "     (HASH TABLE)\n");
+            fprintf(stderr, "     (HASH TABLE)\n");
             HASH_ITER(hh, type_info->hash_table, item, tmp)
             {
                 H5I__id_dump_cb((void *)item, NULL, (void *)&type);
@@ -198,7 +198,7 @@ H5I_dump_ids_for_type(H5I_type_t type)
         }
     }
     else
-        HDfprintf(stderr, "Global type info/tracking pointer for that type is NULL\n");
+        fprintf(stderr, "Global type info/tracking pointer for that type is NULL\n");
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5I_dump_ids_for_type() */
diff --git a/src/H5Iint.c b/src/H5Iint.c
index f7b4344..5804c53 100644
--- a/src/H5Iint.c
+++ b/src/H5Iint.c
@@ -388,10 +388,10 @@ H5I__mark_node(void *_info, void H5_ATTR_UNUSED *key, void *_udata)
                 if (udata->force) {
 #ifdef H5I_DEBUG
                     if (H5DEBUG(I)) {
-                        HDfprintf(H5DEBUG(I),
-                                  "H5I: discard type=%d obj=%p "
-                                  "failure ignored\n",
-                                  (int)udata->type_info->cls->type, info->object);
+                        fprintf(H5DEBUG(I),
+                                "H5I: discard type=%d obj=%p "
+                                "failure ignored\n",
+                                (int)udata->type_info->cls->type, info->object);
                     }
 #endif /* H5I_DEBUG */
 
@@ -411,10 +411,10 @@ H5I__mark_node(void *_info, void H5_ATTR_UNUSED *key, void *_udata)
                 if (udata->force) {
 #ifdef H5I_DEBUG
                     if (H5DEBUG(I)) {
-                        HDfprintf(H5DEBUG(I),
-                                  "H5I: free type=%d obj=%p "
-                                  "failure ignored\n",
-                                  (int)udata->type_info->cls->type, info->object);
+                        fprintf(H5DEBUG(I),
+                                "H5I: free type=%d obj=%p "
+                                "failure ignored\n",
+                                (int)udata->type_info->cls->type, info->object);
                     }
 #endif /* H5I_DEBUG */
 
diff --git a/src/H5MF.c b/src/H5MF.c
index a54501b..92a4125 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -538,7 +538,7 @@ H5MF__delete_fstype(H5F_t *f, H5F_mem_page_t type)
     H5AC_set_ring(fsm_ring, &orig_ring);
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-    HDfprintf(stderr, "%s: Before deleting free space manager\n", __func__);
+    fprintf(stderr, "%s: Before deleting free space manager\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
     /* Delete free space manager for this type */
@@ -593,7 +593,7 @@ H5MF__close_fstype(H5F_t *f, H5F_mem_page_t type)
     assert(f->shared->fs_state[type] != H5F_FS_STATE_CLOSED);
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-    HDfprintf(stderr, "%s: Before closing free space manager\n", __func__);
+    fprintf(stderr, "%s: Before closing free space manager\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
     /* Close an existing free space structure for the file */
@@ -649,10 +649,9 @@ H5MF__add_sect(H5F_t *f, H5FD_mem_t alloc_type, H5FS_t *fspace, H5MF_free_sectio
     H5AC_set_ring(fsm_ring, &orig_ring);
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-    HDfprintf(stderr,
-              "%s: adding node, node->sect_info.addr = %" PRIuHADDR ", node->sect_info.size = %" PRIuHSIZE
-              "\n",
-              __func__, node->sect_info.addr, node->sect_info.size);
+    fprintf(stderr,
+            "%s: adding node, node->sect_info.addr = %" PRIuHADDR ", node->sect_info.size = %" PRIuHSIZE "\n",
+            __func__, node->sect_info.addr, node->sect_info.size);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
     /* Add the section */
     if (H5FS_sect_add(f, fspace, (H5FS_section_info_t *)node, H5FS_ADD_RETURNED_SPACE, &udata) < 0)
@@ -704,7 +703,7 @@ H5MF__find_sect(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size, H5FS_t *fspace, h
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "error locating free space in file")
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-    HDfprintf(stderr, "%s: section found = %d\n", __func__, ret_value);
+    fprintf(stderr, "%s: section found = %d\n", __func__, ret_value);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
     /* Check for actually finding section */
@@ -719,7 +718,7 @@ H5MF__find_sect(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size, H5FS_t *fspace, h
         /* Check for eliminating the section */
         if (node->sect_info.size == size) {
 #ifdef H5MF_ALLOC_DEBUG_MORE
-            HDfprintf(stderr, "%s: freeing node\n", __func__);
+            fprintf(stderr, "%s: freeing node\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
             /* Free section node */
@@ -732,8 +731,8 @@ H5MF__find_sect(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size, H5FS_t *fspace, h
             node->sect_info.size -= size;
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-            HDfprintf(stderr, "%s: re-adding node, node->sect_info.size = %" PRIuHSIZE "\n", __func__,
-                      node->sect_info.size);
+            fprintf(stderr, "%s: re-adding node, node->sect_info.size = %" PRIuHSIZE "\n", __func__,
+                    node->sect_info.size);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
             /* Re-add the section to the free-space manager */
@@ -776,7 +775,7 @@ H5MF_alloc(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size)
 
     FUNC_ENTER_NOAPI_TAG(H5AC__FREESPACE_TAG, HADDR_UNDEF)
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: alloc_type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)alloc_type, size);
+    fprintf(stderr, "%s: alloc_type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)alloc_type, size);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check arguments */
@@ -788,7 +787,7 @@ H5MF_alloc(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size)
     H5MF__alloc_to_fs_type(f->shared, alloc_type, size, &fs_type);
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-    HDfprintf(stderr, "%s: Check 1.0\n", __func__);
+    fprintf(stderr, "%s: Check 1.0\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
     /* Set the ring type in the API context */
@@ -825,7 +824,7 @@ H5MF_alloc(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size)
     /* If no space is found from the free-space manager, continue further action */
     if (!H5_addr_defined(ret_value)) {
 #ifdef H5MF_ALLOC_DEBUG_MORE
-        HDfprintf(stderr, "%s: Check 2.0\n", __func__);
+        fprintf(stderr, "%s: Check 2.0\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
         if (f->shared->fs_strategy == H5F_FSPACE_STRATEGY_PAGE) {
             assert(f->shared->fs_page_size >= H5F_FILE_SPACE_PAGE_SIZE_MIN);
@@ -840,7 +839,7 @@ H5MF_alloc(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size)
     }     /* end if */
     assert(H5_addr_defined(ret_value));
 #ifdef H5MF_ALLOC_DEBUG_MORE
-    HDfprintf(stderr, "%s: Check 3.0\n", __func__);
+    fprintf(stderr, "%s: Check 3.0\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
 done:
@@ -849,8 +848,8 @@ done:
         H5AC_set_ring(orig_ring, NULL);
 
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Leaving: ret_value = %" PRIuHADDR ", size = %" PRIuHSIZE "\n", __func__, ret_value,
-              size);
+    fprintf(stderr, "%s: Leaving: ret_value = %" PRIuHADDR ", size = %" PRIuHSIZE "\n", __func__, ret_value,
+            size);
 #endif /* H5MF_ALLOC_DEBUG */
 #ifdef H5MF_ALLOC_DEBUG_DUMP
     H5MF__sects_dump(f, stderr);
@@ -890,7 +889,7 @@ H5MF__alloc_pagefs(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size)
     FUNC_ENTER_PACKAGE
 
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: alloc_type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)alloc_type, size);
+    fprintf(stderr, "%s: alloc_type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)alloc_type, size);
 #endif /* H5MF_ALLOC_DEBUG */
 
     H5MF__alloc_to_fs_type(f->shared, alloc_type, size, &ptype);
@@ -987,8 +986,8 @@ H5MF__alloc_pagefs(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size)
 
 done:
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Leaving: ret_value = %" PRIuHADDR ", size = %" PRIuHSIZE "\n", __func__, ret_value,
-              size);
+    fprintf(stderr, "%s: Leaving: ret_value = %" PRIuHADDR ", size = %" PRIuHSIZE "\n", __func__, ret_value,
+            size);
 #endif /* H5MF_ALLOC_DEBUG */
 #ifdef H5MF_ALLOC_DEBUG_DUMP
     H5MF__sects_dump(f, stderr);
@@ -1034,7 +1033,7 @@ H5MF_alloc_tmp(H5F_t *f, hsize_t size)
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: size = %" PRIuHSIZE "\n", __func__, size);
+    fprintf(stderr, "%s: size = %" PRIuHSIZE "\n", __func__, size);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check args */
@@ -1086,8 +1085,8 @@ H5MF_xfree(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size)
 
     FUNC_ENTER_NOAPI_TAG(H5AC__FREESPACE_TAG, FAIL)
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Entering - alloc_type = %u, addr = %" PRIuHADDR ", size = %" PRIuHSIZE "\n",
-              __func__, (unsigned)alloc_type, addr, size);
+    fprintf(stderr, "%s: Entering - alloc_type = %u, addr = %" PRIuHADDR ", size = %" PRIuHSIZE "\n",
+            __func__, (unsigned)alloc_type, addr, size);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check arguments */
@@ -1136,13 +1135,13 @@ H5MF_xfree(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size)
          *  space is at the end of the file
          */
 #ifdef H5MF_ALLOC_DEBUG_MORE
-        HDfprintf(stderr, "%s: fs_addr = %" PRIuHADDR "\n", __func__, f->shared->fs_addr[fs_type]);
+        fprintf(stderr, "%s: fs_addr = %" PRIuHADDR "\n", __func__, f->shared->fs_addr[fs_type]);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
         if (!H5_addr_defined(f->shared->fs_addr[fs_type])) {
             htri_t status; /* "can absorb" status for section into */
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-            HDfprintf(stderr, "%s: Trying to avoid starting up free space manager\n", __func__);
+            fprintf(stderr, "%s: Trying to avoid starting up free space manager\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
             /* Try to shrink the file or absorb the block into a block aggregator */
             if ((status = H5MF_try_shrink(f, alloc_type, addr, size)) < 0)
@@ -1152,9 +1151,8 @@ H5MF_xfree(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size)
                 HGOTO_DONE(SUCCEED)
             else if (size < f->shared->fs_threshold) {
 #ifdef H5MF_ALLOC_DEBUG_MORE
-                HDfprintf(stderr,
-                          "%s: dropping addr = %" PRIuHADDR ", size = %" PRIuHSIZE ", on the floor!\n",
-                          __func__, addr, size);
+                fprintf(stderr, "%s: dropping addr = %" PRIuHADDR ", size = %" PRIuHSIZE ", on the floor!\n",
+                        __func__, addr, size);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
                 HGOTO_DONE(SUCCEED)
             } /* end else-if */
@@ -1171,8 +1169,8 @@ H5MF_xfree(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size)
          */
         if (f->shared->fs_state[fs_type] == H5F_FS_STATE_DELETING || !H5F_HAVE_FREE_SPACE_MANAGER(f)) {
 #ifdef H5MF_ALLOC_DEBUG_MORE
-            HDfprintf(stderr, "%s: dropping addr = %" PRIuHADDR ", size = %" PRIuHSIZE ", on the floor!\n",
-                      __func__, addr, size);
+            fprintf(stderr, "%s: dropping addr = %" PRIuHADDR ", size = %" PRIuHSIZE ", on the floor!\n",
+                    __func__, addr, size);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
             HGOTO_DONE(SUCCEED)
         } /* end if */
@@ -1195,7 +1193,7 @@ H5MF_xfree(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size)
         assert(f->shared->fs_man[fs_type]);
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-        HDfprintf(stderr, "%s: Before H5FS_sect_add()\n", __func__);
+        fprintf(stderr, "%s: Before H5FS_sect_add()\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
         /* Add to the free space for the file */
@@ -1204,7 +1202,7 @@ H5MF_xfree(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size)
         node = NULL;
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-        HDfprintf(stderr, "%s: After H5FS_sect_add()\n", __func__);
+        fprintf(stderr, "%s: After H5FS_sect_add()\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
     }  /* end if */
     else {
@@ -1237,7 +1235,7 @@ done:
             HDONE_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't free simple section node")
 
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", __func__, ret_value);
+    fprintf(stderr, "%s: Leaving, ret_value = %d\n", __func__, ret_value);
 #endif /* H5MF_ALLOC_DEBUG */
 #ifdef H5MF_ALLOC_DEBUG_DUMP
     H5MF__sects_dump(f, stderr);
@@ -1281,10 +1279,10 @@ H5MF_try_extend(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size, hsi
 
     FUNC_ENTER_NOAPI_TAG(H5AC__FREESPACE_TAG, FAIL)
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr,
-              "%s: Entering: alloc_type = %u, addr = %" PRIuHADDR ", size = %" PRIuHSIZE
-              ", extra_requested = %" PRIuHSIZE "\n",
-              __func__, (unsigned)alloc_type, addr, size, extra_requested);
+    fprintf(stderr,
+            "%s: Entering: alloc_type = %u, addr = %" PRIuHADDR ", size = %" PRIuHSIZE
+            ", extra_requested = %" PRIuHSIZE "\n",
+            __func__, (unsigned)alloc_type, addr, size, extra_requested);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* Sanity check */
@@ -1336,7 +1334,7 @@ H5MF_try_extend(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size, hsi
         if ((ret_value = H5F__try_extend(f, map_type, end, extra_requested + frag_size)) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTEXTEND, FAIL, "error extending file")
 #ifdef H5MF_ALLOC_DEBUG_MORE
-        HDfprintf(stderr, "%s: extended = %d\n", __func__, ret_value);
+        fprintf(stderr, "%s: extended = %d\n", __func__, ret_value);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
         /* If extending at EOA succeeds: */
@@ -1374,7 +1372,7 @@ H5MF_try_extend(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size, hsi
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTEXTEND, FAIL, "error extending aggregation block")
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-            HDfprintf(stderr, "%s: H5MF__aggr_try_extend = %d\n", __func__, ret_value);
+            fprintf(stderr, "%s: H5MF__aggr_try_extend = %d\n", __func__, ret_value);
 #endif    /* H5MF_ALLOC_DEBUG_MORE */
         } /* end if */
 
@@ -1400,7 +1398,7 @@ H5MF_try_extend(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size, hsi
                     HGOTO_ERROR(H5E_RESOURCE, H5E_CANTEXTEND, FAIL,
                                 "error extending block in free space manager")
 #ifdef H5MF_ALLOC_DEBUG_MORE
-                HDfprintf(stderr, "%s: Try to H5FS_sect_try_extend = %d\n", __func__, ret_value);
+                fprintf(stderr, "%s: Try to H5FS_sect_try_extend = %d\n", __func__, ret_value);
 #endif        /* H5MF_ALLOC_DEBUG_MORE */
             } /* end if */
 
@@ -1411,8 +1409,7 @@ H5MF_try_extend(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size, hsi
                 if (frag_size <= H5F_PGEND_META_THRES(f) && extra_requested <= frag_size)
                     ret_value = TRUE;
 #ifdef H5MF_ALLOC_DEBUG_MORE
-                HDfprintf(stderr, "%s: Try to extend into the page end threshold = %d\n", __func__,
-                          ret_value);
+                fprintf(stderr, "%s: Try to extend into the page end threshold = %d\n", __func__, ret_value);
 #endif        /* H5MF_ALLOC_DEBUG_MORE */
             } /* end if */
         }     /* end if */
@@ -1424,7 +1421,7 @@ done:
         H5AC_set_ring(orig_ring, NULL);
 
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Leaving: ret_value = %d\n", __func__, ret_value);
+    fprintf(stderr, "%s: Leaving: ret_value = %d\n", __func__, ret_value);
 #endif /* H5MF_ALLOC_DEBUG */
 #ifdef H5MF_ALLOC_DEBUG_DUMP
     H5MF__sects_dump(f, stderr);
@@ -1459,8 +1456,8 @@ H5MF_try_shrink(H5F_t *f, H5FD_mem_t alloc_type, haddr_t addr, hsize_t size)
 
     FUNC_ENTER_NOAPI_TAG(H5AC__FREESPACE_TAG, FAIL)
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Entering - alloc_type = %u, addr = %" PRIuHADDR ", size = %" PRIuHSIZE "\n",
-              __func__, (unsigned)alloc_type, addr, size);
+    fprintf(stderr, "%s: Entering - alloc_type = %u, addr = %" PRIuHADDR ", size = %" PRIuHSIZE "\n",
+            __func__, (unsigned)alloc_type, addr, size);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check arguments */
@@ -1516,7 +1513,7 @@ done:
         HDONE_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't free simple section node")
 
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", __func__, ret_value);
+    fprintf(stderr, "%s: Leaving, ret_value = %d\n", __func__, ret_value);
 #endif /* H5MF_ALLOC_DEBUG */
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5MF_try_shrink() */
@@ -1540,7 +1537,7 @@ H5MF_close(H5F_t *f)
 
     FUNC_ENTER_NOAPI_TAG(H5AC__FREESPACE_TAG, FAIL)
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Entering\n", __func__);
+    fprintf(stderr, "%s: Entering\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check args */
@@ -1558,7 +1555,7 @@ H5MF_close(H5F_t *f)
 
 done:
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Leaving\n", __func__);
+    fprintf(stderr, "%s: Leaving\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG */
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5MF_close() */
@@ -1584,7 +1581,7 @@ H5MF__close_delete_fstype(H5F_t *f, H5F_mem_page_t type)
 
     FUNC_ENTER_PACKAGE
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Entering\n", __func__);
+    fprintf(stderr, "%s: Entering\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check args */
@@ -1596,9 +1593,9 @@ H5MF__close_delete_fstype(H5F_t *f, H5F_mem_page_t type)
         assert((H5FD_mem_t)type < H5FD_MEM_NTYPES);
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-    HDfprintf(stderr, "%s: Check 1.0 - f->shared->fs_man[%u] = %p, f->shared->fs_addr[%u] = %" PRIuHADDR "\n",
-              __func__, (unsigned)type, (void *)f->shared->fs_man[type], (unsigned)type,
-              f->shared->fs_addr[type]);
+    fprintf(stderr, "%s: Check 1.0 - f->shared->fs_man[%u] = %p, f->shared->fs_addr[%u] = %" PRIuHADDR "\n",
+            __func__, (unsigned)type, (void *)f->shared->fs_man[type], (unsigned)type,
+            f->shared->fs_addr[type]);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
     /* If the free space manager for this type is open, close it */
@@ -1607,9 +1604,9 @@ H5MF__close_delete_fstype(H5F_t *f, H5F_mem_page_t type)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "can't close the free space manager")
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-    HDfprintf(stderr, "%s: Check 2.0 - f->shared->fs_man[%u] = %p, f->shared->fs_addr[%u] = %" PRIuHADDR "\n",
-              __func__, (unsigned)type, (void *)f->shared->fs_man[type], (unsigned)type,
-              f->shared->fs_addr[type]);
+    fprintf(stderr, "%s: Check 2.0 - f->shared->fs_man[%u] = %p, f->shared->fs_addr[%u] = %" PRIuHADDR "\n",
+            __func__, (unsigned)type, (void *)f->shared->fs_man[type], (unsigned)type,
+            f->shared->fs_addr[type]);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
     /* If there is free space manager info for this type, delete it */
@@ -1619,7 +1616,7 @@ H5MF__close_delete_fstype(H5F_t *f, H5F_mem_page_t type)
 
 done:
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Leaving\n", __func__);
+    fprintf(stderr, "%s: Leaving\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5MF__close_delete() */
@@ -1648,7 +1645,7 @@ H5MF_try_close(H5F_t *f)
 
     FUNC_ENTER_NOAPI_TAG(H5AC__FREESPACE_TAG, FAIL)
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Entering\n", __func__);
+    fprintf(stderr, "%s: Entering\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check args */
@@ -1727,7 +1724,7 @@ done:
         H5AC_set_ring(orig_ring, NULL);
 
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Leaving\n", __func__);
+    fprintf(stderr, "%s: Leaving\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG */
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* H5MF_try_close() */
@@ -1755,7 +1752,7 @@ H5MF__close_aggrfs(H5F_t *f)
 
     FUNC_ENTER_PACKAGE
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Entering\n", __func__);
+    fprintf(stderr, "%s: Entering\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check args */
@@ -1893,7 +1890,7 @@ done:
         H5AC_set_ring(orig_ring, NULL);
 
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Leaving\n", __func__);
+    fprintf(stderr, "%s: Leaving\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF__close_aggrfs() */
@@ -1921,7 +1918,7 @@ H5MF__close_pagefs(H5F_t *f)
 
     FUNC_ENTER_PACKAGE
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Entering\n", __func__);
+    fprintf(stderr, "%s: Entering\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /* check args */
@@ -2068,7 +2065,7 @@ done:
         H5AC_set_ring(orig_ring, NULL);
 
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Leaving\n", __func__);
+    fprintf(stderr, "%s: Leaving\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG */
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5MF__close_pagefs() */
diff --git a/src/H5MFaggr.c b/src/H5MFaggr.c
index 70d807f..1f6a7ec 100644
--- a/src/H5MFaggr.c
+++ b/src/H5MFaggr.c
@@ -91,7 +91,7 @@ H5MF_aggr_vfd_alloc(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size)
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
 #ifdef H5MF_AGGR_DEBUG
-    HDfprintf(stderr, "%s: alloc_type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)alloc_type, size);
+    fprintf(stderr, "%s: alloc_type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)alloc_type, size);
 #endif /* H5MF_AGGR_DEBUG */
 
     /* check arguments */
@@ -119,8 +119,8 @@ H5MF_aggr_vfd_alloc(H5F_t *f, H5FD_mem_t alloc_type, hsize_t size)
 
 done:
 #ifdef H5MF_AGGR_DEBUG
-    HDfprintf(stderr, "%s: Leaving: ret_value = %" PRIuHADDR ", size = %" PRIuHSIZE "\n", __func__, ret_value,
-              size);
+    fprintf(stderr, "%s: Leaving: ret_value = %" PRIuHADDR ", size = %" PRIuHSIZE "\n", __func__, ret_value,
+            size);
 #endif /* H5MF_AGGR_DEBUG */
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -150,7 +150,7 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
 
     FUNC_ENTER_PACKAGE
 #ifdef H5MF_AGGR_DEBUG
-    HDfprintf(stderr, "%s: type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)type, size);
+    fprintf(stderr, "%s: type = %u, size = %" PRIuHSIZE "\n", __func__, (unsigned)type, size);
 #endif /* H5MF_AGGR_DEBUG */
 
     /* check args */
@@ -199,8 +199,8 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
             H5FD_mem_t alloc_type, other_alloc_type; /* Current aggregator & 'other' aggregator types */
 
 #ifdef H5MF_AGGR_DEBUG
-            HDfprintf(stderr, "%s: aggr = {%" PRIuHADDR ", %" PRIuHSIZE ", %" PRIuHSIZE "}\n", __func__,
-                      aggr->addr, aggr->tot_size, aggr->size);
+            fprintf(stderr, "%s: aggr = {%" PRIuHADDR ", %" PRIuHSIZE ", %" PRIuHSIZE "}\n", __func__,
+                    aggr->addr, aggr->tot_size, aggr->size);
 #endif /* H5MF_AGGR_DEBUG */
 
             /* Turn off alignment if allocation < threshold */
@@ -268,7 +268,7 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
 
                     /* Allocate another block */
 #ifdef H5MF_AGGR_DEBUG
-                    HDfprintf(stderr, "%s: Allocating block\n", __func__);
+                    fprintf(stderr, "%s: Allocating block\n", __func__);
 #endif /* H5MF_AGGR_DEBUG */
 
                     if (aggr_frag_size > (ext_size - size))
@@ -388,7 +388,7 @@ H5MF__aggr_alloc(H5F_t *f, H5F_blk_aggr_t *aggr, H5F_blk_aggr_t *other_aggr, H5F
 
 done:
 #ifdef H5MF_AGGR_DEBUG
-        HDfprintf(stderr, "%s: ret_value = %" PRIuHADDR "\n", __func__, ret_value);
+        fprintf(stderr, "%s: ret_value = %" PRIuHADDR "\n", __func__, ret_value);
 #endif /* H5MF_AGGR_DEBUG */
         FUNC_LEAVE_NOAPI(ret_value)
     } /* end H5MF__aggr_alloc() */
@@ -537,11 +537,11 @@ done:
             if (H5_addr_eq((sect->sect_info.addr + sect->sect_info.size), aggr->addr) ||
                 H5_addr_eq((aggr->addr + aggr->size), sect->sect_info.addr)) {
 #ifdef H5MF_AGGR_DEBUG
-                HDfprintf(stderr,
-                          "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins aggr = {%" PRIuHADDR
-                          ", %" PRIuHSIZE "}\n",
-                          "H5MF__aggr_can_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr,
-                          aggr->size);
+                fprintf(stderr,
+                        "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins aggr = {%" PRIuHADDR
+                        ", %" PRIuHSIZE "}\n",
+                        "H5MF__aggr_can_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr,
+                        aggr->size);
 #endif /* H5MF_AGGR_DEBUG */
                 /* Check if aggregator would get too large and should be absorbed into section */
                 if ((aggr->size + sect->sect_info.size) >= aggr->alloc_size)
@@ -590,11 +590,11 @@ done:
             /* Check if the section adjoins the beginning or end of the aggregator */
             if (H5_addr_eq((sect->sect_info.addr + sect->sect_info.size), aggr->addr)) {
 #ifdef H5MF_AGGR_DEBUG
-                HDfprintf(stderr,
-                          "%s: aggr {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins front of section = {%" PRIuHADDR
-                          ", %" PRIuHSIZE "}\n",
-                          "H5MF__aggr_absorb", aggr->addr, aggr->size, sect->sect_info.addr,
-                          sect->sect_info.size);
+                fprintf(stderr,
+                        "%s: aggr {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins front of section = {%" PRIuHADDR
+                        ", %" PRIuHSIZE "}\n",
+                        "H5MF__aggr_absorb", aggr->addr, aggr->size, sect->sect_info.addr,
+                        sect->sect_info.size);
 #endif /* H5MF_AGGR_DEBUG */
                 /* Absorb aggregator onto end of section */
                 sect->sect_info.size += aggr->size;
@@ -604,11 +604,11 @@ done:
                 assert(H5_addr_eq((aggr->addr + aggr->size), sect->sect_info.addr));
 
 #ifdef H5MF_AGGR_DEBUG
-                HDfprintf(stderr,
-                          "%s: aggr {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins end of section = {%" PRIuHADDR
-                          ", %" PRIuHSIZE "}\n",
-                          "H5MF__aggr_absorb", aggr->addr, aggr->size, sect->sect_info.addr,
-                          sect->sect_info.size);
+                fprintf(stderr,
+                        "%s: aggr {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins end of section = {%" PRIuHADDR
+                        ", %" PRIuHSIZE "}\n",
+                        "H5MF__aggr_absorb", aggr->addr, aggr->size, sect->sect_info.addr,
+                        sect->sect_info.size);
 #endif /* H5MF_AGGR_DEBUG */
                 /* Absorb aggregator onto beginning of section */
                 sect->sect_info.addr -= aggr->size;
@@ -624,11 +624,11 @@ done:
             /* Check if the section adjoins the beginning or end of the aggregator */
             if (H5_addr_eq((sect->sect_info.addr + sect->sect_info.size), aggr->addr)) {
 #ifdef H5MF_AGGR_DEBUG
-                HDfprintf(stderr,
-                          "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins front of aggr = {%" PRIuHADDR
-                          ", %" PRIuHSIZE "}\n",
-                          "H5MF__aggr_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr,
-                          aggr->size);
+                fprintf(stderr,
+                        "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins front of aggr = {%" PRIuHADDR
+                        ", %" PRIuHSIZE "}\n",
+                        "H5MF__aggr_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr,
+                        aggr->size);
 #endif /* H5MF_AGGR_DEBUG */
                 /* Absorb section onto front of aggregator */
                 aggr->addr -= sect->sect_info.size;
@@ -644,11 +644,11 @@ done:
                 assert(H5_addr_eq((aggr->addr + aggr->size), sect->sect_info.addr));
 
 #ifdef H5MF_AGGR_DEBUG
-                HDfprintf(stderr,
-                          "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins end of aggr = {%" PRIuHADDR
-                          ", %" PRIuHSIZE "}\n",
-                          "H5MF__aggr_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr,
-                          aggr->size);
+                fprintf(stderr,
+                        "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "} adjoins end of aggr = {%" PRIuHADDR
+                        ", %" PRIuHSIZE "}\n",
+                        "H5MF__aggr_absorb", sect->sect_info.addr, sect->sect_info.size, aggr->addr,
+                        aggr->size);
 #endif /* H5MF_AGGR_DEBUG */
                 /* Absorb section onto end of aggregator */
                 aggr->size += sect->sect_info.size;
@@ -734,8 +734,8 @@ done:
             tmp_addr = aggr->addr;
             tmp_size = aggr->size;
 #ifdef H5MF_AGGR_DEBUG
-            HDfprintf(stderr, "%s: tmp_addr = %" PRIuHADDR ", tmp_size = %" PRIuHSIZE "\n", __func__,
-                      tmp_addr, tmp_size);
+            fprintf(stderr, "%s: tmp_addr = %" PRIuHADDR ", tmp_size = %" PRIuHSIZE "\n", __func__, tmp_addr,
+                    tmp_size);
 #endif /* H5MF_AGGR_DEBUG */
 
             /* Reset aggregator block information */
diff --git a/src/H5MFdbg.c b/src/H5MFdbg.c
index 6b9f897..d42c1f1 100644
--- a/src/H5MFdbg.c
+++ b/src/H5MFdbg.c
@@ -103,20 +103,20 @@ H5MF__sects_debug_cb(H5FS_section_info_t *_sect, void *_udata)
     assert(udata);
 
     /* Print generic section information */
-    HDfprintf(udata->stream, "%*s%-*s %s\n", udata->indent, "", udata->fwidth, "Section type:",
-              (sect->sect_info.type == H5MF_FSPACE_SECT_SIMPLE
-                   ? "simple"
-                   : (sect->sect_info.type == H5MF_FSPACE_SECT_SMALL
-                          ? "small"
-                          : (sect->sect_info.type == H5MF_FSPACE_SECT_LARGE ? "large" : "unknown"))));
-    HDfprintf(udata->stream, "%*s%-*s %" PRIuHADDR "\n", udata->indent, "", udata->fwidth,
-              "Section address:", sect->sect_info.addr);
-    HDfprintf(udata->stream, "%*s%-*s %" PRIuHSIZE "\n", udata->indent, "", udata->fwidth,
-              "Section size:", sect->sect_info.size);
-    HDfprintf(udata->stream, "%*s%-*s %" PRIuHADDR "\n", udata->indent, "", udata->fwidth,
-              "End of section:", (haddr_t)((sect->sect_info.addr + sect->sect_info.size) - 1));
-    HDfprintf(udata->stream, "%*s%-*s %s\n", udata->indent, "", udata->fwidth,
-              "Section state:", (sect->sect_info.state == H5FS_SECT_LIVE ? "live" : "serialized"));
+    fprintf(udata->stream, "%*s%-*s %s\n", udata->indent, "", udata->fwidth, "Section type:",
+            (sect->sect_info.type == H5MF_FSPACE_SECT_SIMPLE
+                 ? "simple"
+                 : (sect->sect_info.type == H5MF_FSPACE_SECT_SMALL
+                        ? "small"
+                        : (sect->sect_info.type == H5MF_FSPACE_SECT_LARGE ? "large" : "unknown"))));
+    fprintf(udata->stream, "%*s%-*s %" PRIuHADDR "\n", udata->indent, "", udata->fwidth,
+            "Section address:", sect->sect_info.addr);
+    fprintf(udata->stream, "%*s%-*s %" PRIuHSIZE "\n", udata->indent, "", udata->fwidth,
+            "Section size:", sect->sect_info.size);
+    fprintf(udata->stream, "%*s%-*s %" PRIuHADDR "\n", udata->indent, "", udata->fwidth,
+            "End of section:", (haddr_t)((sect->sect_info.addr + sect->sect_info.size) - 1));
+    fprintf(udata->stream, "%*s%-*s %s\n", udata->indent, "", udata->fwidth,
+            "Section state:", (sect->sect_info.state == H5FS_SECT_LIVE ? "live" : "serialized"));
 
     /* Dump section-specific debugging information */
     if (H5FS_sect_debug(udata->fspace, _sect, udata->stream, udata->indent + 3, MAX(0, udata->fwidth - 3)) <
@@ -209,7 +209,7 @@ H5MF__sects_dump(H5F_t *f, FILE *stream)
 
     FUNC_ENTER_PACKAGE_TAG(H5AC__FREESPACE_TAG)
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: Dumping file free space sections\n", __func__);
+    fprintf(stderr, "%s: Dumping file free space sections\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG */
 
     /*
@@ -222,7 +222,7 @@ H5MF__sects_dump(H5F_t *f, FILE *stream)
     if (HADDR_UNDEF == (eoa = H5F_get_eoa(f, H5FD_MEM_DEFAULT)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "driver get_eoa request failed")
 #ifdef H5MF_ALLOC_DEBUG
-    HDfprintf(stderr, "%s: for type = H5FD_MEM_DEFAULT, eoa = %" PRIuHADDR "\n", __func__, eoa);
+    fprintf(stderr, "%s: for type = H5FD_MEM_DEFAULT, eoa = %" PRIuHADDR "\n", __func__, eoa);
 #endif /* H5MF_ALLOC_DEBUG */
 
     if (H5F_PAGED_AGGR(f)) {  /* File space paging */
@@ -230,10 +230,10 @@ H5MF__sects_dump(H5F_t *f, FILE *stream)
 
         for (ptype = H5F_MEM_PAGE_META; ptype < H5F_MEM_PAGE_NTYPES; ptype++) {
             /* Print header for type */
-            HDfprintf(stream, "%*sFile Free Space Info for type = %u:\n", indent, "", (unsigned)ptype);
+            fprintf(stream, "%*sFile Free Space Info for type = %u:\n", indent, "", (unsigned)ptype);
 
             /* Print header for sections */
-            HDfprintf(stream, "%*sSections:\n", indent + 3, "");
+            fprintf(stream, "%*sSections:\n", indent + 3, "");
 
             /* If there is a free space manager for this type, iterate over them */
             if (f->shared->fs_man[ptype]) {
@@ -251,7 +251,7 @@ H5MF__sects_dump(H5F_t *f, FILE *stream)
             } /* end if */
             else
                 /* No sections of this type */
-                HDfprintf(stream, "%*s<none>\n", indent + 6, "");
+                fprintf(stream, "%*s<none>\n", indent + 6, "");
         }                                  /* end for */
     }                                      /* end if */
     else {                                 /* not file space paging */
@@ -264,34 +264,33 @@ H5MF__sects_dump(H5F_t *f, FILE *stream)
         /* Retrieve metadata aggregator info, if available */
         H5MF__aggr_query(f, &(f->shared->meta_aggr), &ma_addr, &ma_size);
 #ifdef H5MF_ALLOC_DEBUG
-        HDfprintf(stderr,
-                  "%s: ma_addr = %" PRIuHADDR ", ma_size = %" PRIuHSIZE ", end of ma = %" PRIuHADDR "\n",
-                  __func__, ma_addr, ma_size, (haddr_t)((ma_addr + ma_size) - 1));
+        fprintf(stderr,
+                "%s: ma_addr = %" PRIuHADDR ", ma_size = %" PRIuHSIZE ", end of ma = %" PRIuHADDR "\n",
+                __func__, ma_addr, ma_size, (haddr_t)((ma_addr + ma_size) - 1));
 #endif /* H5MF_ALLOC_DEBUG */
 
         /* Retrieve 'small data' aggregator info, if available */
         H5MF__aggr_query(f, &(f->shared->sdata_aggr), &sda_addr, &sda_size);
 #ifdef H5MF_ALLOC_DEBUG
-        HDfprintf(stderr,
-                  "%s: sda_addr = %" PRIuHADDR ", sda_size = %" PRIuHSIZE ", end of sda = %" PRIuHADDR "\n",
-                  __func__, sda_addr, sda_size, (haddr_t)((sda_addr + sda_size) - 1));
+        fprintf(stderr,
+                "%s: sda_addr = %" PRIuHADDR ", sda_size = %" PRIuHSIZE ", end of sda = %" PRIuHADDR "\n",
+                __func__, sda_addr, sda_size, (haddr_t)((sda_addr + sda_size) - 1));
 #endif /* H5MF_ALLOC_DEBUG */
 
         /* Iterate over all the free space types that have managers and dump each free list's space */
         for (atype = H5FD_MEM_DEFAULT; atype < H5FD_MEM_NTYPES; atype++) {
             /* Print header for type */
-            HDfprintf(stream, "%*sFile Free Space Info for type = %u:\n", indent, "", (unsigned)atype);
+            fprintf(stream, "%*sFile Free Space Info for type = %u:\n", indent, "", (unsigned)atype);
 
             /* Check for this type being mapped to another type */
             if (H5FD_MEM_DEFAULT == f->shared->fs_type_map[atype] || atype == f->shared->fs_type_map[atype]) {
                 /* Retrieve the 'eoa' for this file memory type */
                 if (HADDR_UNDEF == (eoa = H5F_get_eoa(f, atype)))
                     HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "driver get_eoa request failed")
-                HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", MAX(0, fwidth - 3),
-                          "eoa:", eoa);
+                fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", MAX(0, fwidth - 3), "eoa:", eoa);
 
                 /* Print header for sections */
-                HDfprintf(stream, "%*sSections:\n", indent + 3, "");
+                fprintf(stream, "%*sSections:\n", indent + 3, "");
 
                 /* If there is a free space manager for this type, iterate over them */
                 if (f->shared->fs_man[atype]) {
@@ -308,16 +307,16 @@ H5MF__sects_dump(H5F_t *f, FILE *stream)
                         HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't iterate over heap's free space")
                 }    /* end if */
                 else /* No sections of this type */
-                    HDfprintf(stream, "%*s<none>\n", indent + 6, "");
+                    fprintf(stream, "%*s<none>\n", indent + 6, "");
             } /* end if */
             else
-                HDfprintf(stream, "%*sMapped to type = %u\n", indent, "",
-                          (unsigned)f->shared->fs_type_map[atype]);
+                fprintf(stream, "%*sMapped to type = %u\n", indent, "",
+                        (unsigned)f->shared->fs_type_map[atype]);
         } /* end for */
     }     /* end else */
 
 done:
-    HDfprintf(stderr, "%s: Done dumping file free space sections\n", __func__);
+    fprintf(stderr, "%s: Done dumping file free space sections\n", __func__);
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5MF__sects_dump() */
 #endif /* H5MF_ALLOC_DEBUG_DUMP */
diff --git a/src/H5MFsection.c b/src/H5MFsection.c
index f2ed3b2..ebb426a 100644
--- a/src/H5MFsection.c
+++ b/src/H5MFsection.c
@@ -471,9 +471,8 @@ H5MF__sect_simple_can_shrink(const H5FS_section_info_t *_sect, void *_udata)
         /* Set the shrinking type */
         udata->shrink = H5MF_SHRINK_EOA;
 #ifdef H5MF_ALLOC_DEBUG_MORE
-        HDfprintf(stderr,
-                  "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "}, shrinks file, eoa = %" PRIuHADDR "\n",
-                  __func__, sect->sect_info.addr, sect->sect_info.size, eoa);
+        fprintf(stderr, "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "}, shrinks file, eoa = %" PRIuHADDR "\n",
+                __func__, sect->sect_info.addr, sect->sect_info.size, eoa);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
         /* Indicate shrinking can occur */
@@ -496,9 +495,8 @@ H5MF__sect_simple_can_shrink(const H5FS_section_info_t *_sect, void *_udata)
                 /* Set the aggregator to operate on */
                 udata->aggr = &(udata->f->shared->meta_aggr);
 #ifdef H5MF_ALLOC_DEBUG_MORE
-                HDfprintf(stderr,
-                          "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "}, adjoins metadata aggregator\n",
-                          __func__, sect->sect_info.addr, sect->sect_info.size);
+                fprintf(stderr, "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "}, adjoins metadata aggregator\n",
+                        __func__, sect->sect_info.addr, sect->sect_info.size);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
                 /* Indicate shrinking can occur */
@@ -518,9 +516,9 @@ H5MF__sect_simple_can_shrink(const H5FS_section_info_t *_sect, void *_udata)
                 /* Set the aggregator to operate on */
                 udata->aggr = &(udata->f->shared->sdata_aggr);
 #ifdef H5MF_ALLOC_DEBUG_MORE
-                HDfprintf(stderr,
-                          "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "}, adjoins small data aggregator\n",
-                          __func__, sect->sect_info.addr, sect->sect_info.size);
+                fprintf(stderr,
+                        "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "}, adjoins small data aggregator\n",
+                        __func__, sect->sect_info.addr, sect->sect_info.size);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
                 /* Indicate shrinking can occur */
@@ -627,8 +625,8 @@ H5MF__sect_small_add(H5FS_section_info_t **_sect, unsigned *flags, void *_udata)
     FUNC_ENTER_PACKAGE
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-    HDfprintf(stderr, "%s: Entering, section {%" PRIuHADDR ", %" PRIuHSIZE "}\n", __func__,
-              (*sect)->sect_info.addr, (*sect)->sect_info.size);
+    fprintf(stderr, "%s: Entering, section {%" PRIuHADDR ", %" PRIuHSIZE "}\n", __func__,
+            (*sect)->sect_info.addr, (*sect)->sect_info.size);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
     /* Do not adjust the section raw data or global heap data */
@@ -648,15 +646,15 @@ H5MF__sect_small_add(H5FS_section_info_t **_sect, unsigned *flags, void *_udata)
         *flags &= (unsigned)~H5FS_ADD_RETURNED_SPACE;
         *flags |= H5FS_PAGE_END_NO_ADD;
 #ifdef H5MF_ALLOC_DEBUG_MORE
-        HDfprintf(stderr, "%s: section is dropped\n", __func__);
+        fprintf(stderr, "%s: section is dropped\n", __func__);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
     }  /* end if */
     /* Adjust the section if it is not at page end but its size + prem is at page end */
     else if (prem <= H5F_PGEND_META_THRES(udata->f)) {
         (*sect)->sect_info.size += prem;
 #ifdef H5MF_ALLOC_DEBUG_MORE
-        HDfprintf(stderr, "%s: section is adjusted {%" PRIuHADDR ", %" PRIuHSIZE "}\n", __func__,
-                  (*sect)->sect_info.addr, (*sect)->sect_info.size);
+        fprintf(stderr, "%s: section is adjusted {%" PRIuHADDR ", %" PRIuHSIZE "}\n", __func__,
+                (*sect)->sect_info.addr, (*sect)->sect_info.size);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
     }  /* end if */
 
@@ -704,7 +702,7 @@ H5MF__sect_small_can_merge(const H5FS_section_info_t *_sect1, const H5FS_section
             ret_value = FALSE;
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-    HDfprintf(stderr, "%s: Leaving: ret_value = %d\n", __func__, ret_value);
+    fprintf(stderr, "%s: Leaving: ret_value = %d\n", __func__, ret_value);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -808,7 +806,7 @@ H5MF__sect_large_can_merge(const H5FS_section_info_t *_sect1, const H5FS_section
     ret_value = H5_addr_eq(sect1->sect_info.addr + sect1->sect_info.size, sect2->sect_info.addr);
 
 #ifdef H5MF_ALLOC_DEBUG_MORE
-    HDfprintf(stderr, "%s: Leaving: ret_value = %d\n", __func__, ret_value);
+    fprintf(stderr, "%s: Leaving: ret_value = %d\n", __func__, ret_value);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -896,9 +894,8 @@ H5MF__sect_large_can_shrink(const H5FS_section_info_t *_sect, void *_udata)
         /* Set the shrinking type */
         udata->shrink = H5MF_SHRINK_EOA;
 #ifdef H5MF_ALLOC_DEBUG_MORE
-        HDfprintf(stderr,
-                  "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "}, shrinks file, eoa = %" PRIuHADDR "\n",
-                  __func__, sect->sect_info.addr, sect->sect_info.size, eoa);
+        fprintf(stderr, "%s: section {%" PRIuHADDR ", %" PRIuHSIZE "}, shrinks file, eoa = %" PRIuHADDR "\n",
+                __func__, sect->sect_info.addr, sect->sect_info.size, eoa);
 #endif /* H5MF_ALLOC_DEBUG_MORE */
 
         /* Indicate shrinking can occur */
diff --git a/src/H5Oainfo.c b/src/H5Oainfo.c
index fd651e3..ca553ad 100644
--- a/src/H5Oainfo.c
+++ b/src/H5Oainfo.c
@@ -510,19 +510,19 @@ H5O__ainfo_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int i
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth, "Number of attributes:", ainfo->nattrs);
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Track creation order of attributes:", ainfo->track_corder ? "TRUE" : "FALSE");
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Index creation order of attributes:", ainfo->index_corder ? "TRUE" : "FALSE");
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Max. creation index value:", (unsigned)ainfo->max_crt_idx);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "'Dense' attribute storage fractal heap address:", ainfo->fheap_addr);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "'Dense' attribute storage name index v2 B-tree address:", ainfo->name_bt2_addr);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "'Dense' attribute storage creation order index v2 B-tree address:", ainfo->corder_bt2_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth, "Number of attributes:", ainfo->nattrs);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Track creation order of attributes:", ainfo->track_corder ? "TRUE" : "FALSE");
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Index creation order of attributes:", ainfo->index_corder ? "TRUE" : "FALSE");
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Max. creation index value:", (unsigned)ainfo->max_crt_idx);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "'Dense' attribute storage fractal heap address:", ainfo->fheap_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "'Dense' attribute storage name index v2 B-tree address:", ainfo->name_bt2_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "'Dense' attribute storage creation order index v2 B-tree address:", ainfo->corder_bt2_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__ainfo_debug() */
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index 587dd43..1452ae3 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -835,7 +835,7 @@ H5O__attr_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidt
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s \"%s\"\n", indent, "", fwidth, "Name:", mesg->shared->name);
+    fprintf(stream, "%*s%-*s \"%s\"\n", indent, "", fwidth, "Name:", mesg->shared->name);
     switch (mesg->shared->encoding) {
         case H5T_CSET_ASCII:
             s = "ASCII";
@@ -869,25 +869,25 @@ H5O__attr_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidt
             s = buf;
             break;
     } /* end switch */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Character Set of Name:", s);
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Object opened:", mesg->obj_opened ? "TRUE" : "FALSE");
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Object:", mesg->oloc.addr);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Character Set of Name:", s);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Object opened:", mesg->obj_opened ? "TRUE" : "FALSE");
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Object:", mesg->oloc.addr);
 
     /* Check for attribute creation order index on the attribute */
     if (mesg->shared->crt_idx != H5O_MAX_CRT_ORDER_IDX)
-        HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-                  "Creation Index:", (unsigned)mesg->shared->crt_idx);
+        fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+                "Creation Index:", (unsigned)mesg->shared->crt_idx);
 
-    HDfprintf(stream, "%*sDatatype...\n", indent, "");
-    HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(0, fwidth - 3),
-              "Encoded Size:", (unsigned long)(mesg->shared->dt_size));
+    fprintf(stream, "%*sDatatype...\n", indent, "");
+    fprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(0, fwidth - 3),
+            "Encoded Size:", (unsigned long)(mesg->shared->dt_size));
     if ((H5O_MSG_DTYPE->debug)(f, mesg->shared->dt, stream, indent + 3, MAX(0, fwidth - 3)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to display datatype message info")
 
-    HDfprintf(stream, "%*sDataspace...\n", indent, "");
-    HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(0, fwidth - 3),
-              "Encoded Size:", (unsigned long)(mesg->shared->ds_size));
+    fprintf(stream, "%*sDataspace...\n", indent, "");
+    fprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(0, fwidth - 3),
+            "Encoded Size:", (unsigned long)(mesg->shared->ds_size));
     if (H5S_debug(f, mesg->shared->ds, stream, indent + 3, MAX(0, fwidth - 3)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "unable to display dataspace message info")
 
diff --git a/src/H5Obogus.c b/src/H5Obogus.c
index 491dbf9..20beaef 100644
--- a/src/H5Obogus.c
+++ b/src/H5Obogus.c
@@ -213,7 +213,7 @@ H5O__bogus_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int i
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s `%u'\n", indent, "", fwidth, "Bogus Value:", mesg->u);
+    fprintf(stream, "%*s%-*s `%u'\n", indent, "", fwidth, "Bogus Value:", mesg->u);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__bogus_debug() */
diff --git a/src/H5Obtreek.c b/src/H5Obtreek.c
index 8da10a9..7b80de8 100644
--- a/src/H5Obtreek.c
+++ b/src/H5Obtreek.c
@@ -245,12 +245,12 @@ H5O__btreek_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Chunked storage internal B-tree 'K' value:", mesg->btree_k[H5B_CHUNK_ID]);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Symbol table node internal B-tree 'K' value:", mesg->btree_k[H5B_SNODE_ID]);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Symbol table node leaf 'K' value:", mesg->sym_leaf_k);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Chunked storage internal B-tree 'K' value:", mesg->btree_k[H5B_CHUNK_ID]);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Symbol table node internal B-tree 'K' value:", mesg->btree_k[H5B_SNODE_ID]);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Symbol table node leaf 'K' value:", mesg->sym_leaf_k);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__btreek_debug() */
diff --git a/src/H5Ocache_image.c b/src/H5Ocache_image.c
index 2eae6b3..66ad297 100644
--- a/src/H5Ocache_image.c
+++ b/src/H5Ocache_image.c
@@ -328,11 +328,11 @@ H5O__mdci_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int in
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "Metadata Cache Image Block address:", mdci->addr);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "Metadata Cache Image Block address:", mdci->addr);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Metadata Cache Image Block size in bytes:", mdci->size);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Metadata Cache Image Block size in bytes:", mdci->size);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__mdci_debug() */
diff --git a/src/H5Ocont.c b/src/H5Ocont.c
index da05ae2..9871c56 100644
--- a/src/H5Ocont.c
+++ b/src/H5Ocont.c
@@ -260,11 +260,11 @@ H5O__cont_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int in
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Continuation address:", cont->addr);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Continuation address:", cont->addr);
 
-    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-              "Continuation size in bytes:", (unsigned long)(cont->size));
-    HDfprintf(stream, "%*s%-*s %d\n", indent, "", fwidth, "Points to chunk number:", (int)(cont->chunkno));
+    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+            "Continuation size in bytes:", (unsigned long)(cont->size));
+    fprintf(stream, "%*s%-*s %d\n", indent, "", fwidth, "Points to chunk number:", (int)(cont->chunkno));
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__cont_debug() */
diff --git a/src/H5Odbg.c b/src/H5Odbg.c
index 040189c..2e7e408 100644
--- a/src/H5Odbg.c
+++ b/src/H5Odbg.c
@@ -291,28 +291,27 @@ H5O__debug_real(H5F_t *f, H5O_t *oh, haddr_t addr, FILE *stream, int indent, int
     assert(fwidth >= 0);
 
     /* debug */
-    HDfprintf(stream, "%*sObject Header...\n", indent, "");
+    fprintf(stream, "%*sObject Header...\n", indent, "");
 
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Dirty:", oh->cache_info.is_dirty ? "TRUE" : "FALSE");
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", oh->version);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Header size (in bytes):", (unsigned)H5O_SIZEOF_HDR(oh));
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of links:", oh->nlink);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Dirty:", oh->cache_info.is_dirty ? "TRUE" : "FALSE");
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", oh->version);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Header size (in bytes):", (unsigned)H5O_SIZEOF_HDR(oh));
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of links:", oh->nlink);
 
     /* Extra information for later versions */
     if (oh->version > H5O_VERSION_1) {
         /* Display object's status flags */
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Attribute creation order tracked:",
-                  (oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED) ? "Yes" : "No");
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Attribute creation order indexed:",
-                  (oh->flags & H5O_HDR_ATTR_CRT_ORDER_INDEXED) ? "Yes" : "No");
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Attribute storage phase change values:",
-                  (oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) ? "Non-default" : "Default");
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                  "Timestamps:", (oh->flags & H5O_HDR_STORE_TIMES) ? "Enabled" : "Disabled");
+        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Attribute creation order tracked:",
+                (oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED) ? "Yes" : "No");
+        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Attribute creation order indexed:",
+                (oh->flags & H5O_HDR_ATTR_CRT_ORDER_INDEXED) ? "Yes" : "No");
+        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Attribute storage phase change values:",
+                (oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) ? "Non-default" : "Default");
+        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+                "Timestamps:", (oh->flags & H5O_HDR_STORE_TIMES) ? "Enabled" : "Disabled");
         if (oh->flags & ~H5O_HDR_ALL_FLAGS)
-            HDfprintf(stream, "*** UNKNOWN OBJECT HEADER STATUS FLAG: %02x!\n", (unsigned)oh->flags);
+            fprintf(stream, "*** UNKNOWN OBJECT HEADER STATUS FLAG: %02x!\n", (unsigned)oh->flags);
 
         /* Only dump times, if they are tracked */
         if (oh->flags & H5O_HDR_STORE_TIMES) {
@@ -322,45 +321,45 @@ H5O__debug_real(H5F_t *f, H5O_t *oh, haddr_t addr, FILE *stream, int indent, int
             /* Time fields */
             tm = HDlocaltime(&oh->atime);
             HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Access Time:", buf);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Access Time:", buf);
             tm = HDlocaltime(&oh->mtime);
             HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Modification Time:", buf);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Modification Time:", buf);
             tm = HDlocaltime(&oh->ctime);
             HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Change Time:", buf);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Change Time:", buf);
             tm = HDlocaltime(&oh->btime);
             HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Birth Time:", buf);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Birth Time:", buf);
         } /* end if */
 
         /* Attribute tracking fields */
         if (oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) {
-            HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-                      "Max. compact attributes:", (unsigned)oh->max_compact);
-            HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-                      "Min. dense attributes:", (unsigned)oh->min_dense);
+            fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+                    "Max. compact attributes:", (unsigned)oh->max_compact);
+            fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+                    "Min. dense attributes:", (unsigned)oh->min_dense);
         } /* end if */
     }     /* end if */
 
-    HDfprintf(stream, "%*s%-*s %zu (%zu)\n", indent, "", fwidth,
-              "Number of messages (allocated):", oh->nmesgs, oh->alloc_nmesgs);
-    HDfprintf(stream, "%*s%-*s %zu (%zu)\n", indent, "", fwidth, "Number of chunks (allocated):", oh->nchunks,
-              oh->alloc_nchunks);
+    fprintf(stream, "%*s%-*s %zu (%zu)\n", indent, "", fwidth, "Number of messages (allocated):", oh->nmesgs,
+            oh->alloc_nmesgs);
+    fprintf(stream, "%*s%-*s %zu (%zu)\n", indent, "", fwidth, "Number of chunks (allocated):", oh->nchunks,
+            oh->alloc_nchunks);
 
     /* debug each chunk */
     for (i = 0, chunk_total = 0; i < oh->nchunks; i++) {
         size_t chunk_size;
 
-        HDfprintf(stream, "%*sChunk %d...\n", indent, "", i);
+        fprintf(stream, "%*sChunk %d...\n", indent, "", i);
 
-        HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Address:", oh->chunk[i].addr);
+        fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", MAX(0, fwidth - 3),
+                "Address:", oh->chunk[i].addr);
 
         /* Decrement chunk 0's size by the object header prefix size */
         if (0 == i) {
             if (H5_addr_ne(oh->chunk[i].addr, addr))
-                HDfprintf(stream, "*** WRONG ADDRESS FOR CHUNK #0!\n");
+                fprintf(stream, "*** WRONG ADDRESS FOR CHUNK #0!\n");
             chunk_size = oh->chunk[i].size - (size_t)H5O_SIZEOF_HDR(oh);
         } /* end if */
         else
@@ -370,9 +369,9 @@ H5O__debug_real(H5F_t *f, H5O_t *oh, haddr_t addr, FILE *stream, int indent, int
         chunk_total += chunk_size;
         gap_total += oh->chunk[i].gap;
 
-        HDfprintf(stream, "%*s%-*s %zu\n", indent + 3, "", MAX(0, fwidth - 3), "Size in bytes:", chunk_size);
+        fprintf(stream, "%*s%-*s %zu\n", indent + 3, "", MAX(0, fwidth - 3), "Size in bytes:", chunk_size);
 
-        HDfprintf(stream, "%*s%-*s %zu\n", indent + 3, "", MAX(0, fwidth - 3), "Gap:", oh->chunk[i].gap);
+        fprintf(stream, "%*s%-*s %zu\n", indent + 3, "", MAX(0, fwidth - 3), "Gap:", oh->chunk[i].gap);
     } /* end for */
 
     /* debug each message */
@@ -389,21 +388,21 @@ H5O__debug_real(H5F_t *f, H5O_t *oh, haddr_t addr, FILE *stream, int indent, int
         if (oh->mesg[i].type->id == H5O_CONT_ID)
             mesg_total += H5O_SIZEOF_CHKHDR_OH(oh);
 
-        HDfprintf(stream, "%*sMessage %d...\n", indent, "", i);
+        fprintf(stream, "%*sMessage %d...\n", indent, "", i);
 
         /* check for bad message id */
         if (oh->mesg[i].type->id >= (int)NELMTS(H5O_msg_class_g)) {
-            HDfprintf(stream, "*** BAD MESSAGE ID 0x%04x\n", oh->mesg[i].type->id);
+            fprintf(stream, "*** BAD MESSAGE ID 0x%04x\n", oh->mesg[i].type->id);
             continue;
         } /* end if */
 
         /* message name and size */
-        HDfprintf(stream, "%*s%-*s 0x%04x `%s' (%d)\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Message ID (sequence number):", (unsigned)(oh->mesg[i].type->id), oh->mesg[i].type->name,
-                  sequence[oh->mesg[i].type->id]++);
-        HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Dirty:", oh->mesg[i].dirty ? "TRUE" : "FALSE");
-        HDfprintf(stream, "%*s%-*s ", indent + 3, "", MAX(0, fwidth - 3), "Message flags:");
+        fprintf(stream, "%*s%-*s 0x%04x `%s' (%d)\n", indent + 3, "", MAX(0, fwidth - 3),
+                "Message ID (sequence number):", (unsigned)(oh->mesg[i].type->id), oh->mesg[i].type->name,
+                sequence[oh->mesg[i].type->id]++);
+        fprintf(stream, "%*s%-*s %s\n", indent + 3, "", MAX(0, fwidth - 3),
+                "Dirty:", oh->mesg[i].dirty ? "TRUE" : "FALSE");
+        fprintf(stream, "%*s%-*s ", indent + 3, "", MAX(0, fwidth - 3), "Message flags:");
         if (oh->mesg[i].flags) {
             hbool_t flag_printed = FALSE;
 
@@ -415,61 +414,61 @@ H5O__debug_real(H5F_t *f, H5O_t *oh, haddr_t addr, FILE *stream, int indent, int
                               H5O_MSG_FLAG_FAIL_IF_UNKNOWN_ALWAYS));
 
             if (oh->mesg[i].flags & H5O_MSG_FLAG_CONSTANT) {
-                HDfprintf(stream, "%sC", (flag_printed ? ", " : "<"));
+                fprintf(stream, "%sC", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
             if (oh->mesg[i].flags & H5O_MSG_FLAG_SHARED) {
-                HDfprintf(stream, "%sS", (flag_printed ? ", " : "<"));
+                fprintf(stream, "%sS", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
             if (oh->mesg[i].flags & H5O_MSG_FLAG_DONTSHARE) {
-                HDfprintf(stream, "%sDS", (flag_printed ? ", " : "<"));
+                fprintf(stream, "%sDS", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
             if (oh->mesg[i].flags & H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE) {
-                HDfprintf(stream, "%sFIUW", (flag_printed ? ", " : "<"));
+                fprintf(stream, "%sFIUW", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
             if (oh->mesg[i].flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN) {
-                HDfprintf(stream, "%sMIU", (flag_printed ? ", " : "<"));
+                fprintf(stream, "%sMIU", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
             if (oh->mesg[i].flags & H5O_MSG_FLAG_WAS_UNKNOWN) {
                 assert(oh->mesg[i].flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN);
-                HDfprintf(stream, "%sWU", (flag_printed ? ", " : "<"));
+                fprintf(stream, "%sWU", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
             if (oh->mesg[i].flags & H5O_MSG_FLAG_SHAREABLE) {
-                HDfprintf(stream, "%sSA", (flag_printed ? ", " : "<"));
+                fprintf(stream, "%sSA", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
             if (oh->mesg[i].flags & H5O_MSG_FLAG_FAIL_IF_UNKNOWN_ALWAYS) {
-                HDfprintf(stream, "%sFIUA", (flag_printed ? ", " : "<"));
+                fprintf(stream, "%sFIUA", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
             if (!flag_printed)
-                HDfprintf(stream, "-");
-            HDfprintf(stream, ">\n");
+                fprintf(stream, "-");
+            fprintf(stream, ">\n");
             if (oh->mesg[i].flags & ~H5O_MSG_FLAG_BITS)
-                HDfprintf(stream, "%*s%-*s 0x%02x\n", indent + 3, "", MAX(0, fwidth - 3),
-                          "*** ADDITIONAL UNKNOWN FLAGS --->", oh->mesg[i].flags & ~H5O_MSG_FLAG_BITS);
+                fprintf(stream, "%*s%-*s 0x%02x\n", indent + 3, "", MAX(0, fwidth - 3),
+                        "*** ADDITIONAL UNKNOWN FLAGS --->", oh->mesg[i].flags & ~H5O_MSG_FLAG_BITS);
         } /* end if */
         else
-            HDfprintf(stream, "<none>\n");
+            fprintf(stream, "<none>\n");
 
-        HDfprintf(stream, "%*s%-*s %u\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Chunk number:", oh->mesg[i].chunkno);
+        fprintf(stream, "%*s%-*s %u\n", indent + 3, "", MAX(0, fwidth - 3),
+                "Chunk number:", oh->mesg[i].chunkno);
         chunkno = oh->mesg[i].chunkno;
         if (chunkno >= oh->nchunks)
-            HDfprintf(stream, "*** BAD CHUNK NUMBER\n");
-        HDfprintf(stream, "%*s%-*s (%zu, %zu) bytes\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Raw message data (offset, size) in chunk:",
-                  (size_t)(oh->mesg[i].raw - oh->chunk[chunkno].image), oh->mesg[i].raw_size);
+            fprintf(stream, "*** BAD CHUNK NUMBER\n");
+        fprintf(stream, "%*s%-*s (%zu, %zu) bytes\n", indent + 3, "", MAX(0, fwidth - 3),
+                "Raw message data (offset, size) in chunk:",
+                (size_t)(oh->mesg[i].raw - oh->chunk[chunkno].image), oh->mesg[i].raw_size);
 
         /* check the size */
         if ((oh->mesg[i].raw + oh->mesg[i].raw_size > oh->chunk[chunkno].image + oh->chunk[chunkno].size) ||
             (oh->mesg[i].raw < oh->chunk[chunkno].image))
-            HDfprintf(stream, "*** BAD MESSAGE RAW ADDRESS\n");
+            fprintf(stream, "*** BAD MESSAGE RAW ADDRESS\n");
 
         /* decode the message */
         debug_type = oh->mesg[i].type;
@@ -477,15 +476,15 @@ H5O__debug_real(H5F_t *f, H5O_t *oh, haddr_t addr, FILE *stream, int indent, int
             H5O_LOAD_NATIVE(f, H5O_DECODEIO_NOCHANGE, oh, &oh->mesg[i], FAIL)
 
         /* print the message */
-        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), "Message Information:");
+        fprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), "Message Information:");
         if (debug_type->debug && oh->mesg[i].native != NULL)
             (debug_type->debug)(f, oh->mesg[i].native, stream, indent + 6, MAX(0, fwidth - 6));
         else
-            HDfprintf(stream, "%*s<No info for this message>\n", indent + 6, "");
+            fprintf(stream, "%*s<No info for this message>\n", indent + 6, "");
     } /* end for */
 
     if ((mesg_total + gap_total) != chunk_total)
-        HDfprintf(stream, "*** TOTAL SIZE DOES NOT MATCH ALLOCATED SIZE!\n");
+        fprintf(stream, "*** TOTAL SIZE DOES NOT MATCH ALLOCATED SIZE!\n");
 
 done:
     /* Release resources */
diff --git a/src/H5Odrvinfo.c b/src/H5Odrvinfo.c
index 828645c..4c0ca93 100644
--- a/src/H5Odrvinfo.c
+++ b/src/H5Odrvinfo.c
@@ -301,8 +301,8 @@ H5O__drvinfo_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Driver name:", mesg->name);
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Buffer size:", mesg->len);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Driver name:", mesg->name);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Buffer size:", mesg->len);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__drvinfo_debug() */
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index d69e2c0..50d3775 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -1943,45 +1943,45 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
             s = buf;
             break;
     } /* end switch */
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type class:", s);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type class:", s);
 
-    HDfprintf(stream, "%*s%-*s %lu byte%s\n", indent, "", fwidth, "Size:", (unsigned long)(dt->shared->size),
-              1 == dt->shared->size ? "" : "s");
+    fprintf(stream, "%*s%-*s %lu byte%s\n", indent, "", fwidth, "Size:", (unsigned long)(dt->shared->size),
+            1 == dt->shared->size ? "" : "s");
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", dt->shared->version);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", dt->shared->version);
 
     if (H5T_COMPOUND == dt->shared->type) {
-        HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-                  "Number of members:", dt->shared->u.compnd.nmembs);
+        fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+                "Number of members:", dt->shared->u.compnd.nmembs);
         for (i = 0; i < dt->shared->u.compnd.nmembs; i++) {
             HDsnprintf(buf, sizeof(buf), "Member %u:", i);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, buf, dt->shared->u.compnd.memb[i].name);
-            HDfprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(0, fwidth - 3),
-                      "Byte offset:", (unsigned long)(dt->shared->u.compnd.memb[i].offset));
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, buf, dt->shared->u.compnd.memb[i].name);
+            fprintf(stream, "%*s%-*s %lu\n", indent + 3, "", MAX(0, fwidth - 3),
+                    "Byte offset:", (unsigned long)(dt->shared->u.compnd.memb[i].offset));
             H5O__dtype_debug(f, dt->shared->u.compnd.memb[i].type, stream, indent + 3, MAX(0, fwidth - 3));
         } /* end for */
     }     /* end if */
     else if (H5T_ENUM == dt->shared->type) {
-        HDfprintf(stream, "%*s%s\n", indent, "", "Base type:");
+        fprintf(stream, "%*s%s\n", indent, "", "Base type:");
         H5O__dtype_debug(f, dt->shared->parent, stream, indent + 3, MAX(0, fwidth - 3));
-        HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-                  "Number of members:", dt->shared->u.enumer.nmembs);
+        fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+                "Number of members:", dt->shared->u.enumer.nmembs);
         for (i = 0; i < dt->shared->u.enumer.nmembs; i++) {
             HDsnprintf(buf, sizeof(buf), "Member %u:", i);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, buf, dt->shared->u.enumer.name[i]);
-            HDfprintf(stream, "%*s%-*s 0x", indent, "", fwidth, "Raw bytes of value:");
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, buf, dt->shared->u.enumer.name[i]);
+            fprintf(stream, "%*s%-*s 0x", indent, "", fwidth, "Raw bytes of value:");
             for (k = 0; k < dt->shared->parent->shared->size; k++)
-                HDfprintf(stream, "%02x",
-                          (unsigned)*((uint8_t *)dt->shared->u.enumer.value +
-                                      (i * dt->shared->parent->shared->size) + k));
-            HDfprintf(stream, "\n");
+                fprintf(stream, "%02x",
+                        (unsigned)*((uint8_t *)dt->shared->u.enumer.value +
+                                    (i * dt->shared->parent->shared->size) + k));
+            fprintf(stream, "\n");
         } /* end for */
     }     /* end else if */
     else if (H5T_OPAQUE == dt->shared->type) {
-        HDfprintf(stream, "%*s%-*s \"%s\"\n", indent, "", fwidth, "Tag:", dt->shared->u.opaque.tag);
+        fprintf(stream, "%*s%-*s \"%s\"\n", indent, "", fwidth, "Tag:", dt->shared->u.opaque.tag);
     } /* end else if */
     else if (H5T_REFERENCE == dt->shared->type) {
-        HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Fix dumping reference types!");
+        fprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Fix dumping reference types!");
     } /* end else if */
     else if (H5T_STRING == dt->shared->type) {
         switch (dt->shared->u.atomic.u.s.cset) {
@@ -2018,7 +2018,7 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
                 s = buf;
                 break;
         } /* end switch */
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Character Set:", s);
+        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Character Set:", s);
 
         switch (dt->shared->u.atomic.u.s.pad) {
             case H5T_STR_NULLTERM:
@@ -2057,7 +2057,7 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
                 s = buf;
                 break;
         } /* end switch */
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "String Padding:", s);
+        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "String Padding:", s);
     } /* end else if */
     else if (H5T_VLEN == dt->shared->type) {
         switch (dt->shared->u.vlen.type) {
@@ -2076,7 +2076,7 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
                 s = buf;
                 break;
         } /* end switch */
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Vlen type:", s);
+        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Vlen type:", s);
 
         switch (dt->shared->u.vlen.loc) {
             case H5T_LOC_MEMORY:
@@ -2094,7 +2094,7 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
                 s = buf;
                 break;
         } /* end switch */
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Location:", s);
+        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Location:", s);
 
         /* Extra information for VL-strings */
         if (dt->shared->u.vlen.type == H5T_VLEN_STRING) {
@@ -2131,7 +2131,7 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
                     s = buf;
                     break;
             } /* end switch */
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Character Set:", s);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Character Set:", s);
 
             switch (dt->shared->u.vlen.pad) {
                 case H5T_STR_NULLTERM:
@@ -2169,16 +2169,16 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
                     s = buf;
                     break;
             } /* end switch */
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "String Padding:", s);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "String Padding:", s);
         } /* end if */
     }     /* end else if */
     else if (H5T_ARRAY == dt->shared->type) {
-        HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Rank:", dt->shared->u.array.ndims);
-        HDfprintf(stream, "%*s%-*s {", indent, "", fwidth, "Dim Size:");
+        fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Rank:", dt->shared->u.array.ndims);
+        fprintf(stream, "%*s%-*s {", indent, "", fwidth, "Dim Size:");
         for (i = 0; i < dt->shared->u.array.ndims; i++)
-            HDfprintf(stream, "%s%u", (i ? ", " : ""), (unsigned)dt->shared->u.array.dim[i]);
-        HDfprintf(stream, "}\n");
-        HDfprintf(stream, "%*s%s\n", indent, "", "Base type:");
+            fprintf(stream, "%s%u", (i ? ", " : ""), (unsigned)dt->shared->u.array.dim[i]);
+        fprintf(stream, "}\n");
+        fprintf(stream, "%*s%s\n", indent, "", "Base type:");
         H5O__dtype_debug(f, dt->shared->parent, stream, indent + 3, MAX(0, fwidth - 3));
     } /* end else if */
     else {
@@ -2209,15 +2209,15 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
                 s = buf;
                 break;
         } /* end switch */
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Byte order:", s);
+        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Byte order:", s);
 
-        HDfprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
-                  "Precision:", (unsigned long)(dt->shared->u.atomic.prec),
-                  1 == dt->shared->u.atomic.prec ? "" : "s");
+        fprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
+                "Precision:", (unsigned long)(dt->shared->u.atomic.prec),
+                1 == dt->shared->u.atomic.prec ? "" : "s");
 
-        HDfprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
-                  "Offset:", (unsigned long)(dt->shared->u.atomic.offset),
-                  1 == dt->shared->u.atomic.offset ? "" : "s");
+        fprintf(stream, "%*s%-*s %lu bit%s\n", indent, "", fwidth,
+                "Offset:", (unsigned long)(dt->shared->u.atomic.offset),
+                1 == dt->shared->u.atomic.offset ? "" : "s");
 
         switch (dt->shared->u.atomic.lsb_pad) {
             case H5T_PAD_ZERO:
@@ -2238,7 +2238,7 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
                 s = "pad?";
                 break;
         } /* end switch */
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Low pad type:", s);
+        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Low pad type:", s);
 
         switch (dt->shared->u.atomic.msb_pad) {
             case H5T_PAD_ZERO:
@@ -2259,7 +2259,7 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
                 s = "pad?";
                 break;
         } /* end switch */
-        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "High pad type:", s);
+        fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "High pad type:", s);
 
         if (H5T_FLOAT == dt->shared->type) {
             switch (dt->shared->u.atomic.u.f.pad) {
@@ -2285,7 +2285,7 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
                     s = buf;
                     break;
             } /* end switch */
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Internal pad type:", s);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Internal pad type:", s);
 
             switch (dt->shared->u.atomic.u.f.norm) {
                 case H5T_NORM_IMPLIED:
@@ -2305,25 +2305,25 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
                     HDsnprintf(buf, sizeof(buf), "H5T_NORM_%d", (int)(dt->shared->u.atomic.u.f.norm));
                     s = buf;
             } /* end switch */
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Normalization:", s);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Normalization:", s);
 
-            HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-                      "Sign bit location:", (unsigned long)(dt->shared->u.atomic.u.f.sign));
+            fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+                    "Sign bit location:", (unsigned long)(dt->shared->u.atomic.u.f.sign));
 
-            HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-                      "Exponent location:", (unsigned long)(dt->shared->u.atomic.u.f.epos));
+            fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+                    "Exponent location:", (unsigned long)(dt->shared->u.atomic.u.f.epos));
 
-            HDfprintf(stream, "%*s%-*s 0x%08lx\n", indent, "", fwidth,
-                      "Exponent bias:", (unsigned long)(dt->shared->u.atomic.u.f.ebias));
+            fprintf(stream, "%*s%-*s 0x%08lx\n", indent, "", fwidth,
+                    "Exponent bias:", (unsigned long)(dt->shared->u.atomic.u.f.ebias));
 
-            HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-                      "Exponent size:", (unsigned long)(dt->shared->u.atomic.u.f.esize));
+            fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+                    "Exponent size:", (unsigned long)(dt->shared->u.atomic.u.f.esize));
 
-            HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-                      "Mantissa location:", (unsigned long)(dt->shared->u.atomic.u.f.mpos));
+            fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+                    "Mantissa location:", (unsigned long)(dt->shared->u.atomic.u.f.mpos));
 
-            HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-                      "Mantissa size:", (unsigned long)(dt->shared->u.atomic.u.f.msize));
+            fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+                    "Mantissa size:", (unsigned long)(dt->shared->u.atomic.u.f.msize));
 
         } /* end if */
         else if (H5T_INTEGER == dt->shared->type) {
@@ -2343,7 +2343,7 @@ H5O__dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int indent, int fwidt
                     s = buf;
                     break;
             } /* end switch */
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Sign scheme:", s);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Sign scheme:", s);
         } /* end else if */
     }     /* end else */
 
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index 6673b98..38fc4cd 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -542,28 +542,27 @@ H5O__efl_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int ind
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Heap address:", mesg->heap_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Heap address:", mesg->heap_addr);
 
-    HDfprintf(stream, "%*s%-*s %zu/%zu\n", indent, "", fwidth, "Slots used/allocated:", mesg->nused,
-              mesg->nalloc);
+    fprintf(stream, "%*s%-*s %zu/%zu\n", indent, "", fwidth, "Slots used/allocated:", mesg->nused,
+            mesg->nalloc);
 
     for (u = 0; u < mesg->nused; u++) {
         char buf[64];
 
         HDsnprintf(buf, sizeof(buf), "File %zu", u);
-        HDfprintf(stream, "%*s%s:\n", indent, "", buf);
+        fprintf(stream, "%*s%s:\n", indent, "", buf);
 
-        HDfprintf(stream, "%*s%-*s \"%s\"\n", indent + 3, "", MAX(fwidth - 3, 0),
-                  "Name:", mesg->slot[u].name);
+        fprintf(stream, "%*s%-*s \"%s\"\n", indent + 3, "", MAX(fwidth - 3, 0), "Name:", mesg->slot[u].name);
 
-        HDfprintf(stream, "%*s%-*s %zu\n", indent + 3, "", MAX(fwidth - 3, 0),
-                  "Name offset:", mesg->slot[u].name_offset);
+        fprintf(stream, "%*s%-*s %zu\n", indent + 3, "", MAX(fwidth - 3, 0),
+                "Name offset:", mesg->slot[u].name_offset);
 
-        HDfprintf(stream, "%*s%-*s %" PRIdMAX "\n", indent + 3, "", MAX(fwidth - 3, 0),
-                  "Offset of data in file:", (intmax_t)(mesg->slot[u].offset));
+        fprintf(stream, "%*s%-*s %" PRIdMAX "\n", indent + 3, "", MAX(fwidth - 3, 0),
+                "Offset of data in file:", (intmax_t)(mesg->slot[u].offset));
 
-        HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent + 3, "", MAX(fwidth - 3, 0),
-                  "Bytes reserved for data:", (mesg->slot[u].size));
+        fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent + 3, "", MAX(fwidth - 3, 0),
+                "Bytes reserved for data:", (mesg->slot[u].size));
     } /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index a11824e..84ede3a 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -898,75 +898,75 @@ H5O__fill_debug(H5F_t H5_ATTR_UNUSED *f, const void *_fill, FILE *stream, int in
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Space Allocation Time:");
+    fprintf(stream, "%*s%-*s ", indent, "", fwidth, "Space Allocation Time:");
     switch (fill->alloc_time) {
         case H5D_ALLOC_TIME_EARLY:
-            HDfprintf(stream, "Early\n");
+            fprintf(stream, "Early\n");
             break;
 
         case H5D_ALLOC_TIME_LATE:
-            HDfprintf(stream, "Late\n");
+            fprintf(stream, "Late\n");
             break;
 
         case H5D_ALLOC_TIME_INCR:
-            HDfprintf(stream, "Incremental\n");
+            fprintf(stream, "Incremental\n");
             break;
 
         case H5D_ALLOC_TIME_DEFAULT:
         case H5D_ALLOC_TIME_ERROR:
         default:
-            HDfprintf(stream, "Unknown!\n");
+            fprintf(stream, "Unknown!\n");
             break;
     } /* end switch */
-    HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Fill Time:");
+    fprintf(stream, "%*s%-*s ", indent, "", fwidth, "Fill Time:");
     switch (fill->fill_time) {
         case H5D_FILL_TIME_ALLOC:
-            HDfprintf(stream, "On Allocation\n");
+            fprintf(stream, "On Allocation\n");
             break;
 
         case H5D_FILL_TIME_NEVER:
-            HDfprintf(stream, "Never\n");
+            fprintf(stream, "Never\n");
             break;
 
         case H5D_FILL_TIME_IFSET:
-            HDfprintf(stream, "If Set\n");
+            fprintf(stream, "If Set\n");
             break;
 
         case H5D_FILL_TIME_ERROR:
         default:
-            HDfprintf(stream, "Unknown!\n");
+            fprintf(stream, "Unknown!\n");
             break;
 
     } /* end switch */
-    HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Fill Value Defined:");
+    fprintf(stream, "%*s%-*s ", indent, "", fwidth, "Fill Value Defined:");
     H5P_is_fill_value_defined((const H5O_fill_t *)fill, &fill_status);
     switch (fill_status) {
         case H5D_FILL_VALUE_UNDEFINED:
-            HDfprintf(stream, "Undefined\n");
+            fprintf(stream, "Undefined\n");
             break;
 
         case H5D_FILL_VALUE_DEFAULT:
-            HDfprintf(stream, "Default\n");
+            fprintf(stream, "Default\n");
             break;
 
         case H5D_FILL_VALUE_USER_DEFINED:
-            HDfprintf(stream, "User Defined\n");
+            fprintf(stream, "User Defined\n");
             break;
 
         case H5D_FILL_VALUE_ERROR:
         default:
-            HDfprintf(stream, "Unknown!\n");
+            fprintf(stream, "Unknown!\n");
             break;
 
     } /* end switch */
-    HDfprintf(stream, "%*s%-*s %zd\n", indent, "", fwidth, "Size:", fill->size);
-    HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Data type:");
+    fprintf(stream, "%*s%-*s %zd\n", indent, "", fwidth, "Size:", fill->size);
+    fprintf(stream, "%*s%-*s ", indent, "", fwidth, "Data type:");
     if (fill->type) {
         H5T_debug(fill->type, stream);
-        HDfprintf(stream, "\n");
+        fprintf(stream, "\n");
     } /* end if */
     else
-        HDfprintf(stream, "<dataset type>\n");
+        fprintf(stream, "<dataset type>\n");
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__fill_debug() */
diff --git a/src/H5Ofsinfo.c b/src/H5Ofsinfo.c
index 094ff5e..3a1e607 100644
--- a/src/H5Ofsinfo.c
+++ b/src/H5Ofsinfo.c
@@ -375,48 +375,48 @@ H5O__fsinfo_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "File space strategy:");
+    fprintf(stream, "%*s%-*s ", indent, "", fwidth, "File space strategy:");
     switch (fsinfo->strategy) {
         case H5F_FSPACE_STRATEGY_FSM_AGGR:
-            HDfprintf(stream, "%s\n", "H5F_FSPACE_STRATEGY_FSM_AGGR");
+            fprintf(stream, "%s\n", "H5F_FSPACE_STRATEGY_FSM_AGGR");
             break;
 
         case H5F_FSPACE_STRATEGY_PAGE:
-            HDfprintf(stream, "%s\n", "H5F_FSPACE_STRATEGY_PAGE");
+            fprintf(stream, "%s\n", "H5F_FSPACE_STRATEGY_PAGE");
             break;
 
         case H5F_FSPACE_STRATEGY_AGGR:
-            HDfprintf(stream, "%s\n", "H5F_FSPACE_STRATEGY_AGGR");
+            fprintf(stream, "%s\n", "H5F_FSPACE_STRATEGY_AGGR");
             break;
 
         case H5F_FSPACE_STRATEGY_NONE:
-            HDfprintf(stream, "%s\n", "H5F_FSPACE_STRATEGY_NONE");
+            fprintf(stream, "%s\n", "H5F_FSPACE_STRATEGY_NONE");
             break;
 
         case H5F_FSPACE_STRATEGY_NTYPES:
         default:
-            HDfprintf(stream, "%s\n", "unknown");
+            fprintf(stream, "%s\n", "unknown");
     } /* end switch */
 
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Free-space persist:", fsinfo->persist ? "TRUE" : "FALSE");
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Free-space persist:", fsinfo->persist ? "TRUE" : "FALSE");
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "Free-space section threshold:", fsinfo->threshold);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "Free-space section threshold:", fsinfo->threshold);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-              "File space page size:", fsinfo->page_size);
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+            "File space page size:", fsinfo->page_size);
 
-    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-              "Page end metadata threshold:", fsinfo->pgend_meta_thres);
+    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
+            "Page end metadata threshold:", fsinfo->pgend_meta_thres);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "eoa_pre_fsm_fsalloc:", fsinfo->eoa_pre_fsm_fsalloc);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "eoa_pre_fsm_fsalloc:", fsinfo->eoa_pre_fsm_fsalloc);
 
     if (fsinfo->persist) {
         for (ptype = H5F_MEM_PAGE_SUPER; ptype < H5F_MEM_PAGE_NTYPES; ptype++)
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-                      "Free space manager address:", fsinfo->fs_addr[ptype - 1]);
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+                    "Free space manager address:", fsinfo->fs_addr[ptype - 1]);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5Oginfo.c b/src/H5Oginfo.c
index 4ceb551..26ada54 100644
--- a/src/H5Oginfo.c
+++ b/src/H5Oginfo.c
@@ -324,12 +324,12 @@ H5O__ginfo_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int i
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Max. compact links:", ginfo->max_compact);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Min. dense links:", ginfo->min_dense);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Estimated # of objects in group:", ginfo->est_num_entries);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-              "Estimated length of object in group's name:", ginfo->est_name_len);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Max. compact links:", ginfo->max_compact);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Min. dense links:", ginfo->min_dense);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Estimated # of objects in group:", ginfo->est_num_entries);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+            "Estimated length of object in group's name:", ginfo->est_name_len);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__ginfo_debug() */
diff --git a/src/H5Oint.c b/src/H5Oint.c
index 72ab043..3af0652 100644
--- a/src/H5Oint.c
+++ b/src/H5Oint.c
@@ -571,7 +571,7 @@ H5O_open(H5O_loc_t *loc)
 
 #ifdef H5O_DEBUG
     if (H5DEBUG(O))
-        HDfprintf(H5DEBUG(O), "> %" PRIuHADDR "\n", loc->addr);
+        fprintf(H5DEBUG(O), "> %" PRIuHADDR "\n", loc->addr);
 #endif
 
     /* Turn off the variable for holding file or increment open-lock counters */
@@ -801,10 +801,10 @@ H5O_close(H5O_loc_t *loc, hbool_t *file_closed /*out*/)
 #ifdef H5O_DEBUG
     if (H5DEBUG(O)) {
         if (FALSE == H5F_ID_EXISTS(loc->file) && 1 == H5F_NREFS(loc->file))
-            HDfprintf(H5DEBUG(O), "< %" PRIuHADDR " auto %lu remaining\n", loc->addr,
-                      (unsigned long)H5F_NOPEN_OBJS(loc->file));
+            fprintf(H5DEBUG(O), "< %" PRIuHADDR " auto %lu remaining\n", loc->addr,
+                    (unsigned long)H5F_NOPEN_OBJS(loc->file));
         else
-            HDfprintf(H5DEBUG(O), "< %" PRIuHADDR "\n", loc->addr);
+            fprintf(H5DEBUG(O), "< %" PRIuHADDR "\n", loc->addr);
     }
 #endif
 
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 01526e7..dd5ff98 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -1351,96 +1351,95 @@ H5O__layout_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", mesg->version);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", mesg->version);
     switch (mesg->type) {
         case H5D_CHUNKED:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type:", "Chunked");
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type:", "Chunked");
 
             /* Chunk # of dims & size */
-            HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
-                      "Number of dimensions:", (unsigned long)(mesg->u.chunk.ndims));
-            HDfprintf(stream, "%*s%-*s {", indent, "", fwidth, "Size:");
+            fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth,
+                    "Number of dimensions:", (unsigned long)(mesg->u.chunk.ndims));
+            fprintf(stream, "%*s%-*s {", indent, "", fwidth, "Size:");
             for (u = 0; u < (size_t)mesg->u.chunk.ndims; u++)
-                HDfprintf(stream, "%s%lu", u ? ", " : "", (unsigned long)(mesg->u.chunk.dim[u]));
-            HDfprintf(stream, "}\n");
+                fprintf(stream, "%s%lu", u ? ", " : "", (unsigned long)(mesg->u.chunk.dim[u]));
+            fprintf(stream, "}\n");
 
             /* Index information */
             switch (mesg->u.chunk.idx_type) {
                 case H5D_CHUNK_IDX_BTREE:
-                    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "v1 B-tree");
+                    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "v1 B-tree");
                     break;
 
                 case H5D_CHUNK_IDX_NONE:
-                    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "Implicit");
+                    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "Implicit");
                     break;
 
                 case H5D_CHUNK_IDX_SINGLE:
-                    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "Single Chunk");
+                    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "Single Chunk");
                     break;
 
                 case H5D_CHUNK_IDX_FARRAY:
-                    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "Fixed Array");
+                    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "Fixed Array");
                     /* (Should print the fixed array creation parameters) */
                     break;
 
                 case H5D_CHUNK_IDX_EARRAY:
-                    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "Extensible Array");
+                    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "Extensible Array");
                     /* (Should print the extensible array creation parameters) */
                     break;
 
                 case H5D_CHUNK_IDX_BT2:
-                    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "v2 B-tree");
+                    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Index Type:", "v2 B-tree");
                     /* (Should print the v2-Btree creation parameters) */
                     break;
 
                 case H5D_CHUNK_IDX_NTYPES:
                 default:
-                    HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Index Type:", "Unknown",
-                              (unsigned)mesg->u.chunk.idx_type);
+                    fprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Index Type:", "Unknown",
+                            (unsigned)mesg->u.chunk.idx_type);
                     break;
             } /* end switch */
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-                      "Index address:", mesg->storage.u.chunk.idx_addr);
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+                    "Index address:", mesg->storage.u.chunk.idx_addr);
             break;
 
         case H5D_CONTIGUOUS:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type:", "Contiguous");
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-                      "Data address:", mesg->storage.u.contig.addr);
-            HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
-                      "Data Size:", mesg->storage.u.contig.size);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type:", "Contiguous");
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+                    "Data address:", mesg->storage.u.contig.addr);
+            fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth,
+                    "Data Size:", mesg->storage.u.contig.size);
             break;
 
         case H5D_COMPACT:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type:", "Compact");
-            HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-                      "Data Size:", mesg->storage.u.compact.size);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type:", "Compact");
+            fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Data Size:", mesg->storage.u.compact.size);
             break;
 
         case H5D_VIRTUAL:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type:", "Virtual");
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-                      "Global heap address:", mesg->storage.u.virt.serial_list_hobjid.addr);
-            HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-                      "Global heap index:", mesg->storage.u.virt.serial_list_hobjid.idx);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Type:", "Virtual");
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+                    "Global heap address:", mesg->storage.u.virt.serial_list_hobjid.addr);
+            fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
+                    "Global heap index:", mesg->storage.u.virt.serial_list_hobjid.idx);
             for (u = 0; u < mesg->storage.u.virt.list_nused; u++) {
-                HDfprintf(stream, "%*sMapping %zu:\n", indent, "", u);
-                HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth - 3,
-                          "Virtual selection:", "<Not yet implemented>");
-                HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth - 3,
-                          "Source file name:", mesg->storage.u.virt.list[u].source_file_name);
-                HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth - 3,
-                          "Source dataset name:", mesg->storage.u.virt.list[u].source_dset_name);
-                HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth - 3,
-                          "Source selection:", "<Not yet implemented>");
+                fprintf(stream, "%*sMapping %zu:\n", indent, "", u);
+                fprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth - 3,
+                        "Virtual selection:", "<Not yet implemented>");
+                fprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth - 3,
+                        "Source file name:", mesg->storage.u.virt.list[u].source_file_name);
+                fprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth - 3,
+                        "Source dataset name:", mesg->storage.u.virt.list[u].source_dset_name);
+                fprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth - 3,
+                        "Source selection:", "<Not yet implemented>");
             } /* end for */
             break;
 
         case H5D_LAYOUT_ERROR:
         case H5D_NLAYOUTS:
         default:
-            HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Type:", "Unknown",
-                      (unsigned)mesg->type);
+            fprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Type:", "Unknown",
+                    (unsigned)mesg->type);
             break;
     } /* end switch */
 
diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c
index cecdb32..c1e9bca 100644
--- a/src/H5Olinfo.c
+++ b/src/H5Olinfo.c
@@ -556,19 +556,19 @@ H5O__linfo_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int i
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Track creation order of links:", linfo->track_corder ? "TRUE" : "FALSE");
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-              "Index creation order of links:", linfo->index_corder ? "TRUE" : "FALSE");
-    HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth, "Number of links:", linfo->nlinks);
-    HDfprintf(stream, "%*s%-*s %" PRId64 "\n", indent, "", fwidth,
-              "Max. creation order value:", linfo->max_corder);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "'Dense' link storage fractal heap address:", linfo->fheap_addr);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "'Dense' link storage name index v2 B-tree address:", linfo->name_bt2_addr);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-              "'Dense' link storage creation order index v2 B-tree address:", linfo->corder_bt2_addr);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Track creation order of links:", linfo->track_corder ? "TRUE" : "FALSE");
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+            "Index creation order of links:", linfo->index_corder ? "TRUE" : "FALSE");
+    fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent, "", fwidth, "Number of links:", linfo->nlinks);
+    fprintf(stream, "%*s%-*s %" PRId64 "\n", indent, "", fwidth,
+            "Max. creation order value:", linfo->max_corder);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "'Dense' link storage fractal heap address:", linfo->fheap_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "'Dense' link storage name index v2 B-tree address:", linfo->name_bt2_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+            "'Dense' link storage creation order index v2 B-tree address:", linfo->corder_bt2_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__linfo_debug() */
diff --git a/src/H5Olink.c b/src/H5Olink.c
index 2afb89c..219f4b0 100644
--- a/src/H5Olink.c
+++ b/src/H5Olink.c
@@ -812,31 +812,31 @@ H5O__link_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int in
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Link Type:",
-              (lnk->type == H5L_TYPE_HARD
-                   ? "Hard"
-                   : (lnk->type == H5L_TYPE_SOFT
-                          ? "Soft"
-                          : (lnk->type == H5L_TYPE_EXTERNAL
-                                 ? "External"
-                                 : (lnk->type >= H5L_TYPE_UD_MIN ? "User-defined" : "Unknown")))));
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Link Type:",
+            (lnk->type == H5L_TYPE_HARD
+                 ? "Hard"
+                 : (lnk->type == H5L_TYPE_SOFT
+                        ? "Soft"
+                        : (lnk->type == H5L_TYPE_EXTERNAL
+                               ? "External"
+                               : (lnk->type >= H5L_TYPE_UD_MIN ? "User-defined" : "Unknown")))));
 
     if (lnk->corder_valid)
-        HDfprintf(stream, "%*s%-*s %" PRId64 "\n", indent, "", fwidth, "Creation Order:", lnk->corder);
+        fprintf(stream, "%*s%-*s %" PRId64 "\n", indent, "", fwidth, "Creation Order:", lnk->corder);
 
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Link Name Character Set:",
-              (lnk->cset == H5T_CSET_ASCII ? "ASCII" : (lnk->cset == H5T_CSET_UTF8 ? "UTF-8" : "Unknown")));
-    HDfprintf(stream, "%*s%-*s '%s'\n", indent, "", fwidth, "Link Name:", lnk->name);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Link Name Character Set:",
+            (lnk->cset == H5T_CSET_ASCII ? "ASCII" : (lnk->cset == H5T_CSET_UTF8 ? "UTF-8" : "Unknown")));
+    fprintf(stream, "%*s%-*s '%s'\n", indent, "", fwidth, "Link Name:", lnk->name);
 
     /* Display link-specific information */
     switch (lnk->type) {
         case H5L_TYPE_HARD:
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-                      "Object address:", lnk->u.hard.addr);
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+                    "Object address:", lnk->u.hard.addr);
             break;
 
         case H5L_TYPE_SOFT:
-            HDfprintf(stream, "%*s%-*s '%s'\n", indent, "", fwidth, "Link Value:", lnk->u.soft.name);
+            fprintf(stream, "%*s%-*s '%s'\n", indent, "", fwidth, "Link Value:", lnk->u.soft.name);
             break;
 
         case H5L_TYPE_ERROR:
@@ -848,13 +848,13 @@ H5O__link_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int in
                     const char *objname =
                         (const char *)lnk->u.ud.udata + (HDstrlen((const char *)lnk->u.ud.udata) + 1);
 
-                    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                              "External File Name:", (const char *)lnk->u.ud.udata);
-                    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "External Object Name:", objname);
+                    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+                            "External File Name:", (const char *)lnk->u.ud.udata);
+                    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "External Object Name:", objname);
                 } /* end if */
                 else {
-                    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
-                              "User-Defined Link Size:", lnk->u.ud.size);
+                    fprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth,
+                            "User-Defined Link Size:", lnk->u.ud.size);
                 } /* end else */
             }     /* end if */
             else
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index 150b3be..9fb1826 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -439,7 +439,7 @@ H5O__mtime_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int i
     tm = HDlocaltime(mesg);
 
     HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Time:", buf);
+    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Time:", buf);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__mtime_debug() */
diff --git a/src/H5Oname.c b/src/H5Oname.c
index 29bbab0..f364b5a 100644
--- a/src/H5Oname.c
+++ b/src/H5Oname.c
@@ -266,7 +266,7 @@ H5O__name_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int in
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s `%s'\n", indent, "", fwidth, "Name:", mesg->s);
+    fprintf(stream, "%*s%-*s `%s'\n", indent, "", fwidth, "Name:", mesg->s);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__name_debug() */
diff --git a/src/H5Opline.c b/src/H5Opline.c
index 4b4b8ab..bbd8859 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -662,8 +662,8 @@ H5O__pline_debug(H5F_t H5_ATTR_UNUSED *f, const void *mesg, FILE *stream, int in
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %zu/%zu\n", indent, "", fwidth, "Number of filters:", pline->nused,
-              pline->nalloc);
+    fprintf(stream, "%*s%-*s %zu/%zu\n", indent, "", fwidth, "Number of filters:", pline->nused,
+            pline->nalloc);
 
     /* Loop over all the filters */
     for (size_t i = 0; i < pline->nused; i++) {
@@ -675,26 +675,26 @@ H5O__pline_debug(H5F_t H5_ATTR_UNUSED *f, const void *mesg, FILE *stream, int in
         HDmemset(name, 0, 64);
         HDsnprintf(name, sizeof(name), "Filter at position %zu", i);
 
-        HDfprintf(stream, "%*s%-*s\n", indent, "", fwidth, name);
-        HDfprintf(stream, "%*s%-*s 0x%04x\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Filter identification:", (unsigned)(pline->filter[i].id));
+        fprintf(stream, "%*s%-*s\n", indent, "", fwidth, name);
+        fprintf(stream, "%*s%-*s 0x%04x\n", indent + 3, "", MAX(0, fwidth - 3),
+                "Filter identification:", (unsigned)(pline->filter[i].id));
         if (pline->filter[i].name)
-            HDfprintf(stream, "%*s%-*s \"%s\"\n", indent + 3, "", MAX(0, fwidth - 3),
-                      "Filter name:", pline->filter[i].name);
+            fprintf(stream, "%*s%-*s \"%s\"\n", indent + 3, "", MAX(0, fwidth - 3),
+                    "Filter name:", pline->filter[i].name);
         else
-            HDfprintf(stream, "%*s%-*s NONE\n", indent + 3, "", MAX(0, fwidth - 3), "Filter name:");
-        HDfprintf(stream, "%*s%-*s 0x%04x\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Flags:", pline->filter[i].flags);
-        HDfprintf(stream, "%*s%-*s %zu\n", indent + 3, "", MAX(0, fwidth - 3),
-                  "Num CD values:", pline->filter[i].cd_nelmts);
+            fprintf(stream, "%*s%-*s NONE\n", indent + 3, "", MAX(0, fwidth - 3), "Filter name:");
+        fprintf(stream, "%*s%-*s 0x%04x\n", indent + 3, "", MAX(0, fwidth - 3),
+                "Flags:", pline->filter[i].flags);
+        fprintf(stream, "%*s%-*s %zu\n", indent + 3, "", MAX(0, fwidth - 3),
+                "Num CD values:", pline->filter[i].cd_nelmts);
 
         /* Filter parameters */
         for (size_t j = 0; j < pline->filter[i].cd_nelmts; j++) {
             char field_name[32];
 
             HDsnprintf(field_name, sizeof(field_name), "CD value %lu", (unsigned long)j);
-            HDfprintf(stream, "%*s%-*s %u\n", indent + 6, "", MAX(0, fwidth - 6), field_name,
-                      pline->filter[i].cd_values[j]);
+            fprintf(stream, "%*s%-*s %u\n", indent + 6, "", MAX(0, fwidth - 6), field_name,
+                    pline->filter[i].cd_values[j]);
         }
     }
 
diff --git a/src/H5Orefcount.c b/src/H5Orefcount.c
index 04d9eaa..ddb1219 100644
--- a/src/H5Orefcount.c
+++ b/src/H5Orefcount.c
@@ -301,7 +301,7 @@ H5O__refcount_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, in
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of links:", (unsigned)*refcount);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of links:", (unsigned)*refcount);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__refcount_debug() */
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c
index c71a839..3e4dd87 100644
--- a/src/H5Osdspace.c
+++ b/src/H5Osdspace.c
@@ -520,29 +520,29 @@ H5O__sdspace_debug(H5F_t H5_ATTR_UNUSED *f, const void *mesg, FILE *stream, int
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth, "Rank:", (unsigned long)(sdim->rank));
+    fprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth, "Rank:", (unsigned long)(sdim->rank));
 
     if (sdim->rank > 0) {
         unsigned u; /* local counting variable */
 
-        HDfprintf(stream, "%*s%-*s {", indent, "", fwidth, "Dim Size:");
+        fprintf(stream, "%*s%-*s {", indent, "", fwidth, "Dim Size:");
         for (u = 0; u < sdim->rank; u++)
-            HDfprintf(stream, "%s%" PRIuHSIZE, u ? ", " : "", sdim->size[u]);
-        HDfprintf(stream, "}\n");
+            fprintf(stream, "%s%" PRIuHSIZE, u ? ", " : "", sdim->size[u]);
+        fprintf(stream, "}\n");
 
-        HDfprintf(stream, "%*s%-*s ", indent, "", fwidth, "Dim Max:");
+        fprintf(stream, "%*s%-*s ", indent, "", fwidth, "Dim Max:");
         if (sdim->max) {
-            HDfprintf(stream, "{");
+            fprintf(stream, "{");
             for (u = 0; u < sdim->rank; u++) {
                 if (H5S_UNLIMITED == sdim->max[u])
-                    HDfprintf(stream, "%sUNLIM", u ? ", " : "");
+                    fprintf(stream, "%sUNLIM", u ? ", " : "");
                 else
-                    HDfprintf(stream, "%s%" PRIuHSIZE, u ? ", " : "", sdim->max[u]);
+                    fprintf(stream, "%s%" PRIuHSIZE, u ? ", " : "", sdim->max[u]);
             } /* end for */
-            HDfprintf(stream, "}\n");
+            fprintf(stream, "}\n");
         } /* end if */
         else
-            HDfprintf(stream, "CONSTANT\n");
+            fprintf(stream, "CONSTANT\n");
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index 4483b44..9d07170 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -701,28 +701,28 @@ H5O__shared_debug(const H5O_shared_t *mesg, FILE *stream, int indent, int fwidth
 
     switch (mesg->type) {
         case H5O_SHARE_TYPE_UNSHARED:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Shared Message type:", "Unshared");
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Shared Message type:", "Unshared");
             break;
 
         case H5O_SHARE_TYPE_COMMITTED:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Shared Message type:", "Obj Hdr");
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
-                      "Object address:", mesg->u.loc.oh_addr);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Shared Message type:", "Obj Hdr");
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth,
+                    "Object address:", mesg->u.loc.oh_addr);
             break;
 
         case H5O_SHARE_TYPE_SOHM:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Shared Message type:", "SOHM");
-            HDfprintf(stream, "%*s%-*s %016llx\n", indent, "", fwidth,
-                      "Heap ID:", (unsigned long long)mesg->u.heap_id.val);
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Shared Message type:", "SOHM");
+            fprintf(stream, "%*s%-*s %016llx\n", indent, "", fwidth,
+                    "Heap ID:", (unsigned long long)mesg->u.heap_id.val);
             break;
 
         case H5O_SHARE_TYPE_HERE:
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Shared Message type:", "Here");
+            fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Shared Message type:", "Here");
             break;
 
         default:
-            HDfprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Shared Message type:", "Unknown",
-                      (unsigned)mesg->type);
+            fprintf(stream, "%*s%-*s %s (%u)\n", indent, "", fwidth, "Shared Message type:", "Unknown",
+                    (unsigned)mesg->type);
     } /* end switch */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5Oshmesg.c b/src/H5Oshmesg.c
index 6112b9c..5c9a199 100644
--- a/src/H5Oshmesg.c
+++ b/src/H5Oshmesg.c
@@ -234,10 +234,10 @@ H5O__shmesg_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", mesg->version);
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR " (rel)\n", indent, "", fwidth,
-              "Shared message table address:", mesg->addr);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of indexes:", mesg->nindexes);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", mesg->version);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR " (rel)\n", indent, "", fwidth,
+            "Shared message table address:", mesg->addr);
+    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of indexes:", mesg->nindexes);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__shmesg_debug() */
diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index ecb55b2..6c17a8f 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -407,9 +407,9 @@ H5O__stab_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream, int in
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "B-tree address:", stab->btree_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "B-tree address:", stab->btree_addr);
 
-    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Name heap address:", stab->heap_addr);
+    fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Name heap address:", stab->heap_addr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__stab_debug() */
diff --git a/src/H5PB.c b/src/H5PB.c
index 23efc06..86a7462 100644
--- a/src/H5PB.c
+++ b/src/H5PB.c
@@ -242,27 +242,27 @@ H5PB_print_stats(const H5PB_t *page_buf)
 
     assert(page_buf);
 
-    HDprintf("PAGE BUFFER STATISTICS:\n");
-
-    HDprintf("******* METADATA\n");
-    HDprintf("\t Total Accesses: %u\n", page_buf->accesses[0]);
-    HDprintf("\t Hits: %u\n", page_buf->hits[0]);
-    HDprintf("\t Misses: %u\n", page_buf->misses[0]);
-    HDprintf("\t Evictions: %u\n", page_buf->evictions[0]);
-    HDprintf("\t Bypasses: %u\n", page_buf->bypasses[0]);
-    HDprintf("\t Hit Rate = %f%%\n",
-             ((double)page_buf->hits[0] / (page_buf->accesses[0] - page_buf->bypasses[0])) * 100);
-    HDprintf("*****************\n\n");
-
-    HDprintf("******* RAWDATA\n");
-    HDprintf("\t Total Accesses: %u\n", page_buf->accesses[1]);
-    HDprintf("\t Hits: %u\n", page_buf->hits[1]);
-    HDprintf("\t Misses: %u\n", page_buf->misses[1]);
-    HDprintf("\t Evictions: %u\n", page_buf->evictions[1]);
-    HDprintf("\t Bypasses: %u\n", page_buf->bypasses[1]);
-    HDprintf("\t Hit Rate = %f%%\n",
-             ((double)page_buf->hits[1] / (page_buf->accesses[1] - page_buf->bypasses[0])) * 100);
-    HDprintf("*****************\n\n");
+    printf("PAGE BUFFER STATISTICS:\n");
+
+    printf("******* METADATA\n");
+    printf("\t Total Accesses: %u\n", page_buf->accesses[0]);
+    printf("\t Hits: %u\n", page_buf->hits[0]);
+    printf("\t Misses: %u\n", page_buf->misses[0]);
+    printf("\t Evictions: %u\n", page_buf->evictions[0]);
+    printf("\t Bypasses: %u\n", page_buf->bypasses[0]);
+    printf("\t Hit Rate = %f%%\n",
+           ((double)page_buf->hits[0] / (page_buf->accesses[0] - page_buf->bypasses[0])) * 100);
+    printf("*****************\n\n");
+
+    printf("******* RAWDATA\n");
+    printf("\t Total Accesses: %u\n", page_buf->accesses[1]);
+    printf("\t Hits: %u\n", page_buf->hits[1]);
+    printf("\t Misses: %u\n", page_buf->misses[1]);
+    printf("\t Evictions: %u\n", page_buf->evictions[1]);
+    printf("\t Bypasses: %u\n", page_buf->bypasses[1]);
+    printf("\t Hit Rate = %f%%\n",
+           ((double)page_buf->hits[1] / (page_buf->accesses[1] - page_buf->bypasses[0])) * 100);
+    printf("*****************\n\n");
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5PB_print_stats */
diff --git a/src/H5Rint.c b/src/H5Rint.c
index db9ce26..9b56b10 100644
--- a/src/H5Rint.c
+++ b/src/H5Rint.c
@@ -91,9 +91,9 @@
 #ifdef H5R_DEBUG
 #define H5R_LOG_DEBUG(...)                                                                                   \
     do {                                                                                                     \
-        HDfprintf(stdout, " # %s(): ", __func__);                                                            \
-        HDfprintf(stdout, __VA_ARGS__);                                                                      \
-        HDfprintf(stdout, "\n");                                                                             \
+        fprintf(stdout, " # %s(): ", __func__);                                                              \
+        fprintf(stdout, __VA_ARGS__);                                                                        \
+        fprintf(stdout, "\n");                                                                               \
         HDfflush(stdout);                                                                                    \
     } while (0)
 static const char *
diff --git a/src/H5SM.c b/src/H5SM.c
index c87001d..04a21e5 100644
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -2553,11 +2553,11 @@ H5SM_table_debug(H5F_t *f, haddr_t table_addr, FILE *stream, int indent, int fwi
     if (table_vers == UINT_MAX)
         table_vers = H5F_SOHM_VERS(f);
     else if (table_vers != H5F_SOHM_VERS(f))
-        HDfprintf(stream, "*** SOHM TABLE VERSION DOESN'T MATCH VERSION IN SUPERBLOCK!\n");
+        fprintf(stream, "*** SOHM TABLE VERSION DOESN'T MATCH VERSION IN SUPERBLOCK!\n");
     if (num_indexes == UINT_MAX)
         num_indexes = H5F_SOHM_NINDEXES(f);
     else if (num_indexes != H5F_SOHM_NINDEXES(f))
-        HDfprintf(stream, "*** NUMBER OF SOHM INDEXES DOESN'T MATCH VALUE IN SUPERBLOCK!\n");
+        fprintf(stream, "*** NUMBER OF SOHM INDEXES DOESN'T MATCH VALUE IN SUPERBLOCK!\n");
 
     /* Check arguments.  Version must be 0, the only version implemented so far */
     if (table_vers > HDF5_SHAREDHEADER_VERSION)
@@ -2574,28 +2574,28 @@ H5SM_table_debug(H5F_t *f, haddr_t table_addr, FILE *stream, int indent, int fwi
                                                              H5AC__READ_ONLY_FLAG)))
         HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
-    HDfprintf(stream, "%*sShared Message Master Table...\n", indent, "");
+    fprintf(stream, "%*sShared Message Master Table...\n", indent, "");
     for (x = 0; x < num_indexes; ++x) {
-        HDfprintf(stream, "%*sIndex %d...\n", indent, "", x);
-        HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, "SOHM Index Type:",
-                  (table->indexes[x].index_type == H5SM_LIST
-                       ? "List"
-                       : (table->indexes[x].index_type == H5SM_BTREE ? "B-Tree" : "Unknown")));
-
-        HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", fwidth,
-                  "Address of index:", table->indexes[x].index_addr);
-        HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", fwidth,
-                  "Address of index's heap:", table->indexes[x].heap_addr);
-        HDfprintf(stream, "%*s%-*s 0x%08x\n", indent + 3, "", fwidth,
-                  "Message type flags:", table->indexes[x].mesg_types);
-        HDfprintf(stream, "%*s%-*s %zu\n", indent + 3, "", fwidth,
-                  "Minimum size of messages:", table->indexes[x].min_mesg_size);
-        HDfprintf(stream, "%*s%-*s %zu\n", indent + 3, "", fwidth,
-                  "Number of messages:", table->indexes[x].num_messages);
-        HDfprintf(stream, "%*s%-*s %zu\n", indent + 3, "", fwidth,
-                  "Maximum list size:", table->indexes[x].list_max);
-        HDfprintf(stream, "%*s%-*s %zu\n", indent + 3, "", fwidth,
-                  "Minimum B-tree size:", table->indexes[x].btree_min);
+        fprintf(stream, "%*sIndex %d...\n", indent, "", x);
+        fprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, "SOHM Index Type:",
+                (table->indexes[x].index_type == H5SM_LIST
+                     ? "List"
+                     : (table->indexes[x].index_type == H5SM_BTREE ? "B-Tree" : "Unknown")));
+
+        fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", fwidth,
+                "Address of index:", table->indexes[x].index_addr);
+        fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", fwidth,
+                "Address of index's heap:", table->indexes[x].heap_addr);
+        fprintf(stream, "%*s%-*s 0x%08x\n", indent + 3, "", fwidth,
+                "Message type flags:", table->indexes[x].mesg_types);
+        fprintf(stream, "%*s%-*s %zu\n", indent + 3, "", fwidth,
+                "Minimum size of messages:", table->indexes[x].min_mesg_size);
+        fprintf(stream, "%*s%-*s %zu\n", indent + 3, "", fwidth,
+                "Number of messages:", table->indexes[x].num_messages);
+        fprintf(stream, "%*s%-*s %zu\n", indent + 3, "", fwidth,
+                "Maximum list size:", table->indexes[x].list_max);
+        fprintf(stream, "%*s%-*s %zu\n", indent + 3, "", fwidth,
+                "Minimum B-tree size:", table->indexes[x].btree_min);
     } /* end for */
 
 done:
@@ -2673,31 +2673,31 @@ H5SM_list_debug(H5F_t *f, haddr_t list_addr, FILE *stream, int indent, int fwidt
         if (NULL == (fh = H5HF_open(f, table->indexes[index_num].heap_addr)))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTOPENOBJ, FAIL, "unable to open SOHM heap")
 
-    HDfprintf(stream, "%*sShared Message List Index...\n", indent, "");
+    fprintf(stream, "%*sShared Message List Index...\n", indent, "");
     for (x = 0; x < table->indexes[index_num].num_messages; ++x) {
-        HDfprintf(stream, "%*sShared Object Header Message %d...\n", indent, "", x);
-        HDfprintf(stream, "%*s%-*s %08lu\n", indent + 3, "", fwidth,
-                  "Hash value:", (unsigned long)list->messages[x].hash);
+        fprintf(stream, "%*sShared Object Header Message %d...\n", indent, "", x);
+        fprintf(stream, "%*s%-*s %08lu\n", indent + 3, "", fwidth,
+                "Hash value:", (unsigned long)list->messages[x].hash);
         if (list->messages[x].location == H5SM_IN_HEAP) {
             assert(fh);
 
-            HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, "Location:", "in heap");
-            HDfprintf(stream, "%*s%-*s 0x%" PRIx64 "\n", indent + 3, "", fwidth,
-                      "Heap ID:", list->messages[x].u.heap_loc.fheap_id.val);
-            HDfprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent + 3, "", fwidth,
-                      "Reference count:", list->messages[x].u.heap_loc.ref_count);
+            fprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, "Location:", "in heap");
+            fprintf(stream, "%*s%-*s 0x%" PRIx64 "\n", indent + 3, "", fwidth,
+                    "Heap ID:", list->messages[x].u.heap_loc.fheap_id.val);
+            fprintf(stream, "%*s%-*s %" PRIuHSIZE "\n", indent + 3, "", fwidth,
+                    "Reference count:", list->messages[x].u.heap_loc.ref_count);
         } /* end if */
         else if (list->messages[x].location == H5SM_IN_OH) {
-            HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, "Location:", "in object header");
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", fwidth,
-                      "Object header address:", list->messages[x].u.mesg_loc.oh_addr);
-            HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", fwidth,
-                      "Message creation index:", list->messages[x].u.mesg_loc.oh_addr);
-            HDfprintf(stream, "%*s%-*s %u\n", indent + 3, "", fwidth,
-                      "Message type ID:", list->messages[x].msg_type_id);
+            fprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, "Location:", "in object header");
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", fwidth,
+                    "Object header address:", list->messages[x].u.mesg_loc.oh_addr);
+            fprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent + 3, "", fwidth,
+                    "Message creation index:", list->messages[x].u.mesg_loc.oh_addr);
+            fprintf(stream, "%*s%-*s %u\n", indent + 3, "", fwidth,
+                    "Message type ID:", list->messages[x].msg_type_id);
         } /* end if */
         else
-            HDfprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, "Location:", "invalid");
+            fprintf(stream, "%*s%-*s %s\n", indent + 3, "", fwidth, "Location:", "invalid");
     } /* end for */
 
 done:
diff --git a/src/H5SMbtree2.c b/src/H5SMbtree2.c
index 5ba9d9b..461fdcf 100644
--- a/src/H5SMbtree2.c
+++ b/src/H5SMbtree2.c
@@ -186,14 +186,14 @@ H5SM__bt2_debug(FILE *stream, int indent, int fwidth, const void *record, const
     FUNC_ENTER_PACKAGE_NOERR
 
     if (sohm->location == H5SM_IN_HEAP)
-        HDfprintf(stream, "%*s%-*s {%" PRIu64 ", %" PRIo32 ", %" PRIxHSIZE "}\n", indent, "", fwidth,
-                  "Shared Message in heap:", sohm->u.heap_loc.fheap_id.val, sohm->hash,
-                  sohm->u.heap_loc.ref_count);
+        fprintf(stream, "%*s%-*s {%" PRIu64 ", %" PRIo32 ", %" PRIxHSIZE "}\n", indent, "", fwidth,
+                "Shared Message in heap:", sohm->u.heap_loc.fheap_id.val, sohm->hash,
+                sohm->u.heap_loc.ref_count);
     else {
         assert(sohm->location == H5SM_IN_OH);
-        HDfprintf(stream, "%*s%-*s {%" PRIuHADDR ", %" PRIo32 ", %x, %" PRIx32 "}\n", indent, "", fwidth,
-                  "Shared Message in OH:", sohm->u.mesg_loc.oh_addr, sohm->hash, sohm->msg_type_id,
-                  sohm->u.mesg_loc.index);
+        fprintf(stream, "%*s%-*s {%" PRIuHADDR ", %" PRIo32 ", %x, %" PRIx32 "}\n", indent, "", fwidth,
+                "Shared Message in OH:", sohm->u.mesg_loc.oh_addr, sohm->hash, sohm->msg_type_id,
+                sohm->u.mesg_loc.index);
     } /* end else */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5Sdbg.c b/src/H5Sdbg.c
index f4d027b..39c9cfb 100644
--- a/src/H5Sdbg.c
+++ b/src/H5Sdbg.c
@@ -83,22 +83,22 @@ H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidth)
 
     switch (H5S_GET_EXTENT_TYPE(mesg)) {
         case H5S_NULL:
-            HDfprintf(stream, "%*s%-*s H5S_NULL\n", indent, "", fwidth, "Space class:");
+            fprintf(stream, "%*s%-*s H5S_NULL\n", indent, "", fwidth, "Space class:");
             break;
 
         case H5S_SCALAR:
-            HDfprintf(stream, "%*s%-*s H5S_SCALAR\n", indent, "", fwidth, "Space class:");
+            fprintf(stream, "%*s%-*s H5S_SCALAR\n", indent, "", fwidth, "Space class:");
             break;
 
         case H5S_SIMPLE:
-            HDfprintf(stream, "%*s%-*s H5S_SIMPLE\n", indent, "", fwidth, "Space class:");
+            fprintf(stream, "%*s%-*s H5S_SIMPLE\n", indent, "", fwidth, "Space class:");
             H5O_debug_id(H5O_SDSPACE_ID, f, &(mesg->extent), stream, indent + 3, MAX(0, fwidth - 3));
             break;
 
         case H5S_NO_CLASS:
         default:
-            HDfprintf(stream, "%*s%-*s **UNKNOWN-%ld**\n", indent, "", fwidth,
-                      "Space class:", (long)(H5S_GET_EXTENT_TYPE(mesg)));
+            fprintf(stream, "%*s%-*s **UNKNOWN-%ld**\n", indent, "", fwidth,
+                    "Space class:", (long)(H5S_GET_EXTENT_TYPE(mesg)));
             break;
     } /* end switch */
 
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index a208ed5..d164d30 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -297,12 +297,12 @@ H5S__hyper_print_spans_helper(FILE *f, const H5S_hyper_span_t *span, unsigned de
     FUNC_ENTER_PACKAGE_NOERR
 
     while (span) {
-        HDfprintf(f, "%s: %*sdepth=%u, span=%p, (%" PRIuHSIZE ", %" PRIuHSIZE "), next=%p\n", __func__,
-                  depth * 2, "", depth, (void *)span, span->low, span->high, (void *)span->next);
+        fprintf(f, "%s: %*sdepth=%u, span=%p, (%" PRIuHSIZE ", %" PRIuHSIZE "), next=%p\n", __func__,
+                depth * 2, "", depth, (void *)span, span->low, span->high, (void *)span->next);
         if (span->down) {
-            HDfprintf(f, "%s: %*sspans=%p, count=%u, bounds[0]={%" PRIuHSIZE ", %" PRIuHSIZE "}, head=%p\n",
-                      __func__, (depth + 1) * 2, "", (void *)span->down, span->down->count,
-                      span->down->low_bounds[0], span->down->high_bounds[0], (void *)span->down->head);
+            fprintf(f, "%s: %*sspans=%p, count=%u, bounds[0]={%" PRIuHSIZE ", %" PRIuHSIZE "}, head=%p\n",
+                    __func__, (depth + 1) * 2, "", (void *)span->down, span->down->count,
+                    span->down->low_bounds[0], span->down->high_bounds[0], (void *)span->down->head);
             H5S__hyper_print_spans_helper(f, span->down->head, depth + 1);
         } /* end if */
         span = span->next;
@@ -317,9 +317,9 @@ H5S__hyper_print_spans(FILE *f, const H5S_hyper_span_info_t *span_lst)
     FUNC_ENTER_PACKAGE_NOERR
 
     if (span_lst != NULL) {
-        HDfprintf(f, "%s: spans=%p, count=%u, bounds[0]={%" PRIuHSIZE ", %" PRIuHSIZE "}, head=%p\n",
-                  __func__, (void *)span_lst, span_lst->count, span_lst->low_bounds[0],
-                  span_lst->high_bounds[0], (void *)span_lst->head);
+        fprintf(f, "%s: spans=%p, count=%u, bounds[0]={%" PRIuHSIZE ", %" PRIuHSIZE "}, head=%p\n", __func__,
+                (void *)span_lst, span_lst->count, span_lst->low_bounds[0], span_lst->high_bounds[0],
+                (void *)span_lst->head);
         H5S__hyper_print_spans_helper(f, span_lst->head, 0);
     } /* end if */
 
@@ -344,21 +344,21 @@ H5S__hyper_print_diminfo_helper(FILE *f, const char *field, unsigned ndims, cons
     FUNC_ENTER_PACKAGE_NOERR
 
     if (dinfo != NULL) {
-        HDfprintf(f, "%s: %s: start=[", __func__, field);
+        fprintf(f, "%s: %s: start=[", __func__, field);
         for (u = 0; u < ndims; u++)
-            HDfprintf(f, "%" PRIuHSIZE "%s", dinfo[u].start, (u < (ndims - 1) ? ", " : "]\n"));
-        HDfprintf(f, "%s: %s: stride=[", __func__, field);
+            fprintf(f, "%" PRIuHSIZE "%s", dinfo[u].start, (u < (ndims - 1) ? ", " : "]\n"));
+        fprintf(f, "%s: %s: stride=[", __func__, field);
         for (u = 0; u < ndims; u++)
-            HDfprintf(f, "%" PRIuHSIZE "%s", dinfo[u].stride, (u < (ndims - 1) ? ", " : "]\n"));
-        HDfprintf(f, "%s: %s: count=[", __func__, field);
+            fprintf(f, "%" PRIuHSIZE "%s", dinfo[u].stride, (u < (ndims - 1) ? ", " : "]\n"));
+        fprintf(f, "%s: %s: count=[", __func__, field);
         for (u = 0; u < ndims; u++)
-            HDfprintf(f, "%" PRIuHSIZE "%s", dinfo[u].count, (u < (ndims - 1) ? ", " : "]\n"));
-        HDfprintf(f, "%s: %s: block=[", __func__, field);
+            fprintf(f, "%" PRIuHSIZE "%s", dinfo[u].count, (u < (ndims - 1) ? ", " : "]\n"));
+        fprintf(f, "%s: %s: block=[", __func__, field);
         for (u = 0; u < ndims; u++)
-            HDfprintf(f, "%" PRIuHSIZE "%s", dinfo[u].block, (u < (ndims - 1) ? ", " : "]\n"));
+            fprintf(f, "%" PRIuHSIZE "%s", dinfo[u].block, (u < (ndims - 1) ? ", " : "]\n"));
     } /* end if */
     else
-        HDfprintf(f, "%s: %s==NULL\n", __func__, field);
+        fprintf(f, "%s: %s==NULL\n", __func__, field);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
@@ -413,32 +413,32 @@ H5S__hyper_print_spans_dfs(FILE *f, const H5S_hyper_span_info_t *span_lst, unsig
     } /* end while */
 
     for (u = 0; u < depth; u++)
-        HDfprintf(f, "\t");
-    HDfprintf(f, "DIM[%u]: ref_count=%u, #elems=%u, head=%p, tail=%p, actual_tail=%p, matched=%d\n", depth,
-              span_lst->count, num_elems, (void *)span_lst->head, (void *)span_lst->tail, (void *)actual_tail,
-              (span_lst->tail == actual_tail));
+        fprintf(f, "\t");
+    fprintf(f, "DIM[%u]: ref_count=%u, #elems=%u, head=%p, tail=%p, actual_tail=%p, matched=%d\n", depth,
+            span_lst->count, num_elems, (void *)span_lst->head, (void *)span_lst->tail, (void *)actual_tail,
+            (span_lst->tail == actual_tail));
 
     for (u = 0; u < depth; u++)
-        HDfprintf(f, "\t");
-    HDfprintf(f, "low_bounds=[");
+        fprintf(f, "\t");
+    fprintf(f, "low_bounds=[");
     for (u = 0; u < dims - 1; u++)
-        HDfprintf(f, "%" PRIuHSIZE ",", span_lst->low_bounds[u]);
-    HDfprintf(f, "%" PRIuHSIZE "]\n", span_lst->low_bounds[dims - 1]);
+        fprintf(f, "%" PRIuHSIZE ",", span_lst->low_bounds[u]);
+    fprintf(f, "%" PRIuHSIZE "]\n", span_lst->low_bounds[dims - 1]);
 
     for (u = 0; u < depth; u++)
-        HDfprintf(f, "\t");
-    HDfprintf(f, "high_bounds=[");
+        fprintf(f, "\t");
+    fprintf(f, "high_bounds=[");
     for (u = 0; u < dims - 1; u++)
-        HDfprintf(f, "%" PRIuHSIZE ",", span_lst->high_bounds[u]);
-    HDfprintf(f, "%" PRIuHSIZE "]\n", span_lst->high_bounds[dims - 1]);
+        fprintf(f, "%" PRIuHSIZE ",", span_lst->high_bounds[u]);
+    fprintf(f, "%" PRIuHSIZE "]\n", span_lst->high_bounds[dims - 1]);
 
     cur_elem = span_lst->head;
     elem_idx = 0;
     while (cur_elem) {
         for (u = 0; u < depth; u++)
-            HDfprintf(f, "\t");
-        HDfprintf(f, "ELEM[%u]: ptr=%p, low=%" PRIuHSIZE ", high=%" PRIuHSIZE ", down=%p\n", elem_idx++,
-                  (void *)cur_elem, cur_elem->low, cur_elem->high, (void *)cur_elem->down);
+            fprintf(f, "\t");
+        fprintf(f, "ELEM[%u]: ptr=%p, low=%" PRIuHSIZE ", high=%" PRIuHSIZE ", down=%p\n", elem_idx++,
+                (void *)cur_elem, cur_elem->low, cur_elem->high, (void *)cur_elem->down);
         if (cur_elem->down)
             H5S__hyper_print_spans_dfs(f, cur_elem->down, depth + 1, dims);
         cur_elem = cur_elem->next;
@@ -474,37 +474,37 @@ H5S__hyper_print_space_dfs(FILE *f, const H5S_t *space)
 
     assert(hslab);
 
-    HDfprintf(f, "=======================\n");
-    HDfprintf(f, "SPACE: span_lst=%p, #dims=%u, offset_changed=%d\n", (void *)hslab->span_lst, dims,
-              space->select.offset_changed);
+    fprintf(f, "=======================\n");
+    fprintf(f, "SPACE: span_lst=%p, #dims=%u, offset_changed=%d\n", (void *)hslab->span_lst, dims,
+            space->select.offset_changed);
 
-    HDfprintf(f, "       offset=[");
+    fprintf(f, "       offset=[");
     for (u = 0; u < dims - 1; u++)
-        HDfprintf(f, "%lld,", space->select.offset[u]);
-    HDfprintf(f, "%lld]\n", space->select.offset[dims - 1]);
+        fprintf(f, "%lld,", space->select.offset[u]);
+    fprintf(f, "%lld]\n", space->select.offset[dims - 1]);
 
-    HDfprintf(f, "       low_bounds=[");
+    fprintf(f, "       low_bounds=[");
     if (space->select.sel_info.hslab->diminfo_valid == H5S_DIMINFO_VALID_YES) {
         for (u = 0; u < dims - 1; u++)
-            HDfprintf(f, "%" PRIuHSIZE ",", space->select.sel_info.hslab->diminfo.low_bounds[u]);
-        HDfprintf(f, "%" PRIuHSIZE "]\n", space->select.sel_info.hslab->diminfo.low_bounds[dims - 1]);
+            fprintf(f, "%" PRIuHSIZE ",", space->select.sel_info.hslab->diminfo.low_bounds[u]);
+        fprintf(f, "%" PRIuHSIZE "]\n", space->select.sel_info.hslab->diminfo.low_bounds[dims - 1]);
     } /* end if */
     else {
         for (u = 0; u < dims - 1; u++)
-            HDfprintf(f, "%" PRIuHSIZE ",", space->select.sel_info.hslab->span_lst->low_bounds[u]);
-        HDfprintf(f, "%" PRIuHSIZE "]\n", space->select.sel_info.hslab->span_lst->low_bounds[dims - 1]);
+            fprintf(f, "%" PRIuHSIZE ",", space->select.sel_info.hslab->span_lst->low_bounds[u]);
+        fprintf(f, "%" PRIuHSIZE "]\n", space->select.sel_info.hslab->span_lst->low_bounds[dims - 1]);
     } /* end else */
 
-    HDfprintf(f, "       high_bounds=[");
+    fprintf(f, "       high_bounds=[");
     if (space->select.sel_info.hslab->diminfo_valid == H5S_DIMINFO_VALID_YES) {
         for (u = 0; u < dims - 1; u++)
-            HDfprintf(f, "%" PRIuHSIZE ",", space->select.sel_info.hslab->diminfo.high_bounds[u]);
-        HDfprintf(f, "%" PRIuHSIZE "]\n", space->select.sel_info.hslab->diminfo.high_bounds[dims - 1]);
+            fprintf(f, "%" PRIuHSIZE ",", space->select.sel_info.hslab->diminfo.high_bounds[u]);
+        fprintf(f, "%" PRIuHSIZE "]\n", space->select.sel_info.hslab->diminfo.high_bounds[dims - 1]);
     } /* end if */
     else {
         for (u = 0; u < dims - 1; u++)
-            HDfprintf(f, "%" PRIuHSIZE ",", space->select.sel_info.hslab->span_lst->high_bounds[u]);
-        HDfprintf(f, "%" PRIuHSIZE "]\n", space->select.sel_info.hslab->span_lst->high_bounds[dims - 1]);
+            fprintf(f, "%" PRIuHSIZE ",", space->select.sel_info.hslab->span_lst->high_bounds[u]);
+        fprintf(f, "%" PRIuHSIZE "]\n", space->select.sel_info.hslab->span_lst->high_bounds[dims - 1]);
     } /* end else */
 
     /* Print out diminfo, if it's valid */
@@ -514,7 +514,7 @@ H5S__hyper_print_space_dfs(FILE *f, const H5S_t *space)
     /* Start print out the highest-order of dimension */
     if (hslab->span_lst)
         H5S__hyper_print_spans_dfs(f, hslab->span_lst, 0, dims);
-    HDfprintf(f, "=======================\n\n");
+    fprintf(f, "=======================\n\n");
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5S__hyper_print_space_dfs() */
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index f0f55c4..417ade6 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -707,7 +707,7 @@ H5S__mpio_reg_hyper_type(H5S_t *space, size_t elmt_size, MPI_Datatype *new_type,
         rank = sel_iter->u.hyp.iter_rank;
 #ifdef H5S_DEBUG
         if (H5DEBUG(S))
-            HDfprintf(H5DEBUG(S), "%s: Flattened selection\n", __func__);
+            fprintf(H5DEBUG(S), "%s: Flattened selection\n", __func__);
 #endif
         for (u = 0; u < rank; ++u) {
             H5_CHECK_OVERFLOW(diminfo[u].start, hsize_t, hssize_t)
@@ -719,14 +719,14 @@ H5S__mpio_reg_hyper_type(H5S_t *space, size_t elmt_size, MPI_Datatype *new_type,
 
 #ifdef H5S_DEBUG
             if (H5DEBUG(S)) {
-                HDfprintf(H5DEBUG(S),
-                          "%s: start=%" PRIdHSIZE "  stride=%" PRIuHSIZE "  count=%" PRIuHSIZE
-                          "  block=%" PRIuHSIZE "  xtent=%" PRIuHSIZE,
-                          __func__, d[u].start, d[u].strid, d[u].count, d[u].block, d[u].xtent);
+                fprintf(H5DEBUG(S),
+                        "%s: start=%" PRIdHSIZE "  stride=%" PRIuHSIZE "  count=%" PRIuHSIZE
+                        "  block=%" PRIuHSIZE "  xtent=%" PRIuHSIZE,
+                        __func__, d[u].start, d[u].strid, d[u].count, d[u].block, d[u].xtent);
                 if (u == 0)
-                    HDfprintf(H5DEBUG(S), "  rank=%u\n", rank);
+                    fprintf(H5DEBUG(S), "  rank=%u\n", rank);
                 else
-                    HDfprintf(H5DEBUG(S), "\n");
+                    fprintf(H5DEBUG(S), "\n");
             }
 #endif
 
@@ -741,7 +741,7 @@ H5S__mpio_reg_hyper_type(H5S_t *space, size_t elmt_size, MPI_Datatype *new_type,
         rank = space->extent.rank;
 #ifdef H5S_DEBUG
         if (H5DEBUG(S))
-            HDfprintf(H5DEBUG(S), "%s: Non-flattened selection\n", __func__);
+            fprintf(H5DEBUG(S), "%s: Non-flattened selection\n", __func__);
 #endif
         for (u = 0; u < rank; ++u) {
             H5_CHECK_OVERFLOW(diminfo[u].start, hsize_t, hssize_t)
@@ -753,14 +753,14 @@ H5S__mpio_reg_hyper_type(H5S_t *space, size_t elmt_size, MPI_Datatype *new_type,
 
 #ifdef H5S_DEBUG
             if (H5DEBUG(S)) {
-                HDfprintf(H5DEBUG(S),
-                          "%s: start=%" PRIdHSIZE "  stride=%" PRIuHSIZE "  count=%" PRIuHSIZE
-                          "  block=%" PRIuHSIZE "  xtent=%" PRIuHSIZE,
-                          __func__, d[u].start, d[u].strid, d[u].count, d[u].block, d[u].xtent);
+                fprintf(H5DEBUG(S),
+                        "%s: start=%" PRIdHSIZE "  stride=%" PRIuHSIZE "  count=%" PRIuHSIZE
+                        "  block=%" PRIuHSIZE "  xtent=%" PRIuHSIZE,
+                        __func__, d[u].start, d[u].strid, d[u].count, d[u].block, d[u].xtent);
                 if (u == 0)
-                    HDfprintf(H5DEBUG(S), "  rank=%u\n", rank);
+                    fprintf(H5DEBUG(S), "  rank=%u\n", rank);
                 else
-                    HDfprintf(H5DEBUG(S), "\n");
+                    fprintf(H5DEBUG(S), "\n");
             }
 #endif
 
@@ -780,8 +780,8 @@ H5S__mpio_reg_hyper_type(H5S_t *space, size_t elmt_size, MPI_Datatype *new_type,
 #ifdef H5S_DEBUG
     if (H5DEBUG(S)) {
         i = ((int)rank) - 1;
-        HDfprintf(H5DEBUG(S), " offset[%2d]=%" PRIuHSIZE "; max_xtent[%2d]=%" PRIuHSIZE "\n", i, offset[i], i,
-                  max_xtent[i]);
+        fprintf(H5DEBUG(S), " offset[%2d]=%" PRIuHSIZE "; max_xtent[%2d]=%" PRIuHSIZE "\n", i, offset[i], i,
+                max_xtent[i]);
     }
 #endif
     for (i = ((int)rank) - 2; i >= 0; --i) {
@@ -789,8 +789,8 @@ H5S__mpio_reg_hyper_type(H5S_t *space, size_t elmt_size, MPI_Datatype *new_type,
         max_xtent[i] = max_xtent[i + 1] * d[i].xtent;
 #ifdef H5S_DEBUG
         if (H5DEBUG(S))
-            HDfprintf(H5DEBUG(S), " offset[%2d]=%" PRIuHSIZE "; max_xtent[%2d]=%" PRIuHSIZE "\n", i,
-                      offset[i], i, max_xtent[i]);
+            fprintf(H5DEBUG(S), " offset[%2d]=%" PRIuHSIZE "; max_xtent[%2d]=%" PRIuHSIZE "\n", i, offset[i],
+                    i, max_xtent[i]);
 #endif
     } /* end for */
 
@@ -805,9 +805,9 @@ H5S__mpio_reg_hyper_type(H5S_t *space, size_t elmt_size, MPI_Datatype *new_type,
  *******************************************************/
 #ifdef H5S_DEBUG
     if (H5DEBUG(S)) {
-        HDfprintf(H5DEBUG(S), "%s: Making contig type %zu MPI_BYTEs\n", __func__, elmt_size);
+        fprintf(H5DEBUG(S), "%s: Making contig type %zu MPI_BYTEs\n", __func__, elmt_size);
         for (i = ((int)rank) - 1; i >= 0; --i)
-            HDfprintf(H5DEBUG(S), "d[%d].xtent=%" PRIuHSIZE "\n", i, d[i].xtent);
+            fprintf(H5DEBUG(S), "d[%d].xtent=%" PRIuHSIZE "\n", i, d[i].xtent);
     }
 #endif
 
@@ -835,16 +835,16 @@ H5S__mpio_reg_hyper_type(H5S_t *space, size_t elmt_size, MPI_Datatype *new_type,
     for (i = ((int)rank) - 1; i >= 0; --i) {
 #ifdef H5S_DEBUG
         if (H5DEBUG(S))
-            HDfprintf(H5DEBUG(S),
-                      "%s: Dimension i=%d \n"
-                      "start=%" PRIdHSIZE " count=%" PRIuHSIZE " block=%" PRIuHSIZE " stride=%" PRIuHSIZE
-                      ", xtent=%" PRIuHSIZE " max_xtent=%" PRIuHSIZE "\n",
-                      __func__, i, d[i].start, d[i].count, d[i].block, d[i].strid, d[i].xtent, max_xtent[i]);
+            fprintf(H5DEBUG(S),
+                    "%s: Dimension i=%d \n"
+                    "start=%" PRIdHSIZE " count=%" PRIuHSIZE " block=%" PRIuHSIZE " stride=%" PRIuHSIZE
+                    ", xtent=%" PRIuHSIZE " max_xtent=%" PRIuHSIZE "\n",
+                    __func__, i, d[i].start, d[i].count, d[i].block, d[i].strid, d[i].xtent, max_xtent[i]);
 #endif
 
 #ifdef H5S_DEBUG
         if (H5DEBUG(S))
-            HDfprintf(H5DEBUG(S), "%s: i=%d  Making vector-type \n", __func__, i);
+            fprintf(H5DEBUG(S), "%s: i=%d  Making vector-type \n", __func__, i);
 #endif
         /****************************************
          * Build vector type of the selection.
@@ -981,8 +981,8 @@ done:
 
 #ifdef H5S_DEBUG
     if (H5DEBUG(S))
-        HDfprintf(H5DEBUG(S), "Leave %s, count=%d  is_derived_type=%s\n", __func__, *count,
-                  (*is_derived_type) ? "TRUE" : "FALSE");
+        fprintf(H5DEBUG(S), "Leave %s, count=%d  is_derived_type=%s\n", __func__, *count,
+                (*is_derived_type) ? "TRUE" : "FALSE");
 #endif
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S__mpio_reg_hyper_type() */
diff --git a/src/H5T.c b/src/H5T.c
index 2d8b2ec..0e75710 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1495,11 +1495,11 @@ H5T_top_term_package(void)
                                                 (size_t)0, (size_t)0, NULL, NULL, H5CX_get_dxpl()) < 0) {
 #ifdef H5T_DEBUG
                         if (H5DEBUG(T)) {
-                            HDfprintf(H5DEBUG(T),
-                                      "H5T: conversion function "
-                                      "0x%016zx failed to free private data for "
-                                      "%s (ignored)\n",
-                                      (size_t)path->conv.u.app_func, path->name);
+                            fprintf(H5DEBUG(T),
+                                    "H5T: conversion function "
+                                    "0x%016zx failed to free private data for "
+                                    "%s (ignored)\n",
+                                    (size_t)path->conv.u.app_func, path->name);
                         } /* end if */
 #endif
                         H5E_clear_stack(NULL); /*ignore the error*/
@@ -1510,11 +1510,11 @@ H5T_top_term_package(void)
                                                 (size_t)0, (size_t)0, NULL, NULL) < 0) {
 #ifdef H5T_DEBUG
                         if (H5DEBUG(T)) {
-                            HDfprintf(H5DEBUG(T),
-                                      "H5T: conversion function "
-                                      "0x%016zx failed to free private data for "
-                                      "%s (ignored)\n",
-                                      (size_t)path->conv.u.lib_func, path->name);
+                            fprintf(H5DEBUG(T),
+                                    "H5T: conversion function "
+                                    "0x%016zx failed to free private data for "
+                                    "%s (ignored)\n",
+                                    (size_t)path->conv.u.lib_func, path->name);
                         } /* end if */
 #endif
                         H5E_clear_stack(NULL); /*ignore the error*/
@@ -2625,10 +2625,10 @@ H5T__register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_con
                                                 (size_t)0, NULL, NULL, H5CX_get_dxpl()) < 0) {
 #ifdef H5T_DEBUG
                     if (H5DEBUG(T))
-                        HDfprintf(H5DEBUG(T),
-                                  "H5T: conversion function 0x%016zx "
-                                  "failed to free private data for %s (ignored)\n",
-                                  (size_t)old_path->conv.u.app_func, old_path->name);
+                        fprintf(H5DEBUG(T),
+                                "H5T: conversion function 0x%016zx "
+                                "failed to free private data for %s (ignored)\n",
+                                (size_t)old_path->conv.u.app_func, old_path->name);
 #endif
                 } /* end if */
             }     /* end if */
@@ -2636,10 +2636,10 @@ H5T__register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_con
                                                  (size_t)0, NULL, NULL) < 0) {
 #ifdef H5T_DEBUG
                 if (H5DEBUG(T))
-                    HDfprintf(H5DEBUG(T),
-                              "H5T: conversion function 0x%016zx "
-                              "failed to free private data for %s (ignored)\n",
-                              (size_t)old_path->conv.u.lib_func, old_path->name);
+                    fprintf(H5DEBUG(T),
+                            "H5T: conversion function 0x%016zx "
+                            "failed to free private data for %s (ignored)\n",
+                            (size_t)old_path->conv.u.lib_func, old_path->name);
 #endif
             } /* end if */
             (void)H5T_close_real(old_path->src);
@@ -2805,10 +2805,10 @@ H5T__unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_c
                                             (size_t)0, NULL, NULL, H5CX_get_dxpl()) < 0) {
 #ifdef H5T_DEBUG
                     if (H5DEBUG(T))
-                        HDfprintf(H5DEBUG(T),
-                                  "H5T: conversion function 0x%016zx failed "
-                                  "to free private data for %s (ignored)\n",
-                                  (size_t)path->conv.u.app_func, path->name);
+                        fprintf(H5DEBUG(T),
+                                "H5T: conversion function 0x%016zx failed "
+                                "to free private data for %s (ignored)\n",
+                                (size_t)path->conv.u.app_func, path->name);
 #endif
                 } /* end if */
             }     /* end if */
@@ -2816,10 +2816,10 @@ H5T__unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_c
                                              (size_t)0, NULL, NULL) < 0) {
 #ifdef H5T_DEBUG
                 if (H5DEBUG(T))
-                    HDfprintf(H5DEBUG(T),
-                              "H5T: conversion function 0x%016zx failed "
-                              "to free private data for %s (ignored)\n",
-                              (size_t)path->conv.u.lib_func, path->name);
+                    fprintf(H5DEBUG(T),
+                            "H5T: conversion function 0x%016zx failed "
+                            "to free private data for %s (ignored)\n",
+                            (size_t)path->conv.u.lib_func, path->name);
 #endif
             } /* end if */
             (void)H5T_close_real(path->src);
@@ -5036,7 +5036,7 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co
                            NULL, NULL) < 0) {
 #ifdef H5T_DEBUG
             if (H5DEBUG(T))
-                HDfprintf(H5DEBUG(T), "H5T: unable to initialize no-op conversion function (ignored)\n");
+                fprintf(H5DEBUG(T), "H5T: unable to initialize no-op conversion function (ignored)\n");
 #endif
             H5E_clear_stack(NULL); /*ignore the error*/
         }                          /* end if */
@@ -5221,8 +5221,8 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co
                                          (size_t)0, NULL, NULL, H5CX_get_dxpl()) < 0) {
 #ifdef H5T_DEBUG
                 if (H5DEBUG(T))
-                    HDfprintf(H5DEBUG(T), "H5T: conversion function 0x%016zx free failed for %s (ignored)\n",
-                              (size_t)path->conv.u.app_func, path->name);
+                    fprintf(H5DEBUG(T), "H5T: conversion function 0x%016zx free failed for %s (ignored)\n",
+                            (size_t)path->conv.u.app_func, path->name);
 #endif
                 H5E_clear_stack(NULL); /*ignore the failure*/
             }                          /* end if */
@@ -5231,8 +5231,8 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co
                                           (size_t)0, NULL, NULL) < 0) {
 #ifdef H5T_DEBUG
             if (H5DEBUG(T))
-                HDfprintf(H5DEBUG(T), "H5T: conversion function 0x%016zx free failed for %s (ignored)\n",
-                          (size_t)path->conv.u.lib_func, path->name);
+                fprintf(H5DEBUG(T), "H5T: conversion function 0x%016zx free failed for %s (ignored)\n",
+                        (size_t)path->conv.u.lib_func, path->name);
 #endif
             H5E_clear_stack(NULL); /*ignore the failure*/
         }                          /* end if */
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 937cad2..1835c11 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -1002,12 +1002,12 @@ done:
 #define CI_PRINT_STATS(STYPE, DTYPE)                                                                         \
     {                                                                                                        \
         if (H5DEBUG(T) && ((H5T_conv_hw_t *)cdata->priv)->s_aligned) {                                       \
-            HDfprintf(H5DEBUG(T), "      %zu src elements aligned on %zu-byte boundaries\n",                 \
-                      ((H5T_conv_hw_t *)cdata->priv)->s_aligned, H5T_NATIVE_##STYPE##_ALIGN_g);              \
+            fprintf(H5DEBUG(T), "      %zu src elements aligned on %zu-byte boundaries\n",                   \
+                    ((H5T_conv_hw_t *)cdata->priv)->s_aligned, H5T_NATIVE_##STYPE##_ALIGN_g);                \
         }                                                                                                    \
         if (H5DEBUG(T) && ((H5T_conv_hw_t *)cdata->priv)->d_aligned) {                                       \
-            HDfprintf(H5DEBUG(T), "      %zu dst elements aligned on %zu-byte boundaries\n",                 \
-                      ((H5T_conv_hw_t *)cdata->priv)->d_aligned, H5T_NATIVE_##DTYPE##_ALIGN_g);              \
+            fprintf(H5DEBUG(T), "      %zu dst elements aligned on %zu-byte boundaries\n",                   \
+                    ((H5T_conv_hw_t *)cdata->priv)->d_aligned, H5T_NATIVE_##DTYPE##_ALIGN_g);                \
         }                                                                                                    \
     }
 
@@ -2869,9 +2869,8 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, si
         case H5T_CONV_FREE:
 #ifdef H5T_DEBUG
             if (H5DEBUG(T)) {
-                HDfprintf(H5DEBUG(T), "      Using %s mapping function%s\n",
-                          priv->length ? "O(1)" : "O(log N)",
-                          priv->length ? "" : ", where N is the number of enum members");
+                fprintf(H5DEBUG(T), "      Using %s mapping function%s\n", priv->length ? "O(1)" : "O(log N)",
+                        priv->length ? "" : ", where N is the number of enum members");
             }
 #endif
             if (priv) {
diff --git a/src/H5Tdbg.c b/src/H5Tdbg.c
index 2f14a0f..52c70b9 100644
--- a/src/H5Tdbg.c
+++ b/src/H5Tdbg.c
@@ -99,11 +99,11 @@ H5T__print_stats(H5T_path_t H5_ATTR_UNUSED *path, int H5_ATTR_UNUSED *nprint /*i
                       H5_timer_get_time_string(path->stats.times.elapsed)};
 
         if (nprint && 0 == (*nprint)++) {
-            HDfprintf(H5DEBUG(T), "H5T: type conversion statistics:\n");
-            HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n", "Conversion", "Elmts", "Calls",
-                      "User", "System", "Elapsed", "Bandwidth");
-            HDfprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n", "----------", "-----", "-----",
-                      "----", "------", "-------", "---------");
+            fprintf(H5DEBUG(T), "H5T: type conversion statistics:\n");
+            fprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n", "Conversion", "Elmts", "Calls",
+                    "User", "System", "Elapsed", "Bandwidth");
+            fprintf(H5DEBUG(T), "   %-16s %10s %10s %8s %8s %8s %10s\n", "----------", "-----", "-----",
+                    "----", "------", "-------", "---------");
         } /* end if */
 
         if (path->src && path->dst)
@@ -116,9 +116,9 @@ H5T__print_stats(H5T_path_t H5_ATTR_UNUSED *path, int H5_ATTR_UNUSED *nprint /*i
             nbytes = 0;
         nbytes *= path->stats.nelmts;
         H5_bandwidth(bandwidth, sizeof(bandwidth), (double)nbytes, path->stats.times.elapsed);
-        HDfprintf(H5DEBUG(T), "   %-16s %10" PRIdHSIZE " %10u %8s %8s %8s %10s\n", path->name,
-                  path->stats.nelmts, path->stats.ncalls, timestrs.user, timestrs.system, timestrs.elapsed,
-                  bandwidth);
+        fprintf(H5DEBUG(T), "   %-16s %10" PRIdHSIZE " %10u %8s %8s %8s %10s\n", path->name,
+                path->stats.nelmts, path->stats.ncalls, timestrs.user, timestrs.system, timestrs.elapsed,
+                bandwidth);
         HDfree(timestrs.user);
         HDfree(timestrs.system);
         HDfree(timestrs.elapsed);
@@ -227,7 +227,7 @@ H5T_debug(const H5T_t *dt, FILE *stream)
             assert(0 && "This Should never be executed!");
     } /* end switch */
 
-    HDfprintf(stream, "%s%s {nbytes=%lu", s1, s2, (unsigned long)(dt->shared->size));
+    fprintf(stream, "%s%s {nbytes=%lu", s1, s2, (unsigned long)(dt->shared->size));
 
     if (H5T_IS_ATOMIC(dt->shared)) {
         uint64_t tmp;
@@ -259,12 +259,12 @@ H5T_debug(const H5T_t *dt, FILE *stream)
                 break;
         } /* end switch */
 
-        HDfprintf(stream, ", %s", s1);
+        fprintf(stream, ", %s", s1);
 
         if (dt->shared->u.atomic.offset)
-            HDfprintf(stream, ", offset=%lu", (unsigned long)(dt->shared->u.atomic.offset));
+            fprintf(stream, ", offset=%lu", (unsigned long)(dt->shared->u.atomic.offset));
         if (dt->shared->u.atomic.prec != 8 * dt->shared->size)
-            HDfprintf(stream, ", prec=%lu", (unsigned long)(dt->shared->u.atomic.prec));
+            fprintf(stream, ", prec=%lu", (unsigned long)(dt->shared->u.atomic.prec));
 
         switch (dt->shared->type) {
             case H5T_NO_CLASS:
@@ -292,7 +292,7 @@ H5T_debug(const H5T_t *dt, FILE *stream)
 
                 } /* end switch */
                 if (s1)
-                    HDfprintf(stream, ", %s", s1);
+                    fprintf(stream, ", %s", s1);
                 break;
 
             case H5T_FLOAT:
@@ -318,20 +318,20 @@ H5T_debug(const H5T_t *dt, FILE *stream)
                         break;
                 } /* end switch */
 
-                HDfprintf(stream, ", sign=%lu+1", (unsigned long)(dt->shared->u.atomic.u.f.sign));
-                HDfprintf(stream, ", mant=%lu+%lu (%s)", (unsigned long)(dt->shared->u.atomic.u.f.mpos),
-                          (unsigned long)(dt->shared->u.atomic.u.f.msize), s1);
-                HDfprintf(stream, ", exp=%lu+%lu", (unsigned long)(dt->shared->u.atomic.u.f.epos),
-                          (unsigned long)(dt->shared->u.atomic.u.f.esize));
+                fprintf(stream, ", sign=%lu+1", (unsigned long)(dt->shared->u.atomic.u.f.sign));
+                fprintf(stream, ", mant=%lu+%lu (%s)", (unsigned long)(dt->shared->u.atomic.u.f.mpos),
+                        (unsigned long)(dt->shared->u.atomic.u.f.msize), s1);
+                fprintf(stream, ", exp=%lu+%lu", (unsigned long)(dt->shared->u.atomic.u.f.epos),
+                        (unsigned long)(dt->shared->u.atomic.u.f.esize));
                 tmp = dt->shared->u.atomic.u.f.ebias >> 32;
                 if (tmp) {
                     size_t hi = (size_t)tmp;
                     size_t lo = (size_t)(dt->shared->u.atomic.u.f.ebias & 0xffffffff);
-                    HDfprintf(stream, " bias=0x%08lx%08lx", (unsigned long)hi, (unsigned long)lo);
+                    fprintf(stream, " bias=0x%08lx%08lx", (unsigned long)hi, (unsigned long)lo);
                 }
                 else {
                     size_t lo = (size_t)(dt->shared->u.atomic.u.f.ebias & 0xffffffff);
-                    HDfprintf(stream, " bias=0x%08lx", (unsigned long)lo);
+                    fprintf(stream, " bias=0x%08lx", (unsigned long)lo);
                 }
                 break;
 
@@ -353,12 +353,12 @@ H5T_debug(const H5T_t *dt, FILE *stream)
     else if (H5T_COMPOUND == dt->shared->type) {
         /* Compound data type */
         for (i = 0; i < dt->shared->u.compnd.nmembs; i++) {
-            HDfprintf(stream, "\n\"%s\" @%lu", dt->shared->u.compnd.memb[i].name,
-                      (unsigned long)(dt->shared->u.compnd.memb[i].offset));
-            HDfprintf(stream, " ");
+            fprintf(stream, "\n\"%s\" @%lu", dt->shared->u.compnd.memb[i].name,
+                    (unsigned long)(dt->shared->u.compnd.memb[i].offset));
+            fprintf(stream, " ");
             H5T_debug(dt->shared->u.compnd.memb[i].type, stream);
         } /* end for */
-        HDfprintf(stream, "\n");
+        fprintf(stream, "\n");
     }
     else if (H5T_VLEN == dt->shared->type) {
         switch (dt->shared->u.vlen.loc) {
@@ -367,54 +367,53 @@ H5T_debug(const H5T_t *dt, FILE *stream)
                 break;
 
             case H5T_LOC_MEMORY:
-                HDfprintf(stream, ", loc=memory");
+                fprintf(stream, ", loc=memory");
                 break;
 
             case H5T_LOC_DISK:
-                HDfprintf(stream, ", loc=disk");
+                fprintf(stream, ", loc=disk");
                 break;
 
             case H5T_LOC_MAXLOC:
             default:
-                HDfprintf(stream, ", loc=UNKNOWN");
+                fprintf(stream, ", loc=UNKNOWN");
                 break;
         } /* end switch */
 
         if (H5T_IS_VL_STRING(dt->shared))
             /* Variable length string datatype */
-            HDfprintf(stream, ", variable-length");
+            fprintf(stream, ", variable-length");
         else {
             /* Variable length sequence datatype */
-            HDfprintf(stream, " VLEN ");
+            fprintf(stream, " VLEN ");
             H5T_debug(dt->shared->parent, stream);
-            HDfprintf(stream, "\n");
+            fprintf(stream, "\n");
         } /* end else */
     }
     else if (H5T_ENUM == dt->shared->type) {
         size_t base_size;
 
         /* Enumeration data type */
-        HDfprintf(stream, " ");
+        fprintf(stream, " ");
         H5T_debug(dt->shared->parent, stream);
         base_size = dt->shared->parent->shared->size;
         for (i = 0; i < dt->shared->u.enumer.nmembs; i++) {
             size_t k;
 
-            HDfprintf(stream, "\n\"%s\" = 0x", dt->shared->u.enumer.name[i]);
+            fprintf(stream, "\n\"%s\" = 0x", dt->shared->u.enumer.name[i]);
             for (k = 0; k < base_size; k++)
-                HDfprintf(stream, "%02" PRIx8,
-                          *((uint8_t *)dt->shared->u.enumer.value + (i * base_size) + k));
+                fprintf(stream, "%02" PRIx8, *((uint8_t *)dt->shared->u.enumer.value + (i * base_size) + k));
         } /* end for */
-        HDfprintf(stream, "\n");
+        fprintf(stream, "\n");
     }
     else if (H5T_OPAQUE == dt->shared->type) {
-        HDfprintf(stream, ", tag=\"%s\"", dt->shared->u.opaque.tag);
+        fprintf(stream, ", tag=\"%s\"", dt->shared->u.opaque.tag);
     }
     else {
         /* Unknown */
-        HDfprintf(stream, "unknown class %d\n", (int)(dt->shared->type));
+        fprintf(stream, "unknown class %d\n", (int)(dt->shared->type));
     }
-    HDfprintf(stream, "}");
+    fprintf(stream, "}");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Tref.c b/src/H5Tref.c
index 39e4774..37b3604 100644
--- a/src/H5Tref.c
+++ b/src/H5Tref.c
@@ -46,9 +46,9 @@
 #ifdef H5T_REF_DEBUG
 #define H5T_REF_LOG_DEBUG(...)                                                                               \
     do {                                                                                                     \
-        HDfprintf(stdout, " # %s(): ", __func__);                                                            \
-        HDfprintf(stdout, __VA_ARGS__);                                                                      \
-        HDfprintf(stdout, "\n");                                                                             \
+        fprintf(stdout, " # %s(): ", __func__);                                                              \
+        fprintf(stdout, __VA_ARGS__);                                                                        \
+        fprintf(stdout, "\n");                                                                               \
         HDfflush(stdout);                                                                                    \
     } while (0)
 #else
diff --git a/src/H5Z.c b/src/H5Z.c
index dcb2d36..36aa04d 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -154,12 +154,12 @@ H5Z_term_package(void)
 
                 if (0 == nprint++) {
                     /* Print column headers */
-                    HDfprintf(H5DEBUG(Z), "H5Z: filter statistics "
-                                          "accumulated over life of library:\n");
-                    HDfprintf(H5DEBUG(Z), "   %-16s %10s %10s %8s %8s %8s %10s\n", "Filter", "Total",
-                              "Errors", "User", "System", "Elapsed", "Bandwidth");
-                    HDfprintf(H5DEBUG(Z), "   %-16s %10s %10s %8s %8s %8s %10s\n", "------", "-----",
-                              "------", "----", "------", "-------", "---------");
+                    fprintf(H5DEBUG(Z), "H5Z: filter statistics "
+                                        "accumulated over life of library:\n");
+                    fprintf(H5DEBUG(Z), "   %-16s %10s %10s %8s %8s %8s %10s\n", "Filter", "Total", "Errors",
+                            "User", "System", "Elapsed", "Bandwidth");
+                    fprintf(H5DEBUG(Z), "   %-16s %10s %10s %8s %8s %8s %10s\n", "------", "-----", "------",
+                            "----", "------", "-------", "---------");
                 } /* end if */
 
                 /* Truncate the comment to fit in the field */
@@ -175,10 +175,10 @@ H5Z_term_package(void)
                              H5Z_stat_table_g[i].stats[dir].times.elapsed);
 
                 /* Print the statistics */
-                HDfprintf(H5DEBUG(Z), "   %s%-15s %10" PRIdHSIZE " %10" PRIdHSIZE " %8s %8s %8s %10s\n",
-                          (dir ? "<" : ">"), comment, H5Z_stat_table_g[i].stats[dir].total,
-                          H5Z_stat_table_g[i].stats[dir].errors, timestrs.user, timestrs.system,
-                          timestrs.elapsed, bandwidth);
+                fprintf(H5DEBUG(Z), "   %s%-15s %10" PRIdHSIZE " %10" PRIdHSIZE " %8s %8s %8s %10s\n",
+                        (dir ? "<" : ">"), comment, H5Z_stat_table_g[i].stats[dir].total,
+                        H5Z_stat_table_g[i].stats[dir].errors, timestrs.user, timestrs.system,
+                        timestrs.elapsed, bandwidth);
 next:
                 HDfree(timestrs.user);
                 HDfree(timestrs.system);
diff --git a/src/H5dbg.c b/src/H5dbg.c
index ddf33ad..ed517ad 100644
--- a/src/H5dbg.c
+++ b/src/H5dbg.c
@@ -87,24 +87,24 @@ H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf, const uint8_t *mark
     /*
      * Print the buffer in a VMS-style octal dump.
      */
-    HDfprintf(stream, "%*sData follows (`__' indicates free region)...\n", indent, "");
+    fprintf(stream, "%*sData follows (`__' indicates free region)...\n", indent, "");
     for (u = 0; u < buf_size; u += 16) {
         uint8_t c;
 
-        HDfprintf(stream, "%*s %8zu: ", indent, "", u + buf_offset);
+        fprintf(stream, "%*s %8zu: ", indent, "", u + buf_offset);
 
         /* Print the hex values */
         for (v = 0; v < 16; v++) {
             if (u + v < buf_size) {
                 if (marker[u + v])
-                    HDfprintf(stream, "__ ");
+                    fprintf(stream, "__ ");
                 else {
                     c = buf[buf_offset + u + v];
-                    HDfprintf(stream, "%02x ", c);
+                    fprintf(stream, "%02x ", c);
                 } /* end else */
             }     /* end if */
             else
-                HDfprintf(stream, "   ");
+                fprintf(stream, "   ");
 
             if (7 == v)
                 HDfputc(' ', stream);
diff --git a/src/H5private.h b/src/H5private.h
index d8c8aee..f14b54b 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -742,9 +742,6 @@ H5_DLL H5_ATTR_CONST int Nflock(int fd, int operation);
 #ifndef HDfopen
 #define HDfopen(S, M) fopen(S, M)
 #endif
-#ifndef HDfprintf
-#define HDfprintf fprintf
-#endif
 #ifndef HDfputc
 #define HDfputc(C, F) fputc(C, F)
 #endif
@@ -949,9 +946,6 @@ H5_DLL H5_ATTR_CONST int Nflock(int fd, int operation);
 #ifndef HDpread
 #define HDpread(F, B, C, O) pread(F, B, C, O)
 #endif
-#ifndef HDprintf
-#define HDprintf printf /*varargs*/
-#endif
 #ifndef HDputc
 #define HDputc(C, F) putc(C, F)
 #endif
diff --git a/src/H5system.c b/src/H5system.c
index e9cfd79..7a76723 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -1272,7 +1272,7 @@ H5_get_option(int argc, const char *const *argv, const char *opts, const struct
                         }
                         else if (l_opts[i].has_arg == require_arg) {
                             if (H5_opterr)
-                                HDfprintf(stderr, "%s: option required for \"--%s\" flag\n", argv[0], arg);
+                                fprintf(stderr, "%s: option required for \"--%s\" flag\n", argv[0], arg);
 
                             optchar = '?';
                         }
@@ -1281,7 +1281,7 @@ H5_get_option(int argc, const char *const *argv, const char *opts, const struct
                 else {
                     if (H5_optarg) {
                         if (H5_opterr)
-                            HDfprintf(stderr, "%s: no option required for \"%s\" flag\n", argv[0], arg);
+                            fprintf(stderr, "%s: no option required for \"%s\" flag\n", argv[0], arg);
 
                         optchar = '?';
                     }
@@ -1293,7 +1293,7 @@ H5_get_option(int argc, const char *const *argv, const char *opts, const struct
         if (l_opts && l_opts[i].name == NULL) {
             /* exhausted all of the l_opts we have and still didn't match */
             if (H5_opterr)
-                HDfprintf(stderr, "%s: unknown option \"%s\"\n", argv[0], arg);
+                fprintf(stderr, "%s: unknown option \"%s\"\n", argv[0], arg);
 
             optchar = '?';
         }
@@ -1311,7 +1311,7 @@ H5_get_option(int argc, const char *const *argv, const char *opts, const struct
 
         if (optchar == ':' || (cp = HDstrchr(opts, optchar)) == 0) {
             if (H5_opterr)
-                HDfprintf(stderr, "%s: unknown option \"%c\"\n", argv[0], optchar);
+                fprintf(stderr, "%s: unknown option \"%c\"\n", argv[0], optchar);
 
             /* if no chars left in this token, move to next token */
             if (argv[H5_optind][++sp] == '\0') {
@@ -1329,7 +1329,7 @@ H5_get_option(int argc, const char *const *argv, const char *opts, const struct
             }
             else if (++H5_optind >= argc) {
                 if (H5_opterr)
-                    HDfprintf(stderr, "%s: value expected for option \"%c\"\n", argv[0], optchar);
+                    fprintf(stderr, "%s: value expected for option \"%c\"\n", argv[0], optchar);
 
                 optchar = '?';
             }
diff --git a/test/API/H5_api_async_test.c b/test/API/H5_api_async_test.c
index 3d676c0..4afea50 100644
--- a/test/API/H5_api_async_test.c
+++ b/test/API/H5_api_async_test.c
@@ -73,8 +73,7 @@ test_one_dataset_io(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, dataset, or flush aren't supported with this connector\n");
+        printf("    API functions for basic file, dataset, or flush aren't supported with this connector\n");
         return 0;
     }
 
@@ -135,7 +134,7 @@ test_one_dataset_io(void)
                 for (j = 0; j < 10; j++)
                     if (wbuf[i][j] != rbuf[i][j]) {
                         H5_FAILED();
-                        HDprintf("    data verification failed\n");
+                        printf("    data verification failed\n");
                         PART_ERROR(single_dset_eswait);
                     } /* end if */
 
@@ -177,7 +176,7 @@ test_one_dataset_io(void)
                 for (j = 0; j < 10; j++)
                     if (wbuf[i][j] != rbuf[i][j]) {
                         H5_FAILED();
-                        HDprintf("    data verification failed\n");
+                        printf("    data verification failed\n");
                         PART_ERROR(single_dset_dclose);
                     } /* end if */
 
@@ -222,7 +221,7 @@ test_one_dataset_io(void)
                 for (j = 0; j < 10; j++)
                     if (wbuf[i][j] != rbuf[i][j]) {
                         H5_FAILED();
-                        HDprintf("    data verification failed\n");
+                        printf("    data verification failed\n");
                         PART_ERROR(single_dset_dflush);
                     } /* end if */
 
@@ -276,7 +275,7 @@ test_one_dataset_io(void)
                 for (j = 0; j < 10; j++)
                     if (wbuf[i][j] != rbuf[i][j]) {
                         H5_FAILED();
-                        HDprintf("    data verification failed\n");
+                        printf("    data verification failed\n");
                         PART_ERROR(single_dset_fclose);
                     } /* end if */
 
@@ -341,8 +340,7 @@ test_multi_dataset_io(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, dataset, or flush aren't supported with this connector\n");
+        printf("    API functions for basic file, dataset, or flush aren't supported with this connector\n");
         return 0;
     }
 
@@ -432,7 +430,7 @@ test_multi_dataset_io(void)
                     for (k = 0; k < 10; k++)
                         if (wbuf[i][j][k] != rbuf[i][j][k]) {
                             H5_FAILED();
-                            HDprintf("    data verification failed\n");
+                            printf("    data verification failed\n");
                             PART_ERROR(multi_dset_open);
                         } /* end if */
 
@@ -526,7 +524,7 @@ test_multi_dataset_io(void)
                     for (k = 0; k < 10; k++)
                         if (wbuf[i][j][k] != rbuf[i][j][k]) {
                             H5_FAILED();
-                            HDprintf("    data verification failed\n");
+                            printf("    data verification failed\n");
                             PART_ERROR(multi_dset_close);
                         } /* end if */
 
@@ -596,8 +594,7 @@ test_multi_file_dataset_io(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, dataset, or flush aren't supported with this connector\n");
+        printf("    API functions for basic file, dataset, or flush aren't supported with this connector\n");
         return 0;
     }
 
@@ -673,7 +670,7 @@ test_multi_file_dataset_io(void)
                     for (k = 0; k < 10; k++)
                         if (wbuf[i][j][k] != rbuf[i][j][k]) {
                             H5_FAILED();
-                            HDprintf("    data verification failed\n");
+                            printf("    data verification failed\n");
                             PART_ERROR(multi_file_dset_open);
                         } /* end if */
 
@@ -744,7 +741,7 @@ test_multi_file_dataset_io(void)
                     for (k = 0; k < 10; k++)
                         if (wbuf[i][j][k] != rbuf[i][j][k]) {
                             H5_FAILED();
-                            HDprintf("    data verification failed\n");
+                            printf("    data verification failed\n");
                             PART_ERROR(multi_file_dset_dclose);
                         } /* end if */
 
@@ -838,7 +835,7 @@ test_multi_file_dataset_io(void)
                     for (k = 0; k < 10; k++)
                         if (wbuf[i][j][k] != rbuf[i][j][k]) {
                             H5_FAILED();
-                            HDprintf("    data verification failed\n");
+                            printf("    data verification failed\n");
                             PART_ERROR(multi_file_dset_fclose);
                         } /* end if */
 
@@ -907,8 +904,7 @@ test_multi_file_grp_dset_io(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -1028,7 +1024,7 @@ test_multi_file_grp_dset_io(void)
                     for (k = 0; k < 10; k++)
                         if (wbuf[i][j][k] != rbuf[i][j][k]) {
                             H5_FAILED();
-                            HDprintf("    data verification failed\n");
+                            printf("    data verification failed\n");
                             PART_ERROR(multi_file_grp_dset_no_kick);
                         } /* end if */
 
@@ -1149,7 +1145,7 @@ test_multi_file_grp_dset_io(void)
                     for (k = 0; k < 10; k++)
                         if (wbuf[i][j][k] != rbuf[i][j][k]) {
                             H5_FAILED();
-                            HDprintf("    data verification failed\n");
+                            printf("    data verification failed\n");
                             PART_ERROR(multi_file_grp_dset_kick);
                         } /* end if */
 
@@ -1224,8 +1220,8 @@ test_set_extent(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, dataset, dataset more, or flush aren't supported with "
-                 "this connector\n");
+        printf("    API functions for basic file, dataset, dataset more, or flush aren't supported with "
+               "this connector\n");
         return 0;
     }
 
@@ -1428,8 +1424,8 @@ test_attribute_exists(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -1549,8 +1545,8 @@ test_attribute_io(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -1691,7 +1687,7 @@ test_attribute_io_tconv(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, attribute, or flush aren't supported with this connector\n");
         return 0;
     }
@@ -1837,7 +1833,7 @@ test_attribute_io_compound(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, attribute, or flush aren't supported with this connector\n");
         return 0;
     }
@@ -2143,8 +2139,8 @@ test_group(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or group more aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, or group more aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -2314,8 +2310,8 @@ test_link(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, link, hard link, soft link, flush, or creation order "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, link, hard link, soft link, flush, or creation order "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -2505,8 +2501,8 @@ test_ocopy_orefresh(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, object more, flush, or refresh aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, object more, flush, or refresh aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -2615,7 +2611,7 @@ test_file_reopen(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or file more aren't supported with this connector\n");
+        printf("    API functions for basic file or file more aren't supported with this connector\n");
         return 0;
     }
 
@@ -2691,16 +2687,16 @@ H5_api_async_test(void)
     size_t i;
     int    nerrors;
 
-    HDprintf("**********************************************\n");
-    HDprintf("*                                            *\n");
-    HDprintf("*             API Async Tests                *\n");
-    HDprintf("*                                            *\n");
-    HDprintf("**********************************************\n\n");
+    printf("**********************************************\n");
+    printf("*                                            *\n");
+    printf("*             API Async Tests                *\n");
+    printf("*                                            *\n");
+    printf("**********************************************\n\n");
 
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_ASYNC)) {
         SKIPPED();
-        HDprintf("    Async APIs aren't supported with this connector\n");
+        printf("    Async APIs aren't supported with this connector\n");
         return 0;
     }
 
@@ -2708,9 +2704,9 @@ H5_api_async_test(void)
         nerrors += (*async_tests[i])() ? 1 : 0;
     }
 
-    HDprintf("\n");
+    printf("\n");
 
-    HDprintf("Cleaning up testing files\n");
+    printf("Cleaning up testing files\n");
     cleanup_files();
 
     return nerrors;
@@ -2721,13 +2717,13 @@ H5_api_async_test(void)
 int
 H5_api_async_test(void)
 {
-    HDprintf("**********************************************\n");
-    HDprintf("*                                            *\n");
-    HDprintf("*             API Async Tests                *\n");
-    HDprintf("*                                            *\n");
-    HDprintf("**********************************************\n\n");
+    printf("**********************************************\n");
+    printf("*                                            *\n");
+    printf("*             API Async Tests                *\n");
+    printf("*                                            *\n");
+    printf("**********************************************\n\n");
 
-    HDprintf("SKIPPED due to no async support in HDF5 library\n");
+    printf("SKIPPED due to no async support in HDF5 library\n");
 
     return 0;
 }
diff --git a/test/API/H5_api_attribute_test.c b/test/API/H5_api_attribute_test.c
index f1409a4..84ddbb0 100644
--- a/test/API/H5_api_attribute_test.c
+++ b/test/API/H5_api_attribute_test.c
@@ -126,7 +126,7 @@ test_create_attribute_on_root(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or attribute aren't supported with this connector\n");
+        printf("    API functions for basic file or attribute aren't supported with this connector\n");
         return 0;
     }
 
@@ -134,7 +134,7 @@ test_create_attribute_on_root(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
@@ -157,22 +157,22 @@ test_create_attribute_on_root(void)
             if ((attr_id = H5Acreate2(file_id, ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME, attr_dtype1, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s' using H5Acreate\n",
-                         ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME);
+                printf("    couldn't create attribute '%s' using H5Acreate\n",
+                       ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME);
                 PART_ERROR(H5Acreate2);
             }
 
             /* Verify the attribute has been created */
             if ((attr_exists = H5Aexists(file_id, ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME);
                 PART_ERROR(H5Acreate2);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME);
+                printf("    attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME);
                 PART_ERROR(H5Acreate2);
             }
 
@@ -187,21 +187,21 @@ test_create_attribute_on_root(void)
             if ((attr_id2 = H5Acreate_by_name(file_id, "/", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2, attr_dtype2,
                                               space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute on root group using H5Acreate_by_name\n");
+                printf("    couldn't create attribute on root group using H5Acreate_by_name\n");
                 PART_ERROR(H5Acreate_by_name);
             }
 
             /* Verify the attribute has been created */
             if ((attr_exists = H5Aexists(file_id, ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2);
                 PART_ERROR(H5Acreate_by_name);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2);
+                printf("    attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2);
                 PART_ERROR(H5Acreate_by_name);
             }
 
@@ -269,8 +269,8 @@ test_create_attribute_on_dataset(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or attribute aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, dataset, or attribute aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -278,20 +278,20 @@ test_create_attribute_on_dataset(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_ON_DATASET_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_CREATE_ON_DATASET_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_CREATE_ON_DATASET_GROUP_NAME);
         goto error;
     }
 
@@ -312,7 +312,7 @@ test_create_attribute_on_dataset(void)
     if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_CREATE_ON_DATASET_DSET_NAME, dset_dtype, dset_space_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset\n");
+        printf("    couldn't create dataset\n");
         goto error;
     }
 
@@ -327,21 +327,21 @@ test_create_attribute_on_dataset(void)
             if ((attr_id = H5Acreate2(dset_id, ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME, attr_dtype1,
                                       attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute\n");
+                printf("    couldn't create attribute\n");
                 PART_ERROR(H5Acreate_on_dataset);
             }
 
             /* Verify the attribute has been created */
             if ((attr_exists = H5Aexists(dset_id, ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME);
                 PART_ERROR(H5Acreate_on_dataset);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME);
+                printf("    attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME);
                 PART_ERROR(H5Acreate_on_dataset);
             }
 
@@ -357,21 +357,21 @@ test_create_attribute_on_dataset(void)
                                               ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2, attr_dtype2,
                                               attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute on dataset by name\n");
+                printf("    couldn't create attribute on dataset by name\n");
                 PART_ERROR(H5Acreate_by_name_on_dataset);
             }
 
             /* Verify the attribute has been created */
             if ((attr_exists = H5Aexists(dset_id, ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2);
                 PART_ERROR(H5Acreate_by_name_on_dataset);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2);
+                printf("    attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2);
                 PART_ERROR(H5Acreate_by_name_on_dataset);
             }
 
@@ -453,8 +453,8 @@ test_create_attribute_on_datatype(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, stored datatype, or attribute aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, stored datatype, or attribute aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -462,33 +462,33 @@ test_create_attribute_on_datatype(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_ON_DATATYPE_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_CREATE_ON_DATATYPE_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_CREATE_ON_DATATYPE_GROUP_NAME);
         goto error;
     }
 
     if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype\n");
+        printf("    couldn't create datatype\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, ATTRIBUTE_CREATE_ON_DATATYPE_DTYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT,
                    H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype\n");
+        printf("    couldn't commit datatype\n");
         goto error;
     }
 
@@ -511,19 +511,19 @@ test_create_attribute_on_datatype(void)
             if ((attr_id = H5Acreate2(type_id, ATTRIBUTE_CREATE_ON_DATATYPE_ATTR_NAME, attr_dtype1, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute on datatype using H5Acreate\n");
+                printf("    couldn't create attribute on datatype using H5Acreate\n");
                 PART_ERROR(H5Acreate_on_datatype);
             }
 
             if ((attr_exists = H5Aexists(type_id, ATTRIBUTE_CREATE_ON_DATATYPE_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute exists\n");
+                printf("    couldn't determine if attribute exists\n");
                 PART_ERROR(H5Acreate_on_datatype);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute did not exist\n");
+                printf("    attribute did not exist\n");
                 PART_ERROR(H5Acreate_on_datatype);
             }
 
@@ -539,20 +539,20 @@ test_create_attribute_on_datatype(void)
                                               ATTRIBUTE_CREATE_ON_DATATYPE_ATTR_NAME2, attr_dtype2, space_id,
                                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute on datatype using H5Acreate_by_name\n");
+                printf("    couldn't create attribute on datatype using H5Acreate_by_name\n");
                 PART_ERROR(H5Acreate_by_name_on_datatype);
             }
 
             /* Verify the attribute has been created */
             if ((attr_exists = H5Aexists(type_id, ATTRIBUTE_CREATE_ON_DATATYPE_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute exists\n");
+                printf("    couldn't determine if attribute exists\n");
                 PART_ERROR(H5Acreate_by_name_on_datatype);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute did not exist\n");
+                printf("    attribute did not exist\n");
                 PART_ERROR(H5Acreate_by_name_on_datatype);
             }
 
@@ -625,27 +625,27 @@ test_create_attribute_with_null_space(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_SUBGROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup\n");
+        printf("    couldn't create container subgroup\n");
         goto error;
     }
 
@@ -658,20 +658,20 @@ test_create_attribute_with_null_space(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_ATTR_NAME, attr_dtype, space_id,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -680,7 +680,7 @@ test_create_attribute_with_null_space(void)
 
     if ((attr_id = H5Aopen(group_id, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open attribute\n");
+        printf("    couldn't open attribute\n");
         goto error;
     }
 
@@ -736,27 +736,27 @@ test_create_attribute_with_scalar_space(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_SUBGROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup\n");
+        printf("    couldn't create container subgroup\n");
         goto error;
     }
 
@@ -769,20 +769,20 @@ test_create_attribute_with_scalar_space(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_ATTR_NAME, attr_dtype,
                               space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -791,7 +791,7 @@ test_create_attribute_with_scalar_space(void)
 
     if ((attr_id = H5Aopen(group_id, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open attribute\n");
+        printf("    couldn't open attribute\n");
         goto error;
     }
 
@@ -849,28 +849,27 @@ test_create_attribute_with_space_in_name(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n",
-                 ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_GROUP_NAME);
         goto error;
     }
 
@@ -884,20 +883,20 @@ test_create_attribute_with_space_in_name(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_ATTR_NAME, attr_dtype, space_id,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -953,7 +952,7 @@ test_create_attribute_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
@@ -962,20 +961,20 @@ test_create_attribute_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group\n");
+        printf("    couldn't create container group\n");
         goto error;
     }
 
@@ -1002,7 +1001,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate with an invalid loc_id!\n");
+                printf("    created attribute using H5Acreate with an invalid loc_id!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_invalid_loc_id);
             }
@@ -1023,7 +1022,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate with a NULL name!\n");
+                printf("    created attribute using H5Acreate with a NULL name!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_invalid_attr_name);
             }
@@ -1036,7 +1035,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate with an invalid name of ''!\n");
+                printf("    created attribute using H5Acreate with an invalid name of ''!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_invalid_attr_name);
             }
@@ -1058,7 +1057,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate with an invalid datatype!\n");
+                printf("    created attribute using H5Acreate with an invalid datatype!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_invalid_datatype);
             }
@@ -1080,7 +1079,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate with an invalid dataspace!\n");
+                printf("    created attribute using H5Acreate with an invalid dataspace!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_invalid_dataspace);
             }
@@ -1102,7 +1101,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate with an invalid ACPL!\n");
+                printf("    created attribute using H5Acreate with an invalid ACPL!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_invalid_acpl);
             }
@@ -1124,7 +1123,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate with an invalid AAPL!\n");
+                printf("    created attribute using H5Acreate with an invalid AAPL!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_invalid_aapl);
             }
@@ -1147,7 +1146,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate_by_name with an invalid loc_id!\n");
+                printf("    created attribute using H5Acreate_by_name with an invalid loc_id!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_by_name_invalid_loc_id);
             }
@@ -1169,7 +1168,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate_by_name with a NULL object name!\n");
+                printf("    created attribute using H5Acreate_by_name with a NULL object name!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_by_name_invalid_obj_name);
             }
@@ -1183,8 +1182,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    created attribute using H5Acreate_by_name with an invalid object name of ''!\n");
+                printf("    created attribute using H5Acreate_by_name with an invalid object name of ''!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_by_name_invalid_obj_name);
             }
@@ -1206,7 +1204,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate_by_name with a NULL attribute name!\n");
+                printf("    created attribute using H5Acreate_by_name with a NULL attribute name!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_by_name_invalid_attr_name);
             }
@@ -1220,7 +1218,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    created attribute using H5Acreate_by_name with an invalid attribute name of ''!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_by_name_invalid_attr_name);
@@ -1244,7 +1242,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate_by_name with an invalid datatype!\n");
+                printf("    created attribute using H5Acreate_by_name with an invalid datatype!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_by_name_invalid_datatype);
             }
@@ -1267,7 +1265,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate_by_name with an invalid dataspace!\n");
+                printf("    created attribute using H5Acreate_by_name with an invalid dataspace!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_by_name_invalid_dataspace);
             }
@@ -1290,7 +1288,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate_by_name with an invalid ACPL!\n");
+                printf("    created attribute using H5Acreate_by_name with an invalid ACPL!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_by_name_invalid_acpl);
             }
@@ -1313,7 +1311,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate_by_name with an invalid AAPL!\n");
+                printf("    created attribute using H5Acreate_by_name with an invalid AAPL!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_by_name_invalid_aapl);
             }
@@ -1336,7 +1334,7 @@ test_create_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created attribute using H5Acreate_by_name with an invalid LAPL!\n");
+                printf("    created attribute using H5Acreate_by_name with an invalid LAPL!\n");
                 H5Aclose(attr_id);
                 PART_ERROR(H5Acreate_by_name_invalid_lapl);
             }
@@ -1398,8 +1396,8 @@ test_open_attribute(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or attribute aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, or attribute aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -1407,26 +1405,26 @@ test_open_attribute(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for attribute creation order tracking\n");
+        printf("    couldn't create GCPL for attribute creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set attribute creation order tracking\n");
+            printf("    couldn't set attribute creation order tracking\n");
             goto error;
         }
     }
@@ -1434,7 +1432,7 @@ test_open_attribute(void)
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_OPEN_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_OPEN_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -1448,7 +1446,7 @@ test_open_attribute(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_TEST_ATTR_NAME, attr_type, space_id, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
+        printf("    couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
         goto error;
     }
 
@@ -1458,7 +1456,7 @@ test_open_attribute(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_TEST_ATTR_NAME2, attr_type, space_id, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2);
+        printf("    couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2);
         goto error;
     }
 
@@ -1468,7 +1466,7 @@ test_open_attribute(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_TEST_ATTR_NAME3, attr_type, space_id, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3);
+        printf("    couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3);
         goto error;
     }
 
@@ -1485,13 +1483,13 @@ test_open_attribute(void)
 
             if ((attr_id = H5Aopen(group_id, ATTRIBUTE_OPEN_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' using H5Aopen\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
+                printf("    couldn't open attribute '%s' using H5Aopen\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
                 PART_ERROR(H5Aopen);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
                 PART_ERROR(H5Aopen);
             }
 
@@ -1506,14 +1504,14 @@ test_open_attribute(void)
             if ((attr_id = H5Aopen_by_name(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME,
                                            ATTRIBUTE_OPEN_TEST_ATTR_NAME, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' using H5Aopen_by_name\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME);
+                printf("    couldn't open attribute '%s' using H5Aopen_by_name\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME);
                 PART_ERROR(H5Aopen_by_name);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
                 PART_ERROR(H5Aopen_by_name);
             }
 
@@ -1527,52 +1525,52 @@ test_open_attribute(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking is not supported with this VOL connector\n");
+                printf("    creation order tracking is not supported with this VOL connector\n");
                 PART_EMPTY(H5Aopen_by_idx_crt_order_increasing);
             }
 
             if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                           H5_ITER_INC, 0, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation "
-                         "order in increasing order\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME, 0);
+                printf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation "
+                       "order in increasing order\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME, 0);
                 PART_ERROR(H5Aopen_by_idx_crt_order_increasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
                 PART_ERROR(H5Aopen_by_idx_crt_order_increasing);
             }
 
             if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                           H5_ITER_INC, 1, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation "
-                         "order in increasing order\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1);
+                printf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation "
+                       "order in increasing order\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1);
                 PART_ERROR(H5Aopen_by_idx_crt_order_increasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2);
                 PART_ERROR(H5Aopen_by_idx_crt_order_increasing);
             }
 
             if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                           H5_ITER_INC, 2, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation "
-                         "order in increasing order\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 2);
+                printf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation "
+                       "order in increasing order\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 2);
                 PART_ERROR(H5Aopen_by_idx_crt_order_increasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3);
                 PART_ERROR(H5Aopen_by_idx_crt_order_increasing);
             }
 
@@ -1586,52 +1584,52 @@ test_open_attribute(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking is not supported with this VOL connector\n");
+                printf("    creation order tracking is not supported with this VOL connector\n");
                 PART_EMPTY(H5Aopen_by_idx_crt_order_decreasing);
             }
 
             if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                           H5_ITER_DEC, 2, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation "
-                         "order in decreasing order\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME, 2);
+                printf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation "
+                       "order in decreasing order\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME, 2);
                 PART_ERROR(H5Aopen_by_idx_crt_order_decreasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
                 PART_ERROR(H5Aopen_by_idx_crt_order_decreasing);
             }
 
             if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                           H5_ITER_DEC, 1, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation "
-                         "order in decreasing order\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1);
+                printf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation "
+                       "order in decreasing order\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1);
                 PART_ERROR(H5Aopen_by_idx_crt_order_decreasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2);
                 PART_ERROR(H5Aopen_by_idx_crt_order_decreasing);
             }
 
             if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                           H5_ITER_DEC, 0, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation "
-                         "order in decreasing order\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 0);
+                printf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation "
+                       "order in decreasing order\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 0);
                 PART_ERROR(H5Aopen_by_idx_crt_order_decreasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3);
                 PART_ERROR(H5Aopen_by_idx_crt_order_decreasing);
             }
 
@@ -1646,45 +1644,45 @@ test_open_attribute(void)
             if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME,
                                           H5_ITER_INC, 0, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical "
-                         "order in increasing order\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME, 0);
+                printf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical "
+                       "order in increasing order\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME, 0);
                 PART_ERROR(H5Aopen_by_idx_name_order_increasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
                 PART_ERROR(H5Aopen_by_idx_name_order_increasing);
             }
 
             if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME,
                                           H5_ITER_INC, 1, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical "
-                         "order in increasing order\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1);
+                printf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical "
+                       "order in increasing order\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1);
                 PART_ERROR(H5Aopen_by_idx_name_order_increasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2);
                 PART_ERROR(H5Aopen_by_idx_name_order_increasing);
             }
 
             if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME,
                                           H5_ITER_INC, 2, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical "
-                         "order in increasing order\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 2);
+                printf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical "
+                       "order in increasing order\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 2);
                 PART_ERROR(H5Aopen_by_idx_name_order_increasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3);
                 PART_ERROR(H5Aopen_by_idx_name_order_increasing);
             }
 
@@ -1699,45 +1697,45 @@ test_open_attribute(void)
             if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME,
                                           H5_ITER_DEC, 2, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by "
-                         "alphabetical order in decreasing order\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME, 2);
+                printf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by "
+                       "alphabetical order in decreasing order\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME, 2);
                 PART_ERROR(H5Aopen_by_idx_name_order_decreasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME);
                 PART_ERROR(H5Aopen_by_idx_name_order_decreasing);
             }
 
             if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME,
                                           H5_ITER_DEC, 1, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by "
-                         "alphabetical order in decreasing order\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1);
+                printf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by "
+                       "alphabetical order in decreasing order\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1);
                 PART_ERROR(H5Aopen_by_idx_name_order_decreasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2);
                 PART_ERROR(H5Aopen_by_idx_name_order_decreasing);
             }
 
             if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME,
                                           H5_ITER_DEC, 0, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by "
-                         "alphabetical order in decreasing order\n",
-                         ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 0);
+                printf("    couldn't open attribute '%s' at index %d using H5Aopen_by_idx by "
+                       "alphabetical order in decreasing order\n",
+                       ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 0);
                 PART_ERROR(H5Aopen_by_idx_name_order_decreasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3);
                 PART_ERROR(H5Aopen_by_idx_name_order_decreasing);
             }
 
@@ -1801,7 +1799,7 @@ test_open_attribute_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
@@ -1810,20 +1808,20 @@ test_open_attribute_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -1837,7 +1835,7 @@ test_open_attribute_invalid_params(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME, attr_type, space_id,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+        printf("    couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
         goto error;
     }
 
@@ -1860,8 +1858,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen with an invalid loc_id!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen with an invalid loc_id!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_invalid_loc_id);
             }
@@ -1882,8 +1880,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen with a NULL attribute name!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen with a NULL attribute name!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_invalid_attr_name);
             }
@@ -1896,8 +1894,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen with an invalid attribute name of ''!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen with an invalid attribute name of ''!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_invalid_attr_name);
             }
@@ -1918,8 +1916,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen with an invalid AAPL!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen with an invalid AAPL!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_invalid_aapl);
             }
@@ -1942,8 +1940,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen_by_name with an invalid loc_id!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_name with an invalid loc_id!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_name_invalid_loc_id);
             }
@@ -1965,8 +1963,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen_by_name with a NULL object name!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_name with a NULL object name!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_name_invalid_obj_name);
             }
@@ -1980,9 +1978,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    opened attribute '%s' using H5Aopen_by_name with an invalid object name of ''!\n",
-                    ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_name with an invalid object name of ''!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_name_invalid_obj_name);
             }
@@ -2004,8 +2001,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen_by_name with a NULL attribute name!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_name with a NULL attribute name!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_name_invalid_attr_name);
             }
@@ -2019,7 +2016,7 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    opened attribute '%s' using H5Aopen_by_name with an invalid attribute name of ''!\n",
                     ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
@@ -2044,8 +2041,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen_by_name with an invalid AAPL!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_name with an invalid AAPL!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_name_invalid_aapl);
             }
@@ -2068,8 +2065,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen_by_name with an invalid LAPL!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_name with an invalid LAPL!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_name_invalid_lapl);
             }
@@ -2091,8 +2088,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen_by_idx with an invalid loc_id!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_idx with an invalid loc_id!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_idx_invalid_loc_id);
             }
@@ -2114,8 +2111,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen_by_idx with a NULL object name!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_idx with a NULL object name!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_idx_invalid_obj_name);
             }
@@ -2129,9 +2126,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    opened attribute '%s' using H5Aopen_by_idx with an invalid object name of ''!\n",
-                    ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_idx with an invalid object name of ''!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_idx_invalid_obj_name);
             }
@@ -2153,9 +2149,9 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen_by_idx with invalid index type "
-                         "H5_INDEX_UNKNOWN!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_idx with invalid index type "
+                       "H5_INDEX_UNKNOWN!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_idx_invalid_index_type);
             }
@@ -2169,9 +2165,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    opened attribute '%s' using H5Aopen_by_idx with invalid index type H5_INDEX_N!\n",
-                    ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_idx with invalid index type H5_INDEX_N!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_idx_invalid_index_type);
             }
@@ -2193,9 +2188,9 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen_by_idx with invalid iteration order "
-                         "H5_ITER_UNKNOWN!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_idx with invalid iteration order "
+                       "H5_ITER_UNKNOWN!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_idx_invalid_iter_order);
             }
@@ -2209,9 +2204,9 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen_by_idx with invalid iteration order "
-                         "H5_ITER_N!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_idx with invalid iteration order "
+                       "H5_ITER_N!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_idx_invalid_iter_order);
             }
@@ -2233,8 +2228,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen_by_idx with an invalid AAPL!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_idx with an invalid AAPL!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_idx_invalid_aapl);
             }
@@ -2256,8 +2251,8 @@ test_open_attribute_invalid_params(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened attribute '%s' using H5Aopen_by_idx with an invalid LAPL!\n",
-                         ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
+                printf("    opened attribute '%s' using H5Aopen_by_idx with an invalid LAPL!\n",
+                       ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME);
                 H5Aclose(attr_id);
                 PART_ERROR(H5Aopen_by_idx_invalid_lapl);
             }
@@ -2323,27 +2318,27 @@ test_write_attribute(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, attribute, or file flush aren't supported with "
-                 "this connector\n");
+        printf("    API functions for basic file, group, attribute, or file flush aren't supported with "
+               "this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_WRITE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_WRITE_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_WRITE_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2353,20 +2348,20 @@ test_write_attribute(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_WRITE_TEST_ATTR_NAME, ATTRIBUTE_WRITE_TEST_ATTR_DTYPE,
                               space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_WRITE_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -2382,14 +2377,14 @@ test_write_attribute(void)
 
     if (H5Awrite(attr_id, ATTRIBUTE_WRITE_TEST_ATTR_DTYPE, data) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't write to attribute\n");
+        printf("    couldn't write to attribute\n");
         goto error;
     }
 
     /* Make sure that the attribute can be flushed to the file */
     if (H5Fflush(file_id, H5F_SCOPE_GLOBAL) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't flush the attribute\n");
+        printf("    couldn't flush the attribute\n");
         goto error;
     }
 
@@ -2453,7 +2448,7 @@ test_write_attribute_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
@@ -2462,21 +2457,20 @@ test_write_attribute_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n",
-                 ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2488,20 +2482,20 @@ test_write_attribute_invalid_params(void)
                               ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_DTYPE, space_id, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -2531,7 +2525,7 @@ test_write_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    wrote to attribute using an invalid attr_id!\n");
+                printf("    wrote to attribute using an invalid attr_id!\n");
                 PART_ERROR(H5Awrite_invalid_attr_id);
             }
 
@@ -2551,7 +2545,7 @@ test_write_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    wrote to attribute using an invalid datatype!\n");
+                printf("    wrote to attribute using an invalid datatype!\n");
                 PART_ERROR(H5Awrite_invalid_datatype);
             }
 
@@ -2571,7 +2565,7 @@ test_write_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    wrote to attribute using an invalid data buffer!\n");
+                printf("    wrote to attribute using an invalid data buffer!\n");
                 PART_ERROR(H5Awrite_invalid_data_buf);
             }
 
@@ -2644,27 +2638,27 @@ test_read_attribute(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_READ_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_READ_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_READ_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2674,20 +2668,20 @@ test_read_attribute(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_READ_TEST_ATTR_NAME, ATTRIBUTE_READ_TEST_ATTR_DTYPE,
                               space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_READ_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -2705,7 +2699,7 @@ test_read_attribute(void)
 
     if (H5Awrite(attr_id, ATTRIBUTE_READ_TEST_ATTR_DTYPE, data) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't write to attribute\n");
+        printf("    couldn't write to attribute\n");
         goto error;
     }
 
@@ -2719,20 +2713,20 @@ test_read_attribute(void)
 
     if ((attr_id = H5Aopen(group_id, ATTRIBUTE_READ_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open attribute\n");
+        printf("    couldn't open attribute\n");
         goto error;
     }
 
     if (H5Aread(attr_id, ATTRIBUTE_READ_TEST_ATTR_DTYPE, read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from attribute\n");
+        printf("    couldn't read from attribute\n");
         goto error;
     }
 
     for (i = 0; i < data_size / ATTRIBUTE_READ_TEST_ATTR_DTYPE_SIZE; i++) {
         if (((int *)read_buf)[i] != (int)i) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         }
     }
@@ -2800,7 +2794,7 @@ test_read_attribute_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
@@ -2809,20 +2803,20 @@ test_read_attribute_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_READ_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_READ_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_READ_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2834,20 +2828,20 @@ test_read_attribute_invalid_params(void)
                               ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_DTYPE, space_id, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -2865,7 +2859,7 @@ test_read_attribute_invalid_params(void)
 
     if (H5Awrite(attr_id, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_DTYPE, data) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't write to attribute\n");
+        printf("    couldn't write to attribute\n");
         goto error;
     }
 
@@ -2879,7 +2873,7 @@ test_read_attribute_invalid_params(void)
 
     if ((attr_id = H5Aopen(group_id, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open attribute\n");
+        printf("    couldn't open attribute\n");
         goto error;
     }
 
@@ -2899,7 +2893,7 @@ test_read_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    read attribute with an invalid attr_id!\n");
+                printf("    read attribute with an invalid attr_id!\n");
                 PART_ERROR(H5Aread_invalid_attr_id);
             }
 
@@ -2919,7 +2913,7 @@ test_read_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    read attribute with an invalid datatype!\n");
+                printf("    read attribute with an invalid datatype!\n");
                 PART_ERROR(H5Aread_invalid_datatype);
             }
 
@@ -2939,7 +2933,7 @@ test_read_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    read attribute with an invalid read buffer!\n");
+                printf("    read attribute with an invalid read buffer!\n");
                 PART_ERROR(H5Aread_invalid_read_buf);
             }
 
@@ -3011,27 +3005,27 @@ test_read_empty_attribute(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_READ_EMPTY_ATTR_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_READ_EMPTY_ATTR_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_READ_EMPTY_ATTR_GROUP_NAME);
         goto error;
     }
 
@@ -3041,20 +3035,20 @@ test_read_empty_attribute(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_READ_EMPTY_ATTR_NAME, ATTRIBUTE_READ_EMPTY_DTYPE, space_id,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_READ_EMPTY_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -3063,7 +3057,7 @@ test_read_empty_attribute(void)
 
     if ((attr_id = H5Aopen(group_id, ATTRIBUTE_READ_EMPTY_ATTR_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open attribute\n");
+        printf("    couldn't open attribute\n");
         goto error;
     }
 
@@ -3076,7 +3070,7 @@ test_read_empty_attribute(void)
 
     if (H5Aread(attr_id, ATTRIBUTE_READ_EMPTY_DTYPE, read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from attribute\n");
+        printf("    couldn't read from attribute\n");
         goto error;
     }
 
@@ -3130,13 +3124,13 @@ test_close_attribute_invalid_id(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or attribute aren't supported with this connector\n");
+        printf("    API functions for basic file or attribute aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
@@ -3148,7 +3142,7 @@ test_close_attribute_invalid_id(void)
 
     if (err_ret >= 0) {
         H5_FAILED();
-        HDprintf("    H5Aclose succeeded with an invalid attribute ID!\n");
+        printf("    H5Aclose succeeded with an invalid attribute ID!\n");
         goto error;
     }
 
@@ -3195,8 +3189,8 @@ test_get_attribute_space_and_type(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, attribute, or attribute aren't supported with "
-                 "this connector\n");
+        printf("    API functions for basic file, group, attribute, or attribute aren't supported with "
+               "this connector\n");
         return 0;
     }
 
@@ -3204,20 +3198,20 @@ test_get_attribute_space_and_type(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_SPACE_TYPE_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -3231,20 +3225,20 @@ test_get_attribute_space_and_type(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME, attr_dtype, attr_space_id,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -3259,7 +3253,7 @@ test_get_attribute_space_and_type(void)
 
             if ((tmp_type_id = H5Aget_type(attr_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve attribute's datatype\n");
+                printf("    couldn't retrieve attribute's datatype\n");
                 PART_ERROR(H5Aget_type);
             }
 
@@ -3268,13 +3262,13 @@ test_get_attribute_space_and_type(void)
 
                 if (types_equal < 0) {
                     H5_FAILED();
-                    HDprintf("    datatype was invalid\n");
+                    printf("    datatype was invalid\n");
                     PART_ERROR(H5Aget_type);
                 }
 
                 if (!types_equal) {
                     H5_FAILED();
-                    HDprintf("    attribute's datatype did not match\n");
+                    printf("    attribute's datatype did not match\n");
                     PART_ERROR(H5Aget_type);
                 }
             }
@@ -3289,7 +3283,7 @@ test_get_attribute_space_and_type(void)
 
             if ((tmp_space_id = H5Aget_space(attr_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve attribute's dataspace\n");
+                printf("    couldn't retrieve attribute's dataspace\n");
                 PART_ERROR(H5Aget_space);
             }
 
@@ -3298,14 +3292,14 @@ test_get_attribute_space_and_type(void)
 
                 if (H5Sget_simple_extent_dims(tmp_space_id, space_dims, NULL) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't retrieve dimensions of dataspace\n");
+                    printf("    couldn't retrieve dimensions of dataspace\n");
                     PART_ERROR(H5Aget_space);
                 }
 
                 for (i = 0; i < ATTRIBUTE_GET_SPACE_TYPE_TEST_SPACE_RANK; i++)
                     if (space_dims[i] != attr_dims[i]) {
                         H5_FAILED();
-                        HDprintf("    attribute's dataspace dims didn't match\n");
+                        printf("    attribute's dataspace dims didn't match\n");
                         PART_ERROR(H5Aget_space);
                     }
             }
@@ -3348,13 +3342,13 @@ test_get_attribute_space_and_type(void)
 
             if ((attr_id = H5Aopen(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME);
+                printf("    couldn't open attribute '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME);
                 PART_ERROR(H5Aget_type_reopened);
             }
 
             if ((tmp_type_id = H5Aget_type(attr_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve attribute's datatype\n");
+                printf("    couldn't retrieve attribute's datatype\n");
                 PART_ERROR(H5Aget_type_reopened);
             }
 
@@ -3363,13 +3357,13 @@ test_get_attribute_space_and_type(void)
 
                 if (types_equal < 0) {
                     H5_FAILED();
-                    HDprintf("    datatype was invalid\n");
+                    printf("    datatype was invalid\n");
                     PART_ERROR(H5Aget_type_reopened);
                 }
 
                 if (!types_equal) {
                     H5_FAILED();
-                    HDprintf("    attribute's datatype did not match\n");
+                    printf("    attribute's datatype did not match\n");
                     PART_ERROR(H5Aget_type_reopened);
                 }
             }
@@ -3393,13 +3387,13 @@ test_get_attribute_space_and_type(void)
 
             if ((attr_id = H5Aopen(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME);
+                printf("    couldn't open attribute '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME);
                 PART_ERROR(H5Aget_space_reopened);
             }
 
             if ((tmp_space_id = H5Aget_space(attr_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve attribute's dataspace\n");
+                printf("    couldn't retrieve attribute's dataspace\n");
                 PART_ERROR(H5Aget_space_reopened);
             }
 
@@ -3408,14 +3402,14 @@ test_get_attribute_space_and_type(void)
 
                 if (H5Sget_simple_extent_dims(tmp_space_id, space_dims, NULL) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't retrieve dimensions of dataspace\n");
+                    printf("    couldn't retrieve dimensions of dataspace\n");
                     PART_ERROR(H5Aget_space_reopened);
                 }
 
                 for (i = 0; i < ATTRIBUTE_GET_SPACE_TYPE_TEST_SPACE_RANK; i++) {
                     if (space_dims[i] != attr_dims[i]) {
                         H5_FAILED();
-                        HDprintf("    dataspace dims didn't match!\n");
+                        printf("    dataspace dims didn't match!\n");
                         PART_ERROR(H5Aget_space_reopened);
                     }
                 }
@@ -3498,7 +3492,7 @@ test_get_attribute_space_and_type_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
@@ -3507,21 +3501,21 @@ test_get_attribute_space_and_type_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n",
-                 ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n",
+               ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -3535,20 +3529,20 @@ test_get_attribute_space_and_type_invalid_params(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype,
                               attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -3569,7 +3563,7 @@ test_get_attribute_space_and_type_invalid_params(void)
 
             if (tmp_type_id >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved copy of attribute's datatype using an invalid attr_id!\n");
+                printf("    retrieved copy of attribute's datatype using an invalid attr_id!\n");
                 PART_ERROR(H5Aget_type_invalid_attr_id);
             }
 
@@ -3589,7 +3583,7 @@ test_get_attribute_space_and_type_invalid_params(void)
 
             if (tmp_space_id >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved copy of attribute's dataspace using an invalid attr_id!\n");
+                printf("    retrieved copy of attribute's dataspace using an invalid attr_id!\n");
                 PART_ERROR(H5Aget_space_invalid_attr_id);
             }
 
@@ -3658,8 +3652,8 @@ test_attribute_property_lists(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, attribute, or getting property list aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, attribute, or getting property list aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -3667,20 +3661,20 @@ test_attribute_property_lists(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_PROPERTY_LIST_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group\n");
+        printf("    couldn't create container sub-group\n");
         goto error;
     }
 
@@ -3694,27 +3688,27 @@ test_attribute_property_lists(void)
 
     if ((acpl_id1 = H5Pcreate(H5P_ATTRIBUTE_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create ACPL\n");
+        printf("    couldn't create ACPL\n");
         goto error;
     }
 
     if (H5Pset_char_encoding(acpl_id1, encoding) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't set ACPL property value\n");
+        printf("    couldn't set ACPL property value\n");
         goto error;
     }
 
     if ((attr_id1 = H5Acreate2(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1, attr_dtype1, space_id,
                                acpl_id1, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     if ((attr_id2 = H5Acreate2(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2, attr_dtype2, space_id,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
@@ -3724,25 +3718,25 @@ test_attribute_property_lists(void)
     /* Verify the attributes have been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -3758,13 +3752,13 @@ test_attribute_property_lists(void)
              * does not */
             if ((acpl_id1 = H5Aget_create_plist(attr_id1)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Aget_create_plist);
             }
 
             if ((acpl_id2 = H5Aget_create_plist(attr_id2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Aget_create_plist);
             }
 
@@ -3773,13 +3767,13 @@ test_attribute_property_lists(void)
 
             if (H5Pget_char_encoding(acpl_id1, &encoding) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve ACPL property value\n");
+                printf("    couldn't retrieve ACPL property value\n");
                 PART_ERROR(H5Aget_create_plist);
             }
 
             if (H5T_CSET_UTF8 != encoding) {
                 H5_FAILED();
-                HDprintf("   ACPL property value was incorrect\n");
+                printf("   ACPL property value was incorrect\n");
                 PART_ERROR(H5Aget_create_plist);
             }
 
@@ -3787,13 +3781,13 @@ test_attribute_property_lists(void)
 
             if (H5Pget_char_encoding(acpl_id2, &encoding) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve ACPL property value\n");
+                printf("    couldn't retrieve ACPL property value\n");
                 PART_ERROR(H5Aget_create_plist);
             }
 
             if (H5T_CSET_UTF8 == encoding) {
                 H5_FAILED();
-                HDprintf("    ACPL property value was set!\n");
+                printf("    ACPL property value was set!\n");
                 PART_ERROR(H5Aget_create_plist);
             }
 
@@ -3844,26 +3838,26 @@ test_attribute_property_lists(void)
             if ((attr_id1 = H5Aopen(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s'\n", ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1);
+                printf("    couldn't open attribute '%s'\n", ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1);
                 PART_ERROR(H5Aget_create_plist_reopened);
             }
 
             if ((attr_id2 = H5Aopen(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s'\n", ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2);
+                printf("    couldn't open attribute '%s'\n", ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2);
                 PART_ERROR(H5Aget_create_plist_reopened);
             }
 
             if ((acpl_id1 = H5Aget_create_plist(attr_id1)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Aget_create_plist_reopened);
             }
 
             if ((acpl_id2 = H5Aget_create_plist(attr_id2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Aget_create_plist_reopened);
             }
 
@@ -3945,8 +3939,8 @@ test_get_attribute_name(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or attribute aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, or attribute aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -3954,26 +3948,26 @@ test_get_attribute_name(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for attribute creation order tracking\n");
+        printf("    couldn't create GCPL for attribute creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set attribute creation order tracking\n");
+            printf("    couldn't set attribute creation order tracking\n");
             goto error;
         }
     }
@@ -3981,7 +3975,7 @@ test_get_attribute_name(void)
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_GET_NAME_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_GET_NAME_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -3995,7 +3989,7 @@ test_get_attribute_name(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, attr_dtype, space_id,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
+        printf("    couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
         goto error;
     }
 
@@ -4005,7 +3999,7 @@ test_get_attribute_name(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2, attr_dtype, space_id,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
+        printf("    couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
         goto error;
     }
 
@@ -4015,7 +4009,7 @@ test_get_attribute_name(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3, attr_dtype, space_id,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
+        printf("    couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
         goto error;
     }
 
@@ -4025,39 +4019,37 @@ test_get_attribute_name(void)
     /* Verify the attributes have been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
+        printf("    couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
+        printf("    attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
         goto error;
     }
 
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute '%s' exists\n",
-                 ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
+        printf("    couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
+        printf("    attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
         goto error;
     }
 
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute '%s' exists\n",
-                 ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
+        printf("    couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
+        printf("    attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
         goto error;
     }
 
@@ -4065,7 +4057,7 @@ test_get_attribute_name(void)
     name_buf_size = strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 2;
     if (NULL == (name_buf = (char *)HDmalloc((size_t)name_buf_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for storing attribute's name\n");
+        printf("    couldn't allocate buffer for storing attribute's name\n");
         goto error;
     }
 
@@ -4079,28 +4071,28 @@ test_get_attribute_name(void)
 
             if ((attr_id = H5Aopen(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
+                printf("    couldn't open attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
                 PART_ERROR(H5Aget_name);
             }
 
             *name_buf = '\0';
             if (H5Aget_name(attr_id, (size_t)name_buf_size, name_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve attribute name\n");
+                printf("    couldn't retrieve attribute name\n");
                 PART_ERROR(H5Aget_name);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
                 PART_ERROR(H5Aget_name);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
                 PART_ERROR(H5Aget_name);
             }
 
@@ -4121,7 +4113,7 @@ test_get_attribute_name(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aget_name_by_idx_crt_order_increasing);
             }
 
@@ -4129,17 +4121,17 @@ test_get_attribute_name(void)
             if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                    H5_ITER_INC, 0, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
-                         "creation order in increasing order\n",
-                         0);
+                printf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
+                       "creation order in increasing order\n",
+                       0);
                 PART_ERROR(H5Aget_name_by_idx_crt_order_increasing);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
                 PART_ERROR(H5Aget_name_by_idx_crt_order_increasing);
             }
 
@@ -4147,17 +4139,17 @@ test_get_attribute_name(void)
             if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                    H5_ITER_INC, 1, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
-                         "creation order in increasing order\n",
-                         1);
+                printf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
+                       "creation order in increasing order\n",
+                       1);
                 PART_ERROR(H5Aget_name_by_idx_crt_order_increasing);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
                 PART_ERROR(H5Aget_name_by_idx_crt_order_increasing);
             }
 
@@ -4165,17 +4157,17 @@ test_get_attribute_name(void)
             if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                    H5_ITER_INC, 2, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
-                         "creation order in increasing order\n",
-                         2);
+                printf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
+                       "creation order in increasing order\n",
+                       2);
                 PART_ERROR(H5Aget_name_by_idx_crt_order_increasing);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
                 PART_ERROR(H5Aget_name_by_idx_crt_order_increasing);
             }
 
@@ -4189,7 +4181,7 @@ test_get_attribute_name(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aget_name_by_idx_crt_order_decreasing);
             }
 
@@ -4197,17 +4189,17 @@ test_get_attribute_name(void)
             if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                    H5_ITER_DEC, 2, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
-                         "creation order in decreasing order\n",
-                         2);
+                printf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
+                       "creation order in decreasing order\n",
+                       2);
                 PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
                 PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing);
             }
 
@@ -4215,17 +4207,17 @@ test_get_attribute_name(void)
             if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                    H5_ITER_DEC, 1, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
-                         "creation order in decreasing order\n",
-                         1);
+                printf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
+                       "creation order in decreasing order\n",
+                       1);
                 PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
                 PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing);
             }
 
@@ -4233,17 +4225,17 @@ test_get_attribute_name(void)
             if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                    H5_ITER_DEC, 0, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
-                         "creation order in decreasing order\n",
-                         0);
+                printf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
+                       "creation order in decreasing order\n",
+                       0);
                 PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
                 PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing);
             }
 
@@ -4259,17 +4251,17 @@ test_get_attribute_name(void)
             if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME,
                                    H5_ITER_INC, 0, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
-                         "alphabetical order in increasing order\n",
-                         0);
+                printf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
+                       "alphabetical order in increasing order\n",
+                       0);
                 PART_ERROR(H5Aget_name_by_idx_name_order_increasing);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
                 PART_ERROR(H5Aget_name_by_idx_name_order_increasing);
             }
 
@@ -4277,17 +4269,17 @@ test_get_attribute_name(void)
             if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME,
                                    H5_ITER_INC, 1, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
-                         "alphabetical order in increasing order\n",
-                         1);
+                printf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
+                       "alphabetical order in increasing order\n",
+                       1);
                 PART_ERROR(H5Aget_name_by_idx_name_order_increasing);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
                 PART_ERROR(H5Aget_name_by_idx_name_order_increasing);
             }
 
@@ -4295,17 +4287,17 @@ test_get_attribute_name(void)
             if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME,
                                    H5_ITER_INC, 2, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
-                         "alphabetical order in increasing order\n",
-                         2);
+                printf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by "
+                       "alphabetical order in increasing order\n",
+                       2);
                 PART_ERROR(H5Aget_name_by_idx_name_order_increasing);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
                 PART_ERROR(H5Aget_name_by_idx_name_order_increasing);
             }
 
@@ -4321,17 +4313,17 @@ test_get_attribute_name(void)
             if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME,
                                    H5_ITER_DEC, 2, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index "
-                         "by alphabetical order in decreasing order\n",
-                         2);
+                printf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index "
+                       "by alphabetical order in decreasing order\n",
+                       2);
                 PART_ERROR(H5Aget_name_by_idx_name_order_decreasing);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME);
                 PART_ERROR(H5Aget_name_by_idx_name_order_decreasing);
             }
 
@@ -4339,17 +4331,17 @@ test_get_attribute_name(void)
             if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME,
                                    H5_ITER_DEC, 1, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index "
-                         "by alphabetical order in decreasing order\n",
-                         1);
+                printf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index "
+                       "by alphabetical order in decreasing order\n",
+                       1);
                 PART_ERROR(H5Aget_name_by_idx_name_order_decreasing);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2);
                 PART_ERROR(H5Aget_name_by_idx_name_order_decreasing);
             }
 
@@ -4357,17 +4349,17 @@ test_get_attribute_name(void)
             if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME,
                                    H5_ITER_DEC, 0, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index "
-                         "by alphabetical order in decreasing order\n",
-                         0);
+                printf("    couldn't retrieve name of attribute at index %d using H5Aget_name_by_index "
+                       "by alphabetical order in decreasing order\n",
+                       0);
                 PART_ERROR(H5Aget_name_by_idx_name_order_decreasing);
             }
 
             if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3,
                           strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
-                         ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
+                printf("    retrieved attribute name '%s' didn't match '%s'\n", name_buf,
+                       ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3);
                 PART_ERROR(H5Aget_name_by_idx_name_order_decreasing);
             }
 
@@ -4443,7 +4435,7 @@ test_get_attribute_name_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
@@ -4452,21 +4444,21 @@ test_get_attribute_name_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n",
-                 ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n",
+               ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -4480,20 +4472,20 @@ test_get_attribute_name_invalid_params(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_ATTRIBUTE_NAME, attr_dtype,
                               space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_ATTRIBUTE_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -4503,7 +4495,7 @@ test_get_attribute_name_invalid_params(void)
 
     if ((name_buf_size = H5Aget_name(attr_id, 0, NULL)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't retrieve name buf size\n");
+        printf("    couldn't retrieve name buf size\n");
         goto error;
     }
 
@@ -4526,7 +4518,7 @@ test_get_attribute_name_invalid_params(void)
 
             if (name_buf_size >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name using H5Aget_name with an invalid attr_id!\n");
+                printf("    retrieved attribute name using H5Aget_name with an invalid attr_id!\n");
                 PART_ERROR(H5Aget_name_invalid_attr_id);
             }
 
@@ -4547,7 +4539,7 @@ test_get_attribute_name_invalid_params(void)
 
             if (name_buf_size >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name using H5Aget_name with an invalid name buffer!\n");
+                printf("    retrieved attribute name using H5Aget_name with an invalid name buffer!\n");
                 PART_ERROR(H5Aget_name_invalid_name_buf);
             }
 
@@ -4569,7 +4561,7 @@ test_get_attribute_name_invalid_params(void)
 
             if (name_buf_size >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name using H5Aget_name_by_idx with an invalid loc_id!\n");
+                printf("    retrieved attribute name using H5Aget_name_by_idx with an invalid loc_id!\n");
                 PART_ERROR(H5Aget_name_by_idx_invalid_loc_id);
             }
 
@@ -4590,7 +4582,7 @@ test_get_attribute_name_invalid_params(void)
 
             if (name_buf_size >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name using H5Aget_name_by_idx with a NULL object name!\n");
+                printf("    retrieved attribute name using H5Aget_name_by_idx with a NULL object name!\n");
                 PART_ERROR(H5Aget_name_by_idx_invalid_obj_name);
             }
 
@@ -4603,8 +4595,8 @@ test_get_attribute_name_invalid_params(void)
 
             if (name_buf_size >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name using H5Aget_name_by_idx with an invalid object name "
-                         "of ''!\n");
+                printf("    retrieved attribute name using H5Aget_name_by_idx with an invalid object name "
+                       "of ''!\n");
                 PART_ERROR(H5Aget_name_by_idx_invalid_obj_name);
             }
 
@@ -4626,8 +4618,8 @@ test_get_attribute_name_invalid_params(void)
 
             if (name_buf_size >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name using H5Aget_name_by_idx with invalid index type "
-                         "H5_INDEX_UNKNOWN!\n");
+                printf("    retrieved attribute name using H5Aget_name_by_idx with invalid index type "
+                       "H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Aget_name_by_idx_invalid_index_type);
             }
 
@@ -4641,8 +4633,8 @@ test_get_attribute_name_invalid_params(void)
 
             if (name_buf_size >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name using H5Aget_name_by_idx with invalid index type "
-                         "H5_INDEX_N!\n");
+                printf("    retrieved attribute name using H5Aget_name_by_idx with invalid index type "
+                       "H5_INDEX_N!\n");
                 PART_ERROR(H5Aget_name_by_idx_invalid_index_type);
             }
 
@@ -4664,8 +4656,8 @@ test_get_attribute_name_invalid_params(void)
 
             if (name_buf_size >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name using H5Aget_name_by_idx with invalid iteration order "
-                         "H5_ITER_UNKNOWN!\n");
+                printf("    retrieved attribute name using H5Aget_name_by_idx with invalid iteration order "
+                       "H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Aget_name_by_idx_invalid_iter_order);
             }
 
@@ -4679,8 +4671,8 @@ test_get_attribute_name_invalid_params(void)
 
             if (name_buf_size >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name using H5Aget_name_by_idx with invalid iteration order "
-                         "H5_ITER_N!\n");
+                printf("    retrieved attribute name using H5Aget_name_by_idx with invalid iteration order "
+                       "H5_ITER_N!\n");
                 PART_ERROR(H5Aget_name_by_idx_invalid_iter_order);
             }
 
@@ -4703,7 +4695,7 @@ test_get_attribute_name_invalid_params(void)
 
             if (name_buf_size >= 0) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    retrieved attribute name using H5Aget_name_by_idx with an invalid name buffer!\n");
                 PART_ERROR(H5Aget_name_by_idx_invalid_name_buf);
             }
@@ -4726,7 +4718,7 @@ test_get_attribute_name_invalid_params(void)
 
             if (name_buf_size >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute name using H5Aget_name_by_idx with an invalid LAPL!\n");
+                printf("    retrieved attribute name using H5Aget_name_by_idx with an invalid LAPL!\n");
                 PART_ERROR(H5Aget_name_by_idx_invalid_lapl);
             }
 
@@ -4812,8 +4804,8 @@ test_get_attribute_info(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or attribute aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, or attribute aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -4821,26 +4813,26 @@ test_get_attribute_info(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for attribute creation order tracking\n");
+        printf("    couldn't create GCPL for attribute creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set attribute creation order tracking\n");
+            printf("    couldn't set attribute creation order tracking\n");
             goto error;
         }
     }
@@ -4848,7 +4840,7 @@ test_get_attribute_info(void)
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_INFO_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_GET_INFO_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_GET_INFO_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -4862,7 +4854,7 @@ test_get_attribute_info(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME);
+        printf("    couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME);
         goto error;
     }
 
@@ -4872,7 +4864,7 @@ test_get_attribute_info(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2, attr_dtype, space_id, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2);
+        printf("    couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2);
         goto error;
     }
 
@@ -4882,7 +4874,7 @@ test_get_attribute_info(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3, attr_dtype, space_id, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3);
+        printf("    couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3);
         goto error;
     }
 
@@ -4892,37 +4884,37 @@ test_get_attribute_info(void)
     /* Verify the attributes have been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME);
+        printf("    couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME);
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME);
+        printf("    attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME);
         goto error;
     }
 
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2);
+        printf("    couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2);
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2);
+        printf("    attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2);
         goto error;
     }
 
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3);
+        printf("    couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3);
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3);
+        printf("    attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3);
         goto error;
     }
 
@@ -4936,21 +4928,21 @@ test_get_attribute_info(void)
 
             if ((attr_id = H5Aopen(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME);
+                printf("    couldn't open attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME);
                 PART_ERROR(H5Aget_info);
             }
 
             HDmemset(&attr_info, 0, sizeof(attr_info));
             if (H5Aget_info(attr_id, &attr_info) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get attribute info\n");
+                printf("    couldn't get attribute info\n");
                 PART_ERROR(H5Aget_info);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 0)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)0);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)0);
                 PART_ERROR(H5Aget_info);
             }
 
@@ -4958,13 +4950,13 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME);
+                printf("    couldn't close attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME);
                 PART_ERROR(H5Aget_info);
             }
 
@@ -4987,14 +4979,14 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME, &attr_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get attribute info by name '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME);
+                printf("    couldn't get attribute info by name '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME);
                 PART_ERROR(H5Aget_info_by_name);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 0)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)0);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)0);
                 PART_ERROR(H5Aget_info_by_name);
             }
 
@@ -5002,7 +4994,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_name);
             }
 
@@ -5010,15 +5002,14 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2, &attr_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get attribute info by name '%s'\n",
-                         ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2);
+                printf("    couldn't get attribute info by name '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2);
                 PART_ERROR(H5Aget_info_by_name);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 1)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)1);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)1);
                 PART_ERROR(H5Aget_info_by_name);
             }
 
@@ -5026,7 +5017,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_name);
             }
 
@@ -5034,15 +5025,14 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3, &attr_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get attribute info by name '%s'\n",
-                         ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3);
+                printf("    couldn't get attribute info by name '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3);
                 PART_ERROR(H5Aget_info_by_name);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 2)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)2);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)2);
                 PART_ERROR(H5Aget_info_by_name);
             }
 
@@ -5050,7 +5040,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_name);
             }
 
@@ -5064,7 +5054,7 @@ test_get_attribute_info(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aget_info_by_idx_crt_order_increasing);
             }
 
@@ -5072,16 +5062,16 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &attr_info,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
-                         "creation order in increasing order\n",
-                         0);
+                printf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
+                       "creation order in increasing order\n",
+                       0);
                 PART_ERROR(H5Aget_info_by_idx_crt_order_increasing);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 0)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)0);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)0);
                 PART_ERROR(H5Aget_info_by_idx_crt_order_increasing);
             }
 
@@ -5089,7 +5079,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_idx_crt_order_increasing);
             }
 
@@ -5097,16 +5087,16 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &attr_info,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
-                         "creation order in increasing order\n",
-                         1);
+                printf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
+                       "creation order in increasing order\n",
+                       1);
                 PART_ERROR(H5Aget_info_by_idx_crt_order_increasing);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 1)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)1);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)1);
                 PART_ERROR(H5Aget_info_by_idx_crt_order_increasing);
             }
 
@@ -5114,7 +5104,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_idx_crt_order_increasing);
             }
 
@@ -5122,16 +5112,16 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &attr_info,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
-                         "creation order in increasing order\n",
-                         2);
+                printf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
+                       "creation order in increasing order\n",
+                       2);
                 PART_ERROR(H5Aget_info_by_idx_crt_order_increasing);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 2)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)2);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)2);
                 PART_ERROR(H5Aget_info_by_idx_crt_order_increasing);
             }
 
@@ -5139,7 +5129,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_idx_crt_order_increasing);
             }
 
@@ -5153,7 +5143,7 @@ test_get_attribute_info(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aget_info_by_idx_crt_order_decreasing);
             }
 
@@ -5161,16 +5151,16 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &attr_info,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
-                         "creation order in decreasing order\n",
-                         2);
+                printf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
+                       "creation order in decreasing order\n",
+                       2);
                 PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 0)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)0);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)0);
                 PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing);
             }
 
@@ -5178,7 +5168,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing);
             }
 
@@ -5186,16 +5176,16 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &attr_info,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
-                         "creation order in decreasing order\n",
-                         1);
+                printf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
+                       "creation order in decreasing order\n",
+                       1);
                 PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 1)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)1);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)1);
                 PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing);
             }
 
@@ -5203,7 +5193,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing);
             }
 
@@ -5211,16 +5201,16 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &attr_info,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
-                         "creation order in decreasing order\n",
-                         0);
+                printf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
+                       "creation order in decreasing order\n",
+                       0);
                 PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 2)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)2);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)2);
                 PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing);
             }
 
@@ -5228,7 +5218,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing);
             }
 
@@ -5244,16 +5234,16 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &attr_info, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
-                         "alphabetical order in increasing order\n",
-                         0);
+                printf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
+                       "alphabetical order in increasing order\n",
+                       0);
                 PART_ERROR(H5Aget_info_by_idx_name_order_increasing);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 0)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)0);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)0);
                 PART_ERROR(H5Aget_info_by_idx_name_order_increasing);
             }
 
@@ -5261,7 +5251,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_idx_name_order_increasing);
             }
 
@@ -5269,16 +5259,16 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &attr_info, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
-                         "alphabetical order in increasing order\n",
-                         1);
+                printf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
+                       "alphabetical order in increasing order\n",
+                       1);
                 PART_ERROR(H5Aget_info_by_idx_name_order_increasing);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 1)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)1);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)1);
                 PART_ERROR(H5Aget_info_by_idx_name_order_increasing);
             }
 
@@ -5286,7 +5276,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_idx_name_order_increasing);
             }
 
@@ -5294,16 +5284,16 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &attr_info, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
-                         "alphabetical order in increasing order\n",
-                         2);
+                printf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
+                       "alphabetical order in increasing order\n",
+                       2);
                 PART_ERROR(H5Aget_info_by_idx_name_order_increasing);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 2)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)2);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)2);
                 PART_ERROR(H5Aget_info_by_idx_name_order_increasing);
             }
 
@@ -5311,7 +5301,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_idx_name_order_increasing);
             }
 
@@ -5327,16 +5317,16 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &attr_info, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
-                         "alphabetical order in decreasing order\n",
-                         2);
+                printf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
+                       "alphabetical order in decreasing order\n",
+                       2);
                 PART_ERROR(H5Aget_info_by_idx_name_order_decreasing);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 0)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)0);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)0);
                 PART_ERROR(H5Aget_info_by_idx_name_order_decreasing);
             }
 
@@ -5344,7 +5334,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_idx_name_order_decreasing);
             }
 
@@ -5352,16 +5342,16 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &attr_info, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
-                         "alphabetical order in decreasing order\n",
-                         1);
+                printf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
+                       "alphabetical order in decreasing order\n",
+                       1);
                 PART_ERROR(H5Aget_info_by_idx_name_order_decreasing);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 1)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)1);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)1);
                 PART_ERROR(H5Aget_info_by_idx_name_order_decreasing);
             }
 
@@ -5369,7 +5359,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_idx_name_order_decreasing);
             }
 
@@ -5377,16 +5367,16 @@ test_get_attribute_info(void)
             if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &attr_info, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
-                         "alphabetical order in decreasing order\n",
-                         0);
+                printf("    couldn't get info for attribute at index %d using H5Aget_info_by_idx by "
+                       "alphabetical order in decreasing order\n",
+                       0);
                 PART_ERROR(H5Aget_info_by_idx_name_order_decreasing);
             }
 
             if (attr_info.corder_valid && (attr_info.corder != 2)) {
                 H5_FAILED();
-                HDprintf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)attr_info.corder, (long long)2);
+                printf("    attribute's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)attr_info.corder, (long long)2);
                 PART_ERROR(H5Aget_info_by_idx_name_order_decreasing);
             }
 
@@ -5394,7 +5384,7 @@ test_get_attribute_info(void)
             if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 &&
                 attr_info.cset != H5T_CSET_ERROR) {
                 H5_FAILED();
-                HDprintf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
+                printf("    attribute info's 'cset' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Aget_info_by_idx_name_order_decreasing);
             }
 
@@ -5462,7 +5452,7 @@ test_get_attribute_info_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
@@ -5471,21 +5461,21 @@ test_get_attribute_info_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n",
-                 ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n",
+               ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -5499,20 +5489,20 @@ test_get_attribute_info_invalid_params(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype,
                               space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -5532,7 +5522,7 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info with an invalid attr_id!\n");
+                printf("    retrieved attribute info using H5Aget_info with an invalid attr_id!\n");
                 PART_ERROR(H5Aget_info_invalid_attr_id);
             }
 
@@ -5552,7 +5542,7 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info with an invalid attr_id!\n");
+                printf("    retrieved attribute info using H5Aget_info with an invalid attr_id!\n");
                 PART_ERROR(H5Aget_info_invalid_attr_info_pointer);
             }
 
@@ -5574,7 +5564,7 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_name with an invalid loc_id!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_name with an invalid loc_id!\n");
                 PART_ERROR(H5Aget_info_by_name_invalid_loc_id);
             }
 
@@ -5596,7 +5586,7 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_name with a NULL object name!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_name with a NULL object name!\n");
                 PART_ERROR(H5Aget_info_by_name_invalid_obj_name);
             }
 
@@ -5609,8 +5599,8 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_name with an invalid object name "
-                         "of ''!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_name with an invalid object name "
+                       "of ''!\n");
                 PART_ERROR(H5Aget_info_by_name_invalid_obj_name);
             }
 
@@ -5630,7 +5620,7 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    retrieved attribute info using H5Aget_info_by_name with a NULL attribute name!\n");
                 PART_ERROR(H5Aget_info_by_name_invalid_attr_name);
             }
@@ -5643,8 +5633,8 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_name with an invalid attribute "
-                         "name of ''!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_name with an invalid attribute "
+                       "name of ''!\n");
                 PART_ERROR(H5Aget_info_by_name_invalid_attr_name);
             }
 
@@ -5665,8 +5655,8 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_name with an invalid attribute "
-                         "info pointer!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_name with an invalid attribute "
+                       "info pointer!\n");
                 PART_ERROR(H5Aget_info_by_name_invalid_attr_info_pointer);
             }
 
@@ -5687,7 +5677,7 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_name with an invalid LAPL!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_name with an invalid LAPL!\n");
                 PART_ERROR(H5Aget_info_by_name_invalid_lapl);
             }
 
@@ -5708,7 +5698,7 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_idx with an invalid loc_id!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_idx with an invalid loc_id!\n");
                 PART_ERROR(H5Aget_info_by_idx_invalid_loc_id);
             }
 
@@ -5729,7 +5719,7 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_idx with a NULL object name!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_idx with a NULL object name!\n");
                 PART_ERROR(H5Aget_info_by_idx_invalid_obj_name);
             }
 
@@ -5742,8 +5732,8 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_idx with an invalid object name "
-                         "of ''!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_idx with an invalid object name "
+                       "of ''!\n");
                 PART_ERROR(H5Aget_info_by_idx_invalid_obj_name);
             }
 
@@ -5764,8 +5754,8 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_idx with invalid index type "
-                         "H5_INDEX_UNKNOWN!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_idx with invalid index type "
+                       "H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Aget_info_by_idx_invalid_index_type);
             }
 
@@ -5778,8 +5768,8 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_idx with invalid index type "
-                         "H5_INDEX_N!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_idx with invalid index type "
+                       "H5_INDEX_N!\n");
                 PART_ERROR(H5Aget_info_by_idx_invalid_index_type);
             }
 
@@ -5800,8 +5790,8 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_idx with invalid iteration order "
-                         "H5_ITER_UNKNOWN!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_idx with invalid iteration order "
+                       "H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Aget_info_by_idx_invalid_iter_order);
             }
 
@@ -5814,8 +5804,8 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_idx with invalid iteration order "
-                         "H5_ITER_N!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_idx with invalid iteration order "
+                       "H5_ITER_N!\n");
                 PART_ERROR(H5Aget_info_by_idx_invalid_iter_order);
             }
 
@@ -5835,8 +5825,8 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_idx with an invalid attribute "
-                         "info pointer!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_idx with an invalid attribute "
+                       "info pointer!\n");
                 PART_ERROR(H5Aget_info_by_idx_invalid_attr_info_pointer);
             }
 
@@ -5857,7 +5847,7 @@ test_get_attribute_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved attribute info using H5Aget_info_by_idx with an invalid LAPL!\n");
+                printf("    retrieved attribute info using H5Aget_info_by_idx with an invalid LAPL!\n");
                 PART_ERROR(H5Aget_info_by_idx_invalid_lapl);
             }
 
@@ -5922,7 +5912,7 @@ test_rename_attribute(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
@@ -5931,20 +5921,20 @@ test_rename_attribute(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_RENAME_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_RENAME_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_RENAME_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -5957,39 +5947,39 @@ test_rename_attribute(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME, attr_dtype, attr_space_id,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     if ((attr_id2 = H5Acreate2(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME2, attr_dtype, attr_space_id,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attributes have been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME2)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -6003,33 +5993,33 @@ test_rename_attribute(void)
 
             if (H5Arename(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME, ATTRIBUTE_RENAME_TEST_NEW_NAME) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't rename attribute '%s' to '%s' using H5Arename\n",
-                         ATTRIBUTE_RENAME_TEST_ATTR_NAME, ATTRIBUTE_RENAME_TEST_NEW_NAME);
+                printf("    couldn't rename attribute '%s' to '%s' using H5Arename\n",
+                       ATTRIBUTE_RENAME_TEST_ATTR_NAME, ATTRIBUTE_RENAME_TEST_NEW_NAME);
                 PART_ERROR(H5Arename);
             }
 
             /* Verify the attribute has been renamed */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute exists\n");
+                printf("    couldn't determine if attribute exists\n");
                 PART_ERROR(H5Arename);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute did not get renamed!\n");
+                printf("    attribute did not get renamed!\n");
                 PART_ERROR(H5Arename);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_NEW_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute exists\n");
+                printf("    couldn't determine if attribute exists\n");
                 PART_ERROR(H5Arename);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute did not get renamed!\n");
+                printf("    attribute did not get renamed!\n");
                 PART_ERROR(H5Arename);
             }
 
@@ -6045,33 +6035,33 @@ test_rename_attribute(void)
                                   ATTRIBUTE_RENAME_TEST_ATTR_NAME2, ATTRIBUTE_RENAME_TEST_NEW_NAME2,
                                   H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't rename attribute '%s' to '%s' using H5Arename_by_name\n",
-                         ATTRIBUTE_RENAME_TEST_ATTR_NAME2, ATTRIBUTE_RENAME_TEST_NEW_NAME2);
+                printf("    couldn't rename attribute '%s' to '%s' using H5Arename_by_name\n",
+                       ATTRIBUTE_RENAME_TEST_ATTR_NAME2, ATTRIBUTE_RENAME_TEST_NEW_NAME2);
                 PART_ERROR(H5Arename_by_name);
             }
 
             /* Verify the attribute has been renamed */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute exists\n");
+                printf("    couldn't determine if attribute exists\n");
                 PART_ERROR(H5Arename_by_name);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute did not get renamed!\n");
+                printf("    attribute did not get renamed!\n");
                 PART_ERROR(H5Arename_by_name);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_NEW_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute exists\n");
+                printf("    couldn't determine if attribute exists\n");
                 PART_ERROR(H5Arename_by_name);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute did not get renamed!\n");
+                printf("    attribute did not get renamed!\n");
                 PART_ERROR(H5Arename_by_name);
             }
 
@@ -6140,7 +6130,7 @@ test_rename_attribute_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
@@ -6149,21 +6139,20 @@ test_rename_attribute_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n",
-                 ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -6177,39 +6166,39 @@ test_rename_attribute_invalid_params(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype,
                               attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     if ((attr_id2 = H5Acreate2(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME2, attr_dtype,
                                attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attributes have been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME2)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -6230,7 +6219,7 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    renamed attribute using H5Arename with an invalid loc_id!\n");
+                printf("    renamed attribute using H5Arename with an invalid loc_id!\n");
                 PART_ERROR(H5Arename_invalid_loc_id);
             }
 
@@ -6250,7 +6239,7 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    renamed attribute using H5Arename with a NULL old attribute name!\n");
+                printf("    renamed attribute using H5Arename with a NULL old attribute name!\n");
                 PART_ERROR(H5Arename_invalid_old_attr_name);
             }
 
@@ -6262,7 +6251,7 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    renamed attribute using H5Arename with an invalid old attribute name of ''!\n");
+                printf("    renamed attribute using H5Arename with an invalid old attribute name of ''!\n");
                 PART_ERROR(H5Arename_invalid_old_attr_name);
             }
 
@@ -6282,7 +6271,7 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    renamed attribute using H5Arename with a NULL new attribute name!\n");
+                printf("    renamed attribute using H5Arename with a NULL new attribute name!\n");
                 PART_ERROR(H5Arename_invalid_new_attr_name);
             }
 
@@ -6294,7 +6283,7 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    renamed attribute using H5Arename with an invalid new attribute name of ''!\n");
+                printf("    renamed attribute using H5Arename with an invalid new attribute name of ''!\n");
                 PART_ERROR(H5Arename_invalid_new_attr_name);
             }
 
@@ -6316,7 +6305,7 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    renamed attribute using H5Arename_by_name with an invalid loc_id!\n");
+                printf("    renamed attribute using H5Arename_by_name with an invalid loc_id!\n");
                 PART_ERROR(H5Arename_by_name_invalid_loc_id);
             }
 
@@ -6337,7 +6326,7 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    renamed attribute using H5Arename_by_name with a NULL object name!\n");
+                printf("    renamed attribute using H5Arename_by_name with a NULL object name!\n");
                 PART_ERROR(H5Arename_by_name_invalid_obj_name);
             }
 
@@ -6350,8 +6339,7 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    renamed attribute using H5Arename_by_name with an invalid object name of ''!\n");
+                printf("    renamed attribute using H5Arename_by_name with an invalid object name of ''!\n");
                 PART_ERROR(H5Arename_by_name_invalid_obj_name);
             }
 
@@ -6372,7 +6360,7 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    renamed attribute using H5Arename_by_name with a NULL old attribute name!\n");
+                printf("    renamed attribute using H5Arename_by_name with a NULL old attribute name!\n");
                 PART_ERROR(H5Arename_by_name_invalid_old_attr_name);
             }
 
@@ -6385,8 +6373,8 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    renamed attribute using H5Arename_by_name with an invalid old attribute name "
-                         "of ''!\n");
+                printf("    renamed attribute using H5Arename_by_name with an invalid old attribute name "
+                       "of ''!\n");
                 PART_ERROR(H5Arename_by_name_invalid_old_attr_name);
             }
 
@@ -6407,7 +6395,7 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    renamed attribute using H5Arename_by_name with a NULL new attribute name!\n");
+                printf("    renamed attribute using H5Arename_by_name with a NULL new attribute name!\n");
                 PART_ERROR(H5Arename_by_name_invalid_new_attr_name);
             }
 
@@ -6420,8 +6408,8 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    renamed attribute using H5Arename_by_name with an invalid new attribute name "
-                         "of ''!\n");
+                printf("    renamed attribute using H5Arename_by_name with an invalid new attribute name "
+                       "of ''!\n");
                 PART_ERROR(H5Arename_by_name_invalid_new_attr_name);
             }
 
@@ -6442,7 +6430,7 @@ test_rename_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    renamed attribute using H5Arename_by_name with an invalid LAPL!\n");
+                printf("    renamed attribute using H5Arename_by_name with an invalid LAPL!\n");
                 PART_ERROR(H5Arename_by_name_invalid_lapl);
             }
 
@@ -6515,8 +6503,8 @@ test_attribute_iterate_group(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, attribute, or iterate aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, attribute, or iterate aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -6524,26 +6512,26 @@ test_attribute_iterate_group(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for attribute creation order tracking\n");
+        printf("    couldn't create GCPL for attribute creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set attribute creation order tracking\n");
+            printf("    couldn't set attribute creation order tracking\n");
             goto error;
         }
     }
@@ -6551,7 +6539,7 @@ test_attribute_iterate_group(void)
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME, H5P_DEFAULT,
                                gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME);
         goto error;
     }
 
@@ -6571,26 +6559,26 @@ test_attribute_iterate_group(void)
         if ((attr_id = H5Acreate2(group_id, attr_name, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) <
             0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s'\n", attr_name);
+            printf("    couldn't create attribute '%s'\n", attr_name);
             goto error;
         }
 
         /* Verify the attribute has been created */
         if ((attr_exists = H5Aexists(group_id, attr_name)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't determine if attribute '%s' exists\n", attr_name);
+            printf("    couldn't determine if attribute '%s' exists\n", attr_name);
             goto error;
         }
 
         if (!attr_exists) {
             H5_FAILED();
-            HDprintf("    attribute '%s' did not exist\n", attr_name);
+            printf("    attribute '%s' did not exist\n", attr_name);
             goto error;
         }
 
         if (H5Aclose(attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    failed to close attribute '%s'\n", attr_name);
+            printf("    failed to close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -6617,15 +6605,15 @@ test_attribute_iterate_group(void)
             if (H5Aiterate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 by index type name in increasing order failed\n");
+                printf("    H5Aiterate2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Aiterate2_name_increasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
-                         "have been called!\n");
+                printf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
+                       "have been called!\n");
                 PART_ERROR(H5Aiterate2_name_increasing);
             }
 
@@ -6642,15 +6630,15 @@ test_attribute_iterate_group(void)
             if (H5Aiterate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 by index type name in decreasing order failed\n");
+                printf("    H5Aiterate2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Aiterate2_name_decreasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
-                         "have been called!\n");
+                printf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
+                       "have been called!\n");
                 PART_ERROR(H5Aiterate2_name_decreasing);
             }
 
@@ -6664,7 +6652,7 @@ test_attribute_iterate_group(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aiterate2_creation_increasing);
             }
 
@@ -6674,15 +6662,15 @@ test_attribute_iterate_group(void)
             if (H5Aiterate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1,
                             &link_counter) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 by index type creation order in increasing order failed\n");
+                printf("    H5Aiterate2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Aiterate2_creation_increasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
-                         "have been called!\n");
+                printf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
+                       "have been called!\n");
                 PART_ERROR(H5Aiterate2_creation_increasing);
             }
 
@@ -6696,7 +6684,7 @@ test_attribute_iterate_group(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aiterate2_creation_decreasing);
             }
 
@@ -6706,15 +6694,15 @@ test_attribute_iterate_group(void)
             if (H5Aiterate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1,
                             &link_counter) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 by index type creation order in decreasing order failed\n");
+                printf("    H5Aiterate2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Aiterate2_creation_decreasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
-                         "have been called!\n");
+                printf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
+                       "have been called!\n");
                 PART_ERROR(H5Aiterate2_creation_decreasing);
             }
 
@@ -6733,15 +6721,15 @@ test_attribute_iterate_group(void)
                     file_id, "/" ATTRIBUTE_TEST_GROUP_NAME "/" ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name by index type name in increasing order failed\n");
+                printf("    H5Aiterate_by_name by index type name in increasing order failed\n");
                 PART_ERROR(H5Aiterate_by_name_name_increasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
-                         "must not have been called!\n");
+                printf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
+                       "must not have been called!\n");
                 PART_ERROR(H5Aiterate_by_name_name_increasing);
             }
 
@@ -6760,15 +6748,15 @@ test_attribute_iterate_group(void)
                     file_id, "/" ATTRIBUTE_TEST_GROUP_NAME "/" ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name by index type name in decreasing order failed\n");
+                printf("    H5Aiterate_by_name by index type name in decreasing order failed\n");
                 PART_ERROR(H5Aiterate_by_name_name_decreasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
-                         "must not have been called!\n");
+                printf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
+                       "must not have been called!\n");
                 PART_ERROR(H5Aiterate_by_name_name_decreasing);
             }
 
@@ -6782,7 +6770,7 @@ test_attribute_iterate_group(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aiterate_by_name_creation_increasing);
             }
 
@@ -6794,15 +6782,15 @@ test_attribute_iterate_group(void)
                                    H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name by index type creation order in increasing order failed\n");
+                printf("    H5Aiterate_by_name by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Aiterate_by_name_creation_increasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
-                         "must not have been called!\n");
+                printf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
+                       "must not have been called!\n");
                 PART_ERROR(H5Aiterate_by_name_creation_increasing);
             }
 
@@ -6816,7 +6804,7 @@ test_attribute_iterate_group(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aiterate_by_name_creation_decreasing);
             }
 
@@ -6828,15 +6816,15 @@ test_attribute_iterate_group(void)
                                    H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name by index type creation order in decreasing order failed\n");
+                printf("    H5Aiterate_by_name by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Aiterate_by_name_creation_decreasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
-                         "must not have been called!\n");
+                printf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
+                       "must not have been called!\n");
                 PART_ERROR(H5Aiterate_by_name_creation_decreasing);
             }
 
@@ -6911,8 +6899,8 @@ test_attribute_iterate_dataset(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, attribute, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, attribute, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -6920,33 +6908,33 @@ test_attribute_iterate_dataset(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_TEST_DSET_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_DSET_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_DSET_SUBGROUP_NAME);
         goto error;
     }
 
     if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create DCPL for attribute creation order tracking\n");
+        printf("    couldn't create DCPL for attribute creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set attribute creation order tracking\n");
+            printf("    couldn't set attribute creation order tracking\n");
             goto error;
         }
     }
@@ -6966,7 +6954,7 @@ test_attribute_iterate_dataset(void)
     if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_ITERATE_TEST_DSET_NAME, dset_dtype, dset_space_id,
                               H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", ATTRIBUTE_ITERATE_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", ATTRIBUTE_ITERATE_TEST_DSET_NAME);
         goto error;
     }
 
@@ -6980,26 +6968,26 @@ test_attribute_iterate_dataset(void)
         if ((attr_id = H5Acreate2(dset_id, attr_name, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) <
             0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s'\n", attr_name);
+            printf("    couldn't create attribute '%s'\n", attr_name);
             goto error;
         }
 
         /* Verify the attribute has been created */
         if ((attr_exists = H5Aexists(dset_id, attr_name)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't determine if attribute '%s' exists\n", attr_name);
+            printf("    couldn't determine if attribute '%s' exists\n", attr_name);
             goto error;
         }
 
         if (!attr_exists) {
             H5_FAILED();
-            HDprintf("    attribute '%s' did not exist\n", attr_name);
+            printf("    attribute '%s' did not exist\n", attr_name);
             goto error;
         }
 
         if (H5Aclose(attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    failed to close attribute '%s'\n", attr_name);
+            printf("    failed to close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -7026,15 +7014,15 @@ test_attribute_iterate_dataset(void)
             if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 by index type name in increasing order failed\n");
+                printf("    H5Aiterate2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Aiterate2_name_increasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
-                         "have been called!\n");
+                printf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
+                       "have been called!\n");
                 PART_ERROR(H5Aiterate2_name_increasing);
             }
 
@@ -7051,15 +7039,15 @@ test_attribute_iterate_dataset(void)
             if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 by index type name in decreasing order failed\n");
+                printf("    H5Aiterate2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Aiterate2_name_decreasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
-                         "have been called!\n");
+                printf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
+                       "have been called!\n");
                 PART_ERROR(H5Aiterate2_name_decreasing);
             }
 
@@ -7073,7 +7061,7 @@ test_attribute_iterate_dataset(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aiterate2_creation_increasing);
             }
 
@@ -7083,15 +7071,15 @@ test_attribute_iterate_dataset(void)
             if (H5Aiterate2(dset_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1,
                             &link_counter) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 by index type creation order in increasing order failed\n");
+                printf("    H5Aiterate2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Aiterate2_creation_increasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
-                         "have been called!\n");
+                printf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
+                       "have been called!\n");
                 PART_ERROR(H5Aiterate2_creation_increasing);
             }
 
@@ -7105,7 +7093,7 @@ test_attribute_iterate_dataset(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aiterate2_creation_decreasing);
             }
 
@@ -7115,15 +7103,15 @@ test_attribute_iterate_dataset(void)
             if (H5Aiterate2(dset_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1,
                             &link_counter) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 by index type creation order in decreasing order failed\n");
+                printf("    H5Aiterate2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Aiterate2_creation_decreasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
-                         "have been called!\n");
+                printf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
+                       "have been called!\n");
                 PART_ERROR(H5Aiterate2_creation_decreasing);
             }
 
@@ -7144,15 +7132,15 @@ test_attribute_iterate_dataset(void)
                                    H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name by index type name in increasing order failed\n");
+                printf("    H5Aiterate_by_name by index type name in increasing order failed\n");
                 PART_ERROR(H5Aiterate_by_name_name_increasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
-                         "must not have been called!\n");
+                printf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
+                       "must not have been called!\n");
                 PART_ERROR(H5Aiterate_by_name_name_increasing);
             }
 
@@ -7173,15 +7161,15 @@ test_attribute_iterate_dataset(void)
                                    H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name by index type name in decreasing order failed\n");
+                printf("    H5Aiterate_by_name by index type name in decreasing order failed\n");
                 PART_ERROR(H5Aiterate_by_name_name_decreasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
-                         "must not have been called!\n");
+                printf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
+                       "must not have been called!\n");
                 PART_ERROR(H5Aiterate_by_name_name_decreasing);
             }
 
@@ -7195,7 +7183,7 @@ test_attribute_iterate_dataset(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aiterate_by_name_creation_increasing);
             }
 
@@ -7208,15 +7196,15 @@ test_attribute_iterate_dataset(void)
                                    H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name by index type creation order in increasing order failed\n");
+                printf("    H5Aiterate_by_name by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Aiterate_by_name_creation_increasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
-                         "must not have been called!\n");
+                printf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
+                       "must not have been called!\n");
                 PART_ERROR(H5Aiterate_by_name_creation_increasing);
             }
 
@@ -7230,7 +7218,7 @@ test_attribute_iterate_dataset(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aiterate_by_name_creation_decreasing);
             }
 
@@ -7243,15 +7231,15 @@ test_attribute_iterate_dataset(void)
                                    H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name by index type creation order in decreasing order failed\n");
+                printf("    H5Aiterate_by_name by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Aiterate_by_name_creation_decreasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
-                         "must not have been called!\n");
+                printf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
+                       "must not have been called!\n");
                 PART_ERROR(H5Aiterate_by_name_creation_decreasing);
             }
 
@@ -7333,8 +7321,8 @@ test_attribute_iterate_datatype(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, stored datatype, attribute, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, stored datatype, attribute, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -7342,33 +7330,33 @@ test_attribute_iterate_datatype(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_TEST_DTYPE_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_DTYPE_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_DTYPE_SUBGROUP_NAME);
         goto error;
     }
 
     if ((tcpl_id = H5Pcreate(H5P_DATATYPE_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create TCPL for attribute creation order tracking\n");
+        printf("    couldn't create TCPL for attribute creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_attr_creation_order(tcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set attribute creation order tracking\n");
+            printf("    couldn't set attribute creation order tracking\n");
             goto error;
         }
     }
@@ -7385,7 +7373,7 @@ test_attribute_iterate_datatype(void)
     if (H5Tcommit2(group_id, ATTRIBUTE_ITERATE_TEST_DTYPE_NAME, type_id, H5P_DEFAULT, tcpl_id, H5P_DEFAULT) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", ATTRIBUTE_ITERATE_TEST_DTYPE_NAME);
+        printf("    couldn't commit datatype '%s'\n", ATTRIBUTE_ITERATE_TEST_DTYPE_NAME);
         goto error;
     }
 
@@ -7399,26 +7387,26 @@ test_attribute_iterate_datatype(void)
         if ((attr_id = H5Acreate2(type_id, attr_name, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) <
             0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s'\n", attr_name);
+            printf("    couldn't create attribute '%s'\n", attr_name);
             goto error;
         }
 
         /* Verify the attribute has been created */
         if ((attr_exists = H5Aexists(type_id, attr_name)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't determine if attribute '%s' exists\n", attr_name);
+            printf("    couldn't determine if attribute '%s' exists\n", attr_name);
             goto error;
         }
 
         if (!attr_exists) {
             H5_FAILED();
-            HDprintf("    attribute '%s' did not exist\n", attr_name);
+            printf("    attribute '%s' did not exist\n", attr_name);
             goto error;
         }
 
         if (H5Aclose(attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    failed to close attribute '%s'\n", attr_name);
+            printf("    failed to close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -7445,15 +7433,15 @@ test_attribute_iterate_datatype(void)
             if (H5Aiterate2(type_id, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 by index type name in increasing order failed\n");
+                printf("    H5Aiterate2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Aiterate2_name_increasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
-                         "have been called!\n");
+                printf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
+                       "have been called!\n");
                 PART_ERROR(H5Aiterate2_name_increasing);
             }
 
@@ -7470,15 +7458,15 @@ test_attribute_iterate_datatype(void)
             if (H5Aiterate2(type_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 by index type name in decreasing order failed\n");
+                printf("    H5Aiterate2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Aiterate2_name_decreasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
-                         "have been called!\n");
+                printf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
+                       "have been called!\n");
                 PART_ERROR(H5Aiterate2_name_decreasing);
             }
 
@@ -7492,7 +7480,7 @@ test_attribute_iterate_datatype(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aiterate2_creation_increasing);
             }
 
@@ -7502,15 +7490,15 @@ test_attribute_iterate_datatype(void)
             if (H5Aiterate2(type_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1,
                             &link_counter) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 by index type creation order in increasing order failed\n");
+                printf("    H5Aiterate2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Aiterate2_creation_increasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
-                         "have been called!\n");
+                printf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
+                       "have been called!\n");
                 PART_ERROR(H5Aiterate2_creation_increasing);
             }
 
@@ -7524,7 +7512,7 @@ test_attribute_iterate_datatype(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aiterate2_creation_decreasing);
             }
 
@@ -7534,15 +7522,15 @@ test_attribute_iterate_datatype(void)
             if (H5Aiterate2(type_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1,
                             &link_counter) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 by index type creation order in decreasing order failed\n");
+                printf("    H5Aiterate2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Aiterate2_creation_decreasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
-                         "have been called!\n");
+                printf("    H5Aiterate sentinel value is unchanged; supplied callback function must not "
+                       "have been called!\n");
                 PART_ERROR(H5Aiterate2_creation_decreasing);
             }
 
@@ -7563,15 +7551,15 @@ test_attribute_iterate_datatype(void)
                     "/" ATTRIBUTE_ITERATE_TEST_DTYPE_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name by index type name in increasing order failed\n");
+                printf("    H5Aiterate_by_name by index type name in increasing order failed\n");
                 PART_ERROR(H5Aiterate_by_name_name_increasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
-                         "must not have been called!\n");
+                printf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
+                       "must not have been called!\n");
                 PART_ERROR(H5Aiterate_by_name_name_increasing);
             }
 
@@ -7592,15 +7580,15 @@ test_attribute_iterate_datatype(void)
                     "/" ATTRIBUTE_ITERATE_TEST_DTYPE_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name by index type name in decreasing order failed\n");
+                printf("    H5Aiterate_by_name by index type name in decreasing order failed\n");
                 PART_ERROR(H5Aiterate_by_name_name_decreasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
-                         "must not have been called!\n");
+                printf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
+                       "must not have been called!\n");
                 PART_ERROR(H5Aiterate_by_name_name_decreasing);
             }
 
@@ -7614,7 +7602,7 @@ test_attribute_iterate_datatype(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aiterate_by_name_creation_increasing);
             }
 
@@ -7628,15 +7616,15 @@ test_attribute_iterate_datatype(void)
                                    H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name by index type creation order in increasing order failed\n");
+                printf("    H5Aiterate_by_name by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Aiterate_by_name_creation_increasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
-                         "must not have been called!\n");
+                printf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
+                       "must not have been called!\n");
                 PART_ERROR(H5Aiterate_by_name_creation_increasing);
             }
 
@@ -7650,7 +7638,7 @@ test_attribute_iterate_datatype(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Aiterate_by_name_creation_decreasing);
             }
 
@@ -7664,15 +7652,15 @@ test_attribute_iterate_datatype(void)
                                    H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name by index type creation order in decreasing order failed\n");
+                printf("    H5Aiterate_by_name by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Aiterate_by_name_creation_decreasing);
             }
 
             /* Make sure that the attribute iteration callback was actually called */
             if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
-                         "must not have been called!\n");
+                printf("    H5Aiterate_by_name sentinel value is unchanged; supplied callback function "
+                       "must not have been called!\n");
                 PART_ERROR(H5Aiterate_by_name_creation_decreasing);
             }
 
@@ -7760,8 +7748,8 @@ test_attribute_iterate_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, attribute, or iterate aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, attribute, or iterate aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -7769,20 +7757,20 @@ test_attribute_iterate_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_SUBGROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup\n");
+        printf("    couldn't create container subgroup\n");
         goto error;
     }
 
@@ -7796,77 +7784,77 @@ test_attribute_iterate_invalid_params(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype,
                               attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     if ((attr_id2 = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME2, attr_dtype,
                                attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     if ((attr_id3 = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME3, attr_dtype,
                                attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     if ((attr_id4 = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME4, attr_dtype,
                                attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attributes have been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME2)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME3)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME4)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -7887,7 +7875,7 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    iterated over attributes using H5Aiterate with an invalid loc_id!\n");
+                printf("    iterated over attributes using H5Aiterate with an invalid loc_id!\n");
                 PART_ERROR(H5Aiterate_invalid_loc_id);
             }
 
@@ -7908,8 +7896,8 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    iterated over attributes using H5Aiterate with invalid index type "
-                         "H5_INDEX_UNKNOWN!\n");
+                printf("    iterated over attributes using H5Aiterate with invalid index type "
+                       "H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Aiterate_invalid_index_type);
             }
 
@@ -7921,8 +7909,7 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    iterated over attributes using H5Aiterate with invalid index type H5_INDEX_N!\n");
+                printf("    iterated over attributes using H5Aiterate with invalid index type H5_INDEX_N!\n");
                 PART_ERROR(H5Aiterate_invalid_index_type);
             }
 
@@ -7943,8 +7930,8 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    iterated over attributes using H5Aiterate with invalid index ordering "
-                         "H5_ITER_UNKNOWN!\n");
+                printf("    iterated over attributes using H5Aiterate with invalid index ordering "
+                       "H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Aiterate_invalid_index_order);
             }
 
@@ -7956,7 +7943,7 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    iterated over attributes using H5Aiterate with invalid index ordering H5_ITER_N!\n");
                 PART_ERROR(H5Aiterate_invalid_index_order);
             }
@@ -7978,7 +7965,7 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    iterated over attributes using H5Aiterate_by_name with an invalid loc_id!\n");
+                printf("    iterated over attributes using H5Aiterate_by_name with an invalid loc_id!\n");
                 PART_ERROR(H5Aiterate_by_name_invalid_loc_id);
             }
 
@@ -7999,7 +7986,7 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    iterated over attributes using H5Aiterate_by_name with a NULL object name!\n");
+                printf("    iterated over attributes using H5Aiterate_by_name with a NULL object name!\n");
                 PART_ERROR(H5Aiterate_by_name_invalid_obj_name);
             }
 
@@ -8012,8 +7999,8 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    iterated over attributes using H5Aiterate_by_name with an invalid object name "
-                         "of ''!\n");
+                printf("    iterated over attributes using H5Aiterate_by_name with an invalid object name "
+                       "of ''!\n");
                 PART_ERROR(H5Aiterate_by_name_invalid_obj_name);
             }
 
@@ -8034,8 +8021,8 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    iterated over attributes using H5Aiterate_by_name with invalid index type "
-                         "H5_INDEX_UNKNOWN!\n");
+                printf("    iterated over attributes using H5Aiterate_by_name with invalid index type "
+                       "H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Aiterate_by_name_invalid_index_type);
             }
 
@@ -8048,8 +8035,8 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    iterated over attributes using H5Aiterate_by_name with invalid index type "
-                         "H5_INDEX_N!\n");
+                printf("    iterated over attributes using H5Aiterate_by_name with invalid index type "
+                       "H5_INDEX_N!\n");
                 PART_ERROR(H5Aiterate_by_name_invalid_index_type);
             }
 
@@ -8070,8 +8057,8 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    iterated over attributes using H5Aiterate_by_name with invalid index ordering "
-                         "H5_ITER_UNKNOWN!\n");
+                printf("    iterated over attributes using H5Aiterate_by_name with invalid index ordering "
+                       "H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Aiterate_by_name_invalid_index_order);
             }
 
@@ -8084,8 +8071,8 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    iterated over attributes using H5Aiterate_by_name with invalid index ordering "
-                         "H5_ITER_N!\n");
+                printf("    iterated over attributes using H5Aiterate_by_name with invalid index ordering "
+                       "H5_ITER_N!\n");
                 PART_ERROR(H5Aiterate_by_name_invalid_index_order);
             }
 
@@ -8106,7 +8093,7 @@ test_attribute_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    iterated over attributes using H5Aiterate_by_name with an invalid LAPL!\n");
+                printf("    iterated over attributes using H5Aiterate_by_name with an invalid LAPL!\n");
                 PART_ERROR(H5Aiterate_by_name_invalid_lapl);
             }
 
@@ -8180,8 +8167,8 @@ test_attribute_iterate_0_attributes(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, attribute, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, attribute, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -8189,20 +8176,20 @@ test_attribute_iterate_0_attributes(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_SUBGROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup\n");
+        printf("    couldn't create container subgroup\n");
         goto error;
     }
 
@@ -8216,7 +8203,7 @@ test_attribute_iterate_0_attributes(void)
     if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, dset_dtype,
                               dset_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset\n");
+        printf("    couldn't create dataset\n");
         goto error;
     }
 
@@ -8230,7 +8217,7 @@ test_attribute_iterate_0_attributes(void)
 
             if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, attr_iter_callback2, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 on object with 0 attributes failed\n");
+                printf("    H5Aiterate2 on object with 0 attributes failed\n");
                 PART_ERROR(H5Aiterate_0_attributes_native);
             }
 
@@ -8244,7 +8231,7 @@ test_attribute_iterate_0_attributes(void)
 
             if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback2, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 on object with 0 attributes failed\n");
+                printf("    H5Aiterate2 on object with 0 attributes failed\n");
                 PART_ERROR(H5Aiterate_0_attributes_inc);
             }
 
@@ -8258,7 +8245,7 @@ test_attribute_iterate_0_attributes(void)
 
             if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback2, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate2 on object with 0 attributes failed\n");
+                printf("    H5Aiterate2 on object with 0 attributes failed\n");
                 PART_ERROR(H5Aiterate_0_attributes_dec);
             }
 
@@ -8273,7 +8260,7 @@ test_attribute_iterate_0_attributes(void)
             if (H5Aiterate_by_name(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, H5_INDEX_NAME,
                                    H5_ITER_NATIVE, NULL, attr_iter_callback2, NULL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name on object with 0 attributes failed\n");
+                printf("    H5Aiterate_by_name on object with 0 attributes failed\n");
                 PART_ERROR(H5Aiterate_by_name_0_attributes_native);
             }
 
@@ -8288,7 +8275,7 @@ test_attribute_iterate_0_attributes(void)
             if (H5Aiterate_by_name(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, H5_INDEX_NAME,
                                    H5_ITER_INC, NULL, attr_iter_callback2, NULL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name on object with 0 attributes failed\n");
+                printf("    H5Aiterate_by_name on object with 0 attributes failed\n");
                 PART_ERROR(H5Aiterate_by_name_0_attributes_inc);
             }
 
@@ -8302,7 +8289,7 @@ test_attribute_iterate_0_attributes(void)
             if (H5Aiterate_by_name(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, H5_INDEX_NAME,
                                    H5_ITER_DEC, NULL, attr_iter_callback2, NULL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Aiterate_by_name on object with 0 attributes failed\n");
+                printf("    H5Aiterate_by_name on object with 0 attributes failed\n");
                 PART_ERROR(H5Aiterate_by_name_0_attributes_dec);
             }
 
@@ -8368,8 +8355,8 @@ test_delete_attribute(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or attribute aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, or attribute aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -8377,26 +8364,26 @@ test_delete_attribute(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for attribute creation order tracking\n");
+        printf("    couldn't create GCPL for attribute creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set attribute creation order tracking\n");
+            printf("    couldn't set attribute creation order tracking\n");
             goto error;
         }
     }
@@ -8404,7 +8391,7 @@ test_delete_attribute(void)
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_DELETION_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_DELETION_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -8426,49 +8413,49 @@ test_delete_attribute(void)
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete);
             }
 
             /* Verify the attribute has been created */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete);
             }
 
             /* Delete the attribute */
             if (H5Adelete(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    failed to delete attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete);
             }
 
             /* Verify the attribute has been deleted */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete);
             }
 
@@ -8491,22 +8478,22 @@ test_delete_attribute(void)
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_name);
             }
 
             /* Verify the attribute has been created */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_name);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_name);
             }
 
@@ -8514,27 +8501,27 @@ test_delete_attribute(void)
             if (H5Adelete_by_name(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME,
                                   ATTRIBUTE_DELETION_TEST_ATTR_NAME, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    failed to delete attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_name);
             }
 
             /* Verify the attribute has been deleted */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_name);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_name);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_name);
             }
 
@@ -8555,7 +8542,7 @@ test_delete_attribute(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Adelete_by_idx_crt_order_increasing);
             }
 
@@ -8563,82 +8550,82 @@ test_delete_attribute(void)
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             /* Verify the attributes have been created */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
@@ -8646,50 +8633,50 @@ test_delete_attribute(void)
             if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                  H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute using H5Adelete_by_idx by creation order in "
-                         "increasing order\n");
+                printf("    failed to delete attribute using H5Adelete_by_idx by creation order in "
+                       "increasing order\n");
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             /* Ensure that the attribute is gone and others remain */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
@@ -8697,95 +8684,95 @@ test_delete_attribute(void)
             if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                  H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute using H5Adelete_by_idx by creation order in "
-                         "increasing order\n");
+                printf("    failed to delete attribute using H5Adelete_by_idx by creation order in "
+                       "increasing order\n");
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                  H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute using H5Adelete_by_idx by creation order in "
-                         "increasing order\n");
+                printf("    failed to delete attribute using H5Adelete_by_idx by creation order in "
+                       "increasing order\n");
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_increasing);
             }
 
@@ -8806,7 +8793,7 @@ test_delete_attribute(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Adelete_by_idx_crt_order_decreasing);
             }
 
@@ -8814,82 +8801,82 @@ test_delete_attribute(void)
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             /* Verify the attributes have been created */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
@@ -8897,50 +8884,50 @@ test_delete_attribute(void)
             if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                  H5_ITER_DEC, 2, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute using H5Adelete_by_idx by creation order in "
-                         "decreasing order\n");
+                printf("    failed to delete attribute using H5Adelete_by_idx by creation order in "
+                       "decreasing order\n");
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             /* Ensure that the attribute is gone and others remain */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
@@ -8948,95 +8935,95 @@ test_delete_attribute(void)
             if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                  H5_ITER_DEC, 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute using H5Adelete_by_idx by creation order in "
-                         "decreasing order\n");
+                printf("    failed to delete attribute using H5Adelete_by_idx by creation order in "
+                       "decreasing order\n");
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                  H5_ITER_DEC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute using H5Adelete_by_idx by creation order in "
-                         "decreasing order\n");
+                printf("    failed to delete attribute using H5Adelete_by_idx by creation order in "
+                       "decreasing order\n");
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_crt_order_decreasing);
             }
 
@@ -9059,82 +9046,82 @@ test_delete_attribute(void)
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             /* Verify the attributes have been created */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
@@ -9142,50 +9129,50 @@ test_delete_attribute(void)
             if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME,
                                  H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute using H5Adelete_by_idx by alphabetical order in "
-                         "increasing order\n");
+                printf("    failed to delete attribute using H5Adelete_by_idx by alphabetical order in "
+                       "increasing order\n");
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             /* Ensure that the attribute is gone and others remain */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
@@ -9193,95 +9180,95 @@ test_delete_attribute(void)
             if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME,
                                  H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute using H5Adelete_by_idx by alphabetical order in "
-                         "increasing order\n");
+                printf("    failed to delete attribute using H5Adelete_by_idx by alphabetical order in "
+                       "increasing order\n");
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME,
                                  H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute using H5Adelete_by_idx by alphabetical order in "
-                         "increasing order\n");
+                printf("    failed to delete attribute using H5Adelete_by_idx by alphabetical order in "
+                       "increasing order\n");
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_increasing);
             }
 
@@ -9304,82 +9291,82 @@ test_delete_attribute(void)
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3, attr_dtype, space_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (H5Aclose(attr_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             /* Verify the attributes have been created */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' didn't exist before deletion\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' didn't exist before deletion\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
@@ -9387,50 +9374,50 @@ test_delete_attribute(void)
             if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME,
                                  H5_ITER_DEC, 2, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute using H5Adelete_by_idx by alphabetical order in "
-                         "decreasing order\n");
+                printf("    failed to delete attribute using H5Adelete_by_idx by alphabetical order in "
+                       "decreasing order\n");
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             /* Ensure that the attribute is gone and others remain */
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
@@ -9438,95 +9425,95 @@ test_delete_attribute(void)
             if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME,
                                  H5_ITER_DEC, 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute using H5Adelete_by_idx by alphabetical order in "
-                         "decreasing order\n");
+                printf("    failed to delete attribute using H5Adelete_by_idx by alphabetical order in "
+                       "decreasing order\n");
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' doesn't exist after deletion of a different attribute!\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME,
                                  H5_ITER_DEC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to delete attribute using H5Adelete_by_idx by alphabetical order in "
-                         "decreasing order\n");
+                printf("    failed to delete attribute using H5Adelete_by_idx by alphabetical order in "
+                       "decreasing order\n");
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute '%s' exists\n",
-                         ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    couldn't determine if attribute '%s' exists\n",
+                       ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
             if (attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
+                printf("    attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3);
                 PART_ERROR(H5Adelete_by_idx_name_order_decreasing);
             }
 
@@ -9601,7 +9588,7 @@ test_delete_attribute_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
@@ -9610,21 +9597,21 @@ test_delete_attribute_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n",
-                 ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n",
+               ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -9638,20 +9625,20 @@ test_delete_attribute_invalid_params(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype,
                               space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute didn't exists\n");
+        printf("    attribute didn't exists\n");
         goto error;
     }
 
@@ -9671,7 +9658,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete with an invalid loc_id!\n");
+                printf("    deleted an attribute using H5Adelete with an invalid loc_id!\n");
                 PART_ERROR(H5Adelete_invalid_loc_id);
             }
 
@@ -9691,7 +9678,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete with a NULL attribute name!\n");
+                printf("    deleted an attribute using H5Adelete with a NULL attribute name!\n");
                 PART_ERROR(H5Adelete_invalid_attr_name);
             }
 
@@ -9703,7 +9690,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete with an invalid attribute name of ''!\n");
+                printf("    deleted an attribute using H5Adelete with an invalid attribute name of ''!\n");
                 PART_ERROR(H5Adelete_invalid_attr_name);
             }
 
@@ -9724,7 +9711,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete_by_name with an invalid loc_id!\n");
+                printf("    deleted an attribute using H5Adelete_by_name with an invalid loc_id!\n");
                 PART_ERROR(H5Adelete_by_name_invalid_loc_id);
             }
 
@@ -9745,7 +9732,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete_by_name with a NULL object name!\n");
+                printf("    deleted an attribute using H5Adelete_by_name with a NULL object name!\n");
                 PART_ERROR(H5Adelete_by_name_invalid_obj_name);
             }
 
@@ -9758,7 +9745,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    deleted an attribute using H5Adelete_by_name with an invalid object name of ''!\n");
                 PART_ERROR(H5Adelete_by_name_invalid_obj_name);
             }
@@ -9779,7 +9766,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete_by_name with a NULL attribute name!\n");
+                printf("    deleted an attribute using H5Adelete_by_name with a NULL attribute name!\n");
                 PART_ERROR(H5Adelete_by_name_invalid_attr_name);
             }
 
@@ -9791,8 +9778,8 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete_by_name with an invalid attribute name of "
-                         "''!\n");
+                printf("    deleted an attribute using H5Adelete_by_name with an invalid attribute name of "
+                       "''!\n");
                 PART_ERROR(H5Adelete_by_name_invalid_attr_name);
             }
 
@@ -9813,7 +9800,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete_by_name with an invalid LAPL!\n");
+                printf("    deleted an attribute using H5Adelete_by_name with an invalid LAPL!\n");
                 PART_ERROR(H5Adelete_by_name_invalid_lapl);
             }
 
@@ -9833,7 +9820,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete_by_idx with an invalid loc_id!\n");
+                printf("    deleted an attribute using H5Adelete_by_idx with an invalid loc_id!\n");
                 PART_ERROR(H5Adelete_by_idx_invalid_loc_id);
             }
 
@@ -9853,7 +9840,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete_by_idx with a NULL object name!\n");
+                printf("    deleted an attribute using H5Adelete_by_idx with a NULL object name!\n");
                 PART_ERROR(H5Adelete_by_idx_invalid_obj_name);
             }
 
@@ -9865,7 +9852,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    deleted an attribute using H5Adelete_by_idx with an invalid object name of ''!\n");
                 PART_ERROR(H5Adelete_by_idx_invalid_obj_name);
             }
@@ -9886,8 +9873,8 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete_by_idx with invalid index type "
-                         "H5_INDEX_UNKNOWN!\n");
+                printf("    deleted an attribute using H5Adelete_by_idx with invalid index type "
+                       "H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Adelete_by_idx_invalid_index_type);
             }
 
@@ -9899,7 +9886,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    deleted an attribute using H5Adelete_by_idx with invalid index type H5_INDEX_N!\n");
                 PART_ERROR(H5Adelete_by_idx_invalid_index_type);
             }
@@ -9920,8 +9907,8 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete_by_idx with invalid index ordering "
-                         "H5_ITER_UNKNOWN!\n");
+                printf("    deleted an attribute using H5Adelete_by_idx with invalid index ordering "
+                       "H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Adelete_by_idx_invalid_index_order);
             }
 
@@ -9933,8 +9920,8 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete_by_idx with invalid index ordering "
-                         "H5_ITER_N!\n");
+                printf("    deleted an attribute using H5Adelete_by_idx with invalid index ordering "
+                       "H5_ITER_N!\n");
                 PART_ERROR(H5Adelete_by_idx_invalid_index_order);
             }
 
@@ -9954,7 +9941,7 @@ test_delete_attribute_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    deleted an attribute using H5Adelete_by_idx with an invalid LAPL!\n");
+                printf("    deleted an attribute using H5Adelete_by_idx with an invalid LAPL!\n");
                 PART_ERROR(H5Adelete_by_idx_invalid_lapl);
             }
 
@@ -10018,7 +10005,7 @@ test_attribute_exists(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
@@ -10027,20 +10014,20 @@ test_attribute_exists(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_EXISTS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", ATTRIBUTE_EXISTS_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_EXISTS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -10053,7 +10040,7 @@ test_attribute_exists(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_EXISTS_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
@@ -10067,13 +10054,13 @@ test_attribute_exists(void)
 
             if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_EXISTS_TEST_ATTR_NAME)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute exists\n");
+                printf("    couldn't determine if attribute exists\n");
                 PART_ERROR(H5Aexists);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' did not exist\n", ATTRIBUTE_EXISTS_TEST_ATTR_NAME);
+                printf("    attribute '%s' did not exist\n", ATTRIBUTE_EXISTS_TEST_ATTR_NAME);
                 PART_ERROR(H5Aexists);
             }
 
@@ -10088,13 +10075,13 @@ test_attribute_exists(void)
             if ((attr_exists = H5Aexists_by_name(container_group, ATTRIBUTE_EXISTS_TEST_GROUP_NAME,
                                                  ATTRIBUTE_EXISTS_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if attribute exists by name\n");
+                printf("    couldn't determine if attribute exists by name\n");
                 PART_ERROR(H5Aexists_by_name);
             }
 
             if (!attr_exists) {
                 H5_FAILED();
-                HDprintf("    attribute '%s' did not exist by name\n", ATTRIBUTE_EXISTS_TEST_ATTR_NAME);
+                printf("    attribute '%s' did not exist by name\n", ATTRIBUTE_EXISTS_TEST_ATTR_NAME);
                 PART_ERROR(H5Aexists_by_name);
             }
 
@@ -10160,7 +10147,7 @@ test_attribute_exists_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
@@ -10169,21 +10156,20 @@ test_attribute_exists_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n",
-                 ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -10197,20 +10183,20 @@ test_attribute_exists_invalid_params(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, space_id,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute didn't exists\n");
+        printf("    attribute didn't exists\n");
         goto error;
     }
 
@@ -10230,7 +10216,7 @@ test_attribute_exists_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Aexists with an invalid loc_id succeeded!\n");
+                printf("    H5Aexists with an invalid loc_id succeeded!\n");
                 PART_ERROR(H5Aexists_invalid_loc_id);
             }
 
@@ -10250,7 +10236,7 @@ test_attribute_exists_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Aexists with a NULL attribute name succeeded!\n");
+                printf("    H5Aexists with a NULL attribute name succeeded!\n");
                 PART_ERROR(H5Aexists_invalid_attr_name);
             }
 
@@ -10262,7 +10248,7 @@ test_attribute_exists_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Aexists with an invalid attribute name of '' succeeded!\n");
+                printf("    H5Aexists with an invalid attribute name of '' succeeded!\n");
                 PART_ERROR(H5Aexists_invalid_attr_name);
             }
 
@@ -10283,7 +10269,7 @@ test_attribute_exists_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Aexists_by_name with an invalid loc_id succeeded!\n");
+                printf("    H5Aexists_by_name with an invalid loc_id succeeded!\n");
                 PART_ERROR(H5Aexists_by_name_invalid_loc_id);
             }
 
@@ -10304,7 +10290,7 @@ test_attribute_exists_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Aexists_by_name with a NULL object name succeeded!\n");
+                printf("    H5Aexists_by_name with a NULL object name succeeded!\n");
                 PART_ERROR(H5Aexists_by_name_invalid_obj_name);
             }
 
@@ -10317,7 +10303,7 @@ test_attribute_exists_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Aexists_by_name with an invalid object name of '' succeeded!\n");
+                printf("    H5Aexists_by_name with an invalid object name of '' succeeded!\n");
                 PART_ERROR(H5Aexists_by_name_invalid_obj_name);
             }
 
@@ -10338,7 +10324,7 @@ test_attribute_exists_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Aexists_by_name with a NULL attribute name succeeded!\n");
+                printf("    H5Aexists_by_name with a NULL attribute name succeeded!\n");
                 PART_ERROR(H5Aexists_by_name_invalid_attr_name);
             }
 
@@ -10351,7 +10337,7 @@ test_attribute_exists_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Aexists_by_name with an invalid attribute name of '' succeeded!\n");
+                printf("    H5Aexists_by_name with an invalid attribute name of '' succeeded!\n");
                 PART_ERROR(H5Aexists_by_name_invalid_attr_name);
             }
 
@@ -10372,7 +10358,7 @@ test_attribute_exists_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Aexists_by_name with an invalid link access property list succeeded!\n");
+                printf("    H5Aexists_by_name with an invalid link access property list succeeded!\n");
                 PART_ERROR(H5Aexists_by_name_invalid_lapl);
             }
 
@@ -10439,27 +10425,27 @@ test_attribute_many(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_MANY_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create the group '%s'\n", ATTRIBUTE_MANY_GROUP_NAME);
+        printf("    couldn't create the group '%s'\n", ATTRIBUTE_MANY_GROUP_NAME);
         goto error;
     }
 
@@ -10475,20 +10461,20 @@ test_attribute_many(void)
 
         if ((attr_id = H5Acreate2(group_id, attrname, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute\n");
+            printf("    couldn't create attribute\n");
             goto error;
         }
 
         /* Verify the attribute has been created */
         if ((attr_exists = H5Aexists(group_id, attrname)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't determine if attribute exists\n");
+            printf("    couldn't determine if attribute exists\n");
             goto error;
         }
 
         if (!attr_exists) {
             H5_FAILED();
-            HDprintf("    attribute did not exist\n");
+            printf("    attribute did not exist\n");
             goto error;
         }
 
@@ -10547,27 +10533,27 @@ test_attribute_duplicate_id(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or attribute aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_DUPLICATE_ID_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create the group '%s'\n", ATTRIBUTE_DUPLICATE_ID_GRP_NAME);
+        printf("    couldn't create the group '%s'\n", ATTRIBUTE_DUPLICATE_ID_GRP_NAME);
         goto error;
     }
 
@@ -10580,27 +10566,27 @@ test_attribute_duplicate_id(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DUPLICATE_ID_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DUPLICATE_ID_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
     /* Open the attribute just created and get a second ID */
     if ((attr_id2 = H5Aopen(group_id, ATTRIBUTE_DUPLICATE_ID_ATTR_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    attribute can't be opened for a second time\n");
+        printf("    attribute can't be opened for a second time\n");
         goto error;
     }
 
@@ -10663,8 +10649,8 @@ test_get_number_attributes(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, attribute, or object aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, attribute, or object aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -10672,20 +10658,20 @@ test_get_number_attributes(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_NUM_ATTRS_TEST_GRP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create the group '%s'\n", ATTRIBUTE_GET_NUM_ATTRS_TEST_GRP_NAME);
+        printf("    couldn't create the group '%s'\n", ATTRIBUTE_GET_NUM_ATTRS_TEST_GRP_NAME);
         goto error;
     }
 
@@ -10698,20 +10684,20 @@ test_get_number_attributes(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NUM_ATTRS_TEST_ATTR_NAME, attr_dtype, space_id,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NUM_ATTRS_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -10726,13 +10712,13 @@ test_get_number_attributes(void)
             /* Now get the number of attributes from the group */
             if (H5Oget_info3(group_id, &obj_info, H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve group info using H5Oget_info3\n");
+                printf("    couldn't retrieve group info using H5Oget_info3\n");
                 PART_ERROR(H5Oget_info);
             }
 
             if (obj_info.num_attrs != 1) {
                 H5_FAILED();
-                HDprintf("    invalid number of attributes received\n");
+                printf("    invalid number of attributes received\n");
                 PART_ERROR(H5Oget_info);
             }
 
@@ -10747,13 +10733,13 @@ test_get_number_attributes(void)
             if (H5Oget_info_by_name3(container_group, ATTRIBUTE_GET_NUM_ATTRS_TEST_GRP_NAME, &obj_info,
                                      H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve group info using H5Oget_info_by_name3\n");
+                printf("    couldn't retrieve group info using H5Oget_info_by_name3\n");
                 PART_ERROR(H5Oget_info_by_name);
             }
 
             if (obj_info.num_attrs != 1) {
                 H5_FAILED();
-                HDprintf("    invalid number of attributes received\n");
+                printf("    invalid number of attributes received\n");
                 PART_ERROR(H5Oget_info_by_name);
             }
 
@@ -10768,13 +10754,13 @@ test_get_number_attributes(void)
             if (H5Oget_info_by_idx3(container_group, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &obj_info,
                                     H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve group info using H5Oget_info_by_idx3\n");
+                printf("    couldn't retrieve group info using H5Oget_info_by_idx3\n");
                 PART_ERROR(H5Oget_info_by_idx);
             }
 
             if (obj_info.num_attrs != 1) {
                 H5_FAILED();
-                HDprintf("    invalid number of attributes received\n");
+                printf("    invalid number of attributes received\n");
                 PART_ERROR(H5Oget_info_by_idx);
             }
 
@@ -10845,27 +10831,27 @@ test_attr_shared_dtype(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, attribute, stored datatype, or object aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, attribute, stored datatype, or object aren't "
+               "supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_SHARED_DTYPE_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create the group '%s'\n", ATTRIBUTE_SHARED_DTYPE_GROUP_NAME);
+        printf("    couldn't create the group '%s'\n", ATTRIBUTE_SHARED_DTYPE_GROUP_NAME);
         goto error;
     }
 
@@ -10879,73 +10865,73 @@ test_attr_shared_dtype(void)
     if (H5Tcommit2(group_id, ATTRIBUTE_SHARED_DTYPE_NAME, attr_dtype, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype\n");
+        printf("    couldn't commit datatype\n");
         goto error;
     }
 
     if (H5Oget_info_by_name3(group_id, ATTRIBUTE_SHARED_DTYPE_NAME, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't retrieve root group info using H5Oget_info_by_name3\n");
+        printf("    couldn't retrieve root group info using H5Oget_info_by_name3\n");
         goto error;
     }
 
     if (obj_info.rc != 1) {
         H5_FAILED();
-        HDprintf("    reference count of the named datatype is wrong: %u\n", obj_info.rc);
+        printf("    reference count of the named datatype is wrong: %u\n", obj_info.rc);
         goto error;
     }
 
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_SHARED_DTYPE_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute\n");
+        printf("    couldn't create attribute\n");
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_SHARED_DTYPE_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute exists\n");
+        printf("    couldn't determine if attribute exists\n");
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
     if (H5Oget_info_by_name3(group_id, ATTRIBUTE_SHARED_DTYPE_NAME, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't retrieve root group info using H5Oget_info_by_name3\n");
+        printf("    couldn't retrieve root group info using H5Oget_info_by_name3\n");
         goto error;
     }
 
     if (obj_info.rc != 2) {
         H5_FAILED();
-        HDprintf("    reference count of the named datatype is wrong: %u\n", obj_info.rc);
+        printf("    reference count of the named datatype is wrong: %u\n", obj_info.rc);
         goto error;
     }
 
     if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_SHARED_DTYPE_DSET_NAME, attr_dtype, space_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset\n");
+        printf("    couldn't create dataset\n");
         goto error;
     }
 
     if (H5Oget_info_by_name3(group_id, ATTRIBUTE_SHARED_DTYPE_NAME, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't retrieve root group info using H5Oget_info_by_name3\n");
+        printf("    couldn't retrieve root group info using H5Oget_info_by_name3\n");
         goto error;
     }
 
     if (obj_info.rc != 3) {
         H5_FAILED();
-        HDprintf("    reference count of the named datatype is wrong: %u\n", obj_info.rc);
+        printf("    reference count of the named datatype is wrong: %u\n", obj_info.rc);
         goto error;
     }
 
@@ -11016,7 +11002,7 @@ attr_iter_callback1(hid_t location_id, const char *attr_name, const H5A_info_t *
     }
 
     if (HDstrncmp(attr_name, expected_attr_name, ATTRIBUTE_ITERATE_TEST_ATTR_NAME_BUF_SIZE)) {
-        HDprintf("    attribute name '%s' didn't match expected name '%s'\n", attr_name, expected_attr_name);
+        printf("    attribute name '%s' didn't match expected name '%s'\n", attr_name, expected_attr_name);
         ret_val = H5_ITER_ERROR;
         goto done;
     }
@@ -11043,8 +11029,8 @@ attr_iter_callback1(hid_t location_id, const char *attr_name, const H5A_info_t *
 
         if (ainfo->corder != expected_crt_order) {
             H5_FAILED();
-            HDprintf("    attribute's creation order value of %lld didn't match expected value of %lld\n",
-                     (long long)ainfo->corder, (long long)expected_crt_order);
+            printf("    attribute's creation order value of %lld didn't match expected value of %lld\n",
+                   (long long)ainfo->corder, (long long)expected_crt_order);
             ret_val = H5_ITER_ERROR;
             goto done;
         }
@@ -11073,17 +11059,17 @@ H5_api_attribute_test(void)
     size_t i;
     int    nerrors;
 
-    HDprintf("**********************************************\n");
-    HDprintf("*                                            *\n");
-    HDprintf("*            API Attribute Tests             *\n");
-    HDprintf("*                                            *\n");
-    HDprintf("**********************************************\n\n");
+    printf("**********************************************\n");
+    printf("*                                            *\n");
+    printf("*            API Attribute Tests             *\n");
+    printf("*                                            *\n");
+    printf("**********************************************\n\n");
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(attribute_tests); i++) {
         nerrors += (*attribute_tests[i])() ? 1 : 0;
     }
 
-    HDprintf("\n");
+    printf("\n");
 
     return nerrors;
 }
diff --git a/test/API/H5_api_dataset_test.c b/test/API/H5_api_dataset_test.c
index e31ed43..e3843a6 100644
--- a/test/API/H5_api_dataset_test.c
+++ b/test/API/H5_api_dataset_test.c
@@ -169,13 +169,13 @@ test_create_dataset_under_root(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
@@ -189,7 +189,7 @@ test_create_dataset_under_root(void)
     if ((dset_id = H5Dcreate2(file_id, DATASET_CREATE_UNDER_ROOT_DSET_NAME, dset_dtype, fspace_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_CREATE_UNDER_ROOT_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_CREATE_UNDER_ROOT_DSET_NAME);
         goto error;
     }
 
@@ -238,27 +238,26 @@ test_create_dataset_under_existing_group(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_UNDER_EXISTING_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", DATASET_CREATE_UNDER_EXISTING_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", DATASET_CREATE_UNDER_EXISTING_GROUP_NAME);
         goto error;
     }
 
@@ -272,7 +271,7 @@ test_create_dataset_under_existing_group(void)
     if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_UNDER_EXISTING_DSET_NAME, dset_dtype, fspace_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_CREATE_UNDER_EXISTING_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_CREATE_UNDER_EXISTING_DSET_NAME);
         goto error;
     }
 
@@ -327,8 +326,7 @@ test_create_dataset_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -336,20 +334,20 @@ test_create_dataset_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", DATASET_CREATE_INVALID_PARAMS_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", DATASET_CREATE_INVALID_PARAMS_GROUP_NAME);
         goto error;
     }
 
@@ -377,7 +375,7 @@ test_create_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created dataset using H5Dcreate with an invalid loc_id!\n");
+                printf("    created dataset using H5Dcreate with an invalid loc_id!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_invalid_loc_id);
             }
@@ -399,7 +397,7 @@ test_create_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created dataset using H5Dcreate with a NULL dataset name!\n");
+                printf("    created dataset using H5Dcreate with a NULL dataset name!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_invalid_dataset_name);
             }
@@ -413,7 +411,7 @@ test_create_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created dataset using H5Dcreate with an invalid dataset name of ''!\n");
+                printf("    created dataset using H5Dcreate with an invalid dataset name of ''!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_invalid_dataset_name);
             }
@@ -435,7 +433,7 @@ test_create_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created dataset using H5Dcreate with an invalid datatype!\n");
+                printf("    created dataset using H5Dcreate with an invalid datatype!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_invalid_datatype);
             }
@@ -457,7 +455,7 @@ test_create_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created dataset using H5Dcreate with an invalid dataspace!\n");
+                printf("    created dataset using H5Dcreate with an invalid dataspace!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_invalid_dataspace);
             }
@@ -479,7 +477,7 @@ test_create_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created dataset using H5Dcreate with an invalid LCPL!\n");
+                printf("    created dataset using H5Dcreate with an invalid LCPL!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_invalid_lcpl);
             }
@@ -501,7 +499,7 @@ test_create_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created dataset using H5Dcreate with an invalid DCPL!\n");
+                printf("    created dataset using H5Dcreate with an invalid DCPL!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_invalid_dcpl);
             }
@@ -523,7 +521,7 @@ test_create_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created dataset using H5Dcreate with an invalid DAPL!\n");
+                printf("    created dataset using H5Dcreate with an invalid DAPL!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_invalid_dapl);
             }
@@ -584,27 +582,26 @@ test_create_anonymous_dataset(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_ANONYMOUS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", DATASET_CREATE_ANONYMOUS_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", DATASET_CREATE_ANONYMOUS_GROUP_NAME);
         goto error;
     }
 
@@ -616,7 +613,7 @@ test_create_anonymous_dataset(void)
 
     if ((dset_id = H5Dcreate_anon(group_id, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create anonymous dataset\n");
+        printf("    couldn't create anonymous dataset\n");
         goto error;
     }
 
@@ -672,8 +669,7 @@ test_create_anonymous_dataset_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -681,21 +677,21 @@ test_create_anonymous_dataset_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n",
-                 DATASET_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n",
+               DATASET_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME);
         goto error;
     }
 
@@ -722,7 +718,7 @@ test_create_anonymous_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created anonymous dataset using an invalid loc_id!\n");
+                printf("    created anonymous dataset using an invalid loc_id!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_anon_invalid_loc_id);
             }
@@ -743,7 +739,7 @@ test_create_anonymous_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created anonymous dataset using an invalid dataset datatype!\n");
+                printf("    created anonymous dataset using an invalid dataset datatype!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_anon_invalid_datatype);
             }
@@ -764,7 +760,7 @@ test_create_anonymous_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created anonymous dataset using an invalid dataset dataspace!\n");
+                printf("    created anonymous dataset using an invalid dataset dataspace!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_anon_invalid_dataspace);
             }
@@ -785,7 +781,7 @@ test_create_anonymous_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created anonymous dataset using an invalid DCPL!\n");
+                printf("    created anonymous dataset using an invalid DCPL!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_anon_invalid_dcpl);
             }
@@ -806,7 +802,7 @@ test_create_anonymous_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created anonymous dataset using an invalid DAPL!\n");
+                printf("    created anonymous dataset using an invalid DAPL!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dcreate_anon_invalid_dapl);
             }
@@ -868,28 +864,27 @@ test_create_dataset_null_space(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_NULL_DATASPACE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 DATASET_CREATE_NULL_DATASPACE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               DATASET_CREATE_NULL_DATASPACE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -902,7 +897,7 @@ test_create_dataset_null_space(void)
     if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME, dset_dtype, fspace_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME);
         goto error;
     }
 
@@ -911,7 +906,7 @@ test_create_dataset_null_space(void)
 
     if ((dset_id = H5Dopen2(group_id, DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME);
         goto error;
     }
 
@@ -966,28 +961,27 @@ test_create_dataset_scalar_space(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_SCALAR_DATASPACE_TEST_SUBGROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 DATASET_CREATE_SCALAR_DATASPACE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               DATASET_CREATE_SCALAR_DATASPACE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -1000,7 +994,7 @@ test_create_dataset_scalar_space(void)
     if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME, dset_dtype, fspace_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME);
         goto error;
     }
 
@@ -1009,7 +1003,7 @@ test_create_dataset_scalar_space(void)
 
     if ((dset_id = H5Dopen2(group_id, DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME);
         goto error;
     }
 
@@ -1066,27 +1060,26 @@ test_create_zero_dim_dset(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ZERO_DIM_DSET_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", ZERO_DIM_DSET_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", ZERO_DIM_DSET_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -1096,27 +1089,27 @@ test_create_zero_dim_dset(void)
     if ((dset_id = H5Dcreate2(group_id, ZERO_DIM_DSET_TEST_DSET_NAME, H5T_NATIVE_INT, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to create 0-sized dataset\n");
+        printf("    failed to create 0-sized dataset\n");
         goto error;
     }
 
     if (H5Sselect_none(fspace_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to set none selection in dataset's file dataspace\n");
+        printf("    failed to set none selection in dataset's file dataspace\n");
         goto error;
     }
 
     /* Attempt to write 0 elements to dataset */
     if (H5Dwrite(dset_id, H5T_NATIVE_INT, fspace_id, fspace_id, H5P_DEFAULT, data) < 0) {
         H5_FAILED();
-        HDprintf("    failed to write 0 elements to 0-sized dataset\n");
+        printf("    failed to write 0 elements to 0-sized dataset\n");
         goto error;
     }
 
     /* Attempt to read 0 elements from dataset */
     if (H5Dread(dset_id, H5T_NATIVE_INT, fspace_id, fspace_id, H5P_DEFAULT, data) < 0) {
         H5_FAILED();
-        HDprintf("    failed to read 0 elements from 0-sized dataset\n");
+        printf("    failed to read 0 elements from 0-sized dataset\n");
         goto error;
     }
 
@@ -1168,27 +1161,26 @@ test_create_dataset_random_shapes(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SHAPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group\n");
+        printf("    couldn't create container sub-group\n");
         goto error;
     }
 
@@ -1201,7 +1193,7 @@ test_create_dataset_random_shapes(void)
 
         if ((space_id = generate_random_dataspace(ndims, NULL, NULL, FALSE)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create dataspace\n");
+            printf("    couldn't create dataspace\n");
             goto error;
         }
 
@@ -1210,7 +1202,7 @@ test_create_dataset_random_shapes(void)
         if ((dset_id = H5Dcreate2(group_id, name, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create dataset\n");
+            printf("    couldn't create dataset\n");
             goto error;
         }
 
@@ -1273,28 +1265,26 @@ test_create_dataset_predefined_types(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_PREDEFINED_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create sub-container group '%s'\n",
-                 DATASET_PREDEFINED_TYPE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create sub-container group '%s'\n", DATASET_PREDEFINED_TYPE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -1310,7 +1300,7 @@ test_create_dataset_predefined_types(void)
         if ((dset_id = H5Dcreate2(group_id, name, predefined_type_test_table[i], fspace_id, H5P_DEFAULT,
                                   H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create dataset '%s'\n", name);
+            printf("    couldn't create dataset '%s'\n", name);
             goto error;
         }
 
@@ -1321,7 +1311,7 @@ test_create_dataset_predefined_types(void)
 
         if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to open dataset '%s'\n", name);
+            printf("    failed to open dataset '%s'\n", name);
             goto error;
         }
 
@@ -1373,8 +1363,7 @@ test_create_dataset_string_types(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -1382,32 +1371,32 @@ test_create_dataset_string_types(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_STRING_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_STRING_TYPE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_STRING_TYPE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((type_id_fixed = H5Tcreate(H5T_STRING, DATASET_STRING_TYPE_TEST_STRING_LENGTH)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create fixed-length string type\n");
+        printf("    couldn't create fixed-length string type\n");
         goto error;
     }
 
     if ((type_id_variable = H5Tcreate(H5T_STRING, H5T_VARIABLE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create variable-length string type\n");
+        printf("    couldn't create variable-length string type\n");
         goto error;
     }
 
@@ -1425,8 +1414,8 @@ test_create_dataset_string_types(void)
             if ((dset_id_fixed = H5Dcreate2(group_id, DATASET_STRING_TYPE_TEST_DSET_NAME1, type_id_fixed,
                                             fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create fixed-length string dataset '%s'\n",
-                         DATASET_STRING_TYPE_TEST_DSET_NAME1);
+                printf("    couldn't create fixed-length string dataset '%s'\n",
+                       DATASET_STRING_TYPE_TEST_DSET_NAME1);
                 PART_ERROR(H5Dcreate_fixed_string_type);
             }
 
@@ -1441,7 +1430,7 @@ test_create_dataset_string_types(void)
 
             if ((dset_id_fixed = H5Dopen2(group_id, DATASET_STRING_TYPE_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to open dataset '%s'\n", DATASET_STRING_TYPE_TEST_DSET_NAME1);
+                printf("    failed to open dataset '%s'\n", DATASET_STRING_TYPE_TEST_DSET_NAME1);
                 PART_ERROR(H5Dcreate_fixed_string_type);
             }
 
@@ -1457,8 +1446,8 @@ test_create_dataset_string_types(void)
                      H5Dcreate2(group_id, DATASET_STRING_TYPE_TEST_DSET_NAME2, type_id_variable, fspace_id,
                                 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create variable-length string dataset '%s'\n",
-                         DATASET_STRING_TYPE_TEST_DSET_NAME2);
+                printf("    couldn't create variable-length string dataset '%s'\n",
+                       DATASET_STRING_TYPE_TEST_DSET_NAME2);
                 PART_ERROR(H5Dcreate_variable_string_type);
             }
 
@@ -1474,7 +1463,7 @@ test_create_dataset_string_types(void)
             if ((dset_id_variable = H5Dopen2(group_id, DATASET_STRING_TYPE_TEST_DSET_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    failed to open dataset '%s'\n", DATASET_STRING_TYPE_TEST_DSET_NAME2);
+                printf("    failed to open dataset '%s'\n", DATASET_STRING_TYPE_TEST_DSET_NAME2);
                 PART_ERROR(H5Dcreate_variable_string_type);
             }
 
@@ -1546,8 +1535,7 @@ test_create_dataset_compound_types(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -1561,20 +1549,20 @@ test_create_dataset_compound_types(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_COMPOUND_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_COMPOUND_TYPE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_COMPOUND_TYPE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -1601,7 +1589,7 @@ test_create_dataset_compound_types(void)
 
         if ((compound_type = H5Tcreate(H5T_COMPOUND, 1)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create compound datatype\n");
+            printf("    couldn't create compound datatype\n");
             goto error;
         }
 
@@ -1614,13 +1602,13 @@ test_create_dataset_compound_types(void)
 
             if ((type_pool[j] = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create compound datatype member %zu\n", j);
+                printf("    couldn't create compound datatype member %zu\n", j);
                 goto error;
             }
 
             if (!(member_size = H5Tget_size(type_pool[j]))) {
                 H5_FAILED();
-                HDprintf("    couldn't get compound member %zu size\n", j);
+                printf("    couldn't get compound member %zu size\n", j);
                 goto error;
             }
 
@@ -1643,7 +1631,7 @@ test_create_dataset_compound_types(void)
         if ((dset_id = H5Dcreate2(group_id, dset_name, compound_type, fspace_id, H5P_DEFAULT, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create dataset '%s'\n", dset_name);
+            printf("    couldn't create dataset '%s'\n", dset_name);
             goto error;
         }
 
@@ -1652,7 +1640,7 @@ test_create_dataset_compound_types(void)
 
         if ((dset_id = H5Dopen2(group_id, dset_name, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to open dataset '%s'\n", dset_name);
+            printf("    failed to open dataset '%s'\n", dset_name);
             goto error;
         }
 
@@ -1717,33 +1705,32 @@ test_create_dataset_enum_types(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_ENUM_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_ENUM_TYPE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_ENUM_TYPE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((enum_native = H5Tcreate(H5T_ENUM, sizeof(int))) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create native enum type\n");
+        printf("    couldn't create native enum type\n");
         goto error;
     }
 
@@ -1753,7 +1740,7 @@ test_create_dataset_enum_types(void)
 
     if ((enum_non_native = H5Tenum_create(H5T_STD_U32LE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create non-native enum type\n");
+        printf("    couldn't create non-native enum type\n");
         goto error;
     }
 
@@ -1772,14 +1759,14 @@ test_create_dataset_enum_types(void)
     if ((dset_id_native = H5Dcreate2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME1, enum_native, fspace_id,
                                      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create native enum dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME1);
+        printf("    couldn't create native enum dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME1);
         goto error;
     }
 
     if ((dset_id_non_native = H5Dcreate2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME2, enum_non_native,
                                          fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create non-native enum dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME2);
+        printf("    couldn't create non-native enum dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME2);
         goto error;
     }
 
@@ -1790,13 +1777,13 @@ test_create_dataset_enum_types(void)
 
     if ((dset_id_native = H5Dopen2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to open dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME1);
+        printf("    failed to open dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME1);
         goto error;
     }
 
     if ((dset_id_non_native = H5Dopen2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to open dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME2);
+        printf("    failed to open dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME2);
         goto error;
     }
 
@@ -1865,27 +1852,26 @@ test_create_dataset_array_types(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_ARRAY_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_ARRAY_TYPE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_ARRAY_TYPE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -1899,7 +1885,7 @@ test_create_dataset_array_types(void)
     if ((array_type_id1 = H5Tarray_create2(array_base_type_id1, DATASET_ARRAY_TYPE_TEST_RANK1, array_dims1)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't create first array type\n");
+        printf("    couldn't create first array type\n");
         goto error;
     }
 
@@ -1912,7 +1898,7 @@ test_create_dataset_array_types(void)
     if ((array_type_id2 = H5Tarray_create2(array_base_type_id2, DATASET_ARRAY_TYPE_TEST_RANK2, array_dims2)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't create second array type\n");
+        printf("    couldn't create second array type\n");
         goto error;
     }
 
@@ -1926,13 +1912,13 @@ test_create_dataset_array_types(void)
     if ((nested_type_id = H5Tarray_create2(array_base_type_id3, DATASET_ARRAY_TYPE_TEST_RANK3, array_dims3)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't create nested array base type\n");
+        printf("    couldn't create nested array base type\n");
         goto error;
     }
 
     if ((array_type_id3 = H5Tarray_create2(nested_type_id, DATASET_ARRAY_TYPE_TEST_RANK3, array_dims3)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create nested array type\n");
+        printf("    couldn't create nested array type\n");
         goto error;
     }
 
@@ -1942,21 +1928,21 @@ test_create_dataset_array_types(void)
     if ((dset_id1 = H5Dcreate2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME1, array_type_id1, fspace_id,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME1);
+        printf("    couldn't create array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME1);
         goto error;
     }
 
     if ((dset_id2 = H5Dcreate2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME2, array_type_id2, fspace_id,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME2);
+        printf("    couldn't create array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME2);
         goto error;
     }
 
     if ((dset_id3 = H5Dcreate2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME3, array_type_id3, fspace_id,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create nested array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME3);
+        printf("    couldn't create nested array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME3);
         goto error;
     }
 
@@ -1969,19 +1955,19 @@ test_create_dataset_array_types(void)
 
     if ((dset_id1 = H5Dopen2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME1);
+        printf("    failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME1);
         goto error;
     }
 
     if ((dset_id2 = H5Dopen2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME2);
+        printf("    failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME2);
         goto error;
     }
 
     if ((dset_id3 = H5Dopen2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME3, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME3);
+        printf("    failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME3);
         goto error;
     }
 
@@ -2063,8 +2049,8 @@ test_create_dataset_creation_properties(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or dataset "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -2072,20 +2058,20 @@ test_create_dataset_creation_properties(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_CREATION_PROPERTIES_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", DATASET_CREATION_PROPERTIES_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", DATASET_CREATION_PROPERTIES_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2119,7 +2105,7 @@ test_create_dataset_creation_properties(void)
 
             if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create DCPL\n");
+                printf("    couldn't create DCPL\n");
                 PART_ERROR(DCPL_alloc_time_test);
             }
 
@@ -2128,7 +2114,7 @@ test_create_dataset_creation_properties(void)
 
                 if (H5Pset_alloc_time(dcpl_id, alloc_times[i]) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't set alloc time property value\n");
+                    printf("    couldn't set alloc time property value\n");
                     PART_ERROR(DCPL_alloc_time_test);
                 }
 
@@ -2137,7 +2123,7 @@ test_create_dataset_creation_properties(void)
                 if ((dset_id = H5Dcreate2(group_id, name, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id,
                                           H5P_DEFAULT)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create dataset '%s'\n", name);
+                    printf("    couldn't create dataset '%s'\n", name);
                     PART_ERROR(DCPL_alloc_time_test);
                 }
 
@@ -2152,7 +2138,7 @@ test_create_dataset_creation_properties(void)
 
                 if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't open dataset '%s'\n", name);
+                    printf("    couldn't open dataset '%s'\n", name);
                     PART_ERROR(DCPL_alloc_time_test);
                 }
 
@@ -2189,13 +2175,13 @@ test_create_dataset_creation_properties(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking is not supported by this VOL connector\n");
+                printf("    creation order tracking is not supported by this VOL connector\n");
                 PART_EMPTY(DCPL_attr_crt_order_test);
             }
 
             if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create DCPL\n");
+                printf("    couldn't create DCPL\n");
                 PART_ERROR(DCPL_attr_crt_order_test);
             }
 
@@ -2204,7 +2190,7 @@ test_create_dataset_creation_properties(void)
 
                 if (H5Pset_attr_creation_order(dcpl_id, creation_orders[i]) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't set attribute creation order property\n");
+                    printf("    couldn't set attribute creation order property\n");
                     PART_ERROR(DCPL_attr_crt_order_test);
                 }
 
@@ -2213,7 +2199,7 @@ test_create_dataset_creation_properties(void)
                 if ((dset_id = H5Dcreate2(group_id, name, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id,
                                           H5P_DEFAULT)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create dataset '%s'\n", name);
+                    printf("    couldn't create dataset '%s'\n", name);
                     PART_ERROR(DCPL_attr_crt_order_test);
                 }
 
@@ -2228,7 +2214,7 @@ test_create_dataset_creation_properties(void)
 
                 if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't open dataset '%s'\n", name);
+                    printf("    couldn't open dataset '%s'\n", name);
                     PART_ERROR(DCPL_attr_crt_order_test);
                 }
 
@@ -2262,22 +2248,22 @@ test_create_dataset_creation_properties(void)
 
             if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create DCPL\n");
+                printf("    couldn't create DCPL\n");
                 PART_ERROR(DCPL_attr_phase_change_test);
             }
 
             if (H5Pset_attr_phase_change(dcpl_id, DATASET_CREATION_PROPERTIES_TEST_MAX_COMPACT,
                                          DATASET_CREATION_PROPERTIES_TEST_MIN_DENSE) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set attribute phase change property\n");
+                printf("    couldn't set attribute phase change property\n");
                 PART_ERROR(DCPL_attr_phase_change_test);
             }
 
             if ((dset_id = H5Dcreate2(group_id, DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME,
                                       dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n",
-                         DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n",
+                       DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME);
                 PART_ERROR(DCPL_attr_phase_change_test);
             }
 
@@ -2293,8 +2279,8 @@ test_create_dataset_creation_properties(void)
             if ((dset_id = H5Dopen2(group_id, DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME,
                                     H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n",
-                         DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME);
+                printf("    couldn't open dataset '%s'\n",
+                       DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME);
                 PART_ERROR(DCPL_attr_phase_change_test);
             }
 
@@ -2328,7 +2314,7 @@ test_create_dataset_creation_properties(void)
 
             if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create DCPL\n");
+                printf("    couldn't create DCPL\n");
                 PART_ERROR(DCPL_fill_time_property_test);
             }
 
@@ -2337,7 +2323,7 @@ test_create_dataset_creation_properties(void)
 
                 if (H5Pset_fill_time(dcpl_id, fill_times[i]) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't set dataset fill time property\n");
+                    printf("    couldn't set dataset fill time property\n");
                     PART_ERROR(DCPL_fill_time_property_test);
                 }
 
@@ -2346,7 +2332,7 @@ test_create_dataset_creation_properties(void)
                 if ((dset_id = H5Dcreate2(group_id, name, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id,
                                           H5P_DEFAULT)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create dataset '%s'\n", name);
+                    printf("    couldn't create dataset '%s'\n", name);
                     PART_ERROR(DCPL_fill_time_property_test);
                 }
 
@@ -2361,7 +2347,7 @@ test_create_dataset_creation_properties(void)
 
                 if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't open dataset '%s'\n", name);
+                    printf("    couldn't open dataset '%s'\n", name);
                     PART_ERROR(DCPL_fill_time_property_test);
                 }
 
@@ -2397,46 +2383,46 @@ test_create_dataset_creation_properties(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILTERS)) {
                 SKIPPED();
-                HDprintf("    dataset filters are not supported by this VOL connector\n");
+                printf("    dataset filters are not supported by this VOL connector\n");
                 PART_EMPTY(DCPL_filters_test);
             }
 
             if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create DCPL\n");
+                printf("    couldn't create DCPL\n");
                 PART_ERROR(DCPL_filters_test);
             }
 
             if (H5Pset_chunk(dcpl_id, DATASET_CREATION_PROPERTIES_TEST_SHAPE_RANK, chunk_dims) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set chunking on DCPL\n");
+                printf("    couldn't set chunking on DCPL\n");
                 PART_ERROR(DCPL_filters_test);
             }
 
             /* Set all of the available filters on the DCPL */
             if (H5Pset_deflate(dcpl_id, 7) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set deflate filter on DCPL\n");
+                printf("    couldn't set deflate filter on DCPL\n");
                 PART_ERROR(DCPL_filters_test);
             }
             if (H5Pset_shuffle(dcpl_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set shuffle filter on DCPL\n");
+                printf("    couldn't set shuffle filter on DCPL\n");
                 PART_ERROR(DCPL_filters_test);
             }
             if (H5Pset_fletcher32(dcpl_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set fletcher32 filter on DCPL\n");
+                printf("    couldn't set fletcher32 filter on DCPL\n");
                 PART_ERROR(DCPL_filters_test);
             }
             if (H5Pset_nbit(dcpl_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set nbit filter on DCPL\n");
+                printf("    couldn't set nbit filter on DCPL\n");
                 PART_ERROR(DCPL_filters_test);
             }
             if (H5Pset_scaleoffset(dcpl_id, H5Z_SO_FLOAT_ESCALE, 2) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set scaleoffset filter on DCPL\n");
+                printf("    couldn't set scaleoffset filter on DCPL\n");
                 PART_ERROR(DCPL_filters_test);
             }
 
@@ -2446,8 +2432,8 @@ test_create_dataset_creation_properties(void)
             if ((dset_id = H5Dcreate2(group_id, DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME,
                                       H5T_NATIVE_INT, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n",
-                         DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n",
+                       DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME);
                 PART_ERROR(DCPL_filters_test);
             }
 
@@ -2463,8 +2449,8 @@ test_create_dataset_creation_properties(void)
             if ((dset_id = H5Dopen2(group_id, DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME,
                                     H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n",
-                         DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME);
+                printf("    couldn't open dataset '%s'\n",
+                       DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME);
                 PART_ERROR(DCPL_filters_test);
             }
 
@@ -2499,7 +2485,7 @@ test_create_dataset_creation_properties(void)
 
             if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create DCPL\n");
+                printf("    couldn't create DCPL\n");
                 PART_ERROR(DCPL_storage_layout_test);
             }
 
@@ -2508,7 +2494,7 @@ test_create_dataset_creation_properties(void)
 
                 if (H5Pset_layout(dcpl_id, layouts[i]) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't set storage layout property\n");
+                    printf("    couldn't set storage layout property\n");
                     PART_ERROR(DCPL_storage_layout_test);
                 }
 
@@ -2522,7 +2508,7 @@ test_create_dataset_creation_properties(void)
                     if (H5Pset_chunk(dcpl_id, DATASET_CREATION_PROPERTIES_TEST_CHUNK_DIM_RANK,
                                      local_chunk_dims) < 0) {
                         H5_FAILED();
-                        HDprintf("    couldn't set chunk dimensionality\n");
+                        printf("    couldn't set chunk dimensionality\n");
                         PART_ERROR(DCPL_storage_layout_test);
                     }
                 }
@@ -2534,7 +2520,7 @@ test_create_dataset_creation_properties(void)
                                     (H5D_COMPACT == layouts[i]) ? compact_fspace_id : fspace_id, H5P_DEFAULT,
                                     dcpl_id, H5P_DEFAULT)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create dataset '%s'\n", name);
+                    printf("    couldn't create dataset '%s'\n", name);
                     PART_ERROR(DCPL_storage_layout_test);
                 }
 
@@ -2549,7 +2535,7 @@ test_create_dataset_creation_properties(void)
 
                 if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't open dataset '%s'\n", name);
+                    printf("    couldn't open dataset '%s'\n", name);
                     PART_ERROR(DCPL_storage_layout_test);
                 }
 
@@ -2583,27 +2569,27 @@ test_create_dataset_creation_properties(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_TRACK_TIMES)) {
                 SKIPPED();
-                HDprintf("    object time tracking is not supported by this VOL connector\n");
+                printf("    object time tracking is not supported by this VOL connector\n");
                 PART_EMPTY(DCPL_track_obj_times_test);
             }
 
             if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create DCPL\n");
+                printf("    couldn't create DCPL\n");
                 PART_ERROR(DCPL_track_obj_times_test);
             }
 
             if (H5Pset_obj_track_times(dcpl_id, true) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set object time tracking property\n");
+                printf("    couldn't set object time tracking property\n");
                 PART_ERROR(DCPL_track_obj_times_test);
             }
 
             if ((dset_id = H5Dcreate2(group_id, DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME,
                                       dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n",
-                         DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n",
+                       DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME);
                 PART_ERROR(DCPL_track_obj_times_test);
             }
 
@@ -2619,8 +2605,8 @@ test_create_dataset_creation_properties(void)
             if ((dset_id = H5Dopen2(group_id, DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME,
                                     H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n",
-                         DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME);
+                printf("    couldn't open dataset '%s'\n",
+                       DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME);
                 PART_ERROR(DCPL_track_obj_times_test);
             }
 
@@ -2635,15 +2621,15 @@ test_create_dataset_creation_properties(void)
 
             if (H5Pset_obj_track_times(dcpl_id, false) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set object time tracking property\n");
+                printf("    couldn't set object time tracking property\n");
                 PART_ERROR(DCPL_track_obj_times_test);
             }
 
             if ((dset_id = H5Dcreate2(group_id, DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME,
                                       dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n",
-                         DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n",
+                       DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME);
                 PART_ERROR(DCPL_track_obj_times_test);
             }
 
@@ -2659,8 +2645,8 @@ test_create_dataset_creation_properties(void)
             if ((dset_id = H5Dopen2(group_id, DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME,
                                     H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n",
-                         DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME);
+                printf("    couldn't open dataset '%s'\n",
+                       DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME);
                 PART_ERROR(DCPL_track_obj_times_test);
             }
 
@@ -2746,58 +2732,57 @@ test_create_many_dataset(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_MANY_CREATE_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", DATASET_MANY_CREATE_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", DATASET_MANY_CREATE_GROUP_NAME);
         goto error;
     }
 
     if ((dataspace_id = H5Screate(H5S_SCALAR)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create scalar data space\n");
+        printf("    couldn't create scalar data space\n");
         goto error;
     }
 
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < DATASET_NUMB; i++) {
-        HDprintf("\r %u/%u", i + 1, DATASET_NUMB);
+        printf("\r %u/%u", i + 1, DATASET_NUMB);
         sprintf(dset_name, "dset_%02u", i);
         data = i % 256;
 
         if ((dset_id = H5Dcreate2(group_id, dset_name, H5T_NATIVE_UCHAR, dataspace_id, H5P_DEFAULT,
                                   H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create dataset '%s'\n", dset_name);
+            printf("    couldn't create dataset '%s'\n", dset_name);
             goto error;
         }
 
         if (H5Dwrite(dset_id, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, &data) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't write to dataset '%s'\n", dset_name);
+            printf("    couldn't write to dataset '%s'\n", dset_name);
             goto error;
         }
 
         if (H5Dclose(dset_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close dataset '%s'\n", dset_name);
+            printf("    couldn't close dataset '%s'\n", dset_name);
             goto error;
         }
     }
@@ -2862,8 +2847,7 @@ test_open_dataset_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -2871,20 +2855,20 @@ test_open_dataset_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_OPEN_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", DATASET_OPEN_INVALID_PARAMS_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", DATASET_OPEN_INVALID_PARAMS_GROUP_NAME);
         goto error;
     }
 
@@ -2898,7 +2882,7 @@ test_open_dataset_invalid_params(void)
     if ((dset_id = H5Dcreate2(group_id, DATASET_OPEN_INVALID_PARAMS_DSET_NAME, dset_dtype, fspace_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_OPEN_INVALID_PARAMS_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_OPEN_INVALID_PARAMS_DSET_NAME);
         goto error;
     }
 
@@ -2921,7 +2905,7 @@ test_open_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened dataset using H5Dopen2 with an invalid loc_id!\n");
+                printf("    opened dataset using H5Dopen2 with an invalid loc_id!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dopen_invalid_loc_id);
             }
@@ -2942,7 +2926,7 @@ test_open_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened dataset using H5Dopen2 with a NULL dataset name!\n");
+                printf("    opened dataset using H5Dopen2 with a NULL dataset name!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dopen_invalid_dataset_name);
             }
@@ -2955,7 +2939,7 @@ test_open_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened dataset using H5Dopen2 with an invalid dataset name of ''!\n");
+                printf("    opened dataset using H5Dopen2 with an invalid dataset name of ''!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dopen_invalid_dataset_name);
             }
@@ -2976,7 +2960,7 @@ test_open_dataset_invalid_params(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened dataset using H5Dopen2 with an invalid DAPL!\n");
+                printf("    opened dataset using H5Dopen2 with an invalid DAPL!\n");
                 H5Dclose(dset_id);
                 PART_ERROR(H5Dopen_invalid_dapl);
             }
@@ -3034,13 +3018,13 @@ test_close_dataset_invalid_params(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
@@ -3052,7 +3036,7 @@ test_close_dataset_invalid_params(void)
 
     if (err_ret >= 0) {
         H5_FAILED();
-        HDprintf("    H5Dclose succeeded with an invalid dataset ID!\n");
+        printf("    H5Dclose succeeded with an invalid dataset ID!\n");
         goto error;
     }
 
@@ -3098,8 +3082,7 @@ test_get_dataset_space_and_type(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -3107,20 +3090,20 @@ test_get_dataset_space_and_type(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_GET_SPACE_TYPE_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", DATASET_GET_SPACE_TYPE_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", DATASET_GET_SPACE_TYPE_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -3134,7 +3117,7 @@ test_get_dataset_space_and_type(void)
     if ((dset_id = H5Dcreate2(group_id, DATASET_GET_SPACE_TYPE_TEST_DSET_NAME, dset_dtype, dset_space_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME);
         goto error;
     }
 
@@ -3149,7 +3132,7 @@ test_get_dataset_space_and_type(void)
 
             if ((tmp_type_id = H5Dget_type(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve dataset's datatype\n");
+                printf("    couldn't retrieve dataset's datatype\n");
                 PART_ERROR(H5Dget_type);
             }
 
@@ -3158,13 +3141,13 @@ test_get_dataset_space_and_type(void)
 
                 if (types_equal < 0) {
                     H5_FAILED();
-                    HDprintf("    datatype was invalid\n");
+                    printf("    datatype was invalid\n");
                     PART_ERROR(H5Dget_type);
                 }
 
                 if (!types_equal) {
                     H5_FAILED();
-                    HDprintf("    dataset's datatype did not match\n");
+                    printf("    dataset's datatype did not match\n");
                     PART_ERROR(H5Dget_type);
                 }
             }
@@ -3179,7 +3162,7 @@ test_get_dataset_space_and_type(void)
 
             if ((tmp_space_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve dataset's dataspace\n");
+                printf("    couldn't retrieve dataset's dataspace\n");
                 PART_ERROR(H5Dget_space);
             }
 
@@ -3188,14 +3171,14 @@ test_get_dataset_space_and_type(void)
 
                 if (H5Sget_simple_extent_dims(tmp_space_id, space_dims, NULL) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't retrieve dataspace dimensions\n");
+                    printf("    couldn't retrieve dataspace dimensions\n");
                     PART_ERROR(H5Dget_space);
                 }
 
                 for (i = 0; i < DATASET_GET_SPACE_TYPE_TEST_SPACE_RANK; i++)
                     if (space_dims[i] != dset_dims[i]) {
                         H5_FAILED();
-                        HDprintf("    dataset's dataspace dims didn't match\n");
+                        printf("    dataset's dataspace dims didn't match\n");
                         PART_ERROR(H5Dget_space);
                     }
             }
@@ -3238,13 +3221,13 @@ test_get_dataset_space_and_type(void)
 
             if ((dset_id = H5Dopen2(group_id, DATASET_GET_SPACE_TYPE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME);
+                printf("    couldn't open dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME);
                 PART_ERROR(H5Dget_type_reopened);
             }
 
             if ((tmp_type_id = H5Dget_type(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve dataset's datatype\n");
+                printf("    couldn't retrieve dataset's datatype\n");
                 PART_ERROR(H5Dget_type_reopened);
             }
 
@@ -3253,13 +3236,13 @@ test_get_dataset_space_and_type(void)
 
                 if (types_equal < 0) {
                     H5_FAILED();
-                    HDprintf("    datatype was invalid\n");
+                    printf("    datatype was invalid\n");
                     PART_ERROR(H5Dget_type_reopened);
                 }
 
                 if (!types_equal) {
                     H5_FAILED();
-                    HDprintf("    dataset's datatype did not match\n");
+                    printf("    dataset's datatype did not match\n");
                     PART_ERROR(H5Dget_type_reopened);
                 }
             }
@@ -3283,13 +3266,13 @@ test_get_dataset_space_and_type(void)
 
             if ((dset_id = H5Dopen2(group_id, DATASET_GET_SPACE_TYPE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME);
+                printf("    couldn't open dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME);
                 PART_ERROR(H5Dget_space_reopened);
             }
 
             if ((tmp_space_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve dataset's dataspace\n");
+                printf("    couldn't retrieve dataset's dataspace\n");
                 PART_ERROR(H5Dget_space_reopened);
             }
 
@@ -3298,14 +3281,14 @@ test_get_dataset_space_and_type(void)
 
                 if (H5Sget_simple_extent_dims(tmp_space_id, space_dims, NULL) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't retrieve dataspace dimensions\n");
+                    printf("    couldn't retrieve dataspace dimensions\n");
                     PART_ERROR(H5Dget_space_reopened);
                 }
 
                 for (i = 0; i < DATASET_GET_SPACE_TYPE_TEST_SPACE_RANK; i++) {
                     if (space_dims[i] != dset_dims[i]) {
                         H5_FAILED();
-                        HDprintf("    dataset's dataspace dims didn't match!\n");
+                        printf("    dataset's dataspace dims didn't match!\n");
                         PART_ERROR(H5Dget_space_reopened);
                     }
                 }
@@ -3387,8 +3370,7 @@ test_get_dataset_space_and_type_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -3396,21 +3378,21 @@ test_get_dataset_space_and_type_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n",
-                 DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n",
+               DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -3424,7 +3406,7 @@ test_get_dataset_space_and_type_invalid_params(void)
     if ((dset_id = H5Dcreate2(group_id, DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype,
                               dset_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_DSET_NAME);
         goto error;
     }
 
@@ -3444,7 +3426,7 @@ test_get_dataset_space_and_type_invalid_params(void)
 
             if (tmp_type_id >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved copy of dataset's datatype using an invalid dataset ID!\n");
+                printf("    retrieved copy of dataset's datatype using an invalid dataset ID!\n");
                 PART_ERROR(H5Dget_type_invalid_dset_id);
             }
 
@@ -3464,7 +3446,7 @@ test_get_dataset_space_and_type_invalid_params(void)
 
             if (tmp_space_id >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved copy of dataset's dataspace using an invalid dataset ID!\n");
+                printf("    retrieved copy of dataset's dataspace using an invalid dataset ID!\n");
                 PART_ERROR(H5Dget_space_invalid_dset_id);
             }
 
@@ -3571,8 +3553,8 @@ test_dataset_property_lists(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or get property list aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, dataset, or get property list aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -3580,27 +3562,27 @@ test_dataset_property_lists(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     /** for DAOS VOL, this test is problematic since auto chunking can be selected, so skip for now */
     if (H5VLget_connector_name(file_id, vol_name, 5) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get VOL connector name\n");
+        printf("    couldn't get VOL connector name\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_PROPERTY_LIST_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_PROPERTY_LIST_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_PROPERTY_LIST_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -3621,27 +3603,27 @@ test_dataset_property_lists(void)
 
     if ((dcpl_id1 = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create DCPL\n");
+        printf("    couldn't create DCPL\n");
         goto error;
     }
 
     if (H5Pset_chunk(dcpl_id1, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't set DCPL property\n");
+        printf("    couldn't set DCPL property\n");
         goto error;
     }
 
     if ((dset_id1 = H5Dcreate2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME1, dset_dtype1, space_id,
                                H5P_DEFAULT, dcpl_id1, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME1);
+        printf("    couldn't create dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME1);
         goto error;
     }
 
     if ((dset_id2 = H5Dcreate2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME2, dset_dtype2, space_id,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME2);
+        printf("    couldn't create dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME2);
         goto error;
     }
 
@@ -3660,13 +3642,13 @@ test_dataset_property_lists(void)
              * does not */
             if ((dcpl_id1 = H5Dget_create_plist(dset_id1)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Dget_create_plist);
             }
 
             if ((dcpl_id2 = H5Dget_create_plist(dset_id2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Dget_create_plist);
             }
 
@@ -3678,14 +3660,14 @@ test_dataset_property_lists(void)
 
                 if (H5Pget_chunk(dcpl_id1, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, tmp_chunk_dims) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't get DCPL property value\n");
+                    printf("    couldn't get DCPL property value\n");
                     PART_ERROR(H5Dget_create_plist);
                 }
 
                 for (i = 0; i < DATASET_PROPERTY_LIST_TEST_SPACE_RANK; i++)
                     if (tmp_chunk_dims[i] != chunk_dims[i]) {
                         H5_FAILED();
-                        HDprintf("    DCPL property values were incorrect\n");
+                        printf("    DCPL property values were incorrect\n");
                         PART_ERROR(H5Dget_create_plist);
                     }
 
@@ -3698,8 +3680,8 @@ test_dataset_property_lists(void)
                 /* DAOS VOL can auto chunk, so don't fail */
                 if (err_ret >= 0 && strcmp(vol_name, "daos") != 0) {
                     H5_FAILED();
-                    HDprintf("    property list 2 shouldn't have had chunk dimensionality set (not a chunked "
-                             "layout)\n");
+                    printf("    property list 2 shouldn't have had chunk dimensionality set (not a chunked "
+                           "layout)\n");
                     PART_ERROR(H5Dget_create_plist);
                 }
             }
@@ -3714,27 +3696,27 @@ test_dataset_property_lists(void)
 
             if ((dapl_id1 = H5Pcreate(H5P_DATASET_ACCESS)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create DAPL\n");
+                printf("    couldn't create DAPL\n");
                 PART_ERROR(H5Dget_access_plist);
             }
 
             if (H5Pset_efile_prefix(dapl_id1, path_prefix) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set DAPL property\n");
+                printf("    couldn't set DAPL property\n");
                 PART_ERROR(H5Dget_access_plist);
             }
 
             if ((dset_id3 = H5Dcreate2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME3, dset_dtype3, space_id,
                                        H5P_DEFAULT, H5P_DEFAULT, dapl_id1)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset\n");
+                printf("    couldn't create dataset\n");
                 PART_ERROR(H5Dget_access_plist);
             }
 
             if ((dset_id4 = H5Dcreate2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME4, dset_dtype4, space_id,
                                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset\n");
+                printf("    couldn't create dataset\n");
                 PART_ERROR(H5Dget_access_plist);
             }
 
@@ -3751,13 +3733,13 @@ test_dataset_property_lists(void)
              * does not */
             if ((dapl_id1 = H5Dget_access_plist(dset_id3)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Dget_access_plist);
             }
 
             if ((dapl_id2 = H5Dget_access_plist(dset_id4)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Dget_access_plist);
             }
 
@@ -3767,25 +3749,25 @@ test_dataset_property_lists(void)
 
                 if ((buf_size = H5Pget_efile_prefix(dapl_id1, NULL, 0)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't retrieve size for property value buffer\n");
+                    printf("    couldn't retrieve size for property value buffer\n");
                     PART_ERROR(H5Dget_access_plist);
                 }
 
                 if (NULL == (tmp_prefix = (char *)HDcalloc(1, (size_t)buf_size + 1))) {
                     H5_FAILED();
-                    HDprintf("    couldn't allocate buffer for property value\n");
+                    printf("    couldn't allocate buffer for property value\n");
                     PART_ERROR(H5Dget_access_plist);
                 }
 
                 if (H5Pget_efile_prefix(dapl_id1, tmp_prefix, (size_t)buf_size + 1) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't retrieve property list value\n");
+                    printf("    couldn't retrieve property list value\n");
                     PART_ERROR(H5Dget_access_plist);
                 }
 
                 if (HDstrncmp(tmp_prefix, path_prefix, (size_t)buf_size + 1)) {
                     H5_FAILED();
-                    HDprintf("    DAPL values were incorrect!\n");
+                    printf("    DAPL values were incorrect!\n");
                     PART_ERROR(H5Dget_access_plist);
                 }
 
@@ -3793,13 +3775,13 @@ test_dataset_property_lists(void)
 
                 if (H5Pget_efile_prefix(dapl_id2, tmp_prefix, (size_t)buf_size) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't retrieve property list value\n");
+                    printf("    couldn't retrieve property list value\n");
                     PART_ERROR(H5Dget_access_plist);
                 }
 
                 if (!HDstrncmp(tmp_prefix, path_prefix, (size_t)buf_size + 1)) {
                     H5_FAILED();
-                    HDprintf("    DAPL property value was set!\n");
+                    printf("    DAPL property value was set!\n");
                     PART_ERROR(H5Dget_access_plist);
                 }
             }
@@ -3850,25 +3832,25 @@ test_dataset_property_lists(void)
 
             if ((dset_id1 = H5Dopen2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME1);
+                printf("    couldn't open dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME1);
                 PART_ERROR(H5Dget_create_plist_reopened);
             }
 
             if ((dset_id2 = H5Dopen2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME2);
+                printf("    couldn't open dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME2);
                 PART_ERROR(H5Dget_create_plist_reopened);
             }
 
             if ((dcpl_id1 = H5Dget_create_plist(dset_id1)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Dget_create_plist_reopened);
             }
 
             if ((dcpl_id2 = H5Dget_create_plist(dset_id2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Dget_create_plist_reopened);
             }
 
@@ -3880,14 +3862,14 @@ test_dataset_property_lists(void)
 
                 if (H5Pget_chunk(dcpl_id1, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, tmp_chunk_dims) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't get DCPL property value\n");
+                    printf("    couldn't get DCPL property value\n");
                     PART_ERROR(H5Dget_create_plist_reopened);
                 }
 
                 for (i = 0; i < DATASET_PROPERTY_LIST_TEST_SPACE_RANK; i++)
                     if (tmp_chunk_dims[i] != chunk_dims[i]) {
                         H5_FAILED();
-                        HDprintf("    DCPL property values were incorrect\n");
+                        printf("    DCPL property values were incorrect\n");
                         PART_ERROR(H5Dget_create_plist_reopened);
                     }
 
@@ -3900,8 +3882,8 @@ test_dataset_property_lists(void)
                 /* DAOS VOL can auto chunk, so don't fail */
                 if (err_ret >= 0 && strcmp(vol_name, "daos") != 0) {
                     H5_FAILED();
-                    HDprintf("    property list 2 shouldn't have had chunk dimensionality set (not a chunked "
-                             "layout)\n");
+                    printf("    property list 2 shouldn't have had chunk dimensionality set (not a chunked "
+                           "layout)\n");
                     PART_ERROR(H5Dget_create_plist_reopened);
                 }
             }
@@ -4088,27 +4070,26 @@ test_read_dataset_small_all(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_READ_TEST_ALL_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_SMALL_READ_TEST_ALL_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_SMALL_READ_TEST_ALL_GROUP_NAME);
         goto error;
     }
 
@@ -4119,7 +4100,7 @@ test_read_dataset_small_all(void)
                               DATASET_SMALL_READ_TEST_ALL_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_ALL_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_ALL_DSET_NAME);
         goto error;
     }
 
@@ -4133,7 +4114,7 @@ test_read_dataset_small_all(void)
     if (H5Dread(dset_id, DATASET_SMALL_READ_TEST_ALL_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_ALL_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_ALL_DSET_NAME);
         goto error;
     }
 
@@ -4198,28 +4179,27 @@ test_read_dataset_small_hyperslab(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_READ_TEST_HYPERSLAB_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_SMALL_READ_TEST_HYPERSLAB_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_SMALL_READ_TEST_HYPERSLAB_GROUP_NAME);
         goto error;
     }
 
@@ -4232,7 +4212,7 @@ test_read_dataset_small_hyperslab(void)
                               DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_NAME);
         goto error;
     }
 
@@ -4258,7 +4238,7 @@ test_read_dataset_small_hyperslab(void)
     if (H5Dread(dset_id, DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_NAME);
         goto error;
     }
 
@@ -4326,28 +4306,27 @@ test_read_dataset_small_point_selection(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_READ_TEST_POINT_SELECTION_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_SMALL_READ_TEST_POINT_SELECTION_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_SMALL_READ_TEST_POINT_SELECTION_GROUP_NAME);
         goto error;
     }
 
@@ -4361,7 +4340,7 @@ test_read_dataset_small_point_selection(void)
                               DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_NAME);
         goto error;
     }
 
@@ -4381,14 +4360,14 @@ test_read_dataset_small_point_selection(void)
     if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, DATASET_SMALL_READ_TEST_POINT_SELECTION_NUM_POINTS,
                            points) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select points\n");
+        printf("    couldn't select points\n");
         goto error;
     }
 
     if (H5Dread(dset_id, DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_DTYPE, mspace_id, fspace_id,
                 H5P_DEFAULT, data) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_NAME);
         goto error;
     }
 
@@ -4481,8 +4460,7 @@ test_dataset_io_point_selections(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -4951,8 +4929,7 @@ test_read_dataset_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -4960,21 +4937,20 @@ test_read_dataset_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_READ_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_READ_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_READ_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -4985,7 +4961,7 @@ test_read_dataset_invalid_params(void)
                               DATASET_READ_INVALID_PARAMS_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_READ_INVALID_PARAMS_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_READ_INVALID_PARAMS_TEST_DSET_NAME);
         goto error;
     }
 
@@ -5013,7 +4989,7 @@ test_read_dataset_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    read from dataset using H5Dread with an invalid dataset ID!\n");
+                printf("    read from dataset using H5Dread with an invalid dataset ID!\n");
                 PART_ERROR(H5Dread_invalid_dset_id);
             }
 
@@ -5033,7 +5009,7 @@ test_read_dataset_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    read from dataset using H5Dread with an invalid memory datatype!\n");
+                printf("    read from dataset using H5Dread with an invalid memory datatype!\n");
                 PART_ERROR(H5Dread_invalid_datatype);
             }
 
@@ -5054,7 +5030,7 @@ test_read_dataset_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    read from dataset using H5Dread with an invalid memory dataspace!\n");
+                printf("    read from dataset using H5Dread with an invalid memory dataspace!\n");
                 PART_ERROR(H5Dread_invalid_mem_dataspace);
             }
 
@@ -5075,7 +5051,7 @@ test_read_dataset_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    read from dataset using H5Dread with an invalid file dataspace!\n");
+                printf("    read from dataset using H5Dread with an invalid file dataspace!\n");
                 PART_ERROR(H5Dread_invalid_file_dataspace);
             }
 
@@ -5096,7 +5072,7 @@ test_read_dataset_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    read from dataset using H5Dread with an invalid DXPL!\n");
+                printf("    read from dataset using H5Dread with an invalid DXPL!\n");
                 PART_ERROR(H5Dread_invalid_dxpl);
             }
 
@@ -5117,7 +5093,7 @@ test_read_dataset_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    read from dataset using H5Dread with an invalid data buffer!\n");
+                printf("    read from dataset using H5Dread with an invalid data buffer!\n");
                 PART_ERROR(H5Dread_invalid_data_buf);
             }
 
@@ -5187,27 +5163,26 @@ test_write_dataset_small_all(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_WRITE_TEST_ALL_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_GROUP_NAME);
         goto error;
     }
 
@@ -5218,7 +5193,7 @@ test_write_dataset_small_all(void)
                               DATASET_SMALL_WRITE_TEST_ALL_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME);
         goto error;
     }
 
@@ -5230,19 +5205,19 @@ test_write_dataset_small_all(void)
 
     if ((dset_id = H5Dopen2(group_id, DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
@@ -5254,7 +5229,7 @@ test_write_dataset_small_all(void)
 
     if (H5Dwrite(dset_id, DATASET_SMALL_WRITE_TEST_ALL_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME);
+        printf("    couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME);
         goto error;
     }
 
@@ -5319,28 +5294,27 @@ test_write_dataset_small_hyperslab(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_WRITE_TEST_HYPERSLAB_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_SMALL_WRITE_TEST_HYPERSLAB_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_SMALL_WRITE_TEST_HYPERSLAB_GROUP_NAME);
         goto error;
     }
 
@@ -5354,7 +5328,7 @@ test_write_dataset_small_hyperslab(void)
                               DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_NAME);
         goto error;
     }
 
@@ -5383,7 +5357,7 @@ test_write_dataset_small_hyperslab(void)
     if (H5Dwrite(dset_id, DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT,
                  data) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_NAME);
+        printf("    couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_NAME);
         goto error;
     }
 
@@ -5451,28 +5425,27 @@ test_write_dataset_small_point_selection(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_WRITE_TEST_POINT_SELECTION_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_SMALL_WRITE_TEST_POINT_SELECTION_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_SMALL_WRITE_TEST_POINT_SELECTION_GROUP_NAME);
         goto error;
     }
 
@@ -5486,7 +5459,7 @@ test_write_dataset_small_point_selection(void)
                               DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_NAME);
         goto error;
     }
 
@@ -5509,14 +5482,14 @@ test_write_dataset_small_point_selection(void)
     if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, DATASET_SMALL_WRITE_TEST_POINT_SELECTION_NUM_POINTS,
                            points) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select points\n");
+        printf("    couldn't select points\n");
         goto error;
     }
 
     if (H5Dwrite(dset_id, DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_DTYPE, mspace_id, fspace_id,
                  H5P_DEFAULT, data) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_NAME);
+        printf("    couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_NAME);
         goto error;
     }
 
@@ -5590,8 +5563,8 @@ test_write_dataset_data_verification(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, basic or more dataset aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, basic or more dataset aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -5599,20 +5572,20 @@ test_write_dataset_data_verification(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -5623,7 +5596,7 @@ test_write_dataset_data_verification(void)
                               DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
         goto error;
     }
 
@@ -5648,7 +5621,7 @@ test_write_dataset_data_verification(void)
             if (H5Dwrite(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                          data) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_all_read);
             }
 
@@ -5676,40 +5649,40 @@ test_write_dataset_data_verification(void)
 
             if ((dset_id = H5Dopen2(group_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
+                printf("    couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if ((fspace_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataset dataspace\n");
+                printf("    couldn't get dataset dataspace\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataspace num points\n");
+                printf("    couldn't get dataspace num points\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if (NULL ==
                 (data = HDmalloc((hsize_t)space_npoints * DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                         data) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             for (i = 0; i < (hsize_t)space_npoints; i++)
                 if (((int *)data)[i] != (int)i) {
                     H5_FAILED();
-                    HDprintf("    H5S_ALL selection data verification failed\n");
+                    printf("    H5S_ALL selection data verification failed\n");
                     PART_ERROR(H5Dwrite_all_read);
                 }
 
@@ -5730,7 +5703,7 @@ test_write_dataset_data_verification(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -5743,14 +5716,14 @@ test_write_dataset_data_verification(void)
 
             if (NULL == (data = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset data verification\n");
+                printf("    couldn't allocate buffer for dataset data verification\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                         data) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -5771,7 +5744,7 @@ test_write_dataset_data_verification(void)
 
             if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't select hyperslab for dataset write\n");
+                printf("    couldn't select hyperslab for dataset write\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -5780,7 +5753,7 @@ test_write_dataset_data_verification(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     PART_ERROR(H5Dwrite_hyperslab_read);
                 }
             }
@@ -5788,7 +5761,7 @@ test_write_dataset_data_verification(void)
             if (H5Dwrite(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, mspace_id, fspace_id,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -5819,39 +5792,39 @@ test_write_dataset_data_verification(void)
 
             if ((dset_id = H5Dopen2(group_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
+                printf("    couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if ((fspace_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataset dataspace\n");
+                printf("    couldn't get dataset dataspace\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataspace num points\n");
+                printf("    couldn't get dataspace num points\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if (NULL == (read_buf = HDmalloc((hsize_t)space_npoints *
                                              DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                         read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if (memcmp(data, read_buf, data_size)) {
                 H5_FAILED();
-                HDprintf("    hyperslab selection data verification failed\n");
+                printf("    hyperslab selection data verification failed\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -5883,7 +5856,7 @@ test_write_dataset_data_verification(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -5896,14 +5869,14 @@ test_write_dataset_data_verification(void)
 
             if (NULL == (data = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset data verification\n");
+                printf("    couldn't allocate buffer for dataset data verification\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                         data) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -5931,7 +5904,7 @@ test_write_dataset_data_verification(void)
             if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, DATASET_DATA_VERIFY_WRITE_TEST_NUM_POINTS,
                                    points) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't select elements in dataspace\n");
+                printf("    couldn't select elements in dataspace\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -5940,7 +5913,7 @@ test_write_dataset_data_verification(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     PART_ERROR(H5Dwrite_point_sel_read);
                 }
             }
@@ -5948,7 +5921,7 @@ test_write_dataset_data_verification(void)
             if (H5Dwrite(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, mspace_id, fspace_id,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -5979,39 +5952,39 @@ test_write_dataset_data_verification(void)
 
             if ((dset_id = H5Dopen2(group_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
+                printf("    couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if ((fspace_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataset dataspace\n");
+                printf("    couldn't get dataset dataspace\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataspace num points\n");
+                printf("    couldn't get dataspace num points\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if (NULL == (read_buf = HDmalloc((hsize_t)space_npoints *
                                              DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                         read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if (memcmp(data, read_buf, data_size)) {
                 H5_FAILED();
-                HDprintf("    point selection data verification failed\n");
+                printf("    point selection data verification failed\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -6097,8 +6070,7 @@ test_write_dataset_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -6106,21 +6078,21 @@ test_write_dataset_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_WRITE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_WRITE_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_WRITE_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -6131,13 +6103,13 @@ test_write_dataset_invalid_params(void)
                               DATASET_SMALL_WRITE_TEST_ALL_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_WRITE_INVALID_PARAMS_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_WRITE_INVALID_PARAMS_TEST_DSET_NAME);
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
@@ -6164,7 +6136,7 @@ test_write_dataset_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    wrote to dataset using H5Dwrite with an invalid dataset ID!\n");
+                printf("    wrote to dataset using H5Dwrite with an invalid dataset ID!\n");
                 PART_ERROR(H5Dwrite_invalid_dset_id);
             }
 
@@ -6184,7 +6156,7 @@ test_write_dataset_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    wrote to dataset using H5Dwrite with an invalid memory datatype!\n");
+                printf("    wrote to dataset using H5Dwrite with an invalid memory datatype!\n");
                 PART_ERROR(H5Dwrite_invalid_datatype);
             }
 
@@ -6205,7 +6177,7 @@ test_write_dataset_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    wrote to dataset using H5Dwrite with an invalid memory dataspace!\n");
+                printf("    wrote to dataset using H5Dwrite with an invalid memory dataspace!\n");
                 PART_ERROR(H5Dwrite_invalid_mem_dataspace);
             }
 
@@ -6226,7 +6198,7 @@ test_write_dataset_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    wrote to dataset using H5Dwrite with an invalid file dataspace!\n");
+                printf("    wrote to dataset using H5Dwrite with an invalid file dataspace!\n");
                 PART_ERROR(H5Dwrite_invalid_file_dataspace);
             }
 
@@ -6247,7 +6219,7 @@ test_write_dataset_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    wrote to dataset using H5Dwrite with an invalid DXPL!\n");
+                printf("    wrote to dataset using H5Dwrite with an invalid DXPL!\n");
                 PART_ERROR(H5Dwrite_invalid_dxpl);
             }
 
@@ -6268,7 +6240,7 @@ test_write_dataset_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    wrote to dataset using H5Dwrite with an invalid data buffer!\n");
+                printf("    wrote to dataset using H5Dwrite with an invalid data buffer!\n");
                 PART_ERROR(H5Dwrite_invalid_data_buf);
             }
 
@@ -6350,8 +6322,8 @@ test_dataset_builtin_type_conversion(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, basic or more dataset aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, basic or more dataset aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -6359,7 +6331,7 @@ test_dataset_builtin_type_conversion(void)
 
     if ((native_order = H5Tget_order(DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get native byte order\n");
+        printf("    couldn't get native byte order\n");
         goto error;
     }
     if (native_order == H5T_ORDER_LE)
@@ -6369,20 +6341,20 @@ test_dataset_builtin_type_conversion(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_DATA_BUILTIN_CONVERSION_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -6392,7 +6364,7 @@ test_dataset_builtin_type_conversion(void)
     if ((dset_id = H5Dcreate2(group_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME, file_type_id,
                               fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
         goto error;
     }
 
@@ -6417,8 +6389,8 @@ test_dataset_builtin_type_conversion(void)
             if (H5Dwrite(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL,
                          H5P_DEFAULT, data) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n",
+                       DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_all_read);
             }
 
@@ -6447,41 +6419,41 @@ test_dataset_builtin_type_conversion(void)
             if ((dset_id = H5Dopen2(group_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
+                printf("    couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if ((fspace_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataset dataspace\n");
+                printf("    couldn't get dataset dataspace\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataspace num points\n");
+                printf("    couldn't get dataspace num points\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if (NULL == (data = HDmalloc((hsize_t)space_npoints *
                                          DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL,
                         H5P_DEFAULT, data) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n",
-                         DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n",
+                       DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             for (i = 0; i < (hsize_t)space_npoints; i++)
                 if (((int *)data)[i] != (int)i) {
                     H5_FAILED();
-                    HDprintf("    H5S_ALL selection data verification failed\n");
+                    printf("    H5S_ALL selection data verification failed\n");
                     PART_ERROR(H5Dwrite_all_read);
                 }
 
@@ -6502,7 +6474,7 @@ test_dataset_builtin_type_conversion(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -6515,15 +6487,15 @@ test_dataset_builtin_type_conversion(void)
 
             if (NULL == (data = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset data verification\n");
+                printf("    couldn't allocate buffer for dataset data verification\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL,
                         H5P_DEFAULT, data) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n",
-                         DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n",
+                       DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -6544,7 +6516,7 @@ test_dataset_builtin_type_conversion(void)
 
             if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't select hyperslab for dataset write\n");
+                printf("    couldn't select hyperslab for dataset write\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -6553,7 +6525,7 @@ test_dataset_builtin_type_conversion(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     PART_ERROR(H5Dwrite_hyperslab_read);
                 }
             }
@@ -6561,8 +6533,8 @@ test_dataset_builtin_type_conversion(void)
             if (H5Dwrite(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, mspace_id, fspace_id,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n",
+                       DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -6594,40 +6566,40 @@ test_dataset_builtin_type_conversion(void)
             if ((dset_id = H5Dopen2(group_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
+                printf("    couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if ((fspace_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataset dataspace\n");
+                printf("    couldn't get dataset dataspace\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataspace num points\n");
+                printf("    couldn't get dataspace num points\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if (NULL == (read_buf = HDmalloc((hsize_t)space_npoints *
                                              DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL,
                         H5P_DEFAULT, read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n",
-                         DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n",
+                       DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if (memcmp(data, read_buf, data_size)) {
                 H5_FAILED();
-                HDprintf("    hyperslab selection data verification failed\n");
+                printf("    hyperslab selection data verification failed\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -6659,7 +6631,7 @@ test_dataset_builtin_type_conversion(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -6672,15 +6644,15 @@ test_dataset_builtin_type_conversion(void)
 
             if (NULL == (data = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset data verification\n");
+                printf("    couldn't allocate buffer for dataset data verification\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL,
                         H5P_DEFAULT, data) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n",
-                         DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n",
+                       DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -6708,7 +6680,7 @@ test_dataset_builtin_type_conversion(void)
             if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, DATASET_DATA_BUILTIN_CONVERSION_TEST_NUM_POINTS,
                                    points) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't select elements in dataspace\n");
+                printf("    couldn't select elements in dataspace\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -6717,7 +6689,7 @@ test_dataset_builtin_type_conversion(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     PART_ERROR(H5Dwrite_point_sel_read);
                 }
             }
@@ -6725,8 +6697,8 @@ test_dataset_builtin_type_conversion(void)
             if (H5Dwrite(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, mspace_id, fspace_id,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n",
+                       DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -6758,40 +6730,40 @@ test_dataset_builtin_type_conversion(void)
             if ((dset_id = H5Dopen2(group_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
+                printf("    couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if ((fspace_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataset dataspace\n");
+                printf("    couldn't get dataset dataspace\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataspace num points\n");
+                printf("    couldn't get dataspace num points\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if (NULL == (read_buf = HDmalloc((hsize_t)space_npoints *
                                              DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL,
                         H5P_DEFAULT, read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n",
-                         DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n",
+                       DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if (memcmp(data, read_buf, data_size)) {
                 H5_FAILED();
-                HDprintf("    point selection data verification failed\n");
+                printf("    point selection data verification failed\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -6887,8 +6859,7 @@ test_dataset_compound_partial_io(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -6896,21 +6867,21 @@ test_dataset_compound_partial_io(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -6937,7 +6908,7 @@ test_dataset_compound_partial_io(void)
     if ((dset_id = H5Dcreate2(group_id, DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_DSET_NAME, full_type_id,
                               space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_DSET_NAME);
         goto error;
     }
 
@@ -7144,28 +7115,28 @@ test_dataset_set_extent_chunked_unlimited(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, basic or more dataset aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, basic or more dataset aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -7186,14 +7157,14 @@ test_dataset_set_extent_chunked_unlimited(void)
 
     if (H5Pset_chunk(dcpl_id, DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_SPACE_RANK, chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    unable to set dataset chunk dimensionality\n");
+        printf("    unable to set dataset chunk dimensionality\n");
         goto error;
     }
 
     if ((dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME, dset_dtype,
                               fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME);
         goto error;
     }
 
@@ -7209,7 +7180,7 @@ test_dataset_set_extent_chunked_unlimited(void)
 
         if (H5Dset_extent(dset_id, new_dims) < 0) {
             H5_FAILED();
-            HDprintf("    failed to set dataset extent\n");
+            printf("    failed to set dataset extent\n");
             goto error;
         }
 
@@ -7221,13 +7192,13 @@ test_dataset_set_extent_chunked_unlimited(void)
 
         if ((fspace_id = H5Dget_space(dset_id)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve dataset's dataspace\n");
+            printf("    failed to retrieve dataset's dataspace\n");
             goto error;
         }
 
         if (H5Sget_simple_extent_dims(fspace_id, new_dims, NULL) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve dataset dimensionality\n");
+            printf("    failed to retrieve dataset dimensionality\n");
             goto error;
         }
 
@@ -7237,7 +7208,7 @@ test_dataset_set_extent_chunked_unlimited(void)
         for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_SPACE_RANK; j++) {
             if (dims[j] == new_dims[j]) {
                 H5_FAILED();
-                HDprintf("    dataset dimension %llu wasn't changed!\n", (unsigned long long)j);
+                printf("    dataset dimension %llu wasn't changed!\n", (unsigned long long)j);
                 goto error;
             }
         }
@@ -7265,7 +7236,7 @@ test_dataset_set_extent_chunked_unlimited(void)
 
         if (H5Dset_extent(dset_id, new_dims) < 0) {
             H5_FAILED();
-            HDprintf("    failed to set dataset extent\n");
+            printf("    failed to set dataset extent\n");
             goto error;
         }
 
@@ -7280,20 +7251,19 @@ test_dataset_set_extent_chunked_unlimited(void)
         if ((dset_id = H5Dopen2(group_id, DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME, H5P_DEFAULT)) <
             0) {
             H5_FAILED();
-            HDprintf("    failed to open dataset '%s'\n",
-                     DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME);
+            printf("    failed to open dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME);
             goto error;
         }
 
         if ((fspace_id = H5Dget_space(dset_id)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve dataset's dataspace\n");
+            printf("    failed to retrieve dataset's dataspace\n");
             goto error;
         }
 
         if (H5Sget_simple_extent_dims(fspace_id, new_dims, NULL) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve dataset dimensionality\n");
+            printf("    failed to retrieve dataset dimensionality\n");
             goto error;
         }
 
@@ -7303,7 +7273,7 @@ test_dataset_set_extent_chunked_unlimited(void)
         for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_SPACE_RANK; j++) {
             if (dims[j] == new_dims[j]) {
                 H5_FAILED();
-                HDprintf("    dataset dimension %llu wasn't changed!\n", (unsigned long long)j);
+                printf("    dataset dimension %llu wasn't changed!\n", (unsigned long long)j);
                 goto error;
             }
         }
@@ -7377,28 +7347,28 @@ test_dataset_set_extent_chunked_fixed(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, basic or more dataset aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, basic or more dataset aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -7423,7 +7393,7 @@ test_dataset_set_extent_chunked_fixed(void)
 
     if (H5Pset_chunk(dcpl_id, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK, chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    unable to set dataset chunk dimensionality\n");
+        printf("    unable to set dataset chunk dimensionality\n");
         goto error;
     }
 
@@ -7435,14 +7405,14 @@ test_dataset_set_extent_chunked_fixed(void)
     if ((dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME, dset_dtype,
                               fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME);
         goto error;
     }
 
     if ((dset_id2 = H5Dcreate2(group_id, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2, dset_dtype,
                                fspace_id2, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2);
+        printf("    couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2);
         goto error;
     }
 
@@ -7471,7 +7441,7 @@ test_dataset_set_extent_chunked_fixed(void)
 
         if (H5Dset_extent(dset_id, new_dims) < 0) {
             H5_FAILED();
-            HDprintf("    failed to set dataset extent\n");
+            printf("    failed to set dataset extent\n");
             goto error;
         }
 
@@ -7483,13 +7453,13 @@ test_dataset_set_extent_chunked_fixed(void)
 
         if ((fspace_id = H5Dget_space(dset_id)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve dataset's dataspace\n");
+            printf("    failed to retrieve dataset's dataspace\n");
             goto error;
         }
 
         if (H5Sget_simple_extent_dims(fspace_id, new_dims, NULL) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve dataset dimensionality\n");
+            printf("    failed to retrieve dataset dimensionality\n");
             goto error;
         }
 
@@ -7499,7 +7469,7 @@ test_dataset_set_extent_chunked_fixed(void)
         for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK; j++) {
             if (dims[j] == new_dims[j]) {
                 H5_FAILED();
-                HDprintf("    dataset dimension %llu wasn't changed!\n", (unsigned long long)j);
+                printf("    dataset dimension %llu wasn't changed!\n", (unsigned long long)j);
                 goto error;
             }
         }
@@ -7540,7 +7510,7 @@ test_dataset_set_extent_chunked_fixed(void)
 
         if (H5Dset_extent(dset_id2, new_dims) < 0) {
             H5_FAILED();
-            HDprintf("    failed to set dataset extent2\n");
+            printf("    failed to set dataset extent2\n");
             goto error;
         }
 
@@ -7555,19 +7525,19 @@ test_dataset_set_extent_chunked_fixed(void)
         if ((dset_id2 = H5Dopen2(group_id, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2, H5P_DEFAULT)) <
             0) {
             H5_FAILED();
-            HDprintf("    failed to open dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2);
+            printf("    failed to open dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2);
             goto error;
         }
 
         if ((fspace_id2 = H5Dget_space(dset_id2)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve dataset's dataspace\n");
+            printf("    failed to retrieve dataset's dataspace\n");
             goto error;
         }
 
         if (H5Sget_simple_extent_dims(fspace_id2, new_dims, NULL) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve dataset dimensionality\n");
+            printf("    failed to retrieve dataset dimensionality\n");
             goto error;
         }
 
@@ -7577,7 +7547,7 @@ test_dataset_set_extent_chunked_fixed(void)
         for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK; j++) {
             if (dims2[j] == new_dims[j]) {
                 H5_FAILED();
-                HDprintf("    dataset dimension %llu wasn't changed!\n", (unsigned long long)j);
+                printf("    dataset dimension %llu wasn't changed!\n", (unsigned long long)j);
                 goto error;
             }
         }
@@ -7666,8 +7636,8 @@ test_dataset_set_extent_data(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, basic or more dataset aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, basic or more dataset aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -7675,20 +7645,20 @@ test_dataset_set_extent_data(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -7700,14 +7670,14 @@ test_dataset_set_extent_data(void)
 
     if (H5Pset_chunk(dcpl_id, DATASET_SET_EXTENT_DATA_TEST_SPACE_RANK, dims_chunk) < 0) {
         H5_FAILED();
-        HDprintf("    unable to set dataset chunk dimensionality\n");
+        printf("    unable to set dataset chunk dimensionality\n");
         goto error;
     }
 
     if ((dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_DATA_TEST_DSET_NAME, H5T_NATIVE_INT, fspace_id,
                               H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SET_EXTENT_DATA_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SET_EXTENT_DATA_TEST_DSET_NAME);
         goto error;
     }
 
@@ -7766,15 +7736,15 @@ test_dataset_set_extent_data(void)
                     if (i >= (int)dims_origin[0] || j >= (int)dims_origin[1]) {
                         if (buf_expand[i][j] != 0) {
                             H5_FAILED();
-                            HDprintf("    buf_expand[%d][%d] = %d. It should be 0\n", i, j, buf_expand[i][j]);
+                            printf("    buf_expand[%d][%d] = %d. It should be 0\n", i, j, buf_expand[i][j]);
                             PART_ERROR(H5Dset_extent_data_expand);
                         }
                     }
                     else {
                         if (buf_expand[i][j] != buf_origin[i][j]) {
                             H5_FAILED();
-                            HDprintf("    buf_expand[%d][%d] = %d. It should be %d\n", i, j, buf_expand[i][j],
-                                     buf_origin[i][j]);
+                            printf("    buf_expand[%d][%d] = %d. It should be %d\n", i, j, buf_expand[i][j],
+                                   buf_origin[i][j]);
                             PART_ERROR(H5Dset_extent_data_expand);
                         }
                     }
@@ -7807,8 +7777,8 @@ test_dataset_set_extent_data(void)
                 for (j = 0; j < (int)dims_shrink[1]; j++) {
                     if (buf_shrink[i][j] != buf_origin[i][j]) {
                         H5_FAILED();
-                        HDprintf("    buf_shrink[%d][%d] = %d. It should be %d\n", i, j, buf_shrink[i][j],
-                                 buf_origin[i][j]);
+                        printf("    buf_shrink[%d][%d] = %d. It should be %d\n", i, j, buf_shrink[i][j],
+                               buf_origin[i][j]);
                         PART_ERROR(H5Dset_extent_data_shrink);
                     }
                 }
@@ -7844,16 +7814,15 @@ test_dataset_set_extent_data(void)
                     if (i >= (int)dims_shrink[0] || j >= (int)dims_shrink[1]) {
                         if (buf_expand2[i][j] != 0) {
                             H5_FAILED();
-                            HDprintf("    buf_expand2[%d][%d] = %d. It should be 0\n", i, j,
-                                     buf_expand2[i][j]);
+                            printf("    buf_expand2[%d][%d] = %d. It should be 0\n", i, j, buf_expand2[i][j]);
                             PART_ERROR(H5Dset_extent_data_expand_to_origin);
                         }
                     }
                     else {
                         if (buf_expand2[i][j] != buf_origin[i][j]) {
                             H5_FAILED();
-                            HDprintf("    buf_expand2[%d][%d] = %d. It should be %d.\n", i, j,
-                                     buf_expand2[i][j], buf_origin[i][j]);
+                            printf("    buf_expand2[%d][%d] = %d. It should be %d.\n", i, j,
+                                   buf_expand2[i][j], buf_origin[i][j]);
                             PART_ERROR(H5Dset_extent_data_expand_to_origin);
                         }
                     }
@@ -7889,8 +7858,8 @@ test_dataset_set_extent_data(void)
             for (i = 0; i < DATASET_SET_EXTENT_DATA_TEST_SPACE_RANK; i++)
                 if (dims_out[i] != 0) {
                     H5_FAILED();
-                    HDprintf("    dims_out[%d] = %llu.  It should be 0.\n", i,
-                             (long long unsigned int)dims_out[i]);
+                    printf("    dims_out[%d] = %llu.  It should be 0.\n", i,
+                           (long long unsigned int)dims_out[i]);
                     PART_ERROR(H5Dset_extent_data_shrink_to_zero);
                 }
 
@@ -7923,7 +7892,7 @@ test_dataset_set_extent_data(void)
                 for (j = 0; j < (int)dims_origin[1]; j++) {
                     if (buf_expand2[i][j] != 0) {
                         H5_FAILED();
-                        HDprintf("    buf_expand2[%d][%d] = %d. It should be 0.\n", i, j, buf_expand2[i][j]);
+                        printf("    buf_expand2[%d][%d] = %d. It should be 0.\n", i, j, buf_expand2[i][j]);
                         PART_ERROR(H5Dset_extent_data_expand_to_origin_again);
                     }
                 }
@@ -8001,27 +7970,27 @@ test_dataset_set_extent_double_handles(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, basic or more dataset aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, basic or more dataset aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -8034,7 +8003,7 @@ test_dataset_set_extent_double_handles(void)
 
     if (H5Pset_chunk(dcpl_id, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_SPACE_RANK, dims_chunk) < 0) {
         H5_FAILED();
-        HDprintf("    unable to set dataset chunk dimensionality\n");
+        printf("    unable to set dataset chunk dimensionality\n");
         goto error;
     }
 
@@ -8042,14 +8011,14 @@ test_dataset_set_extent_double_handles(void)
     if ((dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME, H5T_NATIVE_INT,
                               fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME);
         goto error;
     }
 
     /* Open the same dataset again */
     if ((dset_id2 = H5Dopen2(group_id, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME);
         goto error;
     }
 
@@ -8071,8 +8040,8 @@ test_dataset_set_extent_double_handles(void)
     for (i = 0; i < DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_SPACE_RANK; i++)
         if (dims_out[i] != dims_expand[i]) {
             H5_FAILED();
-            HDprintf("    dims_out[%d] = %" PRIuHSIZE ".  It should be %" PRIuHSIZE ".\n", i, dims_out[i],
-                     dims_expand[i]);
+            printf("    dims_out[%d] = %" PRIuHSIZE ".  It should be %" PRIuHSIZE ".\n", i, dims_out[i],
+                   dims_expand[i]);
             goto error;
         }
 
@@ -8141,8 +8110,8 @@ test_dataset_set_extent_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, basic or more dataset aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, basic or more dataset aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -8150,14 +8119,14 @@ test_dataset_set_extent_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     /** for DAOS VOL, this test is problematic since auto chunking can be selected, so skip for now */
     if (H5VLget_connector_name(file_id, vol_name, 5) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get VOL connector name\n");
+        printf("    couldn't get VOL connector name\n");
         goto error;
     }
     if (strcmp(vol_name, "daos") == 0) {
@@ -8169,15 +8138,15 @@ test_dataset_set_extent_invalid_params(void)
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_INVALID_PARAMS_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_SET_EXTENT_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_SET_EXTENT_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -8213,8 +8182,8 @@ test_dataset_set_extent_invalid_params(void)
              H5Dcreate2(group_id, DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_COMPACT_DSET_NAME, H5T_NATIVE_INT,
                         compact_fspace_id, H5P_DEFAULT, compact_dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n",
-                 DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_COMPACT_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n",
+               DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_COMPACT_DSET_NAME);
         goto error;
     }
 
@@ -8229,8 +8198,8 @@ test_dataset_set_extent_invalid_params(void)
              H5Dcreate2(group_id, DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_CONTIGUOUS_DSET_NAME, dset_dtype,
                         fspace_id, H5P_DEFAULT, contiguous_dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n",
-                 DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_CONTIGUOUS_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n",
+               DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_CONTIGUOUS_DSET_NAME);
         goto error;
     }
 
@@ -8240,14 +8209,14 @@ test_dataset_set_extent_invalid_params(void)
 
     if (H5Pset_chunk(chunked_dcpl_id, DATASET_SET_EXTENT_INVALID_PARAMS_TEST_SPACE_RANK, chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    unable to set dataset chunk dimensionality\n");
+        printf("    unable to set dataset chunk dimensionality\n");
         goto error;
     }
 
     if ((chunked_dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype,
                                       fspace_id, H5P_DEFAULT, chunked_dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SET_EXTENT_INVALID_PARAMS_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SET_EXTENT_INVALID_PARAMS_TEST_DSET_NAME);
         goto error;
     }
 
@@ -8267,7 +8236,7 @@ test_dataset_set_extent_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    setting dataset extent succeeded with an invalid layout (compact)\n");
+                printf("    setting dataset extent succeeded with an invalid layout (compact)\n");
                 PART_ERROR(H5Dset_extent_invalid_layout_compact);
             }
 
@@ -8287,7 +8256,7 @@ test_dataset_set_extent_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    setting dataset extent succeeded with an invalid layout (contiguous)\n");
+                printf("    setting dataset extent succeeded with an invalid layout (contiguous)\n");
                 PART_ERROR(H5Dset_extent_invalid_layout_contiguous);
             }
 
@@ -8307,7 +8276,7 @@ test_dataset_set_extent_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    setting dataset extent succeeded with an invalid dataset ID\n");
+                printf("    setting dataset extent succeeded with an invalid dataset ID\n");
                 PART_ERROR(H5Dset_extent_invalid_dset_id);
             }
 
@@ -8327,7 +8296,7 @@ test_dataset_set_extent_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    setting dataset extent succeeded with a NULL dimension pointer\n");
+                printf("    setting dataset extent succeeded with a NULL dimension pointer\n");
                 PART_ERROR(H5Dset_extent_null_dim_pointer);
             }
 
@@ -8465,27 +8434,27 @@ test_create_single_chunk_dataset(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or get property list aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, dataset, or get property list aren't supported "
+               "with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SINGLE_CHUNK_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_SINGLE_CHUNK_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_SINGLE_CHUNK_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -8499,14 +8468,14 @@ test_create_single_chunk_dataset(void)
 
     if (H5Pset_chunk(dcpl_id, DATASET_SINGLE_CHUNK_TEST_SPACE_RANK, dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to set chunking on DCPL\n");
+        printf("    failed to set chunking on DCPL\n");
         goto error;
     }
 
     if ((dset_id = H5Dcreate2(group_id, DATASET_SINGLE_CHUNK_TEST_DSET_NAME, dset_dtype, fspace_id,
                               H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SINGLE_CHUNK_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SINGLE_CHUNK_TEST_DSET_NAME);
         goto error;
     }
 
@@ -8515,28 +8484,28 @@ test_create_single_chunk_dataset(void)
      */
     if (H5Pclose(dcpl_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close DCPL\n");
+        printf("    failed to close DCPL\n");
         goto error;
     }
 
     if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve copy of DCPL\n");
+        printf("    failed to retrieve copy of DCPL\n");
         goto error;
     }
 
     memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims));
     if (H5Pget_chunk(dcpl_id, DATASET_SINGLE_CHUNK_TEST_SPACE_RANK, retrieved_chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve chunking info\n");
+        printf("    failed to retrieve chunking info\n");
         goto error;
     }
 
     for (i = 0; i < DATASET_SINGLE_CHUNK_TEST_SPACE_RANK; i++) {
         if (dims[i] != retrieved_chunk_dims[i]) {
             H5_FAILED();
-            HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                     "dimensionality\n");
+            printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                   "dimensionality\n");
             goto error;
         }
     }
@@ -8547,40 +8516,40 @@ test_create_single_chunk_dataset(void)
      */
     if (H5Pclose(dcpl_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close DCPL\n");
+        printf("    failed to close DCPL\n");
         goto error;
     }
 
     if (H5Dclose(dset_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close dataset\n");
+        printf("    failed to close dataset\n");
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_SINGLE_CHUNK_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to re-open dataset\n");
+        printf("    failed to re-open dataset\n");
         goto error;
     }
 
     if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve copy of DCPL\n");
+        printf("    failed to retrieve copy of DCPL\n");
         goto error;
     }
 
     memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims));
     if (H5Pget_chunk(dcpl_id, DATASET_SINGLE_CHUNK_TEST_SPACE_RANK, retrieved_chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve chunking info\n");
+        printf("    failed to retrieve chunking info\n");
         goto error;
     }
 
     for (i = 0; i < DATASET_SINGLE_CHUNK_TEST_SPACE_RANK; i++) {
         if (dims[i] != retrieved_chunk_dims[i]) {
             H5_FAILED();
-            HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                     "dimensionality\n");
+            printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                   "dimensionality\n");
             goto error;
         }
     }
@@ -8646,28 +8615,27 @@ test_write_single_chunk_dataset(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or get property list aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, dataset, or get property list aren't supported "
+               "with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_SINGLE_CHUNK_WRITE_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_SINGLE_CHUNK_WRITE_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -8680,7 +8648,7 @@ test_write_single_chunk_dataset(void)
 
     if (H5Pset_chunk(dcpl_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_SPACE_RANK, dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to set chunking on DCPL\n");
+        printf("    failed to set chunking on DCPL\n");
         goto error;
     }
 
@@ -8688,7 +8656,7 @@ test_write_single_chunk_dataset(void)
                               DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME);
         goto error;
     }
 
@@ -8697,28 +8665,28 @@ test_write_single_chunk_dataset(void)
      */
     if (H5Pclose(dcpl_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close DCPL\n");
+        printf("    failed to close DCPL\n");
         goto error;
     }
 
     if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve copy of DCPL\n");
+        printf("    failed to retrieve copy of DCPL\n");
         goto error;
     }
 
     memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims));
     if (H5Pget_chunk(dcpl_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve chunking info\n");
+        printf("    failed to retrieve chunking info\n");
         goto error;
     }
 
     for (i = 0; i < DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_SPACE_RANK; i++) {
         if (dims[i] != retrieved_chunk_dims[i]) {
             H5_FAILED();
-            HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                     "dimensionality\n");
+            printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                   "dimensionality\n");
             goto error;
         }
     }
@@ -8736,7 +8704,7 @@ test_write_single_chunk_dataset(void)
     if (H5Dwrite(dset_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                  write_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't write to dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME);
+        printf("    couldn't write to dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME);
         goto error;
     }
 
@@ -8764,40 +8732,40 @@ test_write_single_chunk_dataset(void)
 
     if ((dset_id = H5Dopen2(group_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
     if (NULL ==
         (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPESIZE))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
     if (H5Dread(dset_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME);
         goto error;
     }
 
     for (i = 0; i < (hsize_t)space_npoints; i++)
         if (((int *)read_buf)[i] != (int)i) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         }
 
@@ -8865,27 +8833,27 @@ test_create_multi_chunk_dataset(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or get property list aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, dataset, or get property list aren't supported "
+               "with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_MULTI_CHUNK_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_MULTI_CHUNK_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -8899,14 +8867,14 @@ test_create_multi_chunk_dataset(void)
 
     if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_TEST_SPACE_RANK, chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to set chunking on DCPL\n");
+        printf("    failed to set chunking on DCPL\n");
         goto error;
     }
 
     if ((dset_id = H5Dcreate2(group_id, DATASET_MULTI_CHUNK_TEST_DSET_NAME, dset_dtype, fspace_id,
                               H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_MULTI_CHUNK_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_MULTI_CHUNK_TEST_DSET_NAME);
         goto error;
     }
 
@@ -8915,28 +8883,28 @@ test_create_multi_chunk_dataset(void)
      */
     if (H5Pclose(dcpl_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close DCPL\n");
+        printf("    failed to close DCPL\n");
         goto error;
     }
 
     if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve copy of DCPL\n");
+        printf("    failed to retrieve copy of DCPL\n");
         goto error;
     }
 
     memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims));
     if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_TEST_SPACE_RANK, retrieved_chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve chunking info\n");
+        printf("    failed to retrieve chunking info\n");
         goto error;
     }
 
     for (i = 0; i < DATASET_MULTI_CHUNK_TEST_SPACE_RANK; i++) {
         if (chunk_dims[i] != retrieved_chunk_dims[i]) {
             H5_FAILED();
-            HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                     "dimensionality\n");
+            printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                   "dimensionality\n");
             goto error;
         }
     }
@@ -8947,40 +8915,40 @@ test_create_multi_chunk_dataset(void)
      */
     if (H5Pclose(dcpl_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close DCPL\n");
+        printf("    failed to close DCPL\n");
         goto error;
     }
 
     if (H5Dclose(dset_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close dataset\n");
+        printf("    failed to close dataset\n");
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to re-open dataset\n");
+        printf("    failed to re-open dataset\n");
         goto error;
     }
 
     if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve copy of DCPL\n");
+        printf("    failed to retrieve copy of DCPL\n");
         goto error;
     }
 
     memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims));
     if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_TEST_SPACE_RANK, retrieved_chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve chunking info\n");
+        printf("    failed to retrieve chunking info\n");
         goto error;
     }
 
     for (i = 0; i < DATASET_MULTI_CHUNK_TEST_SPACE_RANK; i++) {
         if (chunk_dims[i] != retrieved_chunk_dims[i]) {
             H5_FAILED();
-            HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                     "dimensionality\n");
+            printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                   "dimensionality\n");
             goto error;
         }
     }
@@ -9051,28 +9019,28 @@ test_write_multi_chunk_dataset_same_shape_read(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or get property list aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, dataset, or get property list aren't supported "
+               "with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -9086,7 +9054,7 @@ test_write_multi_chunk_dataset_same_shape_read(void)
     if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK, chunk_dims) <
         0) {
         H5_FAILED();
-        HDprintf("    failed to set chunking on DCPL\n");
+        printf("    failed to set chunking on DCPL\n");
         goto error;
     }
 
@@ -9094,8 +9062,8 @@ test_write_multi_chunk_dataset_same_shape_read(void)
                               DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, fspace_id,
                               H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n",
-                 DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n",
+               DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
         goto error;
     }
 
@@ -9104,13 +9072,13 @@ test_write_multi_chunk_dataset_same_shape_read(void)
      */
     if (H5Pclose(dcpl_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close DCPL\n");
+        printf("    failed to close DCPL\n");
         goto error;
     }
 
     if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve copy of DCPL\n");
+        printf("    failed to retrieve copy of DCPL\n");
         goto error;
     }
 
@@ -9118,15 +9086,15 @@ test_write_multi_chunk_dataset_same_shape_read(void)
     if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK,
                      retrieved_chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve chunking info\n");
+        printf("    failed to retrieve chunking info\n");
         goto error;
     }
 
     for (i = 0; i < DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; i++) {
         if (chunk_dims[i] != retrieved_chunk_dims[i]) {
             H5_FAILED();
-            HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                     "dimensionality\n");
+            printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                   "dimensionality\n");
             goto error;
         }
     }
@@ -9202,8 +9170,8 @@ test_write_multi_chunk_dataset_same_shape_read(void)
     if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL,
                  H5P_DEFAULT, write_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't write to dataset '%s'\n",
-                 DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+        printf("    couldn't write to dataset '%s'\n",
+               DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
         goto error;
     }
 
@@ -9232,14 +9200,13 @@ test_write_multi_chunk_dataset_same_shape_read(void)
     if ((dset_id =
              H5Dopen2(group_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n",
-                 DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
@@ -9251,7 +9218,7 @@ test_write_multi_chunk_dataset_same_shape_read(void)
 
         if ((mspace_id = H5Screate_simple(2, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to create memory dataspace\n");
+            printf("    failed to create memory dataspace\n");
             goto error;
         }
     }
@@ -9263,11 +9230,11 @@ test_write_multi_chunk_dataset_same_shape_read(void)
     /*
      * Read every chunk in the dataset, checking the data for each one.
      */
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < data_size / chunk_size; i++) {
         size_t j, k;
 
-        HDprintf("\r Reading chunk %zu", i);
+        printf("\r Reading chunk %zu", i);
 
         for (j = 0; j < DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; j++) {
             if (dims[j] == chunk_dims[j])
@@ -9284,7 +9251,7 @@ test_write_multi_chunk_dataset_same_shape_read(void)
          */
         if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
             H5_FAILED();
-            HDprintf("    failed to set hyperslab selection\n");
+            printf("    failed to set hyperslab selection\n");
             goto error;
         }
 
@@ -9295,8 +9262,8 @@ test_write_multi_chunk_dataset_same_shape_read(void)
         if (H5Dread(dset_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, mspace_id, fspace_id,
                     H5P_DEFAULT, read_buf) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't read from dataset '%s'\n",
-                     DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+            printf("    couldn't read from dataset '%s'\n",
+                   DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
             goto error;
         }
 
@@ -9304,7 +9271,7 @@ test_write_multi_chunk_dataset_same_shape_read(void)
             for (k = 0; k < chunk_dims[1]; k++) {
                 if (read_buf[j][k] != (int)((j * chunk_dims[0]) + k + i)) {
                     H5_FAILED();
-                    HDprintf("    data verification failed for chunk %lld\n", (long long)i);
+                    printf("    data verification failed for chunk %lld\n", (long long)i);
                     goto error;
                 }
             }
@@ -9378,28 +9345,28 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or get property list aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, dataset, or get property list aren't supported "
+               "with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -9413,7 +9380,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
     if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK, chunk_dims) <
         0) {
         H5_FAILED();
-        HDprintf("    failed to set chunking on DCPL\n");
+        printf("    failed to set chunking on DCPL\n");
         goto error;
     }
 
@@ -9421,8 +9388,8 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
                               DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, fspace_id,
                               H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n",
-                 DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n",
+               DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
         goto error;
     }
 
@@ -9431,13 +9398,13 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
      */
     if (H5Pclose(dcpl_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close DCPL\n");
+        printf("    failed to close DCPL\n");
         goto error;
     }
 
     if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve copy of DCPL\n");
+        printf("    failed to retrieve copy of DCPL\n");
         goto error;
     }
 
@@ -9445,15 +9412,15 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
     if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK,
                      retrieved_chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve chunking info\n");
+        printf("    failed to retrieve chunking info\n");
         goto error;
     }
 
     for (i = 0; i < DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; i++) {
         if (chunk_dims[i] != retrieved_chunk_dims[i]) {
             H5_FAILED();
-            HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                     "dimensionality\n");
+            printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                   "dimensionality\n");
             goto error;
         }
     }
@@ -9529,8 +9496,8 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
     if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL,
                  H5P_DEFAULT, write_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't write to dataset '%s'\n",
-                 DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+        printf("    couldn't write to dataset '%s'\n",
+               DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
         goto error;
     }
 
@@ -9559,14 +9526,13 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
     if ((dset_id =
              H5Dopen2(group_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n",
-                 DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
@@ -9575,7 +9541,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
      */
     if (NULL == (read_buf = HDmalloc(chunk_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
@@ -9587,7 +9553,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to create memory dataspace\n");
+            printf("    failed to create memory dataspace\n");
             goto error;
         }
     }
@@ -9599,11 +9565,11 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
     /*
      * Read every chunk in the dataset, checking the data for each one.
      */
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < data_size / chunk_size; i++) {
         size_t j;
 
-        HDprintf("\r Reading chunk %zu", i);
+        printf("\r Reading chunk %zu", i);
 
         for (j = 0; j < DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; j++) {
             if (dims[j] == chunk_dims[j])
@@ -9620,7 +9586,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
          */
         if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
             H5_FAILED();
-            HDprintf("    failed to set hyperslab selection\n");
+            printf("    failed to set hyperslab selection\n");
             goto error;
         }
 
@@ -9628,8 +9594,8 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
         if (H5Dread(dset_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, mspace_id, fspace_id,
                     H5P_DEFAULT, read_buf) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't read from dataset '%s'\n",
-                     DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+            printf("    couldn't read from dataset '%s'\n",
+                   DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
             goto error;
         }
 
@@ -9637,7 +9603,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
              j++)
             if (((int *)read_buf)[j] != (int)(j + i)) {
                 H5_FAILED();
-                HDprintf("    data verification failed for chunk %lld\n", (long long)i);
+                printf("    data verification failed for chunk %lld\n", (long long)i);
                 goto error;
             }
     }
@@ -9717,28 +9683,28 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or get property list aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, dataset, or get property list aren't supported "
+               "with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -9752,7 +9718,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
     if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK,
                      chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to set chunking on DCPL\n");
+        printf("    failed to set chunking on DCPL\n");
         goto error;
     }
 
@@ -9760,8 +9726,8 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
                               DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, fspace_id,
                               H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n",
-                 DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n",
+               DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
         goto error;
     }
 
@@ -9770,13 +9736,13 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
      */
     if (H5Pclose(dcpl_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close DCPL\n");
+        printf("    failed to close DCPL\n");
         goto error;
     }
 
     if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve copy of DCPL\n");
+        printf("    failed to retrieve copy of DCPL\n");
         goto error;
     }
 
@@ -9784,15 +9750,15 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
     if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK,
                      retrieved_chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve chunking info\n");
+        printf("    failed to retrieve chunking info\n");
         goto error;
     }
 
     for (i = 0; i < DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; i++) {
         if (chunk_dims[i] != retrieved_chunk_dims[i]) {
             H5_FAILED();
-            HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                     "dimensionality\n");
+            printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                   "dimensionality\n");
             goto error;
         }
     }
@@ -9816,7 +9782,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
 
         if ((mspace_id = H5Screate_simple(2, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to create memory dataspace\n");
+            printf("    failed to create memory dataspace\n");
             goto error;
         }
     }
@@ -9825,7 +9791,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
         count[i] = chunk_dims[i];
     }
 
-    HDprintf("\n");
+    printf("\n");
     for (niter = 0; niter < DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_NITERS; niter++) {
         memset(write_buf, 0, data_size);
 
@@ -9892,8 +9858,8 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
         if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL,
                      H5P_DEFAULT, write_buf) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't write to dataset '%s'\n",
-                     DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+            printf("    couldn't write to dataset '%s'\n",
+                   DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
             goto error;
         }
 
@@ -9917,14 +9883,14 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
         if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME,
                                 H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't open dataset '%s'\n",
-                     DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+            printf("    couldn't open dataset '%s'\n",
+                   DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
             goto error;
         }
 
         if ((fspace_id = H5Dget_space(dset_id)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't get dataset dataspace\n");
+            printf("    couldn't get dataset dataspace\n");
             goto error;
         }
 
@@ -9934,7 +9900,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
         for (i = 0; i < data_size / chunk_size; i++) {
             size_t j, k;
 
-            HDprintf("\r Reading chunk %zu", i);
+            printf("\r Reading chunk %zu", i);
 
             for (j = 0; j < DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; j++) {
                 if (dims[j] == chunk_dims[j])
@@ -9951,7 +9917,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
              */
             if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to set hyperslab selection\n");
+                printf("    failed to set hyperslab selection\n");
                 goto error;
             }
 
@@ -9962,8 +9928,8 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
             if (H5Dread(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, mspace_id,
                         fspace_id, H5P_DEFAULT, read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n",
-                         DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n",
+                       DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
                 goto error;
             }
 
@@ -9971,7 +9937,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
                 for (k = 0; k < chunk_dims[1]; k++) {
                     if (read_buf[j][k] != (int)((j * chunk_dims[0]) + k + i + niter)) {
                         H5_FAILED();
-                        HDprintf("    data verification failed for chunk %lld\n", (long long)i);
+                        printf("    data verification failed for chunk %lld\n", (long long)i);
                         goto error;
                     }
                 }
@@ -10052,28 +10018,28 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or get property list aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, dataset, or get property list aren't supported "
+               "with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -10087,7 +10053,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
     if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK,
                      chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to set chunking on DCPL\n");
+        printf("    failed to set chunking on DCPL\n");
         goto error;
     }
 
@@ -10095,8 +10061,8 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
                               DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, fspace_id,
                               H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n",
-                 DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n",
+               DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
         goto error;
     }
 
@@ -10105,13 +10071,13 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
      */
     if (H5Pclose(dcpl_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close DCPL\n");
+        printf("    failed to close DCPL\n");
         goto error;
     }
 
     if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve copy of DCPL\n");
+        printf("    failed to retrieve copy of DCPL\n");
         goto error;
     }
 
@@ -10119,15 +10085,15 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
     if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK,
                      retrieved_chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve chunking info\n");
+        printf("    failed to retrieve chunking info\n");
         goto error;
     }
 
     for (i = 0; i < DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; i++) {
         if (chunk_dims[i] != retrieved_chunk_dims[i]) {
             H5_FAILED();
-            HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                     "dimensionality\n");
+            printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                   "dimensionality\n");
             goto error;
         }
     }
@@ -10148,7 +10114,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
      */
     if (NULL == (read_buf = HDmalloc(chunk_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
@@ -10160,7 +10126,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to create memory dataspace\n");
+            printf("    failed to create memory dataspace\n");
             goto error;
         }
     }
@@ -10169,7 +10135,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
         count[i] = chunk_dims[i];
     }
 
-    HDprintf("\n");
+    printf("\n");
     for (niter = 0; niter < DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_NITERS; niter++) {
         memset(write_buf, 0, data_size);
 
@@ -10236,8 +10202,8 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
         if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL,
                      H5P_DEFAULT, write_buf) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't write to dataset '%s'\n",
-                     DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+            printf("    couldn't write to dataset '%s'\n",
+                   DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
             goto error;
         }
 
@@ -10261,14 +10227,14 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
         if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME,
                                 H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't open dataset '%s'\n",
-                     DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+            printf("    couldn't open dataset '%s'\n",
+                   DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
             goto error;
         }
 
         if ((fspace_id = H5Dget_space(dset_id)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't get dataset dataspace\n");
+            printf("    couldn't get dataset dataspace\n");
             goto error;
         }
 
@@ -10278,7 +10244,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
         for (i = 0; i < data_size / chunk_size; i++) {
             size_t j;
 
-            HDprintf("\r Reading chunk %zu", i);
+            printf("\r Reading chunk %zu", i);
 
             for (j = 0; j < DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; j++) {
                 if (dims[j] == chunk_dims[j])
@@ -10295,7 +10261,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
              */
             if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to set hyperslab selection\n");
+                printf("    failed to set hyperslab selection\n");
                 goto error;
             }
 
@@ -10303,8 +10269,8 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
             if (H5Dread(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, mspace_id,
                         fspace_id, H5P_DEFAULT, read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n",
-                         DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n",
+                       DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
                 goto error;
             }
 
@@ -10313,7 +10279,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
                  j++)
                 if (((int *)read_buf)[j] != (int)(j + i + niter)) {
                     H5_FAILED();
-                    HDprintf("    data verification failed for chunk %lld\n", (long long)i);
+                    printf("    data verification failed for chunk %lld\n", (long long)i);
                     goto error;
                 }
         }
@@ -10397,28 +10363,28 @@ test_read_partial_chunk_all_selection(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or get property list aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, dataset, or get property list aren't supported "
+               "with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -10431,7 +10397,7 @@ test_read_partial_chunk_all_selection(void)
 
     if (H5Pset_chunk(dcpl_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_SPACE_RANK, chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to set chunking on DCPL\n");
+        printf("    failed to set chunking on DCPL\n");
         goto error;
     }
 
@@ -10439,7 +10405,7 @@ test_read_partial_chunk_all_selection(void)
                               DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_NAME);
         goto error;
     }
 
@@ -10448,13 +10414,13 @@ test_read_partial_chunk_all_selection(void)
      */
     if (H5Pclose(dcpl_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close DCPL\n");
+        printf("    failed to close DCPL\n");
         goto error;
     }
 
     if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve copy of DCPL\n");
+        printf("    failed to retrieve copy of DCPL\n");
         goto error;
     }
 
@@ -10462,15 +10428,15 @@ test_read_partial_chunk_all_selection(void)
     if (H5Pget_chunk(dcpl_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) <
         0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve chunking info\n");
+        printf("    failed to retrieve chunking info\n");
         goto error;
     }
 
     for (i = 0; i < DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_SPACE_RANK; i++) {
         if (chunk_dims[i] != retrieved_chunk_dims[i]) {
             H5_FAILED();
-            HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                     "dimensionality\n");
+            printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                   "dimensionality\n");
             goto error;
         }
     }
@@ -10486,7 +10452,7 @@ test_read_partial_chunk_all_selection(void)
     if (H5Dwrite(dset_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                  write_buf) < 0) {
         H5_FAILED();
-        HDprintf("    failed to write to dataset\n");
+        printf("    failed to write to dataset\n");
         goto error;
     }
 
@@ -10497,14 +10463,14 @@ test_read_partial_chunk_all_selection(void)
         TEST_ERROR;
     if ((dset_id = H5Dopen2(group_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to re-open dataset\n");
+        printf("    failed to re-open dataset\n");
         goto error;
     }
 
     if (H5Dread(dset_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    failed to read from dataset\n");
+        printf("    failed to read from dataset\n");
         goto error;
     }
 
@@ -10512,7 +10478,7 @@ test_read_partial_chunk_all_selection(void)
         for (j = 0; j < FIXED_DIMSIZE; j++)
             if (read_buf[i][j] != (int)((i * FIXED_DIMSIZE) + j)) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    data verification failed for read buffer element %lld: expected %lld but was %lld\n",
                     (long long)((i * FIXED_DIMSIZE) + j), (long long)((i * FIXED_DIMSIZE) + j),
                     (long long)read_buf[i][j]);
@@ -10584,28 +10550,28 @@ test_read_partial_chunk_hyperslab_selection(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or get property list aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, dataset, or get property list aren't supported "
+               "with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -10618,7 +10584,7 @@ test_read_partial_chunk_hyperslab_selection(void)
 
     if (H5Pset_chunk(dcpl_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK, chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to set chunking on DCPL\n");
+        printf("    failed to set chunking on DCPL\n");
         goto error;
     }
 
@@ -10626,7 +10592,7 @@ test_read_partial_chunk_hyperslab_selection(void)
                               DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               dcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_NAME);
         goto error;
     }
 
@@ -10635,13 +10601,13 @@ test_read_partial_chunk_hyperslab_selection(void)
      */
     if (H5Pclose(dcpl_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close DCPL\n");
+        printf("    failed to close DCPL\n");
         goto error;
     }
 
     if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve copy of DCPL\n");
+        printf("    failed to retrieve copy of DCPL\n");
         goto error;
     }
 
@@ -10649,15 +10615,15 @@ test_read_partial_chunk_hyperslab_selection(void)
     if (H5Pget_chunk(dcpl_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK,
                      retrieved_chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve chunking info\n");
+        printf("    failed to retrieve chunking info\n");
         goto error;
     }
 
     for (i = 0; i < DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK; i++) {
         if (chunk_dims[i] != retrieved_chunk_dims[i]) {
             H5_FAILED();
-            HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                     "dimensionality\n");
+            printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                   "dimensionality\n");
             goto error;
         }
     }
@@ -10681,7 +10647,7 @@ test_read_partial_chunk_hyperslab_selection(void)
         if ((mspace_id = H5Screate_simple(DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK, mdims,
                                           NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to create memory dataspace\n");
+            printf("    failed to create memory dataspace\n");
             goto error;
         }
     }
@@ -10734,30 +10700,30 @@ test_read_partial_chunk_hyperslab_selection(void)
 
             if (H5Sselect_hyperslab(mspace_id, H5S_SELECT_SET, m_start, NULL, count, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to select hyperslab in memory dataspace\n");
+                printf("    failed to select hyperslab in memory dataspace\n");
                 goto error;
             }
         }
         else {
             if (H5Sselect_all(mspace_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to select entire memory dataspace\n");
+                printf("    failed to select entire memory dataspace\n");
                 goto error;
             }
         }
 
         if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
             H5_FAILED();
-            HDprintf("    failed to select hyperslab\n");
+            printf("    failed to select hyperslab\n");
             goto error;
         }
 
-        HDprintf("\r Writing chunk %zu", i);
+        printf("\r Writing chunk %zu", i);
 
         if (H5Dwrite(dset_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_DTYPE, mspace_id, fspace_id,
                      H5P_DEFAULT, write_buf) < 0) {
             H5_FAILED();
-            HDprintf("    failed to write to dataset\n");
+            printf("    failed to write to dataset\n");
             goto error;
         }
 
@@ -10771,28 +10737,28 @@ test_read_partial_chunk_hyperslab_selection(void)
         if ((dset_id = H5Dopen2(group_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_NAME, H5P_DEFAULT)) <
             0) {
             H5_FAILED();
-            HDprintf("    failed to re-open dataset\n");
+            printf("    failed to re-open dataset\n");
             goto error;
         }
 
         if ((fspace_id = H5Dget_space(dset_id)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve dataspace from dataset\n");
+            printf("    failed to retrieve dataspace from dataset\n");
             goto error;
         }
 
         if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
             H5_FAILED();
-            HDprintf("    failed to select hyperslab\n");
+            printf("    failed to select hyperslab\n");
             goto error;
         }
 
-        HDprintf("\r Reading chunk %zu", i);
+        printf("\r Reading chunk %zu", i);
 
         if (H5Dread(dset_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_DTYPE, mspace_id, fspace_id,
                     H5P_DEFAULT, read_buf) < 0) {
             H5_FAILED();
-            HDprintf("    failed to read from dataset\n");
+            printf("    failed to read from dataset\n");
             goto error;
         }
 
@@ -10800,10 +10766,10 @@ test_read_partial_chunk_hyperslab_selection(void)
             for (k = 0; k < FIXED_CHUNK_DIMSIZE; k++)
                 if (read_buf[j][k] != (int)((j * FIXED_CHUNK_DIMSIZE) + k)) {
                     H5_FAILED();
-                    HDprintf("    data verification failed for read buffer element %lld: expected %lld but "
-                             "was %lld\n",
-                             (long long)((j * FIXED_CHUNK_DIMSIZE) + k),
-                             (long long)((j * FIXED_CHUNK_DIMSIZE) + k), (long long)read_buf[j][k]);
+                    printf("    data verification failed for read buffer element %lld: expected %lld but "
+                           "was %lld\n",
+                           (long long)((j * FIXED_CHUNK_DIMSIZE) + k),
+                           (long long)((j * FIXED_CHUNK_DIMSIZE) + k), (long long)read_buf[j][k]);
                     goto error;
                 }
     }
@@ -10889,8 +10855,8 @@ test_get_vlen_buf_size(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or dataset aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -10905,20 +10871,20 @@ test_get_vlen_buf_size(void)
     /* Open the file */
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_GET_VLEN_BUF_SIZE_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_GET_VLEN_BUF_SIZE_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_GET_VLEN_BUF_SIZE_GROUP_NAME);
         goto error;
     }
 
@@ -10948,11 +10914,11 @@ test_get_vlen_buf_size(void)
         ((DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM * (DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM + 1)) / 2) *
             sizeof(unsigned int)) {
         H5_FAILED();
-        HDprintf(
-            "    H5Dvlen_get_buf_size returned wrong size (%lu), compared to the correct size (%lu)\n", size,
-            ((DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM * (DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM + 1)) /
-             2) *
-                sizeof(unsigned int));
+        printf("    H5Dvlen_get_buf_size returned wrong size (%lu), compared to the correct size (%lu)\n",
+               size,
+               ((DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM * (DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM + 1)) /
+                2) *
+                   sizeof(unsigned int));
         goto error;
     }
 
@@ -11005,17 +10971,17 @@ H5_api_dataset_test(void)
     size_t i;
     int    nerrors;
 
-    HDprintf("**********************************************\n");
-    HDprintf("*                                            *\n");
-    HDprintf("*             API Dataset Tests              *\n");
-    HDprintf("*                                            *\n");
-    HDprintf("**********************************************\n\n");
+    printf("**********************************************\n");
+    printf("*                                            *\n");
+    printf("*             API Dataset Tests              *\n");
+    printf("*                                            *\n");
+    printf("**********************************************\n\n");
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(dataset_tests); i++) {
         nerrors += (*dataset_tests[i])() ? 1 : 0;
     }
 
-    HDprintf("\n");
+    printf("\n");
 
     return nerrors;
 }
diff --git a/test/API/H5_api_datatype_test.c b/test/API/H5_api_datatype_test.c
index 8bcd19a..7a67210 100644
--- a/test/API/H5_api_datatype_test.c
+++ b/test/API/H5_api_datatype_test.c
@@ -90,40 +90,40 @@ test_create_committed_datatype(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or stored datatype aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or stored datatype aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATATYPE_CREATE_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATATYPE_CREATE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype to commit\n");
+        printf("    couldn't create datatype to commit\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, DATATYPE_CREATE_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", DATATYPE_CREATE_TEST_TYPE_NAME);
+        printf("    couldn't commit datatype '%s'\n", DATATYPE_CREATE_TEST_TYPE_NAME);
         goto error;
     }
 
@@ -171,8 +171,8 @@ test_create_committed_datatype_invalid_params(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or stored datatype aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or stored datatype aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -180,27 +180,27 @@ test_create_committed_datatype_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATATYPE_CREATE_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATATYPE_CREATE_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype to commit\n");
+        printf("    couldn't create datatype to commit\n");
         goto error;
     }
 
@@ -221,7 +221,7 @@ test_create_committed_datatype_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Tcommit2 succeeded with an invalid loc_id!\n");
+                printf("    H5Tcommit2 succeeded with an invalid loc_id!\n");
                 PART_ERROR(H5Tcommit2_invalid_loc_id);
             }
 
@@ -241,7 +241,7 @@ test_create_committed_datatype_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Tcommit2 succeeded with an invalid datatype name!\n");
+                printf("    H5Tcommit2 succeeded with an invalid datatype name!\n");
                 PART_ERROR(H5Tcommit2_invalid_type_name);
             }
 
@@ -253,7 +253,7 @@ test_create_committed_datatype_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Tcommit2 succeeded with an invalid datatype name!\n");
+                printf("    H5Tcommit2 succeeded with an invalid datatype name!\n");
                 PART_ERROR(H5Tcommit2_invalid_type_name);
             }
 
@@ -274,7 +274,7 @@ test_create_committed_datatype_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Tcommit2 succeeded with an invalid datatype ID!\n");
+                printf("    H5Tcommit2 succeeded with an invalid datatype ID!\n");
                 PART_ERROR(H5Tcommit2_invalid_type_id);
             }
 
@@ -295,7 +295,7 @@ test_create_committed_datatype_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Tcommit2 succeeded with an invalid LCPL!\n");
+                printf("    H5Tcommit2 succeeded with an invalid LCPL!\n");
                 PART_ERROR(H5Tcommit2_invalid_lcpl);
             }
 
@@ -316,7 +316,7 @@ test_create_committed_datatype_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Tcommit2 succeeded with an invalid TCPL!\n");
+                printf("    H5Tcommit2 succeeded with an invalid TCPL!\n");
                 PART_ERROR(H5Tcommit2_invalid_tcpl);
             }
 
@@ -337,7 +337,7 @@ test_create_committed_datatype_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Tcommit2 succeeded with an invalid TAPL!\n");
+                printf("    H5Tcommit2 succeeded with an invalid TAPL!\n");
                 PART_ERROR(H5Tcommit2_invalid_tapl);
             }
 
@@ -392,39 +392,39 @@ test_create_anonymous_committed_datatype(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or stored datatype aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or stored datatype aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_ANONYMOUS_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATATYPE_CREATE_ANONYMOUS_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATATYPE_CREATE_ANONYMOUS_GROUP_NAME);
         goto error;
     }
 
     if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype\n");
+        printf("    couldn't create datatype\n");
         goto error;
     }
 
     if (H5Tcommit_anon(group_id, type_id, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit anonymous datatype\n");
+        printf("    couldn't commit anonymous datatype\n");
         goto error;
     }
 
@@ -472,8 +472,8 @@ test_create_anonymous_committed_datatype_invalid_params(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or stored datatype aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or stored datatype aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -481,27 +481,27 @@ test_create_anonymous_committed_datatype_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATATYPE_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATATYPE_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME);
         goto error;
     }
 
     if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype\n");
+        printf("    couldn't create datatype\n");
         goto error;
     }
 
@@ -521,7 +521,7 @@ test_create_anonymous_committed_datatype_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Tcommit_anon succeeded with an invalid loc_id!\n");
+                printf("    H5Tcommit_anon succeeded with an invalid loc_id!\n");
                 PART_ERROR(H5Tcommit_anon_invalid_loc_id);
             }
 
@@ -541,7 +541,7 @@ test_create_anonymous_committed_datatype_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Tcommit_anon succeeded with an invalid datatype ID!\n");
+                printf("    H5Tcommit_anon succeeded with an invalid datatype ID!\n");
                 PART_ERROR(H5Tcommit_anon_invalid_type_id);
             }
 
@@ -561,7 +561,7 @@ test_create_anonymous_committed_datatype_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Tcommit_anon succeeded with an invalid TCPL!\n");
+                printf("    H5Tcommit_anon succeeded with an invalid TCPL!\n");
                 PART_ERROR(H5Tcommit_anon_invalid_tcpl);
             }
 
@@ -581,7 +581,7 @@ test_create_anonymous_committed_datatype_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Tcommit_anon succeeded with an invalid TAPL!\n");
+                printf("    H5Tcommit_anon succeeded with an invalid TAPL!\n");
                 PART_ERROR(H5Tcommit_anon_invalid_tapl);
             }
 
@@ -638,8 +638,8 @@ test_create_committed_datatype_empty_types(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or stored datatype aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or stored datatype aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -647,21 +647,20 @@ test_create_committed_datatype_empty_types(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_EMPTY_TYPES_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATATYPE_CREATE_EMPTY_TYPES_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATATYPE_CREATE_EMPTY_TYPES_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -675,7 +674,7 @@ test_create_committed_datatype_empty_types(void)
 
             if ((type_id = H5Tcreate(H5T_COMPOUND, (size_t)32)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create compound type\n");
+                printf("    failed to create compound type\n");
                 PART_ERROR(H5Tcommit_empty_compound_type);
             }
 
@@ -688,14 +687,14 @@ test_create_committed_datatype_empty_types(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    committed empty compound datatype!\n");
+                printf("    committed empty compound datatype!\n");
                 PART_ERROR(H5Tcommit_empty_compound_type);
             }
 
             /* Add a field to the compound datatype */
             if (H5Tinsert(type_id, "a", (size_t)0, H5T_NATIVE_INT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to insert field into compound datatype\n");
+                printf("    failed to insert field into compound datatype\n");
                 PART_ERROR(H5Tcommit_empty_compound_type);
             }
 
@@ -703,7 +702,7 @@ test_create_committed_datatype_empty_types(void)
             if (H5Tcommit2(group_id, DATATYPE_CREATE_EMPTY_TYPES_TEST_CMPD_TYPE_NAME, type_id, H5P_DEFAULT,
                            H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to commit non-empty compound datatype\n");
+                printf("    failed to commit non-empty compound datatype\n");
                 PART_ERROR(H5Tcommit_empty_compound_type);
             }
 
@@ -728,7 +727,7 @@ test_create_committed_datatype_empty_types(void)
 
             if ((type_id = H5Tenum_create(H5T_NATIVE_INT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create enum type\n");
+                printf("    failed to create enum type\n");
                 PART_ERROR(H5Tcommit_empty_enum_type);
             }
 
@@ -741,14 +740,14 @@ test_create_committed_datatype_empty_types(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    committed empty enum datatype!\n");
+                printf("    committed empty enum datatype!\n");
                 PART_ERROR(H5Tcommit_empty_enum_type);
             }
 
             /* Add a field to the enum datatype */
             if (H5Tenum_insert(type_id, "a", &enum_val) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to insert field into enum datatype\n");
+                printf("    failed to insert field into enum datatype\n");
                 PART_ERROR(H5Tcommit_empty_enum_type);
             }
 
@@ -756,7 +755,7 @@ test_create_committed_datatype_empty_types(void)
             if (H5Tcommit2(group_id, DATATYPE_CREATE_EMPTY_TYPES_TEST_ENUM_TYPE_NAME, type_id, H5P_DEFAULT,
                            H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to commit non-empty enum datatype\n");
+                printf("    failed to commit non-empty enum datatype\n");
                 PART_ERROR(H5Tcommit_empty_enum_type);
             }
 
@@ -814,52 +813,52 @@ test_recommit_committed_type(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or stored datatype aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or stored datatype aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, RECOMMIT_COMMITTED_TYPE_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", RECOMMIT_COMMITTED_TYPE_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", RECOMMIT_COMMITTED_TYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     /* Copy a predefined datatype and commit the copy */
     if ((type_id = H5Tcopy(H5T_NATIVE_INT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to copy predefined integer datatype\n");
+        printf("    failed to copy predefined integer datatype\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, "native_int", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    failed to commit datatype\n");
+        printf("    failed to commit datatype\n");
         goto error;
     }
 
     if ((is_committed = H5Tcommitted(type_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to determine if datatype is committed\n");
+        printf("    failed to determine if datatype is committed\n");
         goto error;
     }
 
     if (!is_committed) {
         H5_FAILED();
-        HDprintf("    H5Tcommitted() returned false!\n");
+        printf("    H5Tcommitted() returned false!\n");
         goto error;
     }
 
@@ -872,7 +871,7 @@ test_recommit_committed_type(void)
 
     if (err_ret >= 0) {
         H5_FAILED();
-        HDprintf("    re-committed an already committed datatype!\n");
+        printf("    re-committed an already committed datatype!\n");
         goto error;
     }
 
@@ -919,40 +918,40 @@ test_open_committed_datatype(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or stored datatype aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or stored datatype aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATATYPE_OPEN_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATATYPE_OPEN_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATATYPE_OPEN_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype to commit\n");
+        printf("    couldn't create datatype to commit\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, DATATYPE_OPEN_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", DATATYPE_OPEN_TEST_TYPE_NAME);
+        printf("    couldn't commit datatype '%s'\n", DATATYPE_OPEN_TEST_TYPE_NAME);
         goto error;
     }
 
@@ -961,7 +960,7 @@ test_open_committed_datatype(void)
 
     if ((type_id = H5Topen2(group_id, DATATYPE_OPEN_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open committed datatype '%s'\n", DATATYPE_OPEN_TEST_TYPE_NAME);
+        printf("    couldn't open committed datatype '%s'\n", DATATYPE_OPEN_TEST_TYPE_NAME);
         goto error;
     }
 
@@ -1008,8 +1007,8 @@ test_open_committed_datatype_invalid_params(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or stored datatype aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or stored datatype aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -1017,34 +1016,34 @@ test_open_committed_datatype_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATATYPE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATATYPE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATATYPE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype to commit\n");
+        printf("    couldn't create datatype to commit\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, DATATYPE_OPEN_INVALID_PARAMS_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT,
                    H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", DATATYPE_OPEN_INVALID_PARAMS_TEST_TYPE_NAME);
+        printf("    couldn't commit datatype '%s'\n", DATATYPE_OPEN_INVALID_PARAMS_TEST_TYPE_NAME);
         goto error;
     }
 
@@ -1067,7 +1066,7 @@ test_open_committed_datatype_invalid_params(void)
 
             if (type_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened committed datatype with an invalid location ID!\n");
+                printf("    opened committed datatype with an invalid location ID!\n");
                 H5Tclose(type_id);
                 PART_ERROR(H5Topen2_invalid_loc_id);
             }
@@ -1088,7 +1087,7 @@ test_open_committed_datatype_invalid_params(void)
 
             if (type_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened committed datatype with an invalid datatype name!\n");
+                printf("    opened committed datatype with an invalid datatype name!\n");
                 H5Tclose(type_id);
                 PART_ERROR(H5Topen2_invalid_type_name);
             }
@@ -1101,7 +1100,7 @@ test_open_committed_datatype_invalid_params(void)
 
             if (type_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened committed datatype with an invalid datatype name!\n");
+                printf("    opened committed datatype with an invalid datatype name!\n");
                 H5Tclose(type_id);
                 PART_ERROR(H5Topen2_invalid_type_name);
             }
@@ -1122,7 +1121,7 @@ test_open_committed_datatype_invalid_params(void)
 
             if (type_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened committed datatype with an invalid TAPL!\n");
+                printf("    opened committed datatype with an invalid TAPL!\n");
                 H5Tclose(type_id);
                 PART_ERROR(H5Topen2_invalid_tapl);
             }
@@ -1182,8 +1181,8 @@ test_reopen_committed_datatype_indirect(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or stored datatype aren't supported with "
-                 "this connector\n");
+        printf("    API functions for basic file, group, dataset, or stored datatype aren't supported with "
+               "this connector\n");
         return 0;
     }
 
@@ -1191,20 +1190,20 @@ test_reopen_committed_datatype_indirect(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATATYPE_REOPEN_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATATYPE_REOPEN_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATATYPE_REOPEN_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -1221,51 +1220,51 @@ test_reopen_committed_datatype_indirect(void)
 
             if ((strtype = H5Tcopy(H5T_C_S1)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy C-string datatype\n");
+                printf("    failed to copy C-string datatype\n");
                 PART_ERROR(reopen_compound_type);
             }
 
             if (H5Tset_size(strtype, H5T_VARIABLE) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to set string datatype's size to variable\n");
+                printf("    failed to set string datatype's size to variable\n");
                 PART_ERROR(reopen_compound_type);
             }
 
             if ((type_id = H5Tcreate(H5T_COMPOUND, sizeof(char *))) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create compound datatype\n");
+                printf("    failed to create compound datatype\n");
                 PART_ERROR(reopen_compound_type);
             }
 
             if (H5Tinsert(type_id, "vlstr", (size_t)0, strtype) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to insert field into compound datatype\n");
+                printf("    failed to insert field into compound datatype\n");
                 PART_ERROR(reopen_compound_type);
             }
 
             if (H5Tclose(strtype) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close string datatype\n");
+                printf("    failed to close string datatype\n");
                 PART_ERROR(reopen_compound_type);
             }
 
             /* Get size of compound type */
             if ((dt_size = H5Tget_size(type_id)) == 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve size of compound datatype\n");
+                printf("    failed to retrieve size of compound datatype\n");
                 PART_ERROR(reopen_compound_type);
             }
 
             /* Commit compound type and verify the size doesn't change */
             if (H5Tcommit2(group_id, "cmpd_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to commit compound datatype\n");
+                printf("    failed to commit compound datatype\n");
                 PART_ERROR(reopen_compound_type);
             }
 
             if (dt_size != H5Tget_size(type_id)) {
                 H5_FAILED();
-                HDprintf("    committing datatype caused its size to change!\n");
+                printf("    committing datatype caused its size to change!\n");
                 PART_ERROR(reopen_compound_type);
             }
 
@@ -1273,20 +1272,20 @@ test_reopen_committed_datatype_indirect(void)
             if ((dset_id = H5Dcreate2(group_id, "cmpd_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT,
                                       H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create dataset using committed datatype\n");
+                printf("    failed to create dataset using committed datatype\n");
                 PART_ERROR(reopen_compound_type);
             }
 
             /* Indirectly reopen type and verify that the size doesn't change */
             if ((reopened_type_id = H5Dget_type(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to re-open committed datatype using H5Dget_type\n");
+                printf("    failed to re-open committed datatype using H5Dget_type\n");
                 PART_ERROR(reopen_compound_type);
             }
 
             if (dt_size != H5Tget_size(reopened_type_id)) {
                 H5_FAILED();
-                HDprintf("    size of re-opened datatype didn't match size of original datatype\n");
+                printf("    size of re-opened datatype didn't match size of original datatype\n");
                 PART_ERROR(reopen_compound_type);
             }
 
@@ -1315,41 +1314,41 @@ test_reopen_committed_datatype_indirect(void)
 
             if ((type_id = H5Tenum_create(H5T_NATIVE_INT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create enum datatype\n");
+                printf("    failed to create enum datatype\n");
                 PART_ERROR(reopen_enum_type);
             }
 
             enum_value = 0;
             if (H5Tenum_insert(type_id, "val1", &enum_value) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to insert value into enum datatype\n");
+                printf("    failed to insert value into enum datatype\n");
                 PART_ERROR(reopen_enum_type);
             }
 
             enum_value = 1;
             if (H5Tenum_insert(type_id, "val2", &enum_value) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to insert value into enum datatype\n");
+                printf("    failed to insert value into enum datatype\n");
                 PART_ERROR(reopen_enum_type);
             }
 
             /* Get size of enum type */
             if ((dt_size = H5Tget_size(type_id)) == 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve size of enum datatype\n");
+                printf("    failed to retrieve size of enum datatype\n");
                 PART_ERROR(reopen_enum_type);
             }
 
             /* Commit enum type and verify the size doesn't change */
             if (H5Tcommit2(group_id, "enum_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to commit enum datatype\n");
+                printf("    failed to commit enum datatype\n");
                 PART_ERROR(reopen_enum_type);
             }
 
             if (dt_size != H5Tget_size(type_id)) {
                 H5_FAILED();
-                HDprintf("    committing datatype caused its size to change!\n");
+                printf("    committing datatype caused its size to change!\n");
                 PART_ERROR(reopen_enum_type);
             }
 
@@ -1357,20 +1356,20 @@ test_reopen_committed_datatype_indirect(void)
             if ((dset_id = H5Dcreate2(group_id, "enum_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT,
                                       H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create dataset using committed datatype\n");
+                printf("    failed to create dataset using committed datatype\n");
                 PART_ERROR(reopen_enum_type);
             }
 
             /* Indirectly reopen type and verify that the size doesn't change */
             if ((reopened_type_id = H5Dget_type(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to re-open committed datatype using H5Dget_type\n");
+                printf("    failed to re-open committed datatype using H5Dget_type\n");
                 PART_ERROR(reopen_enum_type);
             }
 
             if (dt_size != H5Tget_size(reopened_type_id)) {
                 H5_FAILED();
-                HDprintf("    size of re-opened datatype didn't match size of original datatype\n");
+                printf("    size of re-opened datatype didn't match size of original datatype\n");
                 PART_ERROR(reopen_enum_type);
             }
 
@@ -1395,27 +1394,27 @@ test_reopen_committed_datatype_indirect(void)
 
             if ((type_id = H5Tvlen_create(H5T_NATIVE_INT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create variable-length datatype\n");
+                printf("    failed to create variable-length datatype\n");
                 PART_ERROR(reopen_vlen_type);
             }
 
             /* Get size of variable-length type */
             if ((dt_size = H5Tget_size(type_id)) == 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve size of variable-length datatype\n");
+                printf("    failed to retrieve size of variable-length datatype\n");
                 PART_ERROR(reopen_vlen_type);
             }
 
             /* Commit variable-length type and verify the size doesn't change */
             if (H5Tcommit2(group_id, "vlen_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to commit variable-length datatype\n");
+                printf("    failed to commit variable-length datatype\n");
                 PART_ERROR(reopen_vlen_type);
             }
 
             if (dt_size != H5Tget_size(type_id)) {
                 H5_FAILED();
-                HDprintf("    committing datatype caused its size to change!\n");
+                printf("    committing datatype caused its size to change!\n");
                 PART_ERROR(reopen_vlen_type);
             }
 
@@ -1423,20 +1422,20 @@ test_reopen_committed_datatype_indirect(void)
             if ((dset_id = H5Dcreate2(group_id, "vlen_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT,
                                       H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create dataset using committed datatype\n");
+                printf("    failed to create dataset using committed datatype\n");
                 PART_ERROR(reopen_vlen_type);
             }
 
             /* Indirectly reopen type and verify that the size doesn't change */
             if ((reopened_type_id = H5Dget_type(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to re-open committed datatype using H5Dget_type\n");
+                printf("    failed to re-open committed datatype using H5Dget_type\n");
                 PART_ERROR(reopen_vlen_type);
             }
 
             if (dt_size != H5Tget_size(reopened_type_id)) {
                 H5_FAILED();
-                HDprintf("    size of re-opened datatype didn't match size of original datatype\n");
+                printf("    size of re-opened datatype didn't match size of original datatype\n");
                 PART_ERROR(reopen_vlen_type);
             }
 
@@ -1463,33 +1462,33 @@ test_reopen_committed_datatype_indirect(void)
 
             if ((type_id = H5Tcreate(H5T_OPAQUE, (size_t)13)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create opaque datatype\n");
+                printf("    failed to create opaque datatype\n");
                 PART_ERROR(reopen_opaque_type);
             }
 
             if (H5Tset_tag(type_id, tag) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to set tag on opaque datatype\n");
+                printf("    failed to set tag on opaque datatype\n");
                 PART_ERROR(reopen_opaque_type);
             }
 
             /* Get size of opaque type */
             if ((dt_size = H5Tget_size(type_id)) == 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve size of opaque datatype\n");
+                printf("    failed to retrieve size of opaque datatype\n");
                 PART_ERROR(reopen_opaque_type);
             }
 
             /* Commit opaque type and verify the size doesn't change */
             if (H5Tcommit2(group_id, "opaque_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to commit opaque datatype\n");
+                printf("    failed to commit opaque datatype\n");
                 PART_ERROR(reopen_opaque_type);
             }
 
             if (dt_size != H5Tget_size(type_id)) {
                 H5_FAILED();
-                HDprintf("    committing datatype caused its size to change!\n");
+                printf("    committing datatype caused its size to change!\n");
                 PART_ERROR(reopen_opaque_type);
             }
 
@@ -1497,20 +1496,20 @@ test_reopen_committed_datatype_indirect(void)
             if ((dset_id = H5Dcreate2(group_id, "opaque_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT,
                                       H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create dataset using committed datatype\n");
+                printf("    failed to create dataset using committed datatype\n");
                 PART_ERROR(reopen_opaque_type);
             }
 
             /* Indirectly reopen type and verify that the size doesn't change */
             if ((reopened_type_id = H5Dget_type(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to re-open committed datatype using H5Dget_type\n");
+                printf("    failed to re-open committed datatype using H5Dget_type\n");
                 PART_ERROR(reopen_opaque_type);
             }
 
             if (dt_size != H5Tget_size(reopened_type_id)) {
                 H5_FAILED();
-                HDprintf("    size of re-opened datatype didn't match size of original datatype\n");
+                printf("    size of re-opened datatype didn't match size of original datatype\n");
                 PART_ERROR(reopen_opaque_type);
             }
 
@@ -1537,27 +1536,27 @@ test_reopen_committed_datatype_indirect(void)
 
             if ((type_id = H5Tarray_create2(H5T_NATIVE_INT, 1, array_dims)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create array datatype\n");
+                printf("    failed to create array datatype\n");
                 PART_ERROR(reopen_array_type);
             }
 
             /* Get size of array type */
             if ((dt_size = H5Tget_size(type_id)) == 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve size of array datatype\n");
+                printf("    failed to retrieve size of array datatype\n");
                 PART_ERROR(reopen_array_type);
             }
 
             /* Commit array type and verify the size doesn't change */
             if (H5Tcommit2(group_id, "array_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to commit array datatype\n");
+                printf("    failed to commit array datatype\n");
                 PART_ERROR(reopen_array_type);
             }
 
             if (dt_size != H5Tget_size(type_id)) {
                 H5_FAILED();
-                HDprintf("    committing datatype caused its size to change!\n");
+                printf("    committing datatype caused its size to change!\n");
                 PART_ERROR(reopen_array_type);
             }
 
@@ -1565,20 +1564,20 @@ test_reopen_committed_datatype_indirect(void)
             if ((dset_id = H5Dcreate2(group_id, "array_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT,
                                       H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create dataset using committed datatype\n");
+                printf("    failed to create dataset using committed datatype\n");
                 PART_ERROR(reopen_array_type);
             }
 
             /* Indirectly reopen type and verify that the size doesn't change */
             if ((reopened_type_id = H5Dget_type(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to re-open committed datatype using H5Dget_type\n");
+                printf("    failed to re-open committed datatype using H5Dget_type\n");
                 PART_ERROR(reopen_array_type);
             }
 
             if (dt_size != H5Tget_size(reopened_type_id)) {
                 H5_FAILED();
-                HDprintf("    size of re-opened datatype didn't match size of original datatype\n");
+                printf("    size of re-opened datatype didn't match size of original datatype\n");
                 PART_ERROR(reopen_array_type);
             }
 
@@ -1647,14 +1646,13 @@ test_close_committed_datatype_invalid_id(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file or stored datatype aren't supported with this connector\n");
+        printf("    API functions for basic file or stored datatype aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
@@ -1666,7 +1664,7 @@ test_close_committed_datatype_invalid_id(void)
 
     if (err_ret >= 0) {
         H5_FAILED();
-        HDprintf("    H5Tclose succeeded with an invalid committed datatype ID!\n");
+        printf("    H5Tclose succeeded with an invalid committed datatype ID!\n");
         goto error;
     }
 
@@ -1706,8 +1704,8 @@ test_datatype_property_lists(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, stored datatype, or getting property list aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, stored datatype, or getting property list aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -1715,38 +1713,38 @@ test_datatype_property_lists(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATATYPE_PROPERTY_LIST_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATATYPE_PROPERTY_LIST_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATATYPE_PROPERTY_LIST_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((type_id1 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype\n");
+        printf("    couldn't create datatype\n");
         goto error;
     }
 
     if ((type_id2 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype\n");
+        printf("    couldn't create datatype\n");
         goto error;
     }
 
     if ((tcpl_id1 = H5Pcreate(H5P_DATATYPE_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create TCPL\n");
+        printf("    couldn't create TCPL\n");
         goto error;
     }
 
@@ -1755,14 +1753,14 @@ test_datatype_property_lists(void)
     if (H5Tcommit2(group_id, DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1, type_id1, H5P_DEFAULT, tcpl_id1,
                    H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1);
+        printf("    couldn't commit datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1);
         goto error;
     }
 
     if (H5Tcommit2(group_id, DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2, type_id2, H5P_DEFAULT, H5P_DEFAULT,
                    H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2);
+        printf("    couldn't commit datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2);
         goto error;
     }
 
@@ -1780,13 +1778,13 @@ test_datatype_property_lists(void)
             /* Try to receive copies for the two property lists */
             if ((tcpl_id1 = H5Tget_create_plist(type_id1)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Tget_create_plist);
             }
 
             if ((tcpl_id2 = H5Tget_create_plist(type_id2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Tget_create_plist);
             }
 
@@ -1837,26 +1835,26 @@ test_datatype_property_lists(void)
             if ((type_id1 = H5Topen2(group_id, DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1);
+                printf("    couldn't open datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1);
                 PART_ERROR(H5Tget_create_plist_reopened);
             }
 
             if ((type_id2 = H5Topen2(group_id, DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2);
+                printf("    couldn't open datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2);
                 PART_ERROR(H5Tget_create_plist_reopened);
             }
 
             if ((tcpl_id1 = H5Tget_create_plist(type_id1)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Tget_create_plist_reopened);
             }
 
             if ((tcpl_id2 = H5Tget_create_plist(type_id2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Tget_create_plist_reopened);
             }
 
@@ -1923,40 +1921,40 @@ test_create_dataset_with_committed_type(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or stored datatype aren't supported with "
-                 "this connector\n");
+        printf("    API functions for basic file, group, dataset, or stored datatype aren't supported with "
+               "this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype\n");
+        printf("    couldn't create datatype\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT,
                    H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME);
+        printf("    couldn't commit datatype '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME);
         goto error;
     }
 
@@ -1971,26 +1969,26 @@ test_create_dataset_with_committed_type(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gopen2(container_group, DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((type_id = H5Topen2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open committed datatype '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME);
+        printf("    couldn't open committed datatype '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME);
         goto error;
     }
 
@@ -2000,8 +1998,8 @@ test_create_dataset_with_committed_type(void)
     if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME, type_id, fspace_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s' using committed datatype\n",
-                 DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s' using committed datatype\n",
+               DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME);
         goto error;
     }
 
@@ -2010,7 +2008,7 @@ test_create_dataset_with_committed_type(void)
 
     if ((dset_id = H5Dopen2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to open dataset '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME);
+        printf("    failed to open dataset '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME);
         goto error;
     }
 
@@ -2067,41 +2065,40 @@ test_create_attribute_with_committed_type(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, attribute, or stored datatype aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, attribute, or stored datatype aren't supported "
+               "with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n",
-                 ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((type_id = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype\n");
+        printf("    couldn't create datatype\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME, type_id, H5P_DEFAULT,
                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME);
+        printf("    couldn't commit datatype '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME);
         goto error;
     }
 
@@ -2110,8 +2107,7 @@ test_create_attribute_with_committed_type(void)
 
     if ((type_id = H5Topen2(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open committed datatype '%s'\n",
-                 ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME);
+        printf("    couldn't open committed datatype '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME);
         goto error;
     }
 
@@ -2122,21 +2118,21 @@ test_create_attribute_with_committed_type(void)
     if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME, type_id, space_id,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create attribute '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME);
+        printf("    couldn't create attribute '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME);
         goto error;
     }
 
     /* Verify the attribute has been created */
     if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if attribute '%s' exists\n",
-                 ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME);
+        printf("    couldn't determine if attribute '%s' exists\n",
+               ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME);
         goto error;
     }
 
     if (!attr_exists) {
         H5_FAILED();
-        HDprintf("    attribute did not exist\n");
+        printf("    attribute did not exist\n");
         goto error;
     }
 
@@ -2145,7 +2141,7 @@ test_create_attribute_with_committed_type(void)
 
     if ((attr_id = H5Aopen(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open attribute '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME);
+        printf("    couldn't open attribute '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME);
         goto error;
     }
 
@@ -2200,70 +2196,70 @@ test_delete_committed_type(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, attribute, or stored datatype aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, attribute, or stored datatype aren't supported "
+               "with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s\n", H5_api_test_filename);
+        printf("    couldn't open file '%s\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATATYPE_DELETE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group '%s'\n", DATATYPE_DELETE_TEST_GROUP_NAME);
+        printf("    couldn't create container group '%s'\n", DATATYPE_DELETE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype\n");
+        printf("    couldn't create datatype\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, DATATYPE_DELETE_TEST_DTYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT,
                    H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", DATATYPE_DELETE_TEST_DTYPE_NAME);
+        printf("    couldn't commit datatype '%s'\n", DATATYPE_DELETE_TEST_DTYPE_NAME);
         goto error;
     }
 
     if ((type_exists = H5Lexists(group_id, DATATYPE_DELETE_TEST_DTYPE_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if datatype '%s' exists\n", DATATYPE_DELETE_TEST_DTYPE_NAME);
+        printf("    couldn't determine if datatype '%s' exists\n", DATATYPE_DELETE_TEST_DTYPE_NAME);
         goto error;
     }
 
     if (!type_exists) {
         H5_FAILED();
-        HDprintf("    datatype didn't exist\n");
+        printf("    datatype didn't exist\n");
         goto error;
     }
 
     if (H5Ldelete(group_id, DATATYPE_DELETE_TEST_DTYPE_NAME, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't delete datatype '%s'\n", DATATYPE_DELETE_TEST_DTYPE_NAME);
+        printf("    couldn't delete datatype '%s'\n", DATATYPE_DELETE_TEST_DTYPE_NAME);
         goto error;
     }
 
     if ((type_exists = H5Lexists(group_id, DATATYPE_DELETE_TEST_DTYPE_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if datatype '%s' exists\n", DATATYPE_DELETE_TEST_DTYPE_NAME);
+        printf("    couldn't determine if datatype '%s' exists\n", DATATYPE_DELETE_TEST_DTYPE_NAME);
         goto error;
     }
 
     if (type_exists) {
         H5_FAILED();
-        HDprintf("    datatype exists\n");
+        printf("    datatype exists\n");
         goto error;
     }
 
@@ -2312,55 +2308,55 @@ test_resurrect_datatype(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, hard link, or stored datatype aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, link, hard link, or stored datatype aren't "
+               "supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATATYPE_RESURRECT_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATATYPE_RESURRECT_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATATYPE_RESURRECT_TEST_GROUP_NAME);
         goto error;
     }
 
     /* Create a named datatype in the file */
     if ((type_id = H5Tcopy(H5T_NATIVE_INT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to copy predefined integer type\n");
+        printf("    failed to copy predefined integer type\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, DATATYPE_RESURRECT_TEST_DTYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT,
                    H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    failed to commit datatype\n");
+        printf("    failed to commit datatype\n");
         goto error;
     }
 
     /* Unlink the datatype while it's open (will mark it for deletion when closed) */
     if (H5Ldelete(group_id, DATATYPE_RESURRECT_TEST_DTYPE_NAME, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    failed to delete datatype\n");
+        printf("    failed to delete datatype\n");
         goto error;
     }
 
     /* Check that datatype name is NULL */
     if (H5Iget_name(type_id, NULL, (size_t)0) != 0) {
         H5_FAILED();
-        HDprintf("    deleted datatype name was not NULL!\n");
+        printf("    deleted datatype name was not NULL!\n");
         goto error;
     }
 
@@ -2368,7 +2364,7 @@ test_resurrect_datatype(void)
     if (H5Lcreate_hard(type_id, ".", group_id, DATATYPE_RESURRECT_TEST_DTYPE_NAME2, H5P_DEFAULT,
                        H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    failed to create new link for deleted datatype\n");
+        printf("    failed to create new link for deleted datatype\n");
         goto error;
     }
 
@@ -2385,26 +2381,26 @@ test_resurrect_datatype(void)
     /* Re-open the file */
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gopen2(container_group, DATATYPE_RESURRECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n", DATATYPE_RESURRECT_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n", DATATYPE_RESURRECT_TEST_GROUP_NAME);
         goto error;
     }
 
     /* Attempt to open the datatype under the new name */
     if ((type_id = H5Topen2(group_id, DATATYPE_RESURRECT_TEST_DTYPE_NAME2, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to open resurrected datatype\n");
+        printf("    failed to open resurrected datatype\n");
         goto error;
     }
 
@@ -2494,27 +2490,27 @@ test_cant_commit_predefined(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or stored datatype aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or stored datatype aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, PREDEFINED_TYPE_COMMIT_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", PREDEFINED_TYPE_COMMIT_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", PREDEFINED_TYPE_COMMIT_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2527,7 +2523,7 @@ test_cant_commit_predefined(void)
 
     if (err_ret >= 0) {
         H5_FAILED();
-        HDprintf("    committed a predefined datatype directly (without copying it)!\n");
+        printf("    committed a predefined datatype directly (without copying it)!\n");
         goto error;
     }
 
@@ -2574,52 +2570,52 @@ test_cant_modify_committed_type(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or stored datatype aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or stored datatype aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, MODIFY_COMMITTED_TYPE_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", MODIFY_COMMITTED_TYPE_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", MODIFY_COMMITTED_TYPE_TEST_GROUP_NAME);
         goto error;
     }
 
     /* Copy a predefined datatype and commit the copy */
     if ((type_id = H5Tcopy(H5T_NATIVE_INT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to copy predefined integer datatype\n");
+        printf("    failed to copy predefined integer datatype\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, "native_int", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    failed to commit datatype\n");
+        printf("    failed to commit datatype\n");
         goto error;
     }
 
     if ((is_committed = H5Tcommitted(type_id)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to determine if datatype is committed\n");
+        printf("    failed to determine if datatype is committed\n");
         goto error;
     }
 
     if (!is_committed) {
         H5_FAILED();
-        HDprintf("    H5Tcommitted() returned false!\n");
+        printf("    H5Tcommitted() returned false!\n");
         goto error;
     }
 
@@ -2632,7 +2628,7 @@ test_cant_modify_committed_type(void)
 
     if (err_ret >= 0) {
         H5_FAILED();
-        HDprintf("    modified committed datatype!\n");
+        printf("    modified committed datatype!\n");
         goto error;
     }
 
@@ -2668,17 +2664,17 @@ H5_api_datatype_test(void)
     size_t i;
     int    nerrors;
 
-    HDprintf("**********************************************\n");
-    HDprintf("*                                            *\n");
-    HDprintf("*             API Datatype Tests             *\n");
-    HDprintf("*                                            *\n");
-    HDprintf("**********************************************\n\n");
+    printf("**********************************************\n");
+    printf("*                                            *\n");
+    printf("*             API Datatype Tests             *\n");
+    printf("*                                            *\n");
+    printf("**********************************************\n\n");
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(datatype_tests); i++) {
         nerrors += (*datatype_tests[i])() ? 1 : 0;
     }
 
-    HDprintf("\n");
+    printf("\n");
 
     return nerrors;
 }
diff --git a/test/API/H5_api_file_test.c b/test/API/H5_api_file_test.c
index a8169e2..a73e28f 100644
--- a/test/API/H5_api_file_test.c
+++ b/test/API/H5_api_file_test.c
@@ -67,19 +67,19 @@ test_create_file(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file aren't supported with this connector\n");
+        printf("    API functions for basic file aren't supported with this connector\n");
         return 0;
     }
 
     if (prefix_filename(test_path_prefix, FILE_CREATE_TEST_FILENAME, &prefixed_filename) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
     if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s'\n", prefixed_filename);
+        printf("    couldn't create file '%s'\n", prefixed_filename);
         goto error;
     }
 
@@ -120,13 +120,13 @@ test_create_file_invalid_params(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file aren't supported with this connector\n");
+        printf("    API functions for basic file aren't supported with this connector\n");
         return 0;
     }
 
     if (prefix_filename(test_path_prefix, FILE_CREATE_INVALID_PARAMS_FILE_NAME, &prefixed_filename) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
@@ -144,7 +144,7 @@ test_create_file_invalid_params(void)
 
             if (file_id >= 0) {
                 H5_FAILED();
-                HDprintf("    file was created with a NULL name!\n");
+                printf("    file was created with a NULL name!\n");
                 H5Fclose(file_id);
                 PART_ERROR(H5Fcreate_invalid_name);
             }
@@ -157,7 +157,7 @@ test_create_file_invalid_params(void)
 
             if (file_id >= 0) {
                 H5_FAILED();
-                HDprintf("    file was created with an invalid name of ''!\n");
+                printf("    file was created with an invalid name of ''!\n");
                 H5Fclose(file_id);
                 PART_ERROR(H5Fcreate_invalid_name);
             }
@@ -178,7 +178,7 @@ test_create_file_invalid_params(void)
 
             if (file_id >= 0) {
                 H5_FAILED();
-                HDprintf("    file was created with invalid flag H5F_ACC_RDWR!\n");
+                printf("    file was created with invalid flag H5F_ACC_RDWR!\n");
                 H5Fclose(file_id);
                 PART_ERROR(H5Fcreate_invalid_flags);
             }
@@ -191,7 +191,7 @@ test_create_file_invalid_params(void)
 
             if (file_id >= 0) {
                 H5_FAILED();
-                HDprintf("    file was created with invalid flag H5F_ACC_CREAT!\n");
+                printf("    file was created with invalid flag H5F_ACC_CREAT!\n");
                 H5Fclose(file_id);
                 PART_ERROR(H5Fcreate_invalid_flags);
             }
@@ -204,7 +204,7 @@ test_create_file_invalid_params(void)
 
             if (file_id >= 0) {
                 H5_FAILED();
-                HDprintf("    file was created with invalid flag H5F_ACC_SWMR_READ!\n");
+                printf("    file was created with invalid flag H5F_ACC_SWMR_READ!\n");
                 H5Fclose(file_id);
                 PART_ERROR(H5Fcreate_invalid_flags);
             }
@@ -225,7 +225,7 @@ test_create_file_invalid_params(void)
 
             if (file_id >= 0) {
                 H5_FAILED();
-                HDprintf("    file was created with invalid FCPL!\n");
+                printf("    file was created with invalid FCPL!\n");
                 H5Fclose(file_id);
                 PART_ERROR(H5Fcreate_invalid_fcpl);
             }
@@ -272,19 +272,19 @@ test_create_file_excl(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file aren't supported with this connector\n");
+        printf("    API functions for basic file aren't supported with this connector\n");
         return 0;
     }
 
     if (prefix_filename(test_path_prefix, FILE_CREATE_EXCL_FILE_NAME, &prefixed_filename) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
     if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create first file\n");
+        printf("    couldn't create first file\n");
         goto error;
     }
 
@@ -303,14 +303,14 @@ test_create_file_excl(void)
 
     if (file_id >= 0) {
         H5_FAILED();
-        HDprintf("    created already existing file using H5F_ACC_EXCL flag!\n");
+        printf("    created already existing file using H5F_ACC_EXCL flag!\n");
         goto error;
     }
 
     /* Test creating with H5F_ACC_TRUNC. This will truncate the existing file on disk. */
     if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't truncate the existing file\n");
+        printf("    couldn't truncate the existing file\n");
         goto error;
     }
 
@@ -350,7 +350,7 @@ test_open_file(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file aren't supported with this connector\n");
+        printf("    API functions for basic file aren't supported with this connector\n");
         return 0;
     }
 
@@ -362,7 +362,7 @@ test_open_file(void)
 
             if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    unable to open file '%s' in read-only mode\n", H5_api_test_filename);
+                printf("    unable to open file '%s' in read-only mode\n", H5_api_test_filename);
                 PART_ERROR(H5Fopen_rdonly);
             }
 
@@ -385,7 +385,7 @@ test_open_file(void)
 
             if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    unable to open file '%s' in read-write mode\n", H5_api_test_filename);
+                printf("    unable to open file '%s' in read-write mode\n", H5_api_test_filename);
                 PART_ERROR(H5Fopen_rdwrite);
             }
 
@@ -434,7 +434,7 @@ test_open_file_invalid_params(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file aren't supported with this connector\n");
+        printf("    API functions for basic file aren't supported with this connector\n");
         return 0;
     }
 
@@ -452,7 +452,7 @@ test_open_file_invalid_params(void)
 
             if (file_id >= 0) {
                 H5_FAILED();
-                HDprintf("    file was opened with a NULL name!\n");
+                printf("    file was opened with a NULL name!\n");
                 H5Fclose(file_id);
                 PART_ERROR(H5Fopen_invalid_name);
             }
@@ -465,7 +465,7 @@ test_open_file_invalid_params(void)
 
             if (file_id >= 0) {
                 H5_FAILED();
-                HDprintf("    file was opened with an invalid name of ''!\n");
+                printf("    file was opened with an invalid name of ''!\n");
                 H5Fclose(file_id);
                 PART_ERROR(H5Fopen_invalid_name);
             }
@@ -486,7 +486,7 @@ test_open_file_invalid_params(void)
 
             if (file_id >= 0) {
                 H5_FAILED();
-                HDprintf("    file was opened with invalid flag H5F_ACC_TRUNC!\n");
+                printf("    file was opened with invalid flag H5F_ACC_TRUNC!\n");
                 H5Fclose(file_id);
                 PART_ERROR(H5Fopen_invalid_flags);
             }
@@ -499,7 +499,7 @@ test_open_file_invalid_params(void)
 
             if (file_id >= 0) {
                 H5_FAILED();
-                HDprintf("    file was opened with invalid flag H5F_ACC_EXCL!\n");
+                printf("    file was opened with invalid flag H5F_ACC_EXCL!\n");
                 H5Fclose(file_id);
                 PART_ERROR(H5Fopen_invalid_flags);
             }
@@ -536,13 +536,13 @@ test_open_nonexistent_file(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file aren't supported with this connector\n");
+        printf("    API functions for basic file aren't supported with this connector\n");
         return 0;
     }
 
     if (prefix_filename(test_path_prefix, NONEXISTENT_FILENAME, &prefixed_filename) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
@@ -556,7 +556,7 @@ test_open_nonexistent_file(void)
 
     if (file_id >= 0) {
         H5_FAILED();
-        HDprintf("    non-existent file was opened!\n");
+        printf("    non-existent file was opened!\n");
         goto error;
     }
 
@@ -602,8 +602,8 @@ test_file_permission(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, attribute, or stored datatype aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, attribute, or stored datatype aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -611,26 +611,26 @@ test_file_permission(void)
 
     if (prefix_filename(test_path_prefix, FILE_PERMISSION_TEST_FILENAME, &prefixed_filename) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
     if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s'\n", prefixed_filename);
+        printf("    couldn't create file '%s'\n", prefixed_filename);
         goto error;
     }
 
     if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create data space\n");
+        printf("    couldn't create data space\n");
         goto error;
     }
 
     if ((dset_id = H5Dcreate2(file_id, FILE_PERMISSION_TEST_DSET_NAME, H5T_STD_U32LE, dspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create data set: %s\n", FILE_PERMISSION_TEST_DSET_NAME);
+        printf("    couldn't create data set: %s\n", FILE_PERMISSION_TEST_DSET_NAME);
         goto error;
     }
 
@@ -642,7 +642,7 @@ test_file_permission(void)
     /* Open the file (with read-only permission) */
     if ((file_id = H5Fopen(prefixed_filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
@@ -664,7 +664,7 @@ test_file_permission(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    a group was created in a read-only file!\n");
+                printf("    a group was created in a read-only file!\n");
                 PART_ERROR(H5Gcreate_rdonly_file);
             }
 
@@ -676,7 +676,7 @@ test_file_permission(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    a group was created in a read-only file!\n");
+                printf("    a group was created in a read-only file!\n");
                 PART_ERROR(H5Gcreate_rdonly_file);
             }
 
@@ -698,7 +698,7 @@ test_file_permission(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    a dataset was created in a read-only file!\n");
+                printf("    a dataset was created in a read-only file!\n");
                 PART_ERROR(H5Dcreate_rdonly_file);
             }
 
@@ -710,7 +710,7 @@ test_file_permission(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    a dataset was created in a read-only file!\n");
+                printf("    a dataset was created in a read-only file!\n");
                 PART_ERROR(H5Dcreate_rdonly_file);
             }
 
@@ -732,7 +732,7 @@ test_file_permission(void)
 
             if (attr_id >= 0) {
                 H5_FAILED();
-                HDprintf("    an attribute was created in a read-only file!\n");
+                printf("    an attribute was created in a read-only file!\n");
                 PART_ERROR(H5Acreate_rdonly_file);
             }
 
@@ -746,7 +746,7 @@ test_file_permission(void)
 
             if ((dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't copy a native datatype\n");
+                printf("    couldn't copy a native datatype\n");
                 PART_ERROR(H5Tcommit_rdonly_file);
             }
 
@@ -760,7 +760,7 @@ test_file_permission(void)
 
             if (h5_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    a named datatype was committed in a read-only file!\n");
+                printf("    a named datatype was committed in a read-only file!\n");
                 PART_ERROR(H5Tcommit_rdonly_file);
             }
 
@@ -772,7 +772,7 @@ test_file_permission(void)
 
             if (h5_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    a named datatype was committed in a read-only file!\n");
+                printf("    a named datatype was committed in a read-only file!\n");
                 PART_ERROR(H5Tcommit_rdonly_file);
             }
 
@@ -829,19 +829,19 @@ test_reopen_file(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file aren't supported with this connector\n");
+        printf("    API functions for basic file aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((file_id2 = H5Freopen(file_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file\n");
+        printf("    couldn't re-open file\n");
         goto error;
     }
 
@@ -878,7 +878,7 @@ test_close_file_invalid_id(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file aren't supported with this connector\n");
+        printf("    API functions for basic file aren't supported with this connector\n");
         return 0;
     }
 
@@ -890,7 +890,7 @@ test_close_file_invalid_id(void)
 
     if (err_ret >= 0) {
         H5_FAILED();
-        HDprintf("    closed an invalid file ID!\n");
+        printf("    closed an invalid file ID!\n");
         goto error;
     }
 
@@ -921,8 +921,8 @@ test_flush_file(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, dataset, or file flush aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, dataset, or file flush aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -930,20 +930,20 @@ test_flush_file(void)
 
     if (prefix_filename(test_path_prefix, FILE_FLUSH_TEST_FILENAME, &prefixed_filename) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
     if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s'\n", prefixed_filename);
+        printf("    couldn't create file '%s'\n", prefixed_filename);
         goto error;
     }
 
     /* Create multiple small datasets in file */
     if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create data space\n");
+        printf("    couldn't create data space\n");
         goto error;
     }
 
@@ -953,7 +953,7 @@ test_flush_file(void)
         if ((dset_id = H5Dcreate2(file_id, dset_name, H5T_STD_U32LE, dspace_id, H5P_DEFAULT, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create data set: %s\n", dset_name);
+            printf("    couldn't create data set: %s\n", dset_name);
             goto error;
         }
 
@@ -971,7 +971,7 @@ test_flush_file(void)
 
             if (H5Fflush(file_id, H5F_SCOPE_LOCAL) < 0) {
                 H5_FAILED();
-                HDprintf("    unable to flush file with scope H5F_SCOPE_LOCAL\n");
+                printf("    unable to flush file with scope H5F_SCOPE_LOCAL\n");
                 PART_ERROR(H5Fflush_local);
             }
 
@@ -985,7 +985,7 @@ test_flush_file(void)
 
             if (H5Fflush(file_id, H5F_SCOPE_GLOBAL) < 0) {
                 H5_FAILED();
-                HDprintf("    unable to flush file with scope H5F_SCOPE_GLOBAL\n");
+                printf("    unable to flush file with scope H5F_SCOPE_GLOBAL\n");
                 PART_ERROR(H5Fflush_global);
             }
 
@@ -1038,13 +1038,13 @@ test_file_is_accessible(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file aren't supported with this connector\n");
+        printf("    API functions for basic file aren't supported with this connector\n");
         return 0;
     }
 
     if (prefix_filename(test_path_prefix, fake_filename, &prefixed_filename) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
@@ -1056,14 +1056,14 @@ test_file_is_accessible(void)
 
             if ((is_accessible = H5Fis_accessible(H5_api_test_filename, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if file '%s' is accessible with default FAPL\n",
-                         H5_api_test_filename);
+                printf("    couldn't determine if file '%s' is accessible with default FAPL\n",
+                       H5_api_test_filename);
                 PART_ERROR(H5Fis_accessible_valid_file);
             }
 
             if (!is_accessible) {
                 H5_FAILED();
-                HDprintf("    file '%s' is not accessible with default FAPL\n", H5_api_test_filename);
+                printf("    file '%s' is not accessible with default FAPL\n", H5_api_test_filename);
                 PART_ERROR(H5Fis_accessible_valid_file);
             }
 
@@ -1085,8 +1085,8 @@ test_file_is_accessible(void)
 
             if (is_accessible > 0) {
                 H5_FAILED();
-                HDprintf("    non-existent file '%s' was accessible with default FAPL: is_accessible=%d!\n",
-                         prefixed_filename, is_accessible);
+                printf("    non-existent file '%s' was accessible with default FAPL: is_accessible=%d!\n",
+                       prefixed_filename, is_accessible);
                 PART_ERROR(H5Fis_accessible_invalid_file);
             }
 
@@ -1133,8 +1133,8 @@ test_file_property_lists(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic or more file or get property list aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic or more file or get property list aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -1142,36 +1142,36 @@ test_file_property_lists(void)
 
     if (prefix_filename(test_path_prefix, FILE_PROPERTY_LIST_TEST_FNAME1, &prefixed_filename1) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
     if (prefix_filename(test_path_prefix, FILE_PROPERTY_LIST_TEST_FNAME2, &prefixed_filename2) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
     if ((fcpl_id1 = H5Pcreate(H5P_FILE_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create FCPL\n");
+        printf("    couldn't create FCPL\n");
         goto error;
     }
 
     if (H5Pset_userblock(fcpl_id1, FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) < 0) {
         H5_FAILED();
-        HDprintf("    failed to set test property on FCPL\n");
+        printf("    failed to set test property on FCPL\n");
         goto error;
     }
 
     if ((file_id1 = H5Fcreate(prefixed_filename1, H5F_ACC_TRUNC, fcpl_id1, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file\n");
+        printf("    couldn't create file\n");
         goto error;
     }
 
     if ((file_id2 = H5Fcreate(prefixed_filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file\n");
+        printf("    couldn't create file\n");
         goto error;
     }
 
@@ -1190,42 +1190,42 @@ test_file_property_lists(void)
              * does not */
             if ((fcpl_id1 = H5Fget_create_plist(file_id1)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get FCPL\n");
+                printf("    couldn't get FCPL\n");
                 PART_ERROR(H5Fget_create_plist);
             }
 
             if ((fcpl_id2 = H5Fget_create_plist(file_id2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get FCPL\n");
+                printf("    couldn't get FCPL\n");
                 PART_ERROR(H5Fget_create_plist);
             }
 
             /* Ensure that property list 1 has the property set and property list 2 does not */
             if (H5Pget_userblock(fcpl_id1, &prop_val) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve test property from FCPL\n");
+                printf("    failed to retrieve test property from FCPL\n");
                 PART_ERROR(H5Fget_create_plist);
             }
 
             if (prop_val != FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) {
                 H5_FAILED();
-                HDprintf("    retrieved test property value '%llu' did not match expected value '%llu'\n",
-                         (long long unsigned)prop_val,
-                         (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL);
+                printf("    retrieved test property value '%llu' did not match expected value '%llu'\n",
+                       (long long unsigned)prop_val,
+                       (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL);
                 PART_ERROR(H5Fget_create_plist);
             }
 
             if (H5Pget_userblock(fcpl_id2, &prop_val) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve test property from FCPL\n");
+                printf("    failed to retrieve test property from FCPL\n");
                 PART_ERROR(H5Fget_create_plist);
             }
 
             if (prop_val == FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) {
-                HDprintf("    retrieved test property value '%llu' matched control value '%llu' when it "
-                         "shouldn't have\n",
-                         (long long unsigned)prop_val,
-                         (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL);
+                printf("    retrieved test property value '%llu' matched control value '%llu' when it "
+                       "shouldn't have\n",
+                       (long long unsigned)prop_val,
+                       (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL);
                 PART_ERROR(H5Fget_create_plist);
             }
 
@@ -1244,13 +1244,13 @@ test_file_property_lists(void)
              */
             if ((fapl_id1 = H5Fget_access_plist(file_id1)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get FAPL\n");
+                printf("    couldn't get FAPL\n");
                 PART_ERROR(H5Fget_access_plist);
             }
 
             if ((fapl_id2 = H5Fget_access_plist(file_id2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get FAPL\n");
+                printf("    couldn't get FAPL\n");
                 PART_ERROR(H5Fget_access_plist);
             }
 
@@ -1318,54 +1318,54 @@ test_file_property_lists(void)
 
             if ((file_id1 = H5Fopen(prefixed_filename1, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file\n");
+                printf("    couldn't open file\n");
                 PART_ERROR(H5Fget_create_plist_reopened);
             }
 
             if ((file_id2 = H5Fopen(prefixed_filename2, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file\n");
+                printf("    couldn't open file\n");
                 PART_ERROR(H5Fget_create_plist_reopened);
             }
 
             if ((fcpl_id1 = H5Fget_create_plist(file_id1)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get FCPL\n");
+                printf("    couldn't get FCPL\n");
                 PART_ERROR(H5Fget_create_plist_reopened);
             }
 
             if ((fcpl_id2 = H5Fget_create_plist(file_id2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get FCPL\n");
+                printf("    couldn't get FCPL\n");
                 PART_ERROR(H5Fget_create_plist_reopened);
             }
 
             /* Check the values of the test property */
             if (H5Pget_userblock(fcpl_id1, &prop_val) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve test property from FCPL\n");
+                printf("    failed to retrieve test property from FCPL\n");
                 PART_ERROR(H5Fget_create_plist_reopened);
             }
 
             if (prop_val != FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) {
                 H5_FAILED();
-                HDprintf("    retrieved test property value '%llu' did not match expected value '%llu'\n",
-                         (long long unsigned)prop_val,
-                         (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL);
+                printf("    retrieved test property value '%llu' did not match expected value '%llu'\n",
+                       (long long unsigned)prop_val,
+                       (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL);
                 PART_ERROR(H5Fget_create_plist_reopened);
             }
 
             if (H5Pget_userblock(fcpl_id2, &prop_val) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve test property from FCPL\n");
+                printf("    failed to retrieve test property from FCPL\n");
                 PART_ERROR(H5Fget_create_plist_reopened);
             }
 
             if (prop_val == FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) {
-                HDprintf("    retrieved test property value '%llu' matched control value '%llu' when it "
-                         "shouldn't have\n",
-                         (long long unsigned)prop_val,
-                         (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL);
+                printf("    retrieved test property value '%llu' matched control value '%llu' when it "
+                       "shouldn't have\n",
+                       (long long unsigned)prop_val,
+                       (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL);
                 PART_ERROR(H5Fget_create_plist_reopened);
             }
 
@@ -1428,7 +1428,7 @@ test_get_file_intent(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic or more file aren't supported with this connector\n");
+        printf("    API functions for basic or more file aren't supported with this connector\n");
         return 0;
     }
 
@@ -1436,14 +1436,14 @@ test_get_file_intent(void)
 
     if (prefix_filename(test_path_prefix, FILE_INTENT_TEST_FILENAME, &prefixed_filename) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
     /* Test that file intent retrieval works correctly for file create */
     if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s'\n", prefixed_filename);
+        printf("    couldn't create file '%s'\n", prefixed_filename);
         goto error;
     }
 
@@ -1457,13 +1457,13 @@ test_get_file_intent(void)
 
             if (H5Fget_intent(file_id, &file_intent) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve file intent\n");
+                printf("    failed to retrieve file intent\n");
                 PART_ERROR(H5Fget_intent_file_creation);
             }
 
             if (H5F_ACC_RDWR != file_intent) {
                 H5_FAILED();
-                HDprintf("    received incorrect file intent for file creation\n");
+                printf("    received incorrect file intent for file creation\n");
                 PART_ERROR(H5Fget_intent_file_creation);
             }
 
@@ -1487,19 +1487,19 @@ test_get_file_intent(void)
             /* Test that file intent retrieval works correctly for file open */
             if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_filename);
                 PART_ERROR(H5Fget_intent_rdonly_file_open);
             }
 
             if (H5Fget_intent(file_id, &file_intent) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve file intent\n");
+                printf("    failed to retrieve file intent\n");
                 PART_ERROR(H5Fget_intent_rdonly_file_open);
             }
 
             if (H5F_ACC_RDONLY != file_intent) {
                 H5_FAILED();
-                HDprintf("    received incorrect file intent for read-only file open\n");
+                printf("    received incorrect file intent for read-only file open\n");
                 PART_ERROR(H5Fget_intent_rdonly_file_open);
             }
 
@@ -1522,19 +1522,19 @@ test_get_file_intent(void)
 
             if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_filename);
                 PART_ERROR(H5Fget_intent_rdwrite_file_open);
             }
 
             if (H5Fget_intent(file_id, &file_intent) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve file intent\n");
+                printf("    failed to retrieve file intent\n");
                 PART_ERROR(H5Fget_intent_rdwrite_file_open);
             }
 
             if (H5F_ACC_RDWR != file_intent) {
                 H5_FAILED();
-                HDprintf("    received incorrect file intent\n");
+                printf("    received incorrect file intent\n");
                 PART_ERROR(H5Fget_intent_rdwrite_file_open);
             }
 
@@ -1597,7 +1597,7 @@ test_get_file_obj_count(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic or more file,  basic dataset, group, stored datatypes, or attribute "
             "aren't supported with this connector\n");
         return 0;
@@ -1607,53 +1607,53 @@ test_get_file_obj_count(void)
 
     if (prefix_filename(test_path_prefix, GET_OBJ_COUNT_TEST_FILENAME1, &prefixed_filename1) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
     if (prefix_filename(test_path_prefix, GET_OBJ_COUNT_TEST_FILENAME2, &prefixed_filename2) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
     if ((file_id = H5Fcreate(prefixed_filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s'\n", prefixed_filename1);
+        printf("    couldn't create file '%s'\n", prefixed_filename1);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(file_id, GET_OBJ_COUNT_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", GET_OBJ_COUNT_TEST_GRP_NAME);
+        printf("    couldn't create group '%s'\n", GET_OBJ_COUNT_TEST_GRP_NAME);
         goto error;
     }
 
     /* Create a second file while keeping the first file open */
     if ((file_id2 = H5Fcreate(prefixed_filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s'\n", prefixed_filename2);
+        printf("    couldn't create file '%s'\n", prefixed_filename2);
         goto error;
     }
 
     /* Create a named datatype */
     if ((named_dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't copy a native datatype\n");
+        printf("    couldn't copy a native datatype\n");
         goto error;
     }
 
     if (H5Tcommit2(file_id2, GET_OBJ_COUNT_TEST_NAMED_DTYPE, named_dtype_id, H5P_DEFAULT, H5P_DEFAULT,
                    H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit a named datatype\n");
+        printf("    couldn't commit a named datatype\n");
         goto error;
     }
 
     /* Create a dataspace for the attribute and dataset */
     if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create data space for attribute\n");
+        printf("    couldn't create data space for attribute\n");
         goto error;
     }
 
@@ -1661,7 +1661,7 @@ test_get_file_obj_count(void)
     if ((attr_id = H5Acreate2(file_id2, GET_OBJ_COUNT_TEST_ATTR_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create the attribute '%s'\n", GET_OBJ_COUNT_TEST_ATTR_NAME);
+        printf("    couldn't create the attribute '%s'\n", GET_OBJ_COUNT_TEST_ATTR_NAME);
         goto error;
     }
 
@@ -1669,7 +1669,7 @@ test_get_file_obj_count(void)
     if ((dset_id = H5Dcreate2(file_id2, GET_OBJ_COUNT_TEST_DSET_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create the dataset '%s'\n", GET_OBJ_COUNT_TEST_DSET_NAME);
+        printf("    couldn't create the dataset '%s'\n", GET_OBJ_COUNT_TEST_DSET_NAME);
         goto error;
     }
 
@@ -1684,13 +1684,13 @@ test_get_file_obj_count(void)
             /* Get the number of files currently opened */
             if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_FILE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get the number of open files\n");
+                printf("    couldn't get the number of open files\n");
                 PART_ERROR(H5Fget_obj_count_files);
             }
 
             if (obj_count != 2) {
                 H5_FAILED();
-                HDprintf("    number of open files (%ld) did not match expected number (2)\n", obj_count);
+                printf("    number of open files (%ld) did not match expected number (2)\n", obj_count);
                 PART_ERROR(H5Fget_obj_count_files);
             }
 
@@ -1705,13 +1705,13 @@ test_get_file_obj_count(void)
             /* Get the number of groups */
             if ((obj_count = H5Fget_obj_count(file_id, H5F_OBJ_GROUP)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve number of open groups\n");
+                printf("    couldn't retrieve number of open groups\n");
                 PART_ERROR(H5Fget_obj_count_grps_single_file);
             }
 
             if (obj_count != 1) {
                 H5_FAILED();
-                HDprintf("    number of open groups (%ld) did not match expected number (1)\n", obj_count);
+                printf("    number of open groups (%ld) did not match expected number (1)\n", obj_count);
                 PART_ERROR(H5Fget_obj_count_grps_single_file);
             }
 
@@ -1726,13 +1726,13 @@ test_get_file_obj_count(void)
             /* Get the number of groups in two opened files */
             if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_GROUP)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get the number of open groups\n");
+                printf("    couldn't get the number of open groups\n");
                 PART_ERROR(H5Fget_obj_count_grps);
             }
 
             if (obj_count != 1) {
                 H5_FAILED();
-                HDprintf("    number of open groups (%ld) did not match expected number (1)\n", obj_count);
+                printf("    number of open groups (%ld) did not match expected number (1)\n", obj_count);
                 PART_ERROR(H5Fget_obj_count_grps);
             }
 
@@ -1747,14 +1747,14 @@ test_get_file_obj_count(void)
             /* Get the number of named datatype in two opened files */
             if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_DATATYPE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get the number of open named datatypes\n");
+                printf("    couldn't get the number of open named datatypes\n");
                 PART_ERROR(H5Fget_obj_count_types);
             }
 
             if (obj_count != 1) {
                 H5_FAILED();
-                HDprintf("    number of open named datatypes (%ld) did not match expected number (1)\n",
-                         obj_count);
+                printf("    number of open named datatypes (%ld) did not match expected number (1)\n",
+                       obj_count);
                 PART_ERROR(H5Fget_obj_count_types);
             }
 
@@ -1769,14 +1769,13 @@ test_get_file_obj_count(void)
             /* Get the number of attribute in two opened files */
             if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_ATTR)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get the number of open attributes\n");
+                printf("    couldn't get the number of open attributes\n");
                 PART_ERROR(H5Fget_obj_count_attrs);
             }
 
             if (obj_count != 1) {
                 H5_FAILED();
-                HDprintf("    number of open attributes (%ld) did not match expected number (1)\n",
-                         obj_count);
+                printf("    number of open attributes (%ld) did not match expected number (1)\n", obj_count);
                 PART_ERROR(H5Fget_obj_count_attrs);
             }
 
@@ -1791,13 +1790,13 @@ test_get_file_obj_count(void)
             /* Get the number of dataset in two opened files */
             if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_DATASET)) < 0 || obj_count != 1) {
                 H5_FAILED();
-                HDprintf("    couldn't get the number of open datasets\n");
+                printf("    couldn't get the number of open datasets\n");
                 PART_ERROR(H5Fget_obj_count_dsets);
             }
 
             if (obj_count != 1) {
                 H5_FAILED();
-                HDprintf("    number of open datasets (%ld) did not match expected number (1)\n", obj_count);
+                printf("    number of open datasets (%ld) did not match expected number (1)\n", obj_count);
                 PART_ERROR(H5Fget_obj_count_dsets);
             }
 
@@ -1812,14 +1811,14 @@ test_get_file_obj_count(void)
             /* Get the number of all open objects */
             if ((obj_count = H5Fget_obj_count(file_id, H5F_OBJ_ALL)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve number of open objects\n");
+                printf("    couldn't retrieve number of open objects\n");
                 PART_ERROR(H5Fget_obj_count_all_single_file);
             }
 
             /* One for the file and another for the group */
             if (obj_count != 2) {
                 H5_FAILED();
-                HDprintf("    number of open objects (%ld) did not match expected number (2)\n", obj_count);
+                printf("    number of open objects (%ld) did not match expected number (2)\n", obj_count);
                 PART_ERROR(H5Fget_obj_count_all_single_file);
             }
 
@@ -1834,13 +1833,13 @@ test_get_file_obj_count(void)
             /* Get the number of all open objects */
             if ((obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve number of open objects\n");
+                printf("    couldn't retrieve number of open objects\n");
                 PART_ERROR(H5Fget_obj_count_all);
             }
 
             if (obj_count != 6) {
                 H5_FAILED();
-                HDprintf("    number of open objects (%ld) did not match expected number (6)\n", obj_count);
+                printf("    number of open objects (%ld) did not match expected number (6)\n", obj_count);
                 PART_ERROR(H5Fget_obj_count_all);
             }
 
@@ -1854,14 +1853,14 @@ test_get_file_obj_count(void)
 
             if (H5Fget_obj_ids(file_id, H5F_OBJ_GROUP, (size_t)obj_count, &object_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get opened group IDs\n");
+                printf("    couldn't get opened group IDs\n");
                 PART_ERROR(H5Fget_obj_ids_singular_grp);
             }
 
             if (object_id != group_id) {
                 H5_FAILED();
-                HDprintf("    opened object ID (%ld) did not match only currently open group ID (%ld)\n",
-                         object_id, group_id);
+                printf("    opened object ID (%ld) did not match only currently open group ID (%ld)\n",
+                       object_id, group_id);
                 PART_ERROR(H5Fget_obj_ids_singular_grp);
             }
 
@@ -1937,40 +1936,40 @@ test_file_open_overlap(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic or more file, dataset, or group aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic or more file, dataset, or group aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if (prefix_filename(test_path_prefix, OVERLAPPING_FILENAME, &prefixed_filename) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
     if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s'\n", prefixed_filename);
+        printf("    couldn't create file '%s'\n", prefixed_filename);
         goto error;
     }
 
     if ((file_id2 = H5Fopen(prefixed_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", prefixed_filename);
+        printf("    couldn't open file '%s'\n", prefixed_filename);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(file_id, OVERLAPPING_OPEN_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OVERLAPPING_OPEN_TEST_GRP_NAME);
+        printf("    couldn't create group '%s'\n", OVERLAPPING_OPEN_TEST_GRP_NAME);
         goto error;
     }
 
     /* Create a dataspace for the dataset */
     if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create data space for dataset\n");
+        printf("    couldn't create data space for dataset\n");
         goto error;
     }
 
@@ -1978,20 +1977,20 @@ test_file_open_overlap(void)
     if ((dset_id = H5Dcreate2(group_id, OVERLAPPING_OPEN_TEST_DSET_NAME, H5T_NATIVE_INT, dspace_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create the dataset '%s'\n", OVERLAPPING_OPEN_TEST_DSET_NAME);
+        printf("    couldn't create the dataset '%s'\n", OVERLAPPING_OPEN_TEST_DSET_NAME);
         goto error;
     }
 
     /* Get the number of objects opened in the first file: 3 == file + dataset + group */
     if ((obj_count = H5Fget_obj_count(file_id, H5F_OBJ_LOCAL | H5F_OBJ_ALL)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't retrieve the number of objects opened in the file\n");
+        printf("    couldn't retrieve the number of objects opened in the file\n");
         goto error;
     }
 
     if (obj_count != 3) {
         H5_FAILED();
-        HDprintf("    number of objects opened in file (%ld) did not match expected number (3)\n", obj_count);
+        printf("    number of objects opened in file (%ld) did not match expected number (3)\n", obj_count);
         goto error;
     }
 
@@ -2006,21 +2005,21 @@ test_file_open_overlap(void)
     if ((dset_id = H5Dcreate2(file_id2, OVERLAPPING_OPEN_TEST_DSET_NAME, H5T_NATIVE_INT, dspace_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create the dataset '%s'\n", OVERLAPPING_OPEN_TEST_DSET_NAME);
+        printf("    couldn't create the dataset '%s'\n", OVERLAPPING_OPEN_TEST_DSET_NAME);
         goto error;
     }
 
     /* Get the number of objects opened in the first file: 2 == file + dataset */
     if ((obj_count = H5Fget_obj_count(file_id2, H5F_OBJ_ALL)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't retrieve the number of objects opened in the file\n");
+        printf("    couldn't retrieve the number of objects opened in the file\n");
         goto error;
     }
 
     if (obj_count != 2) {
         H5_FAILED();
-        HDprintf("    number of objects opened in the file (%ld) did not match expected number (2)\n",
-                 obj_count);
+        printf("    number of objects opened in the file (%ld) did not match expected number (2)\n",
+               obj_count);
         goto error;
     }
 
@@ -2072,46 +2071,46 @@ test_file_mounts(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_MOUNT) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file,  file mount, or basic group aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file,  file mount, or basic group aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if (prefix_filename(test_path_prefix, FILE_MOUNT_TEST_FILENAME, &prefixed_filename) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
     if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s'\n", prefixed_filename);
+        printf("    couldn't create file '%s'\n", prefixed_filename);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(file_id, FILE_MOUNT_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", FILE_MOUNT_TEST_GRP_NAME);
+        printf("    couldn't create group '%s'\n", FILE_MOUNT_TEST_GRP_NAME);
         goto error;
     }
 
     if ((child_fid = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     /* Mount one file (child_fid) to the group of another file (file_id) */
     if (H5Fmount(file_id, FILE_MOUNT_TEST_GRP_NAME, child_fid, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't mount file\n");
+        printf("    couldn't mount file\n");
         goto error;
     }
 
     if (H5Funmount(file_id, FILE_MOUNT_TEST_GRP_NAME) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't mount file\n");
+        printf("    couldn't mount file\n");
         goto error;
     }
 
@@ -2167,7 +2166,7 @@ test_get_file_name(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic or more file, basic dataset, group, stored datatypes, or attribute "
             "aren't supported with this connector\n");
         return 0;
@@ -2177,13 +2176,13 @@ test_get_file_name(void)
 
     if (prefix_filename(test_path_prefix, GET_FILE_NAME_TEST_FNAME, &prefixed_filename) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't prefix filename\n");
+        printf("    couldn't prefix filename\n");
         goto error;
     }
 
     if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s'\n", prefixed_filename);
+        printf("    couldn't create file '%s'\n", prefixed_filename);
         goto error;
     }
 
@@ -2208,14 +2207,14 @@ test_get_file_name(void)
             /* Retrieve the actual file name */
             if (H5Fget_name(file_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get file name %s\n", prefixed_filename);
+                printf("    couldn't get file name %s\n", prefixed_filename);
                 PART_ERROR(H5Fget_name_file_id);
             }
 
             if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) {
                 H5_FAILED();
-                HDprintf("    file name '%s' didn't match expected name '%s'\n", file_name_buf,
-                         prefixed_filename);
+                printf("    file name '%s' didn't match expected name '%s'\n", file_name_buf,
+                       prefixed_filename);
                 PART_ERROR(H5Fget_name_file_id);
             }
 
@@ -2233,20 +2232,20 @@ test_get_file_name(void)
             if ((group_id = H5Gcreate2(file_id, GET_FILE_NAME_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                        H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create group '%s'\n", GET_FILE_NAME_TEST_GRP_NAME);
+                printf("    failed to create group '%s'\n", GET_FILE_NAME_TEST_GRP_NAME);
                 PART_ERROR(H5Fget_name_grp_id);
             }
 
             if (H5Fget_name(group_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get file name %s\n", prefixed_filename);
+                printf("    couldn't get file name %s\n", prefixed_filename);
                 PART_ERROR(H5Fget_name_grp_id);
             }
 
             if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) {
                 H5_FAILED();
-                HDprintf("    file name '%s' didn't match expected name '%s'\n", file_name_buf,
-                         prefixed_filename);
+                printf("    file name '%s' didn't match expected name '%s'\n", file_name_buf,
+                       prefixed_filename);
                 PART_ERROR(H5Fget_name_grp_id);
             }
 
@@ -2269,7 +2268,7 @@ test_get_file_name(void)
 
             if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataspace\n");
+                printf("    couldn't create dataspace\n");
                 PART_ERROR(H5Fget_name_dset_id);
             }
 
@@ -2277,21 +2276,21 @@ test_get_file_name(void)
             if ((dset_id = H5Dcreate2(file_id, GET_FILE_NAME_TEST_DSET_NAME, H5T_NATIVE_INT, dspace_id,
                                       H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create the dataset '%s'\n", GET_FILE_NAME_TEST_DSET_NAME);
+                printf("    couldn't create the dataset '%s'\n", GET_FILE_NAME_TEST_DSET_NAME);
                 PART_ERROR(H5Fget_name_dset_id);
             }
 
             /* Get and verify file name from the dataset */
             if (H5Fget_name(dset_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get file name %s\n", prefixed_filename);
+                printf("    couldn't get file name %s\n", prefixed_filename);
                 PART_ERROR(H5Fget_name_dset_id);
             }
 
             if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) {
                 H5_FAILED();
-                HDprintf("    file name '%s' didn't match expected name '%s'\n", file_name_buf,
-                         prefixed_filename);
+                printf("    file name '%s' didn't match expected name '%s'\n", file_name_buf,
+                       prefixed_filename);
                 PART_ERROR(H5Fget_name_dset_id);
             }
 
@@ -2322,7 +2321,7 @@ test_get_file_name(void)
 
             if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataspace\n");
+                printf("    couldn't create dataspace\n");
                 PART_ERROR(H5Fget_name_attr_id);
             }
 
@@ -2330,21 +2329,21 @@ test_get_file_name(void)
             if ((attr_id = H5Acreate2(file_id, GET_FILE_NAME_TEST_ATTR_NAME, H5T_NATIVE_INT, dspace_id,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create the attribute '%s'\n", GET_FILE_NAME_TEST_ATTR_NAME);
+                printf("    couldn't create the attribute '%s'\n", GET_FILE_NAME_TEST_ATTR_NAME);
                 PART_ERROR(H5Fget_name_attr_id);
             }
 
             /* Get and verify file name from the attribute */
             if (H5Fget_name(attr_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get file name %s\n", prefixed_filename);
+                printf("    couldn't get file name %s\n", prefixed_filename);
                 PART_ERROR(H5Fget_name_attr_id);
             }
 
             if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) {
                 H5_FAILED();
-                HDprintf("    file name '%s' didn't match expected name '%s'\n", file_name_buf,
-                         prefixed_filename);
+                printf("    file name '%s' didn't match expected name '%s'\n", file_name_buf,
+                       prefixed_filename);
                 PART_ERROR(H5Fget_name_attr_id);
             }
 
@@ -2376,28 +2375,28 @@ test_get_file_name(void)
             /* Create a named datatype */
             if ((named_dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't copy a native datatype\n");
+                printf("    couldn't copy a native datatype\n");
                 PART_ERROR(H5Fget_name_dtype_id);
             }
 
             if (H5Tcommit2(file_id, GET_FILE_NAME_TEST_NAMED_DTYPE, named_dtype_id, H5P_DEFAULT, H5P_DEFAULT,
                            H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't commit a named datatype\n");
+                printf("    couldn't commit a named datatype\n");
                 PART_ERROR(H5Fget_name_dtype_id);
             }
 
             /* Get and verify file name from the committed datatype */
             if (H5Fget_name(named_dtype_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get file name %s\n", prefixed_filename);
+                printf("    couldn't get file name %s\n", prefixed_filename);
                 PART_ERROR(H5Fget_name_dtype_id);
             }
 
             if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) {
                 H5_FAILED();
-                HDprintf("    file name '%s' didn't match expected name '%s'\n", file_name_buf,
-                         prefixed_filename);
+                printf("    file name '%s' didn't match expected name '%s'\n", file_name_buf,
+                       prefixed_filename);
                 PART_ERROR(H5Fget_name_dtype_id);
             }
 
@@ -2422,7 +2421,7 @@ test_get_file_name(void)
 
             if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataspace\n");
+                printf("    couldn't create dataspace\n");
                 PART_ERROR(H5Fget_name_dspace_id);
             }
 
@@ -2436,7 +2435,7 @@ test_get_file_name(void)
 
             if (name_len >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved file name using H5Fget_name on a dataspace ID!\n");
+                printf("    retrieved file name using H5Fget_name on a dataspace ID!\n");
                 PART_ERROR(H5Fget_name_dspace_id);
             }
 
@@ -2521,19 +2520,19 @@ H5_api_file_test(void)
     size_t i;
     int    nerrors;
 
-    HDprintf("**********************************************\n");
-    HDprintf("*                                            *\n");
-    HDprintf("*               API File Tests               *\n");
-    HDprintf("*                                            *\n");
-    HDprintf("**********************************************\n\n");
+    printf("**********************************************\n");
+    printf("*                                            *\n");
+    printf("*               API File Tests               *\n");
+    printf("*                                            *\n");
+    printf("**********************************************\n\n");
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(file_tests); i++) {
         nerrors += (*file_tests[i])() ? 1 : 0;
     }
 
-    HDprintf("\n");
+    printf("\n");
 
-    HDprintf("Cleaning up testing files\n");
+    printf("Cleaning up testing files\n");
     cleanup_files();
 
     return nerrors;
diff --git a/test/API/H5_api_group_test.c b/test/API/H5_api_group_test.c
index 016d988..20ced5b 100644
--- a/test/API/H5_api_group_test.c
+++ b/test/API/H5_api_group_test.c
@@ -70,13 +70,13 @@ test_create_group_under_root(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or group aren't supported with this connector\n");
+        printf("    API functions for basic file or group aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
@@ -84,7 +84,7 @@ test_create_group_under_root(void)
     if ((parent_gid =
              H5Gcreate2(file_id, GROUP_CREATE_UNDER_ROOT_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", GROUP_CREATE_UNDER_ROOT_GNAME);
+        printf("    couldn't create group '%s'\n", GROUP_CREATE_UNDER_ROOT_GNAME);
         goto error;
     }
 
@@ -124,20 +124,20 @@ test_create_group_under_existing_group(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or group aren't supported with this connector\n");
+        printf("    API functions for basic file or group aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     /* Open the already-existing group (/group_tests) in the file as the parent */
     if ((parent_group_id = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open group\n");
+        printf("    couldn't open group\n");
         goto error;
     }
 
@@ -146,7 +146,7 @@ test_create_group_under_existing_group(void)
     if ((child_group_id = H5Gcreate2(parent_group_id, GROUP_CREATE_UNDER_GROUP_REL_GNAME, H5P_DEFAULT,
                                      H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group using relative path: %s\n", GROUP_CREATE_UNDER_GROUP_REL_GNAME);
+        printf("    couldn't create group using relative path: %s\n", GROUP_CREATE_UNDER_GROUP_REL_GNAME);
         goto error;
     }
 
@@ -155,7 +155,7 @@ test_create_group_under_existing_group(void)
     if ((grandchild_group_id = H5Gcreate2(parent_group_id, GROUP_CREATE_UNDER_GROUP_ABS_GNAME, H5P_DEFAULT,
                                           H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group using absolute path: %s\n", GROUP_CREATE_UNDER_GROUP_ABS_GNAME);
+        printf("    couldn't create group using absolute path: %s\n", GROUP_CREATE_UNDER_GROUP_ABS_GNAME);
         goto error;
     }
 
@@ -202,38 +202,38 @@ test_create_many_groups(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or group aren't supported with this connector\n");
+        printf("    API functions for basic file or group aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((parent_group_id = H5Gcreate2(container_group, MANY_GROUP_CREATIONS_GNAME, H5P_DEFAULT, H5P_DEFAULT,
                                       H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", MANY_GROUP_CREATIONS_GNAME);
+        printf("    couldn't create group '%s'\n", MANY_GROUP_CREATIONS_GNAME);
         goto error;
     }
 
     /* Create multiple groups under the parent group */
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < GROUP_NUMB_MANY; i++) {
-        HDprintf("\r %u/%u", i + 1, GROUP_NUMB_MANY);
+        printf("\r %u/%u", i + 1, GROUP_NUMB_MANY);
         sprintf(group_name, "group %02u", i);
         if ((child_group_id =
                  H5Gcreate2(parent_group_id, group_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create group '%s'\n", group_name);
+            printf("    couldn't create group '%s'\n", group_name);
             goto error;
         }
 
@@ -280,19 +280,19 @@ test_create_deep_groups(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or group aren't supported with this connector\n");
+        printf("    API functions for basic file or group aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
@@ -300,11 +300,11 @@ test_create_deep_groups(void)
     if ((group_id = H5Gcreate2(container_group, DEEP_GROUP_CREATIONS_GNAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", DEEP_GROUP_CREATIONS_GNAME);
+        printf("    couldn't create group '%s'\n", DEEP_GROUP_CREATIONS_GNAME);
         goto error;
     }
 
-    HDprintf("\n");
+    printf("\n");
     if (create_group_recursive(group_id, 1) < 0)
         TEST_ERROR;
 
@@ -340,7 +340,7 @@ create_group_recursive(hid_t parent_gid, unsigned counter)
     hid_t child_gid = H5I_INVALID_HID;
     char  gname[NAME_BUF_SIZE];
 
-    HDprintf("\r %u/%u", counter, GROUP_DEPTH);
+    printf("\r %u/%u", counter, GROUP_DEPTH);
     if (counter == 1)
         sprintf(gname, "2nd_child_group");
     else if (counter == 2)
@@ -349,7 +349,7 @@ create_group_recursive(hid_t parent_gid, unsigned counter)
         sprintf(gname, "%dth_child_group", counter + 1);
     if ((child_gid = H5Gcreate2(parent_gid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", gname);
+        printf("    couldn't create group '%s'\n", gname);
         goto error;
     }
 
@@ -389,19 +389,19 @@ test_create_intermediate_group(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or group aren't supported with this connector\n");
+        printf("    API functions for basic file or group aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
@@ -536,7 +536,7 @@ test_create_group_invalid_params(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or group aren't supported with this connector\n");
+        printf("    API functions for basic file or group aren't supported with this connector\n");
         return 0;
     }
 
@@ -544,7 +544,7 @@ test_create_group_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
@@ -565,7 +565,7 @@ test_create_group_invalid_params(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created group with invalid loc_id!\n");
+                printf("    created group with invalid loc_id!\n");
                 H5Gclose(group_id);
                 PART_ERROR(H5Gcreate_invalid_loc_id);
             }
@@ -586,7 +586,7 @@ test_create_group_invalid_params(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created group with a NULL name!\n");
+                printf("    created group with a NULL name!\n");
                 H5Gclose(group_id);
                 PART_ERROR(H5Gcreate_invalid_grp_name);
             }
@@ -599,7 +599,7 @@ test_create_group_invalid_params(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created group with an invalid group name of ''!\n");
+                printf("    created group with an invalid group name of ''!\n");
                 H5Gclose(group_id);
                 PART_ERROR(H5Gcreate_invalid_grp_name);
             }
@@ -621,7 +621,7 @@ test_create_group_invalid_params(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created group with invalid LCPL!\n");
+                printf("    created group with invalid LCPL!\n");
                 H5Gclose(group_id);
                 PART_ERROR(H5Gcreate_invalid_lcpl);
             }
@@ -643,7 +643,7 @@ test_create_group_invalid_params(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created group with invalid GCPL!\n");
+                printf("    created group with invalid GCPL!\n");
                 H5Gclose(group_id);
                 PART_ERROR(H5Gcreate_invalid_gcpl);
             }
@@ -665,7 +665,7 @@ test_create_group_invalid_params(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created group with invalid GAPL!\n");
+                printf("    created group with invalid GAPL!\n");
                 H5Gclose(group_id);
                 PART_ERROR(H5Gcreate_invalid_gapl);
             }
@@ -711,25 +711,25 @@ test_create_anonymous_group(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or group aren't supported with this connector\n");
+        printf("    API functions for basic file or group aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open group\n");
+        printf("    couldn't open group\n");
         goto error;
     }
 
     if ((new_group_id = H5Gcreate_anon(file_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create anonymous group\n");
+        printf("    couldn't create anonymous group\n");
         goto error;
     }
 
@@ -771,7 +771,7 @@ test_create_anonymous_group_invalid_params(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or group aren't supported with this connector\n");
+        printf("    API functions for basic file or group aren't supported with this connector\n");
         return 0;
     }
 
@@ -779,13 +779,13 @@ test_create_anonymous_group_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open group\n");
+        printf("    couldn't open group\n");
         goto error;
     }
 
@@ -805,7 +805,7 @@ test_create_anonymous_group_invalid_params(void)
 
             if (new_group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created anonymous group with invalid loc_id!\n");
+                printf("    created anonymous group with invalid loc_id!\n");
                 H5Gclose(new_group_id);
                 PART_ERROR(H5Gcreate_anon_invalid_loc_id);
             }
@@ -826,7 +826,7 @@ test_create_anonymous_group_invalid_params(void)
 
             if (new_group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created anonymous group with invalid GCPL!\n");
+                printf("    created anonymous group with invalid GCPL!\n");
                 H5Gclose(new_group_id);
                 PART_ERROR(H5Gcreate_anon_invalid_gcpl);
             }
@@ -847,7 +847,7 @@ test_create_anonymous_group_invalid_params(void)
 
             if (new_group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    created anonymous group with invalid GAPL!\n");
+                printf("    created anonymous group with invalid GAPL!\n");
                 H5Gclose(new_group_id);
                 PART_ERROR(H5Gcreate_anon_invalid_gapl);
             }
@@ -896,13 +896,13 @@ test_open_nonexistent_group(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or group aren't supported with this connector\n");
+        printf("    API functions for basic file or group aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
@@ -914,7 +914,7 @@ test_open_nonexistent_group(void)
 
     if (group_id >= 0) {
         H5_FAILED();
-        HDprintf("    opened non-existent group!\n");
+        printf("    opened non-existent group!\n");
         goto error;
     }
 
@@ -951,7 +951,7 @@ test_open_group_invalid_params(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or group aren't supported with this connector\n");
+        printf("    API functions for basic file or group aren't supported with this connector\n");
         return 0;
     }
 
@@ -959,7 +959,7 @@ test_open_group_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
@@ -979,7 +979,7 @@ test_open_group_invalid_params(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened group using an invalid loc_id!\n");
+                printf("    opened group using an invalid loc_id!\n");
                 H5Gclose(group_id);
                 PART_ERROR(H5Gopen_invalid_loc_id);
             }
@@ -1000,7 +1000,7 @@ test_open_group_invalid_params(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened group using a NULL name!\n");
+                printf("    opened group using a NULL name!\n");
                 H5Gclose(group_id);
                 PART_ERROR(H5Gopen_invalid_grp_name);
             }
@@ -1013,7 +1013,7 @@ test_open_group_invalid_params(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened group using an invalid name of ''!\n");
+                printf("    opened group using an invalid name of ''!\n");
                 H5Gclose(group_id);
                 PART_ERROR(H5Gopen_invalid_grp_name);
             }
@@ -1034,7 +1034,7 @@ test_open_group_invalid_params(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    opened group using an invalid GAPL!\n");
+                printf("    opened group using an invalid GAPL!\n");
                 H5Gclose(group_id);
                 PART_ERROR(H5Gopen_invalid_gapl);
             }
@@ -1079,7 +1079,7 @@ test_close_group_invalid_id(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic group aren't supported with this connector\n");
+        printf("    API functions for basic group aren't supported with this connector\n");
         return 0;
     }
 
@@ -1091,7 +1091,7 @@ test_close_group_invalid_id(void)
 
     if (err_ret >= 0) {
         H5_FAILED();
-        HDprintf("    close a group with an invalid ID!\n");
+        printf("    close a group with an invalid ID!\n");
         goto error;
     }
 
@@ -1123,8 +1123,8 @@ test_group_property_lists(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, property list, or creation order aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, property list, or creation order aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -1132,25 +1132,25 @@ test_group_property_lists(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((gcpl_id1 = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL\n");
+        printf("    couldn't create GCPL\n");
         goto error;
     }
 
     if (H5Pset_link_creation_order(gcpl_id1, dummy_prop_val) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't set property on GCPL\n");
+        printf("    couldn't set property on GCPL\n");
         goto error;
     }
 
@@ -1158,7 +1158,7 @@ test_group_property_lists(void)
     if ((group_id1 = H5Gcreate2(container_group, GROUP_PROPERTY_LIST_TEST_GROUP_NAME1, H5P_DEFAULT, gcpl_id1,
                                 H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group\n");
+        printf("    couldn't create group\n");
         goto error;
     }
 
@@ -1166,7 +1166,7 @@ test_group_property_lists(void)
     if ((group_id2 = H5Gcreate2(container_group, GROUP_PROPERTY_LIST_TEST_GROUP_NAME2, H5P_DEFAULT,
                                 H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group\n");
+        printf("    couldn't create group\n");
         goto error;
     }
 
@@ -1185,13 +1185,13 @@ test_group_property_lists(void)
              * does not */
             if ((gcpl_id1 = H5Gget_create_plist(group_id1)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get GCPL\n");
+                printf("    couldn't get GCPL\n");
                 PART_ERROR(H5Gget_create_plist);
             }
 
             if ((gcpl_id2 = H5Gget_create_plist(group_id2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get GCPL\n");
+                printf("    couldn't get GCPL\n");
                 PART_ERROR(H5Gget_create_plist);
             }
 
@@ -1200,15 +1200,15 @@ test_group_property_lists(void)
 
             if (H5Pget_link_creation_order(gcpl_id1, &dummy_prop_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve GCPL property value\n");
+                printf("    couldn't retrieve GCPL property value\n");
                 PART_ERROR(H5Gget_create_plist);
             }
 
             if (dummy_prop_val != GROUP_PROPERTY_LIST_TEST_DUMMY_VAL) {
                 H5_FAILED();
-                HDprintf("    retrieved GCPL property value '%llu' did not match expected value '%llu'\n",
-                         (unsigned long long)dummy_prop_val,
-                         (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL);
+                printf("    retrieved GCPL property value '%llu' did not match expected value '%llu'\n",
+                       (unsigned long long)dummy_prop_val,
+                       (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL);
                 PART_ERROR(H5Gget_create_plist);
             }
 
@@ -1216,16 +1216,16 @@ test_group_property_lists(void)
 
             if (H5Pget_link_creation_order(gcpl_id2, &dummy_prop_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve GCPL property value\n");
+                printf("    couldn't retrieve GCPL property value\n");
                 PART_ERROR(H5Gget_create_plist);
             }
 
             if (dummy_prop_val == GROUP_PROPERTY_LIST_TEST_DUMMY_VAL) {
                 H5_FAILED();
-                HDprintf("    retrieved GCPL property value '%llu' matched control value '%llu' when it "
-                         "shouldn't have\n",
-                         (unsigned long long)dummy_prop_val,
-                         (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL);
+                printf("    retrieved GCPL property value '%llu' matched control value '%llu' when it "
+                       "shouldn't have\n",
+                       (unsigned long long)dummy_prop_val,
+                       (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL);
                 PART_ERROR(H5Gget_create_plist);
             }
 
@@ -1278,26 +1278,26 @@ test_group_property_lists(void)
             if ((group_id1 = H5Gopen2(container_group, GROUP_PROPERTY_LIST_TEST_GROUP_NAME1, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open group\n");
+                printf("    couldn't open group\n");
                 PART_ERROR(H5Gget_create_plist_reopened);
             }
 
             if ((group_id2 = H5Gopen2(container_group, GROUP_PROPERTY_LIST_TEST_GROUP_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open group\n");
+                printf("    couldn't open group\n");
                 PART_ERROR(H5Gget_create_plist_reopened);
             }
 
             if ((gcpl_id1 = H5Gget_create_plist(group_id1)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Gget_create_plist_reopened);
             }
 
             if ((gcpl_id2 = H5Gget_create_plist(group_id2)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get property list\n");
+                printf("    couldn't get property list\n");
                 PART_ERROR(H5Gget_create_plist_reopened);
             }
 
@@ -1306,15 +1306,15 @@ test_group_property_lists(void)
 
             if (H5Pget_link_creation_order(gcpl_id1, &dummy_prop_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve GCPL property value\n");
+                printf("    couldn't retrieve GCPL property value\n");
                 PART_ERROR(H5Gget_create_plist_reopened);
             }
 
             if (dummy_prop_val != GROUP_PROPERTY_LIST_TEST_DUMMY_VAL) {
                 H5_FAILED();
-                HDprintf("    retrieved GCPL property value '%llu' did not match expected value '%llu'\n",
-                         (unsigned long long)dummy_prop_val,
-                         (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL);
+                printf("    retrieved GCPL property value '%llu' did not match expected value '%llu'\n",
+                       (unsigned long long)dummy_prop_val,
+                       (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL);
                 PART_ERROR(H5Gget_create_plist_reopened);
             }
 
@@ -1322,16 +1322,16 @@ test_group_property_lists(void)
 
             if (H5Pget_link_creation_order(gcpl_id2, &dummy_prop_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve GCPL property value\n");
+                printf("    couldn't retrieve GCPL property value\n");
                 PART_ERROR(H5Gget_create_plist_reopened);
             }
 
             if (dummy_prop_val == GROUP_PROPERTY_LIST_TEST_DUMMY_VAL) {
                 H5_FAILED();
-                HDprintf("    retrieved GCPL property value '%llu' matched control value '%llu' when it "
-                         "shouldn't have\n",
-                         (unsigned long long)dummy_prop_val,
-                         (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL);
+                printf("    retrieved GCPL property value '%llu' matched control value '%llu' when it "
+                       "shouldn't have\n",
+                       (unsigned long long)dummy_prop_val,
+                       (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL);
                 PART_ERROR(H5Gget_create_plist_reopened);
             }
 
@@ -1395,7 +1395,7 @@ test_get_group_info(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or group aren't supported with this connector\n");
+        printf("    API functions for basic file or group aren't supported with this connector\n");
         return 0;
     }
 
@@ -1403,26 +1403,26 @@ test_get_group_info(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -1430,7 +1430,7 @@ test_get_group_info(void)
     if ((parent_group_id = H5Gcreate2(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id,
                                       H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", GROUP_GET_INFO_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", GROUP_GET_INFO_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -1442,7 +1442,7 @@ test_get_group_info(void)
 
         if ((group_id = H5Gcreate2(parent_group_id, group_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create group '%s'\n", group_name);
+            printf("    couldn't create group '%s'\n", group_name);
             goto error;
         }
 
@@ -1463,14 +1463,14 @@ test_get_group_info(void)
             /* Retrieve information about the parent group */
             if (H5Gget_info(parent_group_id, &group_info) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get group info\n");
+                printf("    couldn't get group info\n");
                 PART_ERROR(H5Gget_info);
             }
 
             if (group_info.nlinks != GROUP_GET_INFO_TEST_GROUP_NUMB) {
                 H5_FAILED();
-                HDprintf("    group's number of links '%lu' doesn't match expected value '%u'\n",
-                         group_info.nlinks, (unsigned int)GROUP_GET_INFO_TEST_GROUP_NUMB);
+                printf("    group's number of links '%lu' doesn't match expected value '%u'\n",
+                       group_info.nlinks, (unsigned int)GROUP_GET_INFO_TEST_GROUP_NUMB);
                 PART_ERROR(H5Gget_info);
             }
 
@@ -1480,8 +1480,8 @@ test_get_group_info(void)
              */
             if (group_info.max_corder != GROUP_GET_INFO_TEST_GROUP_NUMB) {
                 H5_FAILED();
-                HDprintf("    group's max creation order '%lld' doesn't match expected value '%lld'\n",
-                         (long long)group_info.max_corder, (long long)GROUP_GET_INFO_TEST_GROUP_NUMB);
+                printf("    group's max creation order '%lld' doesn't match expected value '%lld'\n",
+                       (long long)group_info.max_corder, (long long)GROUP_GET_INFO_TEST_GROUP_NUMB);
                 PART_ERROR(H5Gget_info);
             }
 
@@ -1491,14 +1491,14 @@ test_get_group_info(void)
                 group_info.storage_type != H5G_STORAGE_TYPE_DENSE &&
                 group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) {
                 H5_FAILED();
-                HDprintf("    group info's 'storage_type' field wasn't set to a meaningful value\n");
+                printf("    group info's 'storage_type' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Gget_info);
             }
 
             /* Assume that mounted should be FALSE in this case */
             if (group_info.mounted != FALSE) {
                 H5_FAILED();
-                HDprintf("    group info's 'mounted' field was TRUE when it should have been FALSE\n");
+                printf("    group info's 'mounted' field was TRUE when it should have been FALSE\n");
                 PART_ERROR(H5Gget_info);
             }
 
@@ -1516,14 +1516,14 @@ test_get_group_info(void)
             if (H5Gget_info_by_name(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, &group_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get group info by name\n");
+                printf("    couldn't get group info by name\n");
                 PART_ERROR(H5Gget_info_by_name);
             }
 
             if (group_info.nlinks != GROUP_GET_INFO_TEST_GROUP_NUMB) {
                 H5_FAILED();
-                HDprintf("    group's number of links '%lu' doesn't match expected value '%u'\n",
-                         group_info.nlinks, (unsigned int)GROUP_GET_INFO_TEST_GROUP_NUMB);
+                printf("    group's number of links '%lu' doesn't match expected value '%u'\n",
+                       group_info.nlinks, (unsigned int)GROUP_GET_INFO_TEST_GROUP_NUMB);
                 PART_ERROR(H5Gget_info_by_name);
             }
 
@@ -1533,8 +1533,8 @@ test_get_group_info(void)
              */
             if (group_info.max_corder != GROUP_GET_INFO_TEST_GROUP_NUMB) {
                 H5_FAILED();
-                HDprintf("    group's max creation order '%lld' doesn't match expected value '%lld'\n",
-                         (long long)group_info.max_corder, (long long)GROUP_GET_INFO_TEST_GROUP_NUMB);
+                printf("    group's max creation order '%lld' doesn't match expected value '%lld'\n",
+                       (long long)group_info.max_corder, (long long)GROUP_GET_INFO_TEST_GROUP_NUMB);
                 PART_ERROR(H5Gget_info_by_name);
             }
 
@@ -1544,14 +1544,14 @@ test_get_group_info(void)
                 group_info.storage_type != H5G_STORAGE_TYPE_DENSE &&
                 group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) {
                 H5_FAILED();
-                HDprintf("    group info's 'storage_type' field wasn't set to a meaningful value\n");
+                printf("    group info's 'storage_type' field wasn't set to a meaningful value\n");
                 PART_ERROR(H5Gget_info_by_name);
             }
 
             /* Assume that mounted should be FALSE in this case */
             if (group_info.mounted != FALSE) {
                 H5_FAILED();
-                HDprintf("    group info's 'mounted' field was TRUE when it should have been FALSE\n");
+                printf("    group info's 'mounted' field was TRUE when it should have been FALSE\n");
                 PART_ERROR(H5Gget_info_by_name);
             }
 
@@ -1565,7 +1565,7 @@ test_get_group_info(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Gget_info_by_idx_crt_order_increasing);
             }
 
@@ -1576,21 +1576,21 @@ test_get_group_info(void)
                 if (H5Gget_info_by_idx(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                        H5_ITER_INC, (hsize_t)i, &group_info, H5P_DEFAULT) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't get group info for group at index %u\n", i);
+                    printf("    couldn't get group info for group at index %u\n", i);
                     PART_ERROR(H5Gget_info_by_idx_crt_order_increasing);
                 }
 
                 if (group_info.nlinks != 0) {
                     H5_FAILED();
-                    HDprintf("    group's number of links '%lu' doesn't match expected value '%d'\n",
-                             group_info.nlinks, 0);
+                    printf("    group's number of links '%lu' doesn't match expected value '%d'\n",
+                           group_info.nlinks, 0);
                     PART_ERROR(H5Gget_info_by_idx_crt_order_increasing);
                 }
 
                 if (group_info.max_corder != 0) {
                     H5_FAILED();
-                    HDprintf("    group's max creation order '%lld' doesn't match expected value '%d'\n",
-                             (long long)group_info.max_corder, 0);
+                    printf("    group's max creation order '%lld' doesn't match expected value '%d'\n",
+                           (long long)group_info.max_corder, 0);
                     PART_ERROR(H5Gget_info_by_idx_crt_order_increasing);
                 }
 
@@ -1600,14 +1600,14 @@ test_get_group_info(void)
                     group_info.storage_type != H5G_STORAGE_TYPE_DENSE &&
                     group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) {
                     H5_FAILED();
-                    HDprintf("    group info's 'storage_type' field wasn't set to a meaningful value\n");
+                    printf("    group info's 'storage_type' field wasn't set to a meaningful value\n");
                     PART_ERROR(H5Gget_info_by_idx_crt_order_increasing);
                 }
 
                 /* Assume that mounted should be FALSE in this case */
                 if (group_info.mounted != FALSE) {
                     H5_FAILED();
-                    HDprintf("    group info's 'mounted' field was TRUE when it should have been FALSE\n");
+                    printf("    group info's 'mounted' field was TRUE when it should have been FALSE\n");
                     PART_ERROR(H5Gget_info_by_idx_crt_order_increasing);
                 }
             }
@@ -1622,7 +1622,7 @@ test_get_group_info(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Gget_info_by_idx_crt_order_decreasing);
             }
 
@@ -1633,21 +1633,21 @@ test_get_group_info(void)
                 if (H5Gget_info_by_idx(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER,
                                        H5_ITER_DEC, (hsize_t)i, &group_info, H5P_DEFAULT) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't get group info for group at index %u\n", i);
+                    printf("    couldn't get group info for group at index %u\n", i);
                     PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing);
                 }
 
                 if (group_info.nlinks != 0) {
                     H5_FAILED();
-                    HDprintf("    group's number of links '%lu' doesn't match expected value '%d'\n",
-                             group_info.nlinks, 0);
+                    printf("    group's number of links '%lu' doesn't match expected value '%d'\n",
+                           group_info.nlinks, 0);
                     PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing);
                 }
 
                 if (group_info.max_corder != 0) {
                     H5_FAILED();
-                    HDprintf("    group's max creation order '%lld' doesn't match expected value '%d'\n",
-                             (long long)group_info.max_corder, 0);
+                    printf("    group's max creation order '%lld' doesn't match expected value '%d'\n",
+                           (long long)group_info.max_corder, 0);
                     PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing);
                 }
 
@@ -1657,14 +1657,14 @@ test_get_group_info(void)
                     group_info.storage_type != H5G_STORAGE_TYPE_DENSE &&
                     group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) {
                     H5_FAILED();
-                    HDprintf("    group info's 'storage_type' field wasn't set to a meaningful value\n");
+                    printf("    group info's 'storage_type' field wasn't set to a meaningful value\n");
                     PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing);
                 }
 
                 /* Assume that mounted should be FALSE in this case */
                 if (group_info.mounted != FALSE) {
                     H5_FAILED();
-                    HDprintf("    group info's 'mounted' field was TRUE when it should have been FALSE\n");
+                    printf("    group info's 'mounted' field was TRUE when it should have been FALSE\n");
                     PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing);
                 }
             }
@@ -1684,21 +1684,21 @@ test_get_group_info(void)
                 if (H5Gget_info_by_idx(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5_INDEX_NAME,
                                        H5_ITER_INC, (hsize_t)i, &group_info, H5P_DEFAULT) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't get group info for group at index %u\n", i);
+                    printf("    couldn't get group info for group at index %u\n", i);
                     PART_ERROR(H5Gget_info_by_idx_name_order_increasing);
                 }
 
                 if (group_info.nlinks != 0) {
                     H5_FAILED();
-                    HDprintf("    group's number of links '%lu' doesn't match expected value '%d'\n",
-                             group_info.nlinks, 0);
+                    printf("    group's number of links '%lu' doesn't match expected value '%d'\n",
+                           group_info.nlinks, 0);
                     PART_ERROR(H5Gget_info_by_idx_name_order_increasing);
                 }
 
                 if (group_info.max_corder != 0) {
                     H5_FAILED();
-                    HDprintf("    group's max creation order '%lld' doesn't match expected value '%d'\n",
-                             (long long)group_info.max_corder, 0);
+                    printf("    group's max creation order '%lld' doesn't match expected value '%d'\n",
+                           (long long)group_info.max_corder, 0);
                     PART_ERROR(H5Gget_info_by_idx_name_order_increasing);
                 }
 
@@ -1708,14 +1708,14 @@ test_get_group_info(void)
                     group_info.storage_type != H5G_STORAGE_TYPE_DENSE &&
                     group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) {
                     H5_FAILED();
-                    HDprintf("    group info's 'storage_type' field wasn't set to a meaningful value\n");
+                    printf("    group info's 'storage_type' field wasn't set to a meaningful value\n");
                     PART_ERROR(H5Gget_info_by_idx_name_order_increasing);
                 }
 
                 /* Assume that mounted should be FALSE in this case */
                 if (group_info.mounted != FALSE) {
                     H5_FAILED();
-                    HDprintf("    group info's 'mounted' field was TRUE when it should have been FALSE\n");
+                    printf("    group info's 'mounted' field was TRUE when it should have been FALSE\n");
                     PART_ERROR(H5Gget_info_by_idx_name_order_increasing);
                 }
             }
@@ -1735,22 +1735,21 @@ test_get_group_info(void)
                 if (H5Gget_info_by_idx(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5_INDEX_NAME,
                                        H5_ITER_DEC, (hsize_t)i, &group_info, H5P_DEFAULT) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't get group info for group at index %u\n", i);
+                    printf("    couldn't get group info for group at index %u\n", i);
                     PART_ERROR(H5Gget_info_by_idx_name_order_decreasing);
                 }
 
                 if (group_info.nlinks != 0) {
                     H5_FAILED();
-                    HDprintf("    group's number of links '%" PRIuHSIZE
-                             "' doesn't match expected value '%d'\n",
-                             group_info.nlinks, 0);
+                    printf("    group's number of links '%" PRIuHSIZE "' doesn't match expected value '%d'\n",
+                           group_info.nlinks, 0);
                     PART_ERROR(H5Gget_info_by_idx_name_order_decreasing);
                 }
 
                 if (group_info.max_corder != 0) {
                     H5_FAILED();
-                    HDprintf("    group's max creation order '%lld' doesn't match expected value '%d'\n",
-                             (long long)group_info.max_corder, 0);
+                    printf("    group's max creation order '%lld' doesn't match expected value '%d'\n",
+                           (long long)group_info.max_corder, 0);
                     PART_ERROR(H5Gget_info_by_idx_name_order_decreasing);
                 }
 
@@ -1760,14 +1759,14 @@ test_get_group_info(void)
                     group_info.storage_type != H5G_STORAGE_TYPE_DENSE &&
                     group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) {
                     H5_FAILED();
-                    HDprintf("    group info's 'storage_type' field wasn't set to a meaningful value\n");
+                    printf("    group info's 'storage_type' field wasn't set to a meaningful value\n");
                     PART_ERROR(H5Gget_info_by_idx_name_order_decreasing);
                 }
 
                 /* Assume that mounted should be FALSE in this case */
                 if (group_info.mounted != FALSE) {
                     H5_FAILED();
-                    HDprintf("    group info's 'mounted' field was TRUE when it should have been FALSE\n");
+                    printf("    group info's 'mounted' field was TRUE when it should have been FALSE\n");
                     PART_ERROR(H5Gget_info_by_idx_name_order_decreasing);
                 }
             }
@@ -1823,8 +1822,8 @@ test_get_group_info_invalid_params(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, or more group aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, or more group aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -1832,7 +1831,7 @@ test_get_group_info_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
@@ -1852,7 +1851,7 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info with an invalid loc_id!\n");
+                printf("    retrieved info of group using H5Gget_info with an invalid loc_id!\n");
                 PART_ERROR(H5Gget_info_invalid_loc_id);
             }
 
@@ -1872,7 +1871,7 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info with invalid group info pointer!\n");
+                printf("    retrieved info of group using H5Gget_info with invalid group info pointer!\n");
                 PART_ERROR(H5Gget_info_invalid_grp_info_pointer);
             }
 
@@ -1892,7 +1891,7 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_name with an invalid loc_id!\n");
+                printf("    retrieved info of group using H5Gget_info_by_name with an invalid loc_id!\n");
                 PART_ERROR(H5Gget_info_by_name_invalid_loc_id);
             }
 
@@ -1912,7 +1911,7 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_name with a NULL name!\n");
+                printf("    retrieved info of group using H5Gget_info_by_name with a NULL name!\n");
                 PART_ERROR(H5Gget_info_by_name_invalid_grp_name);
             }
 
@@ -1924,8 +1923,7 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    retrieved info of group using H5Gget_info_by_name with an invalid name of ''!\n");
+                printf("    retrieved info of group using H5Gget_info_by_name with an invalid name of ''!\n");
                 PART_ERROR(H5Gget_info_by_name_invalid_grp_name);
             }
 
@@ -1945,8 +1943,8 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_name with an invalid group info "
-                         "pointer!\n");
+                printf("    retrieved info of group using H5Gget_info_by_name with an invalid group info "
+                       "pointer!\n");
                 PART_ERROR(H5Gget_info_by_name_invalid_grp_info_pointer);
             }
 
@@ -1966,7 +1964,7 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_name with an invalid LAPL!\n");
+                printf("    retrieved info of group using H5Gget_info_by_name with an invalid LAPL!\n");
                 PART_ERROR(H5Gget_info_by_name_invalid_lapl);
             }
 
@@ -1987,7 +1985,7 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_idx with an invalid loc_id!\n");
+                printf("    retrieved info of group using H5Gget_info_by_idx with an invalid loc_id!\n");
                 PART_ERROR(H5Gget_info_by_idx_invalid_loc_id);
             }
 
@@ -2008,7 +2006,7 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_idx with a NULL group name!\n");
+                printf("    retrieved info of group using H5Gget_info_by_idx with a NULL group name!\n");
                 PART_ERROR(H5Gget_info_by_idx_invalid_grp_name);
             }
 
@@ -2021,8 +2019,8 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_idx with an invalid group name of "
-                         "''!\n");
+                printf("    retrieved info of group using H5Gget_info_by_idx with an invalid group name of "
+                       "''!\n");
                 PART_ERROR(H5Gget_info_by_idx_invalid_grp_name);
             }
 
@@ -2043,8 +2041,8 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_idx with invalid index type "
-                         "H5_INDEX_UNKNOWN!\n");
+                printf("    retrieved info of group using H5Gget_info_by_idx with invalid index type "
+                       "H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Gget_info_by_idx_invalid_index_type);
             }
 
@@ -2057,8 +2055,8 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_idx with invalid index type "
-                         "H5_INDEX_N!\n");
+                printf("    retrieved info of group using H5Gget_info_by_idx with invalid index type "
+                       "H5_INDEX_N!\n");
                 PART_ERROR(H5Gget_info_by_idx_invalid_index_type);
             }
 
@@ -2079,8 +2077,8 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_idx with invalid iteration order "
-                         "H5_ITER_UNKNOWN!\n");
+                printf("    retrieved info of group using H5Gget_info_by_idx with invalid iteration order "
+                       "H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Gget_info_by_idx_invalid_iter_order);
             }
 
@@ -2093,8 +2091,8 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_idx with invalid iteration order "
-                         "H5_ITER_N!\n");
+                printf("    retrieved info of group using H5Gget_info_by_idx with invalid iteration order "
+                       "H5_ITER_N!\n");
                 PART_ERROR(H5Gget_info_by_idx_invalid_iter_order);
             }
 
@@ -2114,8 +2112,8 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_idx with an invalid group info "
-                         "pointer!\n");
+                printf("    retrieved info of group using H5Gget_info_by_idx with an invalid group info "
+                       "pointer!\n");
                 PART_ERROR(H5Gget_info_by_idx_invalid_grp_info_pointer);
             }
 
@@ -2136,7 +2134,7 @@ test_get_group_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    retrieved info of group using H5Gget_info_by_idx with an invalid LAPL!\n");
+                printf("    retrieved info of group using H5Gget_info_by_idx with an invalid LAPL!\n");
                 PART_ERROR(H5Gget_info_by_idx_invalid_lapl);
             }
 
@@ -2181,34 +2179,34 @@ test_flush_group(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or flush refresh aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or flush refresh aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, GROUP_FLUSH_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", GROUP_FLUSH_GNAME);
+        printf("    couldn't create group '%s'\n", GROUP_FLUSH_GNAME);
         goto error;
     }
 
     /* Flush the group */
     if (H5Gflush(group_id) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't flush the group '%s'\n", GROUP_FLUSH_GNAME);
+        printf("    couldn't flush the group '%s'\n", GROUP_FLUSH_GNAME);
         goto error;
     }
 
@@ -2249,7 +2247,7 @@ test_flush_group_invalid_params(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         SKIPPED();
-        HDprintf("    API functions for group flush aren't supported with this connector\n");
+        printf("    API functions for group flush aren't supported with this connector\n");
         return 0;
     }
 
@@ -2261,7 +2259,7 @@ test_flush_group_invalid_params(void)
 
     if (status >= 0) {
         H5_FAILED();
-        HDprintf("    flushed group with invalid ID!\n");
+        printf("    flushed group with invalid ID!\n");
         goto error;
     }
 
@@ -2289,34 +2287,34 @@ test_refresh_group(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or flush refresh aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or flush refresh aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, GROUP_REFRESH_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", GROUP_REFRESH_GNAME);
+        printf("    couldn't create group '%s'\n", GROUP_REFRESH_GNAME);
         goto error;
     }
 
     /* Refresh the group */
     if (H5Grefresh(group_id) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't refresh the group '%s'\n", GROUP_REFRESH_GNAME);
+        printf("    couldn't refresh the group '%s'\n", GROUP_REFRESH_GNAME);
         goto error;
     }
 
@@ -2357,7 +2355,7 @@ test_refresh_group_invalid_params(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         SKIPPED();
-        HDprintf("    API functions for group refresh aren't supported with this connector\n");
+        printf("    API functions for group refresh aren't supported with this connector\n");
         return 0;
     }
 
@@ -2369,7 +2367,7 @@ test_refresh_group_invalid_params(void)
 
     if (status >= 0) {
         H5_FAILED();
-        HDprintf("    refreshed group with invalid ID!\n");
+        printf("    refreshed group with invalid ID!\n");
         goto error;
     }
 
@@ -2387,17 +2385,17 @@ H5_api_group_test(void)
     size_t i;
     int    nerrors;
 
-    HDprintf("**********************************************\n");
-    HDprintf("*                                            *\n");
-    HDprintf("*              API Group Tests               *\n");
-    HDprintf("*                                            *\n");
-    HDprintf("**********************************************\n\n");
+    printf("**********************************************\n");
+    printf("*                                            *\n");
+    printf("*              API Group Tests               *\n");
+    printf("*                                            *\n");
+    printf("**********************************************\n\n");
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(group_tests); i++) {
         nerrors += (*group_tests[i])() ? 1 : 0;
     }
 
-    HDprintf("\n");
+    printf("\n");
 
     return nerrors;
 }
diff --git a/test/API/H5_api_link_test.c b/test/API/H5_api_link_test.c
index 65a3277..3559254 100644
--- a/test/API/H5_api_link_test.c
+++ b/test/API/H5_api_link_test.c
@@ -185,46 +185,46 @@ test_create_hard_link(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or hard link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, link, or hard link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, HARD_LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if (H5Lcreate_hard(file_id, "/", group_id, HARD_LINK_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create hard link '%s'\n", HARD_LINK_TEST_LINK_NAME);
+        printf("    couldn't create hard link '%s'\n", HARD_LINK_TEST_LINK_NAME);
         goto error;
     }
 
     /* Verify the link has been created */
     if ((link_exists = H5Lexists(group_id, HARD_LINK_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n", HARD_LINK_TEST_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", HARD_LINK_TEST_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link did not exist\n");
+        printf("    link did not exist\n");
         goto error;
     }
 
@@ -272,33 +272,33 @@ test_create_hard_link_long_name(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or hard link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, link, or hard link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, HARD_LINK_TEST_GROUP_LONG_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if (H5VLget_connector_name(file_id, vol_name, 5) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get VOL connector name\n");
+        printf("    couldn't get VOL connector name\n");
         goto error;
     }
 
@@ -316,20 +316,20 @@ test_create_hard_link_long_name(void)
 
     if (H5Lcreate_hard(file_id, "/", group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create hard link with a long name\n");
+        printf("    couldn't create hard link with a long name\n");
         goto error;
     }
 
     /* Verify the link has been created */
     if ((link_exists = H5Lexists(group_id, objname, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if the link with a long name exists\n");
+        printf("    couldn't determine if the link with a long name exists\n");
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link did not exist\n");
+        printf("    link did not exist\n");
         goto error;
     }
 
@@ -382,34 +382,34 @@ test_create_hard_link_many(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or hard link aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, HARD_LINK_TEST_GROUP_MANY_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id2 = H5Gcreate2(group_id, HARD_LINK_TEST_GROUP_MANY_FINAL_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                 H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_MANY_FINAL_NAME);
+        printf("    couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_MANY_FINAL_NAME);
         goto error;
     }
 
@@ -460,13 +460,13 @@ test_create_hard_link_many(void)
     /* Verify the link has been created */
     if ((link_exists = H5Lexists(group_id, "hard21", H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link 'hard21' exists\n");
+        printf("    couldn't determine if link 'hard21' exists\n");
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link 'hard21' did not exist\n");
+        printf("    link 'hard21' did not exist\n");
         goto error;
     }
 
@@ -482,39 +482,39 @@ test_create_hard_link_many(void)
     /* Reopen the file and group and verify the hard link */
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gopen2(container_group, HARD_LINK_TEST_GROUP_MANY_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     /* Open the object through last hard link */
     if ((group_id2 = H5Gopen2(group_id, "hard21", H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open the group '%s' with the last hard link 'hard21'\n",
-                 HARD_LINK_TEST_GROUP_MANY_FINAL_NAME);
+        printf("    couldn't open the group '%s' with the last hard link 'hard21'\n",
+               HARD_LINK_TEST_GROUP_MANY_FINAL_NAME);
         goto error;
     }
     /* Check name */
     if (H5Iget_name(group_id2, objname, (size_t)HARD_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get the name of the object '%s'\n", HARD_LINK_TEST_GROUP_MANY_FINAL_NAME);
+        printf("    couldn't get the name of the object '%s'\n", HARD_LINK_TEST_GROUP_MANY_FINAL_NAME);
         goto error;
     }
 
     if (HDstrcmp(objname, "/" LINK_TEST_GROUP_NAME "/" HARD_LINK_TEST_GROUP_MANY_NAME "/hard21")) {
         H5_FAILED();
-        HDprintf("    wrong name of the object '%s'\n", objname);
+        printf("    wrong name of the object '%s'\n", objname);
         goto error;
     }
 
@@ -561,8 +561,8 @@ test_create_hard_link_same_loc(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or hard link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, link, or hard link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -570,20 +570,20 @@ test_create_hard_link_same_loc(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, H5L_SAME_LOC_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", H5L_SAME_LOC_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", H5L_SAME_LOC_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -599,20 +599,20 @@ test_create_hard_link_same_loc(void)
             if (H5Lcreate_hard(H5L_SAME_LOC, ".", group_id, H5L_SAME_LOC_TEST_LINK_NAME1, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create first link '%s'\n", H5L_SAME_LOC_TEST_LINK_NAME1);
+                printf("    couldn't create first link '%s'\n", H5L_SAME_LOC_TEST_LINK_NAME1);
                 PART_ERROR(H5L_SAME_LOC_first_param);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(group_id, H5L_SAME_LOC_TEST_LINK_NAME1, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link exists\n");
+                printf("    couldn't determine if link exists\n");
                 PART_ERROR(H5L_SAME_LOC_first_param);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link did not exist\n");
+                printf("    link did not exist\n");
                 PART_ERROR(H5L_SAME_LOC_first_param);
             }
 
@@ -627,20 +627,20 @@ test_create_hard_link_same_loc(void)
             if (H5Lcreate_hard(group_id, ".", H5L_SAME_LOC, H5L_SAME_LOC_TEST_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create second link '%s'\n", H5L_SAME_LOC_TEST_LINK_NAME2);
+                printf("    couldn't create second link '%s'\n", H5L_SAME_LOC_TEST_LINK_NAME2);
                 PART_ERROR(H5L_SAME_LOC_third_param);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(group_id, H5L_SAME_LOC_TEST_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", H5L_SAME_LOC_TEST_LINK_NAME2);
+                printf("    couldn't determine if link '%s' exists\n", H5L_SAME_LOC_TEST_LINK_NAME2);
                 PART_ERROR(H5L_SAME_LOC_third_param);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link did not exist\n");
+                printf("    link did not exist\n");
                 PART_ERROR(H5L_SAME_LOC_third_param);
             }
 
@@ -695,8 +695,8 @@ test_create_hard_link_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or hard link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, link, or hard link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -704,20 +704,20 @@ test_create_hard_link_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, HARD_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", HARD_LINK_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", HARD_LINK_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -738,7 +738,7 @@ test_create_hard_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created hard link with an invalid cur_loc_id!\n");
+                printf("    created hard link with an invalid cur_loc_id!\n");
                 PART_ERROR(H5Lcreate_hard_invalid_cur_loc_id);
             }
 
@@ -759,7 +759,7 @@ test_create_hard_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created hard link with a NULL cur_name!\n");
+                printf("    created hard link with a NULL cur_name!\n");
                 PART_ERROR(H5Lcreate_hard_invalid_cur_name);
             }
 
@@ -772,7 +772,7 @@ test_create_hard_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created hard link with an invalid cur_name of ''!\n");
+                printf("    created hard link with an invalid cur_name of ''!\n");
                 PART_ERROR(H5Lcreate_hard_invalid_cur_name);
             }
 
@@ -793,7 +793,7 @@ test_create_hard_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created hard link with an invalid new_loc_id!\n");
+                printf("    created hard link with an invalid new_loc_id!\n");
                 PART_ERROR(H5Lcreate_hard_invalid_new_loc_id);
             }
 
@@ -813,7 +813,7 @@ test_create_hard_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created hard link with a NULL new_name!\n");
+                printf("    created hard link with a NULL new_name!\n");
                 PART_ERROR(H5Lcreate_hard_invalid_new_name);
             }
 
@@ -825,7 +825,7 @@ test_create_hard_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created hard link with an invalid new_name of ''!\n");
+                printf("    created hard link with an invalid new_name of ''!\n");
                 PART_ERROR(H5Lcreate_hard_invalid_new_name);
             }
 
@@ -846,7 +846,7 @@ test_create_hard_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created hard link with an invalid LCPL!\n");
+                printf("    created hard link with an invalid LCPL!\n");
                 PART_ERROR(H5Lcreate_hard_invalid_lcpl);
             }
 
@@ -867,7 +867,7 @@ test_create_hard_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created hard link with an invalid LAPL!\n");
+                printf("    created hard link with an invalid LAPL!\n");
                 PART_ERROR(H5Lcreate_hard_invalid_lapl);
             }
 
@@ -888,7 +888,7 @@ test_create_hard_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created hard link with the invalid same location!\n");
+                printf("    created hard link with the invalid same location!\n");
                 PART_ERROR(H5Lcreate_hard_invalid_same_loc);
             }
 
@@ -905,7 +905,7 @@ test_create_hard_link_invalid_params(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lcreate_hard_across_files);
             }
 
@@ -918,7 +918,7 @@ test_create_hard_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created hard link across files!\n");
+                printf("    created hard link across files!\n");
                 PART_ERROR(H5Lcreate_hard_across_files);
             }
 
@@ -931,7 +931,7 @@ test_create_hard_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created hard link across files!\n");
+                printf("    created hard link across files!\n");
                 PART_ERROR(H5Lcreate_hard_across_files);
             }
 
@@ -947,14 +947,14 @@ test_create_hard_link_invalid_params(void)
             if ((link_exists = H5Lexists(group_id, HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n",
-                         HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n",
+                       HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_hard_invalid_existence);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    link existed!\n");
+                printf("    link existed!\n");
                 PART_ERROR(H5Lcreate_hard_invalid_existence);
             }
 
@@ -1010,36 +1010,36 @@ test_create_soft_link_existing_relative(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or soft link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, link, or soft link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, SOFT_LINK_EXISTING_RELATIVE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 SOFT_LINK_EXISTING_RELATIVE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               SOFT_LINK_EXISTING_RELATIVE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((object_id = H5Gcreate2(group_id, SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME, H5P_DEFAULT,
                                 H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to create object '%s' for soft link's target\n",
-                 SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME);
+        printf("    failed to create object '%s' for soft link's target\n",
+               SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME);
         goto error;
     }
 
@@ -1049,27 +1049,27 @@ test_create_soft_link_existing_relative(void)
     if (H5Lcreate_soft(SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME, group_id,
                        SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME);
+        printf("    couldn't create soft link '%s'\n", SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME);
         goto error;
     }
 
     /* Verify the link has been created */
     if ((link_exists = H5Lexists(group_id, SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n", SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link did not exist\n");
+        printf("    link did not exist\n");
         goto error;
     }
 
     if ((object_id = H5Gopen2(group_id, SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open object '%s' through the soft link\n",
-                 SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME);
+        printf("    couldn't open object '%s' through the soft link\n",
+               SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME);
         goto error;
     }
 
@@ -1116,55 +1116,55 @@ test_create_soft_link_existing_absolute(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or soft link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, link, or soft link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, SOFT_LINK_EXISTING_ABSOLUTE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 SOFT_LINK_EXISTING_ABSOLUTE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               SOFT_LINK_EXISTING_ABSOLUTE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if (H5Lcreate_soft("/", group_id, SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME);
+        printf("    couldn't create soft link '%s'\n", SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME);
         goto error;
     }
 
     /* Verify the link has been created */
     if ((link_exists = H5Lexists(group_id, SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n", SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link did not exist\n");
+        printf("    link did not exist\n");
         goto error;
     }
 
     if ((root_id = H5Gopen2(group_id, SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open object pointed to by soft link '%s'\n",
-                 SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME);
+        printf("    couldn't open object pointed to by soft link '%s'\n",
+               SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME);
         goto error;
     }
 
@@ -1213,48 +1213,48 @@ test_create_soft_link_dangling_relative(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or soft link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, link, or soft link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, SOFT_LINK_DANGLING_RELATIVE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 SOFT_LINK_DANGLING_RELATIVE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               SOFT_LINK_DANGLING_RELATIVE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if (H5Lcreate_soft(SOFT_LINK_DANGLING_RELATIVE_TEST_OBJECT_NAME, group_id,
                        SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME);
+        printf("    couldn't create soft link '%s'\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME);
         goto error;
     }
 
     /* Verify the link has been created */
     if ((link_exists = H5Lexists(group_id, SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link did not exist\n");
+        printf("    link did not exist\n");
         goto error;
     }
 
@@ -1266,7 +1266,7 @@ test_create_soft_link_dangling_relative(void)
 
     if (object_id >= 0) {
         H5_FAILED();
-        HDprintf("    opened target of dangling link '%s'!\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME);
+        printf("    opened target of dangling link '%s'!\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME);
         H5Gclose(object_id);
         goto error;
     }
@@ -1274,8 +1274,8 @@ test_create_soft_link_dangling_relative(void)
     if ((object_id = H5Gcreate2(group_id, SOFT_LINK_DANGLING_RELATIVE_TEST_OBJECT_NAME, H5P_DEFAULT,
                                 H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to create object '%s' for soft link's target\n",
-                 SOFT_LINK_DANGLING_RELATIVE_TEST_OBJECT_NAME);
+        printf("    failed to create object '%s' for soft link's target\n",
+               SOFT_LINK_DANGLING_RELATIVE_TEST_OBJECT_NAME);
         goto error;
     }
 
@@ -1284,8 +1284,8 @@ test_create_soft_link_dangling_relative(void)
 
     if ((object_id = H5Gopen2(group_id, SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to open object pointed to by soft link '%s'\n",
-                 SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME);
+        printf("    failed to open object pointed to by soft link '%s'\n",
+               SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME);
         goto error;
     }
 
@@ -1334,28 +1334,28 @@ test_create_soft_link_dangling_absolute(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or soft link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, link, or soft link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, SOFT_LINK_DANGLING_ABSOLUTE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 SOFT_LINK_DANGLING_ABSOLUTE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               SOFT_LINK_DANGLING_ABSOLUTE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -1363,20 +1363,20 @@ test_create_soft_link_dangling_absolute(void)
                        "/" SOFT_LINK_DANGLING_ABSOLUTE_TEST_OBJECT_NAME,
                        group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME);
+        printf("    couldn't create soft link '%s'\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME);
         goto error;
     }
 
     /* Verify the link has been created */
     if ((link_exists = H5Lexists(group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link did not exist\n");
+        printf("    link did not exist\n");
         goto error;
     }
 
@@ -1388,7 +1388,7 @@ test_create_soft_link_dangling_absolute(void)
 
     if (object_id >= 0) {
         H5_FAILED();
-        HDprintf("    opened target of dangling link '%s'!\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME);
+        printf("    opened target of dangling link '%s'!\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME);
         H5Gclose(object_id);
         goto error;
     }
@@ -1396,8 +1396,8 @@ test_create_soft_link_dangling_absolute(void)
     if ((object_id = H5Gcreate2(group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_OBJECT_NAME, H5P_DEFAULT,
                                 H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to create object '%s' for soft link's target\n",
-                 SOFT_LINK_DANGLING_ABSOLUTE_TEST_OBJECT_NAME);
+        printf("    failed to create object '%s' for soft link's target\n",
+               SOFT_LINK_DANGLING_ABSOLUTE_TEST_OBJECT_NAME);
         goto error;
     }
 
@@ -1406,8 +1406,8 @@ test_create_soft_link_dangling_absolute(void)
 
     if ((object_id = H5Gopen2(group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to open object pointed to by soft link '%s'\n",
-                 SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME);
+        printf("    failed to open object pointed to by soft link '%s'\n",
+               SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME);
         goto error;
     }
 
@@ -1458,33 +1458,33 @@ test_create_soft_link_long_name(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or soft link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, link, or soft link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, SOFT_LINK_TEST_GROUP_LONG_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_LONG_NAME);
+        printf("    couldn't create container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_LONG_NAME);
         goto error;
     }
 
     if (H5VLget_connector_name(file_id, vol_name, 5) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get VOL connector name\n");
+        printf("    couldn't get VOL connector name\n");
         goto error;
     }
 
@@ -1502,20 +1502,20 @@ test_create_soft_link_long_name(void)
 
     if (H5Lcreate_soft(SOFT_LINK_TEST_LONG_OBJECT_NAME, group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link with a long name\n");
+        printf("    couldn't create soft link with a long name\n");
         goto error;
     }
 
     /* Verify the link has been created */
     if ((link_exists = H5Lexists(group_id, objname, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if the link with a long name exists\n");
+        printf("    couldn't determine if the link with a long name exists\n");
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link did not exist\n");
+        printf("    link did not exist\n");
         goto error;
     }
 
@@ -1569,27 +1569,27 @@ test_create_soft_link_many(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or soft link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, link, or soft link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, SOFT_LINK_TEST_GROUP_MANY_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME);
+        printf("    couldn't create container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME);
         goto error;
     }
 
@@ -1631,13 +1631,13 @@ test_create_soft_link_many(void)
     /* Verify the link has been created */
     if ((link_exists = H5Lexists(group_id, "soft16", H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link 'soft16' exists\n");
+        printf("    couldn't determine if link 'soft16' exists\n");
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link 'soft16' did not exist\n");
+        printf("    link 'soft16' did not exist\n");
         goto error;
     }
 
@@ -1651,19 +1651,19 @@ test_create_soft_link_many(void)
     /* Reopen the file and group and verify the hard link */
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gopen2(container_group, SOFT_LINK_TEST_GROUP_MANY_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME);
+        printf("    couldn't open container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME);
         goto error;
     }
 
@@ -1679,7 +1679,7 @@ test_create_soft_link_many(void)
 
     if (object_id >= 0) {
         H5_FAILED();
-        HDprintf("    opened target of dangling soft link '%s'!\n", SOFT_LINK_TEST_GROUP_MANY_NAME);
+        printf("    opened target of dangling soft link '%s'!\n", SOFT_LINK_TEST_GROUP_MANY_NAME);
         H5Gclose(object_id);
         goto error;
     }
@@ -1687,7 +1687,7 @@ test_create_soft_link_many(void)
     if ((object_id = H5Gcreate2(group_id, SOFT_LINK_TEST_GROUP_MANY_FINAL_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                 H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to create object '%s' for soft link's target\n", SOFT_LINK_TEST_GROUP_MANY_NAME);
+        printf("    failed to create object '%s' for soft link's target\n", SOFT_LINK_TEST_GROUP_MANY_NAME);
         goto error;
     }
 
@@ -1700,19 +1700,19 @@ test_create_soft_link_many(void)
      */
     if ((object_id = H5Gopen2(group_id, "soft16", H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to open object pointed to by soft link '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME);
+        printf("    failed to open object pointed to by soft link '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME);
         goto error;
     }
     /* Check name */
     if (H5Iget_name(object_id, objname, (size_t)SOFT_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get the name of the object 'soft16'\n");
+        printf("    couldn't get the name of the object 'soft16'\n");
         goto error;
     }
 
     if (HDstrcmp(objname, "/" LINK_TEST_GROUP_NAME "/" SOFT_LINK_TEST_GROUP_MANY_NAME "/soft16")) {
         H5_FAILED();
-        HDprintf("    wrong name of the object '%s'\n", objname);
+        printf("    wrong name of the object '%s'\n", objname);
         goto error;
     }
 
@@ -1760,7 +1760,7 @@ test_create_soft_link_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, or soft link aren't supported with this connector\n");
         return 0;
     }
@@ -1769,20 +1769,20 @@ test_create_soft_link_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, SOFT_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", SOFT_LINK_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", SOFT_LINK_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -1803,8 +1803,8 @@ test_create_soft_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created soft link '%s' with an invalid link target!\n",
-                         SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created soft link '%s' with an invalid link target!\n",
+                       SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_soft_invalid_link_target);
             }
 
@@ -1817,8 +1817,8 @@ test_create_soft_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created soft link '%s' with an invalid link target!\n",
-                         SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created soft link '%s' with an invalid link target!\n",
+                       SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_soft_invalid_link_target);
             }
 
@@ -1839,8 +1839,8 @@ test_create_soft_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created soft link '%s' with an invalid link_loc_id!\n",
-                         SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created soft link '%s' with an invalid link_loc_id!\n",
+                       SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_soft_invalid_link_loc_id);
             }
 
@@ -1860,8 +1860,8 @@ test_create_soft_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created soft link '%s' with a NULL link name!\n",
-                         SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created soft link '%s' with a NULL link name!\n",
+                       SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_soft_invalid_link_name);
             }
 
@@ -1873,8 +1873,8 @@ test_create_soft_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created soft link '%s' with an invalid link name of ''!\n",
-                         SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created soft link '%s' with an invalid link name of ''!\n",
+                       SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_soft_invalid_link_name);
             }
 
@@ -1895,8 +1895,8 @@ test_create_soft_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created soft link '%s' with an invalid LCPL!\n",
-                         SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created soft link '%s' with an invalid LCPL!\n",
+                       SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_soft_invalid_lcpl);
             }
 
@@ -1917,8 +1917,8 @@ test_create_soft_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created soft link '%s' with an invalid LAPL!\n",
-                         SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created soft link '%s' with an invalid LAPL!\n",
+                       SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_soft_invalid_lapl);
             }
 
@@ -1934,14 +1934,14 @@ test_create_soft_link_invalid_params(void)
             if ((link_exists = H5Lexists(group_id, SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n",
-                         SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n",
+                       SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_soft_invalid_existence);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' existed!\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    link '%s' existed!\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_soft_invalid_existence);
             }
 
@@ -1995,8 +1995,8 @@ test_create_external_link(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or external link aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, link, or external link aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -2004,7 +2004,7 @@ test_create_external_link(void)
 
     if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+        printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
         goto error;
     }
 
@@ -2013,47 +2013,47 @@ test_create_external_link(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, EXTERNAL_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if (H5Lcreate_external(ext_link_filename, "/", group_id, EXTERNAL_LINK_TEST_LINK_NAME, H5P_DEFAULT,
                            H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create external link '%s'\n", EXTERNAL_LINK_TEST_LINK_NAME);
+        printf("    couldn't create external link '%s'\n", EXTERNAL_LINK_TEST_LINK_NAME);
         goto error;
     }
 
     /* Verify the link has been created */
     if ((link_exists = H5Lexists(group_id, EXTERNAL_LINK_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n", EXTERNAL_LINK_TEST_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", EXTERNAL_LINK_TEST_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link did not exist\n");
+        printf("    link did not exist\n");
         goto error;
     }
 
     if ((root_id = H5Gopen2(group_id, EXTERNAL_LINK_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open root group of other file using external link '%s'\n",
-                 EXTERNAL_LINK_TEST_LINK_NAME);
+        printf("    couldn't open root group of other file using external link '%s'\n",
+               EXTERNAL_LINK_TEST_LINK_NAME);
         goto error;
     }
 
@@ -2103,8 +2103,8 @@ test_create_external_link_dangling(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or external link aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, link, or external link aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -2112,46 +2112,46 @@ test_create_external_link_dangling(void)
 
     if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+        printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
         goto error;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, EXTERNAL_LINK_TEST_DANGLING_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_DANGLING_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_DANGLING_SUBGROUP_NAME);
         goto error;
     }
 
     if (H5Lcreate_external(ext_link_filename, "/" EXTERNAL_LINK_TEST_DANGLING_OBJECT_NAME, group_id,
                            EXTERNAL_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dangling external link '%s'\n", EXTERNAL_LINK_TEST_DANGLING_LINK_NAME);
+        printf("    couldn't create dangling external link '%s'\n", EXTERNAL_LINK_TEST_DANGLING_LINK_NAME);
         goto error;
     }
 
     /* Verify the link has been created */
     if ((link_exists = H5Lexists(group_id, EXTERNAL_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n", EXTERNAL_LINK_TEST_DANGLING_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", EXTERNAL_LINK_TEST_DANGLING_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link did not exist\n");
+        printf("    link did not exist\n");
         goto error;
     }
 
@@ -2163,8 +2163,8 @@ test_create_external_link_dangling(void)
 
     if (object_id >= 0) {
         H5_FAILED();
-        HDprintf("    opened non-existent object in other file using dangling external link '%s'!\n",
-                 EXTERNAL_LINK_TEST_DANGLING_LINK_NAME);
+        printf("    opened non-existent object in other file using dangling external link '%s'!\n",
+               EXTERNAL_LINK_TEST_DANGLING_LINK_NAME);
         H5Gclose(object_id);
         goto error;
     }
@@ -2172,8 +2172,8 @@ test_create_external_link_dangling(void)
     if ((object_id = H5Gcreate2(ext_file_id, EXTERNAL_LINK_TEST_DANGLING_OBJECT_NAME, H5P_DEFAULT,
                                 H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to create object '%s' for external link's target\n",
-                 EXTERNAL_LINK_TEST_DANGLING_OBJECT_NAME);
+        printf("    failed to create object '%s' for external link's target\n",
+               EXTERNAL_LINK_TEST_DANGLING_OBJECT_NAME);
         goto error;
     }
 
@@ -2182,8 +2182,8 @@ test_create_external_link_dangling(void)
 
     if ((object_id = H5Gopen2(group_id, EXTERNAL_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to open object pointed to by external link '%s'\n",
-                 EXTERNAL_LINK_TEST_DANGLING_LINK_NAME);
+        printf("    failed to open object pointed to by external link '%s'\n",
+               EXTERNAL_LINK_TEST_DANGLING_LINK_NAME);
         goto error;
     }
 
@@ -2238,8 +2238,8 @@ test_create_external_link_multi(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or external link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or external link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -2254,52 +2254,51 @@ test_create_external_link_multi(void)
 
             if ((file_id = H5Fcreate(ext_link_filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n",
-                         ext_link_filename1);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename1);
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
             /* Create object down a path */
             if ((group_id = H5Gcreate2(file_id, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create a group\n");
+                printf("    couldn't create a group\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
             if ((group_id = H5Gcreate2(file_id, "A/B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create a group\n");
+                printf("    couldn't create a group\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
             if ((group_id = H5Gcreate2(file_id, "A/B/C", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create a group\n");
+                printf("    couldn't create a group\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
             /* Close file */
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
@@ -2316,27 +2315,26 @@ test_create_external_link_multi(void)
 
             if ((file_id = H5Fcreate(ext_link_filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n",
-                         ext_link_filename2);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename2);
                 PART_ERROR(H5Lcreate_external_second_file);
             }
 
             /* Create object down a path */
             if ((group_id = H5Gcreate2(file_id, "D", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create a group\n");
+                printf("    couldn't create a group\n");
                 PART_ERROR(H5Lcreate_external_second_file);
             }
 
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_second_file);
             }
 
             if ((group_id = H5Gcreate2(file_id, "D/E", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create a group\n");
+                printf("    couldn't create a group\n");
                 PART_ERROR(H5Lcreate_external_second_file);
             }
 
@@ -2344,20 +2342,20 @@ test_create_external_link_multi(void)
             if (H5Lcreate_external(ext_link_filename1, "/A/B/C", group_id, "F", H5P_DEFAULT, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link 'F'\n");
+                printf("    couldn't create external link 'F'\n");
                 PART_ERROR(H5Lcreate_external_second_file);
             }
 
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_second_file);
             }
 
             /* Close file */
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a file\n");
+                printf("    couldn't close a file\n");
                 PART_ERROR(H5Lcreate_external_second_file);
             }
 
@@ -2374,27 +2372,26 @@ test_create_external_link_multi(void)
 
             if ((file_id = H5Fcreate(ext_link_filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n",
-                         ext_link_filename3);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename3);
                 PART_ERROR(H5Lcreate_external_third_file);
             }
 
             /* Create object down a path */
             if ((group_id = H5Gcreate2(file_id, "G", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create a group\n");
+                printf("    couldn't create a group\n");
                 PART_ERROR(H5Lcreate_external_third_file);
             }
 
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_third_file);
             }
 
             if ((group_id = H5Gcreate2(file_id, "G/H", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create a group\n");
+                printf("    couldn't create a group\n");
                 PART_ERROR(H5Lcreate_external_third_file);
             }
 
@@ -2402,20 +2399,20 @@ test_create_external_link_multi(void)
             if (H5Lcreate_external(ext_link_filename2, "/D/E/F", group_id, "I", H5P_DEFAULT, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link 'I'\n");
+                printf("    couldn't create external link 'I'\n");
                 PART_ERROR(H5Lcreate_external_third_file);
             }
 
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_third_file);
             }
 
             /* Close file */
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a file\n");
+                printf("    couldn't close a file\n");
                 PART_ERROR(H5Lcreate_external_third_file);
             }
 
@@ -2429,84 +2426,84 @@ test_create_external_link_multi(void)
 
             if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_filename);
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
             if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
             if ((group_id = H5Gcreate2(container_group, EXTERNAL_LINK_TEST_MULTI_NAME, H5P_DEFAULT,
                                        H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_MULTI_NAME);
+                printf("    couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_MULTI_NAME);
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
             if (H5Lcreate_external(ext_link_filename3, "/G/H/I", group_id, "ext_link", H5P_DEFAULT,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link 'ext_link'\n");
+                printf("    couldn't create external link 'ext_link'\n");
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
             if ((group_id2 = H5Gopen2(group_id, "ext_link", H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open the group that is the external link\n");
+                printf("    couldn't open the group that is the external link\n");
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
             /* Check name */
             if (H5Iget_name(group_id2, objname, (size_t)EXTERNAL_LINK_TEST_MULTI_NAME_BUF_SIZE) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get the name of the object '%s'\n",
-                         HARD_LINK_TEST_GROUP_MANY_FINAL_NAME);
+                printf("    couldn't get the name of the object '%s'\n",
+                       HARD_LINK_TEST_GROUP_MANY_FINAL_NAME);
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
             if (HDstrcmp(objname, "/A/B/C")) {
                 H5_FAILED();
-                HDprintf("    wrong name of the object '%s'\n", objname);
+                printf("    wrong name of the object '%s'\n", objname);
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
             /* Create an object in the external file */
             if ((group_id3 = H5Gcreate2(group_id2, "new_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create a group 'new_group' in the external file\n");
+                printf("    couldn't create a group 'new_group' in the external file\n");
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
             if (H5Gclose(group_id2) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
             if (H5Gclose(group_id3) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a file\n");
+                printf("    couldn't close a file\n");
                 PART_ERROR(H5Lcreate_external_final_file);
             }
 
@@ -2520,38 +2517,38 @@ test_create_external_link_multi(void)
 
             if ((file_id = H5Fopen(ext_link_filename1, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", ext_link_filename1);
+                printf("    couldn't open file '%s'\n", ext_link_filename1);
                 PART_ERROR(H5Lcreate_external_object_created);
             }
 
             if ((group_id = H5Gopen2(file_id, "/A/B/C/new_group", H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open a group 'new_group' in the external file\n");
+                printf("    couldn't open a group 'new_group' in the external file\n");
                 PART_ERROR(H5Lcreate_external_object_created);
             }
 
             /* Check name */
             if (H5Iget_name(group_id, objname, (size_t)EXTERNAL_LINK_TEST_MULTI_NAME_BUF_SIZE) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get the name of the object '/A/B/C/new_group'\n");
+                printf("    couldn't get the name of the object '/A/B/C/new_group'\n");
                 PART_ERROR(H5Lcreate_external_object_created);
             }
 
             if (HDstrcmp(objname, "/A/B/C/new_group")) {
                 H5_FAILED();
-                HDprintf("    wrong name of the object '%s'\n", objname);
+                printf("    wrong name of the object '%s'\n", objname);
                 PART_ERROR(H5Lcreate_external_object_created);
             }
 
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close the group\n");
+                printf("    couldn't close the group\n");
                 PART_ERROR(H5Lcreate_external_object_created);
             }
 
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close the file\n");
+                printf("    couldn't close the file\n");
                 PART_ERROR(H5Lcreate_external_object_created);
             }
 
@@ -2605,8 +2602,8 @@ test_create_external_link_ping_pong(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or external link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or external link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -2622,8 +2619,7 @@ test_create_external_link_ping_pong(void)
             /* Create the first file */
             if ((file_id = H5Fcreate(ext_link_filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n",
-                         ext_link_filename1);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename1);
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
@@ -2631,41 +2627,41 @@ test_create_external_link_ping_pong(void)
             if (H5Lcreate_external(ext_link_filename2, "/link2", file_id, "link1", H5P_DEFAULT, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link\n");
+                printf("    couldn't create external link\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
             if (H5Lcreate_external(ext_link_filename2, "/link4", file_id, "link3", H5P_DEFAULT, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link\n");
+                printf("    couldn't create external link\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
             if (H5Lcreate_external(ext_link_filename2, "/link6", file_id, "link5", H5P_DEFAULT, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link\n");
+                printf("    couldn't create external link\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
             /* Create final object */
             if ((group_id = H5Gcreate2(file_id, "final", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create a group\n");
+                printf("    couldn't create a group\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
             /* Close file */
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_first_file);
             }
 
@@ -2680,7 +2676,7 @@ test_create_external_link_ping_pong(void)
             /* Create the second file */
             if ((file_id = H5Fcreate(ext_link_filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link\n", ext_link_filename2);
+                printf("    couldn't create file '%s' for external link\n", ext_link_filename2);
                 PART_ERROR(H5Lcreate_external_second_file);
             }
 
@@ -2688,28 +2684,28 @@ test_create_external_link_ping_pong(void)
             if (H5Lcreate_external(ext_link_filename1, "/link3", file_id, "link2", H5P_DEFAULT, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link\n");
+                printf("    couldn't create external link\n");
                 PART_ERROR(H5Lcreate_external_second_file);
             }
 
             if (H5Lcreate_external(ext_link_filename1, "/link5", file_id, "link4", H5P_DEFAULT, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link\n");
+                printf("    couldn't create external link\n");
                 PART_ERROR(H5Lcreate_external_second_file);
             }
 
             if (H5Lcreate_external(ext_link_filename1, "/final", file_id, "link6", H5P_DEFAULT, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link\n");
+                printf("    couldn't create external link\n");
                 PART_ERROR(H5Lcreate_external_second_file);
             }
 
             /* Close file */
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close the file\n");
+                printf("    couldn't close the file\n");
                 PART_ERROR(H5Lcreate_external_second_file);
             }
 
@@ -2723,53 +2719,53 @@ test_create_external_link_ping_pong(void)
 
             if ((file_id = H5Fopen(ext_link_filename1, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", ext_link_filename1);
+                printf("    couldn't open file '%s'\n", ext_link_filename1);
                 PART_ERROR(H5Lcreate_external_verify);
             }
 
             /* Open object through external link */
             if ((group_id = H5Gopen2(file_id, "link1", H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open the group that is the external link 'link1'\n");
+                printf("    couldn't open the group that is the external link 'link1'\n");
                 PART_ERROR(H5Lcreate_external_verify);
             }
 
             /* Check the name of the object being pointed to */
             if (H5Iget_name(group_id, objname, (size_t)EXTERNAL_LINK_TEST_PING_PONG_NAME_BUF_SIZE) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get the name of the object\n");
+                printf("    couldn't get the name of the object\n");
                 PART_ERROR(H5Lcreate_external_verify);
             }
 
             if (HDstrcmp(objname, "/final")) {
                 H5_FAILED();
-                HDprintf("    wrong name of the object '%s'\n", objname);
+                printf("    wrong name of the object '%s'\n", objname);
                 PART_ERROR(H5Lcreate_external_verify);
             }
 
             /* Create an object in the external file */
             if ((group_id2 = H5Gcreate2(group_id, "new_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create a new group 'new_group'\n");
+                printf("    couldn't create a new group 'new_group'\n");
                 PART_ERROR(H5Lcreate_external_verify);
             }
 
             if (H5Gclose(group_id2) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_verify);
             }
 
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_verify);
             }
 
             /* Close file */
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close the file\n");
+                printf("    couldn't close the file\n");
                 PART_ERROR(H5Lcreate_external_verify);
             }
 
@@ -2783,40 +2779,40 @@ test_create_external_link_ping_pong(void)
 
             if ((file_id = H5Fopen(ext_link_filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", ext_link_filename1);
+                printf("    couldn't open file '%s'\n", ext_link_filename1);
                 PART_ERROR(H5Lcreate_external_verify_again);
             }
 
             /* Open object through external link */
             if ((group_id = H5Gopen2(file_id, "/final/new_group", H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open the group that is the external link\n");
+                printf("    couldn't open the group that is the external link\n");
                 PART_ERROR(H5Lcreate_external_verify_again);
             }
 
             /* Check the name of the object being pointed to */
             if (H5Iget_name(group_id, objname, (size_t)EXTERNAL_LINK_TEST_PING_PONG_NAME_BUF_SIZE) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get the name of the object\n");
+                printf("    couldn't get the name of the object\n");
                 PART_ERROR(H5Lcreate_external_verify_again);
             }
 
             if (HDstrcmp(objname, "/final/new_group")) {
                 H5_FAILED();
-                HDprintf("    wrong name of the object '%s'\n", objname);
+                printf("    wrong name of the object '%s'\n", objname);
                 PART_ERROR(H5Lcreate_external_verify_again);
             }
 
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close a group\n");
+                printf("    couldn't close a group\n");
                 PART_ERROR(H5Lcreate_external_verify_again);
             }
 
             /* Close file */
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close the file\n");
+                printf("    couldn't close the file\n");
                 PART_ERROR(H5Lcreate_external_verify_again);
             }
 
@@ -2859,8 +2855,8 @@ test_create_external_link_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or external link aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, link, or external link aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -2871,7 +2867,7 @@ test_create_external_link_invalid_params(void)
 
     if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+        printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
         goto error;
     }
 
@@ -2880,21 +2876,20 @@ test_create_external_link_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, EXTERNAL_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 EXTERNAL_LINK_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2915,8 +2910,8 @@ test_create_external_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created external link '%s' using a NULL file name!\n",
-                         EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created external link '%s' using a NULL file name!\n",
+                       EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_external_invalid_file_name);
             }
 
@@ -2929,8 +2924,8 @@ test_create_external_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created external link '%s' using an invalid file name of ''!\n",
-                         EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created external link '%s' using an invalid file name of ''!\n",
+                       EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_external_invalid_file_name);
             }
 
@@ -2952,8 +2947,8 @@ test_create_external_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created external link '%s' using a NULL external object name!\n",
-                         EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created external link '%s' using a NULL external object name!\n",
+                       EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_external_invalid_ext_obj_name);
             }
 
@@ -2967,8 +2962,8 @@ test_create_external_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created external link '%s' using an invalid external object name of ''!\n",
-                         EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created external link '%s' using an invalid external object name of ''!\n",
+                       EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_external_invalid_ext_obj_name);
             }
 
@@ -2990,8 +2985,8 @@ test_create_external_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created external link '%s' using an invalid link_loc_id!\n",
-                         EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created external link '%s' using an invalid link_loc_id!\n",
+                       EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_external_invalid_link_loc_id);
             }
 
@@ -3012,8 +3007,8 @@ test_create_external_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created external link '%s' using a NULL link_loc_id!\n",
-                         EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created external link '%s' using a NULL link_loc_id!\n",
+                       EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_external_invalid_link_name);
             }
 
@@ -3025,8 +3020,8 @@ test_create_external_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created external link '%s' using an invalid link name of ''!\n",
-                         EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created external link '%s' using an invalid link name of ''!\n",
+                       EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_external_invalid_link_name);
             }
 
@@ -3048,8 +3043,8 @@ test_create_external_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created external link '%s' using an invalid LCPL!\n",
-                         EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created external link '%s' using an invalid LCPL!\n",
+                       EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_external_invalid_lcpl);
             }
 
@@ -3071,8 +3066,8 @@ test_create_external_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created external link '%s' using an invalid LAPL!\n",
-                         EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created external link '%s' using an invalid LAPL!\n",
+                       EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_external_invalid_lapl);
             }
 
@@ -3088,14 +3083,14 @@ test_create_external_link_invalid_params(void)
             if ((link_exists =
                      H5Lexists(group_id, EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n",
-                         EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n",
+                       EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_external_invalid_existence);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' existed!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    link '%s' existed!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_external_invalid_existence);
             }
 
@@ -3148,7 +3143,7 @@ test_create_user_defined_link(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, link, or user-defined link aren't supported with this "
             "connector\n");
         return 0;
@@ -3156,20 +3151,20 @@ test_create_user_defined_link(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, UD_LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", UD_LINK_TEST_GROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", UD_LINK_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -3179,20 +3174,20 @@ test_create_user_defined_link(void)
     if (H5Lcreate_ud(group_id, UD_LINK_TEST_LINK_NAME, H5L_TYPE_EXTERNAL, udata, (size_t)udata_size,
                      H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create user-defined link '%s'\n", UD_LINK_TEST_LINK_NAME);
+        printf("    couldn't create user-defined link '%s'\n", UD_LINK_TEST_LINK_NAME);
         goto error;
     }
 
     /* Verify the link has been created */
     if ((link_exists = H5Lexists(group_id, UD_LINK_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n", UD_LINK_TEST_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", UD_LINK_TEST_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link '%s' didn't exist!\n", UD_LINK_TEST_LINK_NAME);
+        printf("    link '%s' didn't exist!\n", UD_LINK_TEST_LINK_NAME);
         goto error;
     }
 
@@ -3239,8 +3234,8 @@ test_create_user_defined_link_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or user-defined link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, or user-defined link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -3248,20 +3243,20 @@ test_create_user_defined_link_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, UD_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", UD_LINK_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", UD_LINK_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -3286,8 +3281,8 @@ test_create_user_defined_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created user-defined link '%s' with an invalid link location ID!\n",
-                         UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created user-defined link '%s' with an invalid link location ID!\n",
+                       UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_ud_invalid_link_loc_id);
             }
 
@@ -3308,8 +3303,8 @@ test_create_user_defined_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created user-defined link '%s' with a NULL link name!\n",
-                         UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created user-defined link '%s' with a NULL link name!\n",
+                       UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_ud_invalid_link_name);
             }
 
@@ -3322,8 +3317,8 @@ test_create_user_defined_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created user-defined link '%s' with an invalid link name of ''!\n",
-                         UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created user-defined link '%s' with an invalid link name of ''!\n",
+                       UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_ud_invalid_link_name);
             }
 
@@ -3344,8 +3339,8 @@ test_create_user_defined_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created user-defined link '%s' with an invalid link type!\n",
-                         UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created user-defined link '%s' with an invalid link type!\n",
+                       UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_ud_invalid_link_type);
             }
 
@@ -3366,8 +3361,8 @@ test_create_user_defined_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created user-defined link '%s' with an invalid udata pointer!\n",
-                         UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created user-defined link '%s' with an invalid udata pointer!\n",
+                       UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_ud_invalid_udata_pointer);
             }
 
@@ -3388,8 +3383,8 @@ test_create_user_defined_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created user-defined link '%s' with an invalid LCPL!\n",
-                         UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created user-defined link '%s' with an invalid LCPL!\n",
+                       UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_ud_invalid_lcpl);
             }
 
@@ -3410,8 +3405,8 @@ test_create_user_defined_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    created user-defined link '%s' with an invalid LAPL!\n",
-                         UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    created user-defined link '%s' with an invalid LAPL!\n",
+                       UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_ud_invalid_lapl);
             }
 
@@ -3426,14 +3421,13 @@ test_create_user_defined_link_invalid_params(void)
             /* Verify the link hasn't been created */
             if ((link_exists = H5Lexists(group_id, UD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n",
-                         UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_ud_invalid_existence);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' existed!\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
+                printf("    link '%s' existed!\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME);
                 PART_ERROR(H5Lcreate_ud_invalid_existence);
             }
 
@@ -3491,8 +3485,8 @@ test_delete_link(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, hard link, soft link, or external link "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, hard link, soft link, or external link "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -3500,26 +3494,26 @@ test_delete_link(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for link creation order tracking\n");
+        printf("    couldn't create GCPL for link creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set link creation order tracking\n");
+            printf("    couldn't set link creation order tracking\n");
             goto error;
         }
     }
@@ -3527,7 +3521,7 @@ test_delete_link(void)
     if ((group_id = H5Gcreate2(container_group, LINK_DELETE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -3542,53 +3536,53 @@ test_delete_link(void)
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME);
                 PART_ERROR(H5Ldelete_hard);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create first hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't create first hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_hard);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if first hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if first hard link '%s' exists\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_hard);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    first hard link did not exist\n");
+                printf("    first hard link did not exist\n");
                 PART_ERROR(H5Ldelete_hard);
             }
 
             if (H5Ldelete(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't delete hard link '%s' using H5Ldelete\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_hard);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if first hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if first hard link '%s' exists\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_hard);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    first hard link exists!\n");
+                printf("    first hard link exists!\n");
                 PART_ERROR(H5Ldelete_hard);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME);
                 PART_ERROR(H5Ldelete_hard);
             }
 
@@ -3610,66 +3604,66 @@ test_delete_link(void)
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_NESTED_SUBGROUP_NAME1, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_NESTED_SUBGROUP_NAME1);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_NESTED_SUBGROUP_NAME1);
                 PART_ERROR(H5Ldelete_hard_indirect);
             }
 
             if ((nested_grp_id = H5Gcreate2(subgroup_id, LINK_DELETE_TEST_NESTED_GRP_NAME, H5P_DEFAULT,
                                             gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_NESTED_GRP_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_NESTED_GRP_NAME);
                 PART_ERROR(H5Ldelete_hard_indirect);
             }
 
             if (H5Lcreate_hard(nested_grp_id, ".", nested_grp_id, LINK_DELETE_TEST_HARD_LINK_NAME,
                                H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create first hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't create first hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_hard_indirect);
             }
 
             if ((link_exists = H5Lexists(nested_grp_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if first hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if first hard link '%s' exists\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_hard_indirect);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    first hard link did not exist\n");
+                printf("    first hard link did not exist\n");
                 PART_ERROR(H5Ldelete_hard_indirect);
             }
 
             if (H5Ldelete(subgroup_id, LINK_DELETE_TEST_NESTED_HARD_LINK_NAME, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete\n",
-                         LINK_DELETE_TEST_NESTED_HARD_LINK_NAME);
+                printf("    couldn't delete hard link '%s' using H5Ldelete\n",
+                       LINK_DELETE_TEST_NESTED_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_hard_indirect);
             }
 
             if ((link_exists = H5Lexists(nested_grp_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if first hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if first hard link '%s' exists\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_hard_indirect);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    first hard link exists!\n");
+                printf("    first hard link exists!\n");
                 PART_ERROR(H5Ldelete_hard_indirect);
             }
 
             if (H5Gclose(nested_grp_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_NESTED_GRP_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_NESTED_GRP_NAME);
                 PART_ERROR(H5Ldelete_hard_indirect);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME);
                 PART_ERROR(H5Ldelete_hard_indirect);
             }
 
@@ -3693,7 +3687,7 @@ test_delete_link(void)
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP2_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP2_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP2_NAME);
                 PART_ERROR(H5Ldelete_soft);
             }
 
@@ -3701,46 +3695,46 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP2_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create first soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create first soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_soft);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if first soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if first soft link '%s' exists\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_soft);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    first soft link did not exist\n");
+                printf("    first soft link did not exist\n");
                 PART_ERROR(H5Ldelete_soft);
             }
 
             if (H5Ldelete(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't delete soft link '%s' using H5Ldelete\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_soft);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if first soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if first soft link '%s' exists\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_soft);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    first soft link exists!\n");
+                printf("    first soft link exists!\n");
                 PART_ERROR(H5Ldelete_soft);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP2_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP2_NAME);
                 PART_ERROR(H5Ldelete_soft);
             }
 
@@ -3764,69 +3758,68 @@ test_delete_link(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Ldelete_external);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Ldelete_external);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP3_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP3_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP3_NAME);
                 PART_ERROR(H5Ldelete_external);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create first external link '%s'\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't create first external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_external);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if first external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if first external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_external);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    first external link did not exist\n");
+                printf("    first external link did not exist\n");
                 PART_ERROR(H5Ldelete_external);
             }
 
             if (H5Ldelete(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't delete external link '%s' using H5Ldelete\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_external);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if first external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if first external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_external);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    first external link exists!\n");
+                printf("    first external link exists!\n");
                 PART_ERROR(H5Ldelete_external);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP3_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP3_NAME);
                 PART_ERROR(H5Ldelete_external);
             }
 
@@ -3867,14 +3860,14 @@ test_delete_link(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP5_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP5_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP5_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
@@ -3882,217 +3875,204 @@ test_delete_link(void)
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             /* Delete a link */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             /* Ensure that the link is gone and others remain */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             /* Repeat until all links have been deleted */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP5_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP5_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing);
             }
 
@@ -4113,14 +4093,14 @@ test_delete_link(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP6_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP6_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP6_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
@@ -4128,217 +4108,204 @@ test_delete_link(void)
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             /* Delete a link */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             /* Ensure that the link is gone and others remain */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             /* Repeat until all links have been deleted */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP6_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP6_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing);
             }
 
@@ -4360,7 +4327,7 @@ test_delete_link(void)
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP7_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP7_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP7_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
@@ -4368,217 +4335,204 @@ test_delete_link(void)
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             /* Delete a link */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             /* Ensure that the link is gone and others remain */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             /* Repeat until all links have been deleted */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP7_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP7_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing);
             }
 
@@ -4600,7 +4554,7 @@ test_delete_link(void)
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP8_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP8_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP8_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
@@ -4608,217 +4562,204 @@ test_delete_link(void)
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             /* Delete a link */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             /* Ensure that the link is gone and others remain */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             /* Repeat until all links have been deleted */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP8_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP8_NAME);
                 PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing);
             }
 
@@ -4839,14 +4780,14 @@ test_delete_link(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP9_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP9_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP9_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
@@ -4855,7 +4796,7 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP9_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
@@ -4863,7 +4804,7 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP9_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
@@ -4871,203 +4812,190 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP9_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             /* Delete a link */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             /* Ensure that the link is gone and others remain */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             /* Repeat until all links have been deleted */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP9_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP9_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing);
             }
 
@@ -5088,14 +5016,14 @@ test_delete_link(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP10_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP10_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP10_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
@@ -5104,7 +5032,7 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP10_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
@@ -5112,7 +5040,7 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP10_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
@@ -5120,203 +5048,190 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP10_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             /* Delete a link */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             /* Ensure that the link is gone and others remain */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             /* Repeat until all links have been deleted */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP10_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP10_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing);
             }
 
@@ -5338,7 +5253,7 @@ test_delete_link(void)
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP11_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP11_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP11_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
@@ -5347,7 +5262,7 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP11_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
@@ -5355,7 +5270,7 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP11_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
@@ -5363,203 +5278,190 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP11_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             /* Delete a link */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             /* Ensure that the link is gone and others remain */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             /* Repeat until all links have been deleted */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP11_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP11_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing);
             }
 
@@ -5581,7 +5483,7 @@ test_delete_link(void)
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP12_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP12_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP12_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
@@ -5590,7 +5492,7 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP12_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
@@ -5598,7 +5500,7 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP12_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
@@ -5606,203 +5508,190 @@ test_delete_link(void)
                                "/" LINK_DELETE_TEST_SUBGROUP12_NAME,
                                subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             /* Delete a link */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             /* Ensure that the link is gone and others remain */
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             /* Repeat until all links have been deleted */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP12_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP12_NAME);
                 PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing);
             }
 
@@ -5823,7 +5712,7 @@ test_delete_link(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
@@ -5833,20 +5722,20 @@ test_delete_link(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP13_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP13_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP13_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
@@ -5854,21 +5743,21 @@ test_delete_link(void)
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
@@ -5876,54 +5765,54 @@ test_delete_link(void)
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             /* Delete a link */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
@@ -5931,158 +5820,158 @@ test_delete_link(void)
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             /* Repeat until all links have been deleted */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in "
-                         "increasing order\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in "
+                       "increasing order\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP13_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP13_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing);
             }
 
@@ -6105,7 +5994,7 @@ test_delete_link(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
@@ -6115,20 +6004,20 @@ test_delete_link(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP14_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP14_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP14_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
@@ -6136,21 +6025,21 @@ test_delete_link(void)
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
@@ -6158,54 +6047,54 @@ test_delete_link(void)
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             /* Delete a link */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
@@ -6213,158 +6102,158 @@ test_delete_link(void)
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             /* Repeat until all links have been deleted */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in "
-                         "decreasing order\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in "
+                       "decreasing order\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP14_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP14_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing);
             }
 
@@ -6391,20 +6280,20 @@ test_delete_link(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP15_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP15_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP15_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
@@ -6412,21 +6301,21 @@ test_delete_link(void)
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
@@ -6434,54 +6323,54 @@ test_delete_link(void)
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             /* Delete a link */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical "
-                         "order in increasing order\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical "
+                       "order in increasing order\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
@@ -6489,158 +6378,158 @@ test_delete_link(void)
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             /* Repeat until all links have been deleted */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical "
-                         "order in increasing order\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical "
+                       "order in increasing order\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical "
-                         "order in increasing order\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical "
+                       "order in increasing order\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP15_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP15_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing);
             }
 
@@ -6667,20 +6556,20 @@ test_delete_link(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP16_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP16_NAME);
+                printf("    couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP16_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
@@ -6688,21 +6577,21 @@ test_delete_link(void)
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
@@ -6710,54 +6599,54 @@ test_delete_link(void)
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist before deletion\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             /* Delete a link */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical "
-                         "order in decreasing order\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical "
+                       "order in decreasing order\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
@@ -6765,158 +6654,158 @@ test_delete_link(void)
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             /* Repeat until all links have been deleted */
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical "
-                         "order in decreasing order\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical "
+                       "order in decreasing order\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist after deletion of a different link!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist after deletion of a different link!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical "
-                         "order in decreasing order\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical "
+                       "order in decreasing order\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' exists after deletion!\n",
-                         LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' exists after deletion!\n",
+                       LINK_DELETE_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP16_NAME);
+                printf("    failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP16_NAME);
                 PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing);
             }
 
@@ -7060,8 +6949,8 @@ test_delete_link_reset_grp_max_crt_order(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or creation order "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, or creation order "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -7069,33 +6958,33 @@ test_delete_link_reset_grp_max_crt_order(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for link creation order tracking\n");
+        printf("    couldn't create GCPL for link creation order tracking\n");
         goto error;
     }
 
     if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't set link creation order tracking\n");
+        printf("    couldn't set link creation order tracking\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME,
                                H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -7110,8 +6999,8 @@ test_delete_link_reset_grp_max_crt_order(void)
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP1_NAME,
                                           H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n",
-                         LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP1_NAME);
+                printf("    couldn't create subgroup '%s'\n",
+                       LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP1_NAME);
                 PART_ERROR(H5Ldelete_links_bottom_up);
             }
 
@@ -7121,7 +7010,7 @@ test_delete_link_reset_grp_max_crt_order(void)
 
                 if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create hard link '%s'\n", link_name);
+                    printf("    couldn't create hard link '%s'\n", link_name);
                     PART_ERROR(H5Ldelete_links_bottom_up);
                 }
             }
@@ -7132,15 +7021,15 @@ test_delete_link_reset_grp_max_crt_order(void)
 
                 if (H5Gget_info(subgroup_id, &grp_info) < 0) {
                     H5_FAILED();
-                    HDprintf("    failed to retrieve group's info\n");
+                    printf("    failed to retrieve group's info\n");
                     PART_ERROR(H5Ldelete_links_bottom_up);
                 }
 
                 if (grp_info.max_corder != LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS) {
                     H5_FAILED();
-                    HDprintf("    group's maximum creation order value got adjusted to %lld during link "
-                             "deletion; value should have remained at %d\n",
-                             (long long)grp_info.max_corder, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS);
+                    printf("    group's maximum creation order value got adjusted to %lld during link "
+                           "deletion; value should have remained at %d\n",
+                           (long long)grp_info.max_corder, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS);
                     PART_ERROR(H5Ldelete_links_bottom_up);
                 }
 
@@ -7148,7 +7037,7 @@ test_delete_link_reset_grp_max_crt_order(void)
 
                 if (H5Ldelete(subgroup_id, link_name, H5P_DEFAULT) < 0) {
                     H5_FAILED();
-                    HDprintf("    failed to delete link '%s'\n", link_name);
+                    printf("    failed to delete link '%s'\n", link_name);
                     PART_ERROR(H5Ldelete_links_bottom_up);
                 }
             }
@@ -7159,15 +7048,15 @@ test_delete_link_reset_grp_max_crt_order(void)
 
             if (H5Gget_info(subgroup_id, &grp_info) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve group's info\n");
+                printf("    failed to retrieve group's info\n");
                 PART_ERROR(H5Ldelete_links_bottom_up);
             }
 
             if (grp_info.max_corder != 0) {
                 H5_FAILED();
-                HDprintf("    group's maximum creation order value didn't reset to 0 after deleting all "
-                         "links from group; value is still %lld\n",
-                         (long long)grp_info.max_corder);
+                printf("    group's maximum creation order value didn't reset to 0 after deleting all "
+                       "links from group; value is still %lld\n",
+                       (long long)grp_info.max_corder);
                 PART_ERROR(H5Ldelete_links_bottom_up);
             }
 
@@ -7189,8 +7078,8 @@ test_delete_link_reset_grp_max_crt_order(void)
             if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP2_NAME,
                                           H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n",
-                         LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP2_NAME);
+                printf("    couldn't create subgroup '%s'\n",
+                       LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP2_NAME);
                 PART_ERROR(H5Ldelete_links_top_down);
             }
 
@@ -7200,7 +7089,7 @@ test_delete_link_reset_grp_max_crt_order(void)
 
                 if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create hard link '%s'\n", link_name);
+                    printf("    couldn't create hard link '%s'\n", link_name);
                     PART_ERROR(H5Ldelete_links_top_down);
                 }
             }
@@ -7211,15 +7100,15 @@ test_delete_link_reset_grp_max_crt_order(void)
 
                 if (H5Gget_info(subgroup_id, &grp_info) < 0) {
                     H5_FAILED();
-                    HDprintf("    failed to retrieve group's info\n");
+                    printf("    failed to retrieve group's info\n");
                     PART_ERROR(H5Ldelete_links_top_down);
                 }
 
                 if (grp_info.max_corder != LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS) {
                     H5_FAILED();
-                    HDprintf("    group's maximum creation order value got adjusted to %lld during link "
-                             "deletion; value should have remained at %d\n",
-                             (long long)grp_info.max_corder, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS);
+                    printf("    group's maximum creation order value got adjusted to %lld during link "
+                           "deletion; value should have remained at %d\n",
+                           (long long)grp_info.max_corder, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS);
                     PART_ERROR(H5Ldelete_links_top_down);
                 }
 
@@ -7228,7 +7117,7 @@ test_delete_link_reset_grp_max_crt_order(void)
 
                 if (H5Ldelete(subgroup_id, link_name, H5P_DEFAULT) < 0) {
                     H5_FAILED();
-                    HDprintf("    failed to delete link '%s'\n", link_name);
+                    printf("    failed to delete link '%s'\n", link_name);
                     PART_ERROR(H5Ldelete_links_top_down);
                 }
             }
@@ -7239,15 +7128,15 @@ test_delete_link_reset_grp_max_crt_order(void)
 
             if (H5Gget_info(subgroup_id, &grp_info) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve group's info\n");
+                printf("    failed to retrieve group's info\n");
                 PART_ERROR(H5Ldelete_links_top_down);
             }
 
             if (grp_info.max_corder != 0) {
                 H5_FAILED();
-                HDprintf("    group's maximum creation order value didn't reset to 0 after deleting all "
-                         "links from group; value is still %lld\n",
-                         (long long)grp_info.max_corder);
+                printf("    group's maximum creation order value didn't reset to 0 after deleting all "
+                       "links from group; value is still %lld\n",
+                       (long long)grp_info.max_corder);
                 PART_ERROR(H5Ldelete_links_top_down);
             }
 
@@ -7308,8 +7197,8 @@ test_delete_link_invalid_params(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_BY_IDX) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, flag by index, or hard link aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, link, flag by index, or hard link aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -7317,27 +7206,27 @@ test_delete_link_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, LINK_DELETE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", LINK_DELETE_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", LINK_DELETE_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
     if (H5Lcreate_hard(group_id, ".", group_id, LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                        H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create hard link '%s'\n", LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+        printf("    couldn't create hard link '%s'\n", LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
@@ -7345,14 +7234,14 @@ test_delete_link_invalid_params(void)
     if ((link_exists = H5Lexists(group_id, LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if first hard link '%s' exists\n",
-                 LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+        printf("    couldn't determine if first hard link '%s' exists\n",
+               LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    first hard link did not exist\n");
+        printf("    first hard link did not exist\n");
         goto error;
     }
 
@@ -7373,7 +7262,7 @@ test_delete_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ldelete succeeded with an invalid location ID!\n");
+                printf("    H5Ldelete succeeded with an invalid location ID!\n");
                 PART_ERROR(H5Ldelete_invalid_loc_id);
             }
 
@@ -7393,7 +7282,7 @@ test_delete_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ldelete succeeded with a NULL link name!\n");
+                printf("    H5Ldelete succeeded with a NULL link name!\n");
                 PART_ERROR(H5Ldelete_invalid_link_name);
             }
 
@@ -7405,7 +7294,7 @@ test_delete_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ldelete succeeded with an invalid link name of ''!\n");
+                printf("    H5Ldelete succeeded with an invalid link name of ''!\n");
                 PART_ERROR(H5Ldelete_invalid_link_name);
             }
 
@@ -7426,7 +7315,7 @@ test_delete_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ldelete succeeded with an invalid LAPL!\n");
+                printf("    H5Ldelete succeeded with an invalid LAPL!\n");
                 PART_ERROR(H5Ldelete_invalid_lapl);
             }
 
@@ -7446,7 +7335,7 @@ test_delete_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ldelete_by_idx succeeded with an invalid location ID!\n");
+                printf("    H5Ldelete_by_idx succeeded with an invalid location ID!\n");
                 PART_ERROR(H5Ldelete_by_idx_invalid_loc_id);
             }
 
@@ -7466,7 +7355,7 @@ test_delete_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ldelete_by_idx succeeded with a NULL group name!\n");
+                printf("    H5Ldelete_by_idx succeeded with a NULL group name!\n");
                 PART_ERROR(H5Ldelete_by_idx_invalid_grp_name);
             }
 
@@ -7478,7 +7367,7 @@ test_delete_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ldelete_by_idx succeeded with an invalid group name of ''!\n");
+                printf("    H5Ldelete_by_idx succeeded with an invalid group name of ''!\n");
                 PART_ERROR(H5Ldelete_by_idx_invalid_grp_name);
             }
 
@@ -7498,7 +7387,7 @@ test_delete_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ldelete_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
+                printf("    H5Ldelete_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Ldelete_by_idx_invalid_index_type);
             }
 
@@ -7510,7 +7399,7 @@ test_delete_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ldelete_by_idx succeeded with invalid index type H5_INDEX_N!\n");
+                printf("    H5Ldelete_by_idx succeeded with invalid index type H5_INDEX_N!\n");
                 PART_ERROR(H5Ldelete_by_idx_invalid_index_type);
             }
 
@@ -7530,7 +7419,7 @@ test_delete_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ldelete_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
+                printf("    H5Ldelete_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Ldelete_by_idx_invalid_index_order);
             }
 
@@ -7542,7 +7431,7 @@ test_delete_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ldelete_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n");
+                printf("    H5Ldelete_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n");
                 PART_ERROR(H5Ldelete_by_idx_invalid_index_order);
             }
 
@@ -7562,7 +7451,7 @@ test_delete_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ldelete_by_idx succeeded with an invalid LAPL!\n");
+                printf("    H5Ldelete_by_idx succeeded with an invalid LAPL!\n");
                 PART_ERROR(H5Ldelete_by_idx_invalid_lapl);
             }
 
@@ -7578,14 +7467,14 @@ test_delete_link_invalid_params(void)
             if ((link_exists =
                      H5Lexists(group_id, LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Ldelete_by_idx_link_existence);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link didn't exist!\n");
+                printf("    hard link didn't exist!\n");
                 PART_ERROR(H5Ldelete_by_idx_link_existence);
             }
 
@@ -7640,9 +7529,8 @@ test_copy_link(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, link, hard link, soft link, or external link aren't "
-            "supported with this connector\n");
+        printf("    API functions for basic file, group, link, hard link, soft link, or external link aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -7650,34 +7538,34 @@ test_copy_link(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s\n", H5_api_test_filename);
+        printf("    couldn't open file '%s\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't opewn container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't opewn container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, COPY_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", COPY_LINK_TEST_SUBGROUP_NAME);
+        printf("    couldn't create group '%s'\n", COPY_LINK_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((src_grp_id = H5Gcreate2(group_id, COPY_LINK_TEST_SRC_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                  H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", COPY_LINK_TEST_SRC_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", COPY_LINK_TEST_SRC_GROUP_NAME);
         goto error;
     }
 
     if ((dst_grp_id = H5Gcreate2(group_id, COPY_LINK_TEST_DST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                  H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", COPY_LINK_TEST_DST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", COPY_LINK_TEST_DST_GROUP_NAME);
         goto error;
     }
 
@@ -7693,33 +7581,33 @@ test_copy_link(void)
             if (H5Lcreate_hard(group_id, ".", src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME);
+                printf("    couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lcopy_hard_no_check);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lcopy_hard_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link did not exist\n");
+                printf("    hard link did not exist\n");
                 PART_ERROR(H5Lcopy_hard_no_check);
             }
 
             /* Verify the link doesn't currently exist in the target group */
             if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lcopy_hard_no_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link existed in target group before copy!\n");
+                printf("    hard link existed in target group before copy!\n");
                 PART_ERROR(H5Lcopy_hard_no_check);
             }
 
@@ -7727,34 +7615,34 @@ test_copy_link(void)
             if (H5Lcopy(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, dst_grp_id,
                         COPY_LINK_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME);
+                printf("    failed to copy hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lcopy_hard_no_check);
             }
 
             /* Verify the link has been copied and still exists in the source group */
             if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link copy '%s' exists\n",
-                         COPY_LINK_TEST_HARD_LINK_COPY_NAME);
+                printf("    couldn't determine if hard link copy '%s' exists\n",
+                       COPY_LINK_TEST_HARD_LINK_COPY_NAME);
                 PART_ERROR(H5Lcopy_hard_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link copy did not exist\n");
+                printf("    hard link copy did not exist\n");
                 PART_ERROR(H5Lcopy_hard_no_check);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if original hard link '%s' exists\n",
-                         COPY_LINK_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if original hard link '%s' exists\n",
+                       COPY_LINK_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lcopy_hard_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original hard link did not exist\n");
+                printf("    original hard link did not exist\n");
                 PART_ERROR(H5Lcopy_hard_no_check);
             }
 
@@ -7773,40 +7661,40 @@ test_copy_link(void)
             if (H5Lcreate_hard(group_id, ".", src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2);
+                printf("    couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link did not exist\n");
+                printf("    hard link did not exist\n");
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             /* Retrieve the link's info */
             if (H5Lget_info2(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2);
+                printf("    couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             /* Verify the link doesn't currently exist in the target group */
             if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link existed in target group before copy!\n");
+                printf("    hard link existed in target group before copy!\n");
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
@@ -7814,83 +7702,83 @@ test_copy_link(void)
             if (H5Lcopy(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, dst_grp_id,
                         COPY_LINK_TEST_HARD_LINK_COPY_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2);
+                printf("    failed to copy hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             /* Verify the link has been copied and still exists in the source group */
             if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link copy '%s' exists\n",
-                         COPY_LINK_TEST_HARD_LINK_COPY_NAME2);
+                printf("    couldn't determine if hard link copy '%s' exists\n",
+                       COPY_LINK_TEST_HARD_LINK_COPY_NAME2);
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link copy did not exist\n");
+                printf("    hard link copy did not exist\n");
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if original hard link '%s' exists\n",
-                         COPY_LINK_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if original hard link '%s' exists\n",
+                       COPY_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original hard link did not exist\n");
+                printf("    original hard link did not exist\n");
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             /* Retrieve the new link's info */
             if (H5Lget_info2(dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME2, &new_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_HARD_LINK_COPY_NAME2);
+                printf("    couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_HARD_LINK_COPY_NAME2);
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             if (new_info.type != orig_info.type) {
                 H5_FAILED();
-                HDprintf("    copied link's link type doesn't match original link's type\n");
+                printf("    copied link's link type doesn't match original link's type\n");
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             if (H5Otoken_cmp(dst_grp_id, &new_info.u.token, &orig_info.u.token, &cmp_value) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to compare link target tokens\n");
+                printf("    failed to compare link target tokens\n");
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             if (cmp_value != 0) {
                 H5_FAILED();
-                HDprintf("    copied hard link's object token doesn't match original link's object token\n");
+                printf("    copied hard link's object token doesn't match original link's object token\n");
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (new_info.corder_valid != orig_info.corder_valid) {
                     H5_FAILED();
-                    HDprintf("    copied link's 'corder_valid' field doesn't match original link's "
-                             "'corder_valid' field\n");
+                    printf("    copied link's 'corder_valid' field doesn't match original link's "
+                           "'corder_valid' field\n");
                     PART_ERROR(H5Lcopy_hard_check);
                 }
 
                 if (new_info.corder_valid && orig_info.corder_valid &&
                     (new_info.corder != orig_info.corder)) {
                     H5_FAILED();
-                    HDprintf("    copied link's creation order value %" PRId64
-                             " doesn't match original link's creation order value %" PRId64 "\n",
-                             new_info.corder, orig_info.corder);
+                    printf("    copied link's creation order value %" PRId64
+                           " doesn't match original link's creation order value %" PRId64 "\n",
+                           new_info.corder, orig_info.corder);
                     PART_ERROR(H5Lcopy_hard_check);
                 }
             }
 
             if (new_info.cset != orig_info.cset) {
                 H5_FAILED();
-                HDprintf("    copied link's character set doesn't match original link's character set\n");
+                printf("    copied link's character set doesn't match original link's character set\n");
                 PART_ERROR(H5Lcopy_hard_check);
             }
 
@@ -7906,20 +7794,20 @@ test_copy_link(void)
             if (H5Lcreate_hard(group_id, ".", src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME3);
+                printf("    couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link did not exist\n");
+                printf("    hard link did not exist\n");
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
@@ -7927,28 +7815,28 @@ test_copy_link(void)
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link existed in target group before copy!\n");
+                printf("    hard link existed in target group before copy!\n");
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2);
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link existed in target group before copy!\n");
+                printf("    hard link existed in target group before copy!\n");
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
@@ -7956,9 +7844,8 @@ test_copy_link(void)
             if (H5Lcopy(H5L_SAME_LOC, COPY_LINK_TEST_HARD_LINK_NAME3, src_grp_id,
                         COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    failed to copy hard link '%s' using H5L_SAME_LOC as first parameter to H5Lcopy\n",
-                    COPY_LINK_TEST_HARD_LINK_NAME3);
+                printf("    failed to copy hard link '%s' using H5L_SAME_LOC as first parameter to H5Lcopy\n",
+                       COPY_LINK_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
@@ -7966,9 +7853,8 @@ test_copy_link(void)
             if (H5Lcopy(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME3, H5L_SAME_LOC,
                         COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    failed to copy hard link '%s' using H5L_SAME_LOC as third parameter to H5Lcopy\n",
-                    COPY_LINK_TEST_HARD_LINK_NAME3);
+                printf("    failed to copy hard link '%s' using H5L_SAME_LOC as third parameter to H5Lcopy\n",
+                       COPY_LINK_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
@@ -7976,41 +7862,41 @@ test_copy_link(void)
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link copy '%s' exists\n",
-                         COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if hard link copy '%s' exists\n",
+                       COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link copy did not exist\n");
+                printf("    hard link copy did not exist\n");
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link copy '%s' exists\n",
-                         COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2);
+                printf("    couldn't determine if hard link copy '%s' exists\n",
+                       COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2);
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link copy did not exist\n");
+                printf("    hard link copy did not exist\n");
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if original hard link '%s' exists\n",
-                         COPY_LINK_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if original hard link '%s' exists\n",
+                       COPY_LINK_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original hard link did not exist\n");
+                printf("    original hard link did not exist\n");
                 PART_ERROR(H5Lcopy_hard_same_loc);
             }
 
@@ -8026,33 +7912,33 @@ test_copy_link(void)
             if (H5Lcreate_soft(COPY_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id,
                                COPY_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lcopy_soft_no_check);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lcopy_soft_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link did not exist\n");
+                printf("    soft link did not exist\n");
                 PART_ERROR(H5Lcopy_soft_no_check);
             }
 
             /* Verify the link doesn't currently exist in the target group */
             if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lcopy_soft_no_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link existed in target group before copy!\n");
+                printf("    soft link existed in target group before copy!\n");
                 PART_ERROR(H5Lcopy_soft_no_check);
             }
 
@@ -8060,34 +7946,34 @@ test_copy_link(void)
             if (H5Lcopy(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, dst_grp_id,
                         COPY_LINK_TEST_SOFT_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME);
+                printf("    failed to copy soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lcopy_soft_no_check);
             }
 
             /* Verify the link has been copied and still exists in the source group */
             if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' copy exists\n",
-                         COPY_LINK_TEST_SOFT_LINK_COPY_NAME);
+                printf("    couldn't determine if soft link '%s' copy exists\n",
+                       COPY_LINK_TEST_SOFT_LINK_COPY_NAME);
                 PART_ERROR(H5Lcopy_soft_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link copy did not exist\n");
+                printf("    soft link copy did not exist\n");
                 PART_ERROR(H5Lcopy_soft_no_check);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if original soft link '%s' exists\n",
-                         COPY_LINK_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if original soft link '%s' exists\n",
+                       COPY_LINK_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lcopy_soft_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original soft link did not exist\n");
+                printf("    original soft link did not exist\n");
                 PART_ERROR(H5Lcopy_soft_no_check);
             }
 
@@ -8107,27 +7993,27 @@ test_copy_link(void)
             if (H5Lcreate_soft(COPY_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id,
                                COPY_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link did not exist\n");
+                printf("    soft link did not exist\n");
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             /* Retrieve the link's info */
             if (H5Lget_info2(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
@@ -8135,20 +8021,20 @@ test_copy_link(void)
             if (H5Lget_val(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, orig_link_val,
                            COPY_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve value for soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't retrieve value for soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             /* Verify the link doesn't currently exist in the target group */
             if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link existed in target group before copy!\n");
+                printf("    soft link existed in target group before copy!\n");
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
@@ -8156,79 +8042,79 @@ test_copy_link(void)
             if (H5Lcopy(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, dst_grp_id,
                         COPY_LINK_TEST_SOFT_LINK_COPY_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    failed to copy soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             /* Verify the link has been copied and still exists in the source group */
             if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' copy exists\n",
-                         COPY_LINK_TEST_SOFT_LINK_COPY_NAME2);
+                printf("    couldn't determine if soft link '%s' copy exists\n",
+                       COPY_LINK_TEST_SOFT_LINK_COPY_NAME2);
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link copy did not exist\n");
+                printf("    soft link copy did not exist\n");
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if original soft link '%s' exists\n",
-                         COPY_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if original soft link '%s' exists\n",
+                       COPY_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original soft link did not exist\n");
+                printf("    original soft link did not exist\n");
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             /* Retrieve the new link's info */
             if (H5Lget_info2(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME2, &new_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_SOFT_LINK_COPY_NAME2);
+                printf("    couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_SOFT_LINK_COPY_NAME2);
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             if (new_info.type != orig_info.type) {
                 H5_FAILED();
-                HDprintf("    copied link's link type doesn't match original link's type\n");
+                printf("    copied link's link type doesn't match original link's type\n");
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             if (new_info.u.val_size != orig_info.u.val_size) {
                 H5_FAILED();
-                HDprintf("    copied soft link's value size of %llu doesn't match original link's value size "
-                         "of %llu\n",
-                         (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size);
+                printf("    copied soft link's value size of %llu doesn't match original link's value size "
+                       "of %llu\n",
+                       (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size);
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (new_info.corder_valid != orig_info.corder_valid) {
                     H5_FAILED();
-                    HDprintf("    copied link's 'corder_valid' field doesn't match original link's "
-                             "'corder_valid' field\n");
+                    printf("    copied link's 'corder_valid' field doesn't match original link's "
+                           "'corder_valid' field\n");
                     PART_ERROR(H5Lcopy_soft_check);
                 }
 
                 if (new_info.corder_valid && orig_info.corder_valid &&
                     (new_info.corder != orig_info.corder)) {
                     H5_FAILED();
-                    HDprintf("    copied link's creation order value %" PRId64
-                             " doesn't match original link's creation order value %" PRId64 "\n",
-                             new_info.corder, orig_info.corder);
+                    printf("    copied link's creation order value %" PRId64
+                           " doesn't match original link's creation order value %" PRId64 "\n",
+                           new_info.corder, orig_info.corder);
                     PART_ERROR(H5Lcopy_soft_check);
                 }
             }
 
             if (new_info.cset != orig_info.cset) {
                 H5_FAILED();
-                HDprintf("    copied link's character set doesn't match original link's character set\n");
+                printf("    copied link's character set doesn't match original link's character set\n");
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
@@ -8236,15 +8122,15 @@ test_copy_link(void)
             if (H5Lget_val(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME2, new_link_val,
                            COPY_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve value for soft link '%s'\n",
-                         COPY_LINK_TEST_SOFT_LINK_COPY_NAME2);
+                printf("    couldn't retrieve value for soft link '%s'\n",
+                       COPY_LINK_TEST_SOFT_LINK_COPY_NAME2);
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
             if (HDstrncmp(orig_link_val, new_link_val, COPY_LINK_TEST_LINK_VAL_BUF_SIZE)) {
                 H5_FAILED();
-                HDprintf("    copied soft link's value '%s' doesn't match original link's value '%s'\n",
-                         new_link_val, orig_link_val);
+                printf("    copied soft link's value '%s' doesn't match original link's value '%s'\n",
+                       new_link_val, orig_link_val);
                 PART_ERROR(H5Lcopy_soft_check);
             }
 
@@ -8260,20 +8146,20 @@ test_copy_link(void)
             if (H5Lcreate_soft(COPY_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id,
                                COPY_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link did not exist\n");
+                printf("    soft link did not exist\n");
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
@@ -8281,28 +8167,28 @@ test_copy_link(void)
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link existed in target group before copy!\n");
+                printf("    soft link existed in target group before copy!\n");
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2);
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link existed in target group before copy!\n");
+                printf("    soft link existed in target group before copy!\n");
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
@@ -8310,9 +8196,8 @@ test_copy_link(void)
             if (H5Lcopy(H5L_SAME_LOC, COPY_LINK_TEST_SOFT_LINK_NAME3, src_grp_id,
                         COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    failed to copy soft link '%s' using H5L_SAME_LOC as first parameter to H5Lcopy\n",
-                    COPY_LINK_TEST_SOFT_LINK_NAME3);
+                printf("    failed to copy soft link '%s' using H5L_SAME_LOC as first parameter to H5Lcopy\n",
+                       COPY_LINK_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
@@ -8320,9 +8205,8 @@ test_copy_link(void)
             if (H5Lcopy(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME3, H5L_SAME_LOC,
                         COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    failed to copy soft link '%s' using H5L_SAME_LOC as third parameter to H5Lcopy\n",
-                    COPY_LINK_TEST_SOFT_LINK_NAME3);
+                printf("    failed to copy soft link '%s' using H5L_SAME_LOC as third parameter to H5Lcopy\n",
+                       COPY_LINK_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
@@ -8330,41 +8214,41 @@ test_copy_link(void)
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' copy exists\n",
-                         COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if soft link '%s' copy exists\n",
+                       COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link copy did not exist\n");
+                printf("    soft link copy did not exist\n");
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' copy exists\n",
-                         COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2);
+                printf("    couldn't determine if soft link '%s' copy exists\n",
+                       COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2);
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link copy did not exist\n");
+                printf("    soft link copy did not exist\n");
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if original soft link '%s' exists\n",
-                         COPY_LINK_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if original soft link '%s' exists\n",
+                       COPY_LINK_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original soft link did not exist\n");
+                printf("    original soft link did not exist\n");
                 PART_ERROR(H5Lcopy_soft_same_loc);
             }
 
@@ -8381,13 +8265,13 @@ test_copy_link(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lcopy_external_no_check);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lcopy_external_no_check);
             }
 
@@ -8395,35 +8279,35 @@ test_copy_link(void)
             if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lcopy_external_no_check);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lcopy_external_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link did not exist\n");
+                printf("    external link did not exist\n");
                 PART_ERROR(H5Lcopy_external_no_check);
             }
 
             /* Verify the link doesn't currently exist in the target group */
             if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lcopy_external_no_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link existed in target group before copy!\n");
+                printf("    external link existed in target group before copy!\n");
                 PART_ERROR(H5Lcopy_external_no_check);
             }
 
@@ -8431,7 +8315,7 @@ test_copy_link(void)
             if (H5Lcopy(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, dst_grp_id,
                         COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME);
+                printf("    failed to copy external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lcopy_external_no_check);
             }
 
@@ -8439,27 +8323,27 @@ test_copy_link(void)
             if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link copy '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME);
+                printf("    couldn't determine if external link copy '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME);
                 PART_ERROR(H5Lcopy_external_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link copy did not exist\n");
+                printf("    external link copy did not exist\n");
                 PART_ERROR(H5Lcopy_external_no_check);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if original external link '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if original external link '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lcopy_external_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original external link did not exist\n");
+                printf("    original external link did not exist\n");
                 PART_ERROR(H5Lcopy_external_no_check);
             }
 
@@ -8490,13 +8374,13 @@ test_copy_link(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
@@ -8504,28 +8388,28 @@ test_copy_link(void)
             if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link did not exist\n");
+                printf("    external link did not exist\n");
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             /* Retrieve the link's info */
             if (H5Lget_info2(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
@@ -8533,29 +8417,29 @@ test_copy_link(void)
             if (H5Lget_val(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, orig_link_val,
                            COPY_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve value for external link '%s'\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't retrieve value for external link '%s'\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if (H5Lunpack_elink_val(orig_link_val, orig_info.u.val_size, &unpack_flags, &orig_filename,
                                     &orig_objname) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack original external link's value buffer\n");
+                printf("    couldn't unpack original external link's value buffer\n");
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             /* Verify the link doesn't currently exist in the target group */
             if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link existed in target group before copy!\n");
+                printf("    external link existed in target group before copy!\n");
                 PART_ERROR(H5Lcopy_external_check);
             }
 
@@ -8563,7 +8447,7 @@ test_copy_link(void)
             if (H5Lcopy(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, dst_grp_id,
                         COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
+                printf("    failed to copy external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
@@ -8571,27 +8455,27 @@ test_copy_link(void)
             if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link copy '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2);
+                printf("    couldn't determine if external link copy '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link copy did not exist\n");
+                printf("    external link copy did not exist\n");
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if original external link '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if original external link '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original external link did not exist\n");
+                printf("    original external link did not exist\n");
                 PART_ERROR(H5Lcopy_external_check);
             }
 
@@ -8599,47 +8483,46 @@ test_copy_link(void)
             if (H5Lget_info2(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2, &new_info, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve info for link '%s'\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2);
+                printf("    couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if (new_info.type != orig_info.type) {
                 H5_FAILED();
-                HDprintf("    copied link's link type doesn't match original link's type\n");
+                printf("    copied link's link type doesn't match original link's type\n");
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if (new_info.u.val_size != orig_info.u.val_size) {
                 H5_FAILED();
-                HDprintf("    copied external link's value size of %llu doesn't match original link's value "
-                         "size of %llu\n",
-                         (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size);
+                printf("    copied external link's value size of %llu doesn't match original link's value "
+                       "size of %llu\n",
+                       (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (new_info.corder_valid != orig_info.corder_valid) {
                     H5_FAILED();
-                    HDprintf("    copied link's 'corder_valid' field doesn't match original link's "
-                             "'corder_valid' field\n");
+                    printf("    copied link's 'corder_valid' field doesn't match original link's "
+                           "'corder_valid' field\n");
                     PART_ERROR(H5Lcopy_external_check);
                 }
 
                 if (new_info.corder_valid && orig_info.corder_valid &&
                     (new_info.corder != orig_info.corder)) {
                     H5_FAILED();
-                    HDprintf("    copied link's creation order value %" PRId64
-                             " doesn't match original link's creation "
-                             "order value %" PRId64 "\n",
-                             new_info.corder, orig_info.corder);
+                    printf("    copied link's creation order value %" PRId64
+                           " doesn't match original link's creation "
+                           "order value %" PRId64 "\n",
+                           new_info.corder, orig_info.corder);
                     PART_ERROR(H5Lcopy_external_check);
                 }
             }
 
             if (new_info.cset != orig_info.cset) {
                 H5_FAILED();
-                HDprintf("    copied link's character set doesn't match original link's character set\n");
+                printf("    copied link's character set doesn't match original link's character set\n");
                 PART_ERROR(H5Lcopy_external_check);
             }
 
@@ -8647,31 +8530,31 @@ test_copy_link(void)
             if (H5Lget_val(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2, new_link_val,
                            COPY_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve value for external link '%s'\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2);
+                printf("    couldn't retrieve value for external link '%s'\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if (H5Lunpack_elink_val(new_link_val, new_info.u.val_size, &unpack_flags, &new_filename,
                                     &new_objname) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack copied external link's value buffer\n");
+                printf("    couldn't unpack copied external link's value buffer\n");
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if (HDstrncmp(new_filename, orig_filename, strlen(orig_filename)) < 0) {
                 H5_FAILED();
-                HDprintf("    copied external link's filename '%s' doesn't match original external link's "
-                         "filename '%s'\n",
-                         new_filename, orig_filename);
+                printf("    copied external link's filename '%s' doesn't match original external link's "
+                       "filename '%s'\n",
+                       new_filename, orig_filename);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
             if (HDstrncmp(new_objname, orig_objname, strlen(orig_objname)) < 0) {
                 H5_FAILED();
-                HDprintf("    copied external link's object name '%s' doesn't match original external link's "
-                         "object name '%s'\n",
-                         new_objname, orig_objname);
+                printf("    copied external link's object name '%s' doesn't match original external link's "
+                       "object name '%s'\n",
+                       new_objname, orig_objname);
                 PART_ERROR(H5Lcopy_external_check);
             }
 
@@ -8695,13 +8578,13 @@ test_copy_link(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
@@ -8709,21 +8592,21 @@ test_copy_link(void)
             if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME3,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link did not exist\n");
+                printf("    external link did not exist\n");
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
@@ -8731,28 +8614,28 @@ test_copy_link(void)
             if ((link_exists =
                      H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link existed in target group before copy!\n");
+                printf("    external link existed in target group before copy!\n");
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
             if ((link_exists =
                      H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2);
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link existed in target group before copy!\n");
+                printf("    external link existed in target group before copy!\n");
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
@@ -8760,9 +8643,9 @@ test_copy_link(void)
             if (H5Lcopy(H5L_SAME_LOC, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, src_grp_id,
                         COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy external link '%s' using H5L_SAME_LOC as first parameter to "
-                         "H5Lcopy\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_NAME3);
+                printf("    failed to copy external link '%s' using H5L_SAME_LOC as first parameter to "
+                       "H5Lcopy\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
@@ -8770,9 +8653,9 @@ test_copy_link(void)
             if (H5Lcopy(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, H5L_SAME_LOC,
                         COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy external link '%s' using H5L_SAME_LOC as third parameter to "
-                         "H5Lcopy\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_NAME3);
+                printf("    failed to copy external link '%s' using H5L_SAME_LOC as third parameter to "
+                       "H5Lcopy\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
@@ -8780,41 +8663,41 @@ test_copy_link(void)
             if ((link_exists =
                      H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link copy '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if external link copy '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link copy did not exist\n");
+                printf("    external link copy did not exist\n");
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
             if ((link_exists =
                      H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link copy '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2);
+                printf("    couldn't determine if external link copy '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2);
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link copy did not exist\n");
+                printf("    external link copy did not exist\n");
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if original external link '%s' exists\n",
-                         COPY_LINK_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if original external link '%s' exists\n",
+                       COPY_LINK_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original external link did not exist\n");
+                printf("    original external link did not exist\n");
                 PART_ERROR(H5Lcopy_external_same_loc);
             }
 
@@ -8958,8 +8841,8 @@ test_copy_link_invalid_params(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or hard links aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, link, or hard links aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -8967,41 +8850,41 @@ test_copy_link_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s\n", H5_api_test_filename);
+        printf("    couldn't open file '%s\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, COPY_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((src_grp_id = H5Gcreate2(group_id, COPY_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME, H5P_DEFAULT,
                                  H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME);
         goto error;
     }
 
     if ((dst_grp_id = H5Gcreate2(group_id, COPY_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME, H5P_DEFAULT,
                                  H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME);
         goto error;
     }
 
     if (H5Lcreate_hard(group_id, ".", src_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                        H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create hard link '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+        printf("    couldn't create hard link '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
@@ -9009,14 +8892,14 @@ test_copy_link_invalid_params(void)
     if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if hard link '%s' exists\n",
-                 COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+        printf("    couldn't determine if hard link '%s' exists\n",
+               COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    hard link did not exist\n");
+        printf("    hard link did not exist\n");
         goto error;
     }
 
@@ -9038,7 +8921,7 @@ test_copy_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lcopy succeeded with an invalid source location ID\n");
+                printf("    H5Lcopy succeeded with an invalid source location ID\n");
                 PART_ERROR(H5Lcopy_invalid_src_loc_id);
             }
 
@@ -9060,7 +8943,7 @@ test_copy_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lcopy succeeded with a NULL source name\n");
+                printf("    H5Lcopy succeeded with a NULL source name\n");
                 PART_ERROR(H5Lcopy_invalid_src_name);
             }
 
@@ -9074,7 +8957,7 @@ test_copy_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lcopy succeeded with an invalid source name of ''\n");
+                printf("    H5Lcopy succeeded with an invalid source name of ''\n");
                 PART_ERROR(H5Lcopy_invalid_src_name);
             }
 
@@ -9096,7 +8979,7 @@ test_copy_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lcopy succeeded with an invalid destination location ID\n");
+                printf("    H5Lcopy succeeded with an invalid destination location ID\n");
                 PART_ERROR(H5Lcopy_invalid_dst_loc_id);
             }
 
@@ -9117,7 +9000,7 @@ test_copy_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lcopy succeeded with a NULL destination name\n");
+                printf("    H5Lcopy succeeded with a NULL destination name\n");
                 PART_ERROR(H5Lcopy_invalid_dst_name);
             }
 
@@ -9130,7 +9013,7 @@ test_copy_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lcopy succeeded with an invalid destination name of ''\n");
+                printf("    H5Lcopy succeeded with an invalid destination name of ''\n");
                 PART_ERROR(H5Lcopy_invalid_dst_name);
             }
 
@@ -9152,7 +9035,7 @@ test_copy_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lcopy succeeded with an invalid LCPL\n");
+                printf("    H5Lcopy succeeded with an invalid LCPL\n");
                 PART_ERROR(H5Lcopy_invalid_lcpl);
             }
 
@@ -9174,7 +9057,7 @@ test_copy_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lcopy succeeded with an invalid LAPL\n");
+                printf("    H5Lcopy succeeded with an invalid LAPL\n");
                 PART_ERROR(H5Lcopy_invalid_lapl);
             }
 
@@ -9196,7 +9079,7 @@ test_copy_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lcopy succeeded with an invalid same location\n");
+                printf("    H5Lcopy succeeded with an invalid same location\n");
                 PART_ERROR(H5Lcopy_invalid_same_location);
             }
 
@@ -9213,7 +9096,7 @@ test_copy_link_invalid_params(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lcopy_invalid_across_files);
             }
 
@@ -9227,13 +9110,13 @@ test_copy_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lcopy succeeded in copying a hard link across files!\n");
+                printf("    H5Lcopy succeeded in copying a hard link across files!\n");
                 PART_ERROR(H5Lcopy_invalid_across_files);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lcopy_invalid_across_files);
             }
 
@@ -9296,9 +9179,8 @@ test_move_link(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, link, hard link, soft link, or external link aren't "
-            "supported with this connector\n");
+        printf("    API functions for basic file, group, link, hard link, soft link, or external link aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -9308,34 +9190,34 @@ test_move_link(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, MOVE_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", MOVE_LINK_TEST_SUBGROUP_NAME);
+        printf("    couldn't create group '%s'\n", MOVE_LINK_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((src_grp_id = H5Gcreate2(group_id, MOVE_LINK_TEST_SRC_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                  H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", MOVE_LINK_TEST_SRC_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", MOVE_LINK_TEST_SRC_GROUP_NAME);
         goto error;
     }
 
     if ((dst_grp_id = H5Gcreate2(group_id, MOVE_LINK_TEST_DST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                  H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", MOVE_LINK_TEST_DST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", MOVE_LINK_TEST_DST_GROUP_NAME);
         goto error;
     }
 
@@ -9351,33 +9233,33 @@ test_move_link(void)
             if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME);
+                printf("    couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lmove_hard_no_check);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lmove_hard_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link did not exist\n");
+                printf("    hard link did not exist\n");
                 PART_ERROR(H5Lmove_hard_no_check);
             }
 
             /* Verify the link doesn't currently exist in the target group */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lmove_hard_no_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link existed in target group before move!\n");
+                printf("    hard link existed in target group before move!\n");
                 PART_ERROR(H5Lmove_hard_no_check);
             }
 
@@ -9385,34 +9267,34 @@ test_move_link(void)
             if (H5Lmove(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME,
                         H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to move link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME);
+                printf("    failed to move link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lmove_hard_no_check);
             }
 
             /* Verify the link has been moved */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lmove_hard_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link did not exist\n");
+                printf("    hard link did not exist\n");
                 PART_ERROR(H5Lmove_hard_no_check);
             }
 
             /* Verify the old link is gone */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if old hard link '%s' exists\n",
-                         MOVE_LINK_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if old hard link '%s' exists\n",
+                       MOVE_LINK_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lmove_hard_no_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    old hard link exists\n");
+                printf("    old hard link exists\n");
                 PART_ERROR(H5Lmove_hard_no_check);
             }
 
@@ -9431,40 +9313,40 @@ test_move_link(void)
             if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
+                printf("    couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link did not exist\n");
+                printf("    hard link did not exist\n");
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             /* Retrieve the link's info */
             if (H5Lget_info2(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
+                printf("    couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             /* Verify the link doesn't currently exist in the target group */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link existed in target group before move!\n");
+                printf("    hard link existed in target group before move!\n");
                 PART_ERROR(H5Lmove_hard_check);
             }
 
@@ -9472,66 +9354,66 @@ test_move_link(void)
             if (H5Lmove(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, dst_grp_id,
                         MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to move link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
+                printf("    failed to move link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             /* Verify the link has been moved */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link did not exist\n");
+                printf("    hard link did not exist\n");
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             /* Verify the old link is gone */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if old hard link '%s' exists\n",
-                         MOVE_LINK_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if old hard link '%s' exists\n",
+                       MOVE_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    old hard link exists\n");
+                printf("    old hard link exists\n");
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             /* Retrieve the moved link's info */
             if (H5Lget_info2(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, &new_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
+                printf("    couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             if (new_info.type != orig_info.type) {
                 H5_FAILED();
-                HDprintf("    moved link's link type doesn't match original link's type\n");
+                printf("    moved link's link type doesn't match original link's type\n");
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             if (H5Otoken_cmp(dst_grp_id, &new_info.u.token, &orig_info.u.token, &cmp_value) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to compare link target tokens\n");
+                printf("    failed to compare link target tokens\n");
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             if (cmp_value != 0) {
                 H5_FAILED();
-                HDprintf("    moved hard link's object token doesn't match original link's object token\n");
+                printf("    moved hard link's object token doesn't match original link's object token\n");
                 PART_ERROR(H5Lmove_hard_check);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (new_info.corder_valid != orig_info.corder_valid) {
                     H5_FAILED();
-                    HDprintf(
+                    printf(
                         "    moved link's 'corder_valid' field doesn't match original link's 'corder_valid' "
                         "field\n");
                     PART_ERROR(H5Lmove_hard_check);
@@ -9540,16 +9422,16 @@ test_move_link(void)
                 if (new_info.corder_valid && orig_info.corder_valid &&
                     (new_info.corder != orig_info.corder)) {
                     H5_FAILED();
-                    HDprintf("    moved link's creation order value %" PRId64
-                             " doesn't match original link's creation order value %" PRId64 "\n",
-                             new_info.corder, orig_info.corder);
+                    printf("    moved link's creation order value %" PRId64
+                           " doesn't match original link's creation order value %" PRId64 "\n",
+                           new_info.corder, orig_info.corder);
                     PART_ERROR(H5Lmove_hard_check);
                 }
             }
 
             if (new_info.cset != orig_info.cset) {
                 H5_FAILED();
-                HDprintf("    moved link's character set doesn't match original link's character set\n");
+                printf("    moved link's character set doesn't match original link's character set\n");
                 PART_ERROR(H5Lmove_hard_check);
             }
 
@@ -9565,20 +9447,20 @@ test_move_link(void)
             if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME3);
+                printf("    couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link did not exist\n");
+                printf("    hard link did not exist\n");
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
@@ -9586,14 +9468,14 @@ test_move_link(void)
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link existed in target group before move!\n");
+                printf("    hard link existed in target group before move!\n");
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
@@ -9601,35 +9483,35 @@ test_move_link(void)
             if (H5Lmove(H5L_SAME_LOC, MOVE_LINK_TEST_HARD_LINK_NAME3, src_grp_id,
                         MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to move link '%s' using H5L_SAME_LOC as first parameter to H5Lmove\n",
-                         MOVE_LINK_TEST_HARD_LINK_NAME3);
+                printf("    failed to move link '%s' using H5L_SAME_LOC as first parameter to H5Lmove\n",
+                       MOVE_LINK_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
             /* Ensure the link has been renamed */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    original hard link existed in target group after move!\n");
+                printf("    original hard link existed in target group after move!\n");
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link did not exist after move!\n");
+                printf("    hard link did not exist after move!\n");
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
@@ -9637,35 +9519,35 @@ test_move_link(void)
             if (H5Lmove(src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5L_SAME_LOC,
                         MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to move link '%s' using H5L_SAME_LOC as third parameter to H5Lmove\n",
-                         MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME);
+                printf("    failed to move link '%s' using H5L_SAME_LOC as third parameter to H5Lmove\n",
+                       MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
             /* Verify the link has been renamed back */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original hard link did not exist after moving the link back!\n");
+                printf("    original hard link did not exist after moving the link back!\n");
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if old hard link '%s' exists\n",
-                         MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if old hard link '%s' exists\n",
+                       MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    renamed hard link exists after moving the link back!\n");
+                printf("    renamed hard link exists after moving the link back!\n");
                 PART_ERROR(H5Lmove_hard_same_loc);
             }
 
@@ -9681,34 +9563,34 @@ test_move_link(void)
             if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME4, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME4);
+                printf("    couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME4);
                 PART_ERROR(H5Lmove_hard_rename);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME4, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME4);
+                printf("    couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME4);
                 PART_ERROR(H5Lmove_hard_rename);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link did not exist\n");
+                printf("    hard link did not exist\n");
                 PART_ERROR(H5Lmove_hard_rename);
             }
 
             /* Verify the renamed link doesn't currently exist in the source group */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NEW_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if renamed hard link '%s' exists\n",
-                         MOVE_LINK_TEST_HARD_LINK_NEW_NAME);
+                printf("    couldn't determine if renamed hard link '%s' exists\n",
+                       MOVE_LINK_TEST_HARD_LINK_NEW_NAME);
                 PART_ERROR(H5Lmove_hard_rename);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    renamed hard link existed in source group before move!\n");
+                printf("    renamed hard link existed in source group before move!\n");
                 PART_ERROR(H5Lmove_hard_rename);
             }
 
@@ -9716,35 +9598,35 @@ test_move_link(void)
             if (H5Lmove(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME4, src_grp_id,
                         MOVE_LINK_TEST_HARD_LINK_NEW_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to rename link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME4);
+                printf("    failed to rename link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME4);
                 PART_ERROR(H5Lmove_hard_rename);
             }
 
             /* Verify the link has been renamed */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NEW_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if renamed hard link '%s' exists\n",
-                         MOVE_LINK_TEST_HARD_LINK_NEW_NAME);
+                printf("    couldn't determine if renamed hard link '%s' exists\n",
+                       MOVE_LINK_TEST_HARD_LINK_NEW_NAME);
                 PART_ERROR(H5Lmove_hard_rename);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    renamed hard link did not exist\n");
+                printf("    renamed hard link did not exist\n");
                 PART_ERROR(H5Lmove_hard_rename);
             }
 
             /* Verify the old link is gone */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME4, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if old hard link '%s' exists\n",
-                         MOVE_LINK_TEST_HARD_LINK_NAME4);
+                printf("    couldn't determine if old hard link '%s' exists\n",
+                       MOVE_LINK_TEST_HARD_LINK_NAME4);
                 PART_ERROR(H5Lmove_hard_rename);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    old hard link exists\n");
+                printf("    old hard link exists\n");
                 PART_ERROR(H5Lmove_hard_rename);
             }
 
@@ -9760,33 +9642,33 @@ test_move_link(void)
             if (H5Lcreate_soft(MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id,
                                MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lmove_soft_no_check);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lmove_soft_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link did not exist\n");
+                printf("    soft link did not exist\n");
                 PART_ERROR(H5Lmove_soft_no_check);
             }
 
             /* Verify the link doesn't currently exist in the target group */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lmove_soft_no_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link existed in target group before move!\n");
+                printf("    soft link existed in target group before move!\n");
                 PART_ERROR(H5Lmove_soft_no_check);
             }
 
@@ -9794,34 +9676,34 @@ test_move_link(void)
             if (H5Lmove(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME,
                         H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to move link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME);
+                printf("    failed to move link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lmove_soft_no_check);
             }
 
             /* Verify the link has been moved */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lmove_soft_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link did not exist\n");
+                printf("    soft link did not exist\n");
                 PART_ERROR(H5Lmove_soft_no_check);
             }
 
             /* Verify the old link is gone */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if old soft link '%s' exists\n",
-                         MOVE_LINK_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if old soft link '%s' exists\n",
+                       MOVE_LINK_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lmove_soft_no_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    old soft link exists\n");
+                printf("    old soft link exists\n");
                 PART_ERROR(H5Lmove_soft_no_check);
             }
 
@@ -9841,27 +9723,27 @@ test_move_link(void)
             if (H5Lcreate_soft(MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id,
                                MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link did not exist\n");
+                printf("    soft link did not exist\n");
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             /* Retrieve the link's info */
             if (H5Lget_info2(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lmove_soft_check);
             }
 
@@ -9869,20 +9751,20 @@ test_move_link(void)
             if (H5Lget_val(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, orig_link_val,
                            MOVE_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve value for soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't retrieve value for soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             /* Verify the link doesn't currently exist in the target group */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link existed in target group before move!\n");
+                printf("    soft link existed in target group before move!\n");
                 PART_ERROR(H5Lmove_soft_check);
             }
 
@@ -9890,62 +9772,62 @@ test_move_link(void)
             if (H5Lmove(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, dst_grp_id,
                         MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to move link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    failed to move link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             /* Verify the link has been moved */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link did not exist\n");
+                printf("    soft link did not exist\n");
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             /* Verify the old link is gone */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if old soft link '%s' exists\n",
-                         MOVE_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if old soft link '%s' exists\n",
+                       MOVE_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    old soft link exists\n");
+                printf("    old soft link exists\n");
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             /* Retrieve the moved link's info */
             if (H5Lget_info2(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, &new_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             if (new_info.type != orig_info.type) {
                 H5_FAILED();
-                HDprintf("    moved link's link type doesn't match original link's type\n");
+                printf("    moved link's link type doesn't match original link's type\n");
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             if (new_info.u.val_size != orig_info.u.val_size) {
                 H5_FAILED();
-                HDprintf("    moved soft link's value size of %llu doesn't match original link's value size "
-                         "of %llu\n",
-                         (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size);
+                printf("    moved soft link's value size of %llu doesn't match original link's value size "
+                       "of %llu\n",
+                       (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size);
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (new_info.corder_valid != orig_info.corder_valid) {
                     H5_FAILED();
-                    HDprintf(
+                    printf(
                         "    moved link's 'corder_valid' field doesn't match original link's 'corder_valid' "
                         "field\n");
                     PART_ERROR(H5Lmove_soft_check);
@@ -9954,16 +9836,16 @@ test_move_link(void)
                 if (new_info.corder_valid && orig_info.corder_valid &&
                     (new_info.corder != orig_info.corder)) {
                     H5_FAILED();
-                    HDprintf("    moved link's creation order value %" PRId64
-                             " doesn't match original link's creation order value %" PRId64 "\n",
-                             new_info.corder, orig_info.corder);
+                    printf("    moved link's creation order value %" PRId64
+                           " doesn't match original link's creation order value %" PRId64 "\n",
+                           new_info.corder, orig_info.corder);
                     PART_ERROR(H5Lmove_soft_check);
                 }
             }
 
             if (new_info.cset != orig_info.cset) {
                 H5_FAILED();
-                HDprintf("    moved link's character set doesn't match original link's character set\n");
+                printf("    moved link's character set doesn't match original link's character set\n");
                 PART_ERROR(H5Lmove_soft_check);
             }
 
@@ -9971,14 +9853,14 @@ test_move_link(void)
             if (H5Lget_val(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, new_link_val,
                            MOVE_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve value for soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't retrieve value for soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lmove_soft_check);
             }
 
             if (HDstrncmp(orig_link_val, new_link_val, MOVE_LINK_TEST_LINK_VAL_BUF_SIZE)) {
                 H5_FAILED();
-                HDprintf("    moved soft link's value '%s' doesn't match original link's value '%s'\n",
-                         new_link_val, orig_link_val);
+                printf("    moved soft link's value '%s' doesn't match original link's value '%s'\n",
+                       new_link_val, orig_link_val);
                 PART_ERROR(H5Lmove_soft_check);
             }
 
@@ -9994,20 +9876,20 @@ test_move_link(void)
             if (H5Lcreate_soft(MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id,
                                MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link did not exist\n");
+                printf("    soft link did not exist\n");
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
@@ -10015,14 +9897,14 @@ test_move_link(void)
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link existed in target group before move!\n");
+                printf("    soft link existed in target group before move!\n");
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
@@ -10030,35 +9912,35 @@ test_move_link(void)
             if (H5Lmove(H5L_SAME_LOC, MOVE_LINK_TEST_SOFT_LINK_NAME3, src_grp_id,
                         MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to move link '%s' using H5L_SAME_LOC as first parameter to H5Lmove\n",
-                         MOVE_LINK_TEST_SOFT_LINK_NAME3);
+                printf("    failed to move link '%s' using H5L_SAME_LOC as first parameter to H5Lmove\n",
+                       MOVE_LINK_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
             /* Ensure the link has been renamed */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    original soft link existed in target group after move!\n");
+                printf("    original soft link existed in target group after move!\n");
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link did not exist after move!\n");
+                printf("    soft link did not exist after move!\n");
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
@@ -10066,35 +9948,35 @@ test_move_link(void)
             if (H5Lmove(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5L_SAME_LOC,
                         MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to move link '%s' using H5L_SAME_LOC as third parameter to H5Lmove\n",
-                         MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME);
+                printf("    failed to move link '%s' using H5L_SAME_LOC as third parameter to H5Lmove\n",
+                       MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
             /* Verify the link has been renamed back */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original hard link did not exist after moving the link back!\n");
+                printf("    original hard link did not exist after moving the link back!\n");
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if old soft link '%s' exists\n",
-                         MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if old soft link '%s' exists\n",
+                       MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    renamed soft link exists after moving the link back!\n");
+                printf("    renamed soft link exists after moving the link back!\n");
                 PART_ERROR(H5Lmove_soft_same_loc);
             }
 
@@ -10110,34 +9992,34 @@ test_move_link(void)
             if (H5Lcreate_soft(MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id,
                                MOVE_LINK_TEST_SOFT_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME4);
+                printf("    couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME4);
                 PART_ERROR(H5Lmove_soft_rename);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME4, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME4);
+                printf("    couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME4);
                 PART_ERROR(H5Lmove_soft_rename);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link did not exist\n");
+                printf("    soft link did not exist\n");
                 PART_ERROR(H5Lmove_soft_rename);
             }
 
             /* Verify the renamed link doesn't currently exist in the source group */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NEW_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if renamed soft link '%s' exists\n",
-                         MOVE_LINK_TEST_SOFT_LINK_NEW_NAME);
+                printf("    couldn't determine if renamed soft link '%s' exists\n",
+                       MOVE_LINK_TEST_SOFT_LINK_NEW_NAME);
                 PART_ERROR(H5Lmove_soft_rename);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    renamed soft link existed in source group before move!\n");
+                printf("    renamed soft link existed in source group before move!\n");
                 PART_ERROR(H5Lmove_soft_rename);
             }
 
@@ -10145,35 +10027,35 @@ test_move_link(void)
             if (H5Lmove(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME4, src_grp_id,
                         MOVE_LINK_TEST_SOFT_LINK_NEW_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to rename link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME4);
+                printf("    failed to rename link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME4);
                 PART_ERROR(H5Lmove_soft_rename);
             }
 
             /* Verify the link has been renamed */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NEW_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if renamed soft link '%s' exists\n",
-                         MOVE_LINK_TEST_SOFT_LINK_NEW_NAME);
+                printf("    couldn't determine if renamed soft link '%s' exists\n",
+                       MOVE_LINK_TEST_SOFT_LINK_NEW_NAME);
                 PART_ERROR(H5Lmove_soft_rename);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    renamed soft link did not exist\n");
+                printf("    renamed soft link did not exist\n");
                 PART_ERROR(H5Lmove_soft_rename);
             }
 
             /* Verify the old link is gone */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME4, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if old soft link '%s' exists\n",
-                         MOVE_LINK_TEST_SOFT_LINK_NAME4);
+                printf("    couldn't determine if old soft link '%s' exists\n",
+                       MOVE_LINK_TEST_SOFT_LINK_NAME4);
                 PART_ERROR(H5Lmove_soft_rename);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    old soft link exists\n");
+                printf("    old soft link exists\n");
                 PART_ERROR(H5Lmove_soft_rename);
             }
 
@@ -10190,13 +10072,13 @@ test_move_link(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lmove_external_no_check);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lmove_external_no_check);
             }
 
@@ -10204,35 +10086,35 @@ test_move_link(void)
             if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME);
                 PART_ERROR(H5Lmove_external_no_check);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME);
                 PART_ERROR(H5Lmove_external_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link did not exist\n");
+                printf("    external link did not exist\n");
                 PART_ERROR(H5Lmove_external_no_check);
             }
 
             /* Verify the link doesn't currently exist in the target group */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME);
                 PART_ERROR(H5Lmove_external_no_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link existed in target group before move!\n");
+                printf("    external link existed in target group before move!\n");
                 PART_ERROR(H5Lmove_external_no_check);
             }
 
@@ -10240,35 +10122,35 @@ test_move_link(void)
             if (H5Lmove(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, dst_grp_id,
                         MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME);
+                printf("    failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME);
                 PART_ERROR(H5Lmove_external_no_check);
             }
 
             /* Verify the link has been moved */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME);
                 PART_ERROR(H5Lmove_external_no_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link did not exist\n");
+                printf("    external link did not exist\n");
                 PART_ERROR(H5Lmove_external_no_check);
             }
 
             /* Verify the old link is gone */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if old external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME);
+                printf("    couldn't determine if old external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME);
                 PART_ERROR(H5Lmove_external_no_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    old external link exists\n");
+                printf("    old external link exists\n");
                 PART_ERROR(H5Lmove_external_no_check);
             }
 
@@ -10299,13 +10181,13 @@ test_move_link(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lmove_external_check);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lmove_external_check);
             }
 
@@ -10313,28 +10195,28 @@ test_move_link(void)
             if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2);
                 PART_ERROR(H5Lmove_external_check);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME2);
                 PART_ERROR(H5Lmove_external_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link did not exist\n");
+                printf("    external link did not exist\n");
                 PART_ERROR(H5Lmove_external_check);
             }
 
             /* Retrieve the link's info */
             if (H5Lget_info2(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2);
+                printf("    couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2);
                 PART_ERROR(H5Lmove_external_check);
             }
 
@@ -10342,29 +10224,29 @@ test_move_link(void)
             if (H5Lget_val(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, orig_link_val,
                            MOVE_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve value for external link '%s'\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME2);
+                printf("    couldn't retrieve value for external link '%s'\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME2);
                 PART_ERROR(H5Lmove_external_check);
             }
 
             if (H5Lunpack_elink_val(orig_link_val, orig_info.u.val_size, &unpack_flags, &orig_filename,
                                     &orig_objname) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack original external link's value buffer\n");
+                printf("    couldn't unpack original external link's value buffer\n");
                 PART_ERROR(H5Lmove_external_check);
             }
 
             /* Verify the link doesn't currently exist in the target group */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME2);
                 PART_ERROR(H5Lmove_external_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link existed in target group before move!\n");
+                printf("    external link existed in target group before move!\n");
                 PART_ERROR(H5Lmove_external_check);
             }
 
@@ -10372,63 +10254,63 @@ test_move_link(void)
             if (H5Lmove(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, dst_grp_id,
                         MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2);
+                printf("    failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2);
                 PART_ERROR(H5Lmove_external_check);
             }
 
             /* Verify the link has been moved */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME2);
                 PART_ERROR(H5Lmove_external_check);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link did not exist\n");
+                printf("    external link did not exist\n");
                 PART_ERROR(H5Lmove_external_check);
             }
 
             /* Verify the old link is gone */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if old external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME2);
+                printf("    couldn't determine if old external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME2);
                 PART_ERROR(H5Lmove_external_check);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    old external link exists\n");
+                printf("    old external link exists\n");
                 PART_ERROR(H5Lmove_external_check);
             }
 
             /* Retrieve the moved link's info */
             if (H5Lget_info2(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, &new_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2);
+                printf("    couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2);
                 PART_ERROR(H5Lmove_external_check);
             }
 
             if (new_info.type != orig_info.type) {
                 H5_FAILED();
-                HDprintf("    moved link's link type doesn't match original link's type\n");
+                printf("    moved link's link type doesn't match original link's type\n");
                 PART_ERROR(H5Lmove_external_check);
             }
 
             if (new_info.u.val_size != orig_info.u.val_size) {
                 H5_FAILED();
-                HDprintf("    moved external link's value size of %llu doesn't match original link's value "
-                         "size of %llu\n",
-                         (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size);
+                printf("    moved external link's value size of %llu doesn't match original link's value "
+                       "size of %llu\n",
+                       (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size);
                 PART_ERROR(H5Lmove_external_check);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (new_info.corder_valid != orig_info.corder_valid) {
                     H5_FAILED();
-                    HDprintf(
+                    printf(
                         "    moved link's 'corder_valid' field doesn't match original link's 'corder_valid' "
                         "field\n");
                     PART_ERROR(H5Lmove_external_check);
@@ -10437,17 +10319,17 @@ test_move_link(void)
                 if (new_info.corder_valid && orig_info.corder_valid &&
                     (new_info.corder != orig_info.corder)) {
                     H5_FAILED();
-                    HDprintf("    moved link's creation order value %" PRId64
-                             " doesn't match original link's creation "
-                             "order value %" PRId64 "\n",
-                             new_info.corder, orig_info.corder);
+                    printf("    moved link's creation order value %" PRId64
+                           " doesn't match original link's creation "
+                           "order value %" PRId64 "\n",
+                           new_info.corder, orig_info.corder);
                     PART_ERROR(H5Lmove_external_check);
                 }
             }
 
             if (new_info.cset != orig_info.cset) {
                 H5_FAILED();
-                HDprintf("    moved link's character set doesn't match original link's character set\n");
+                printf("    moved link's character set doesn't match original link's character set\n");
                 PART_ERROR(H5Lmove_external_check);
             }
 
@@ -10455,31 +10337,31 @@ test_move_link(void)
             if (H5Lget_val(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, new_link_val,
                            MOVE_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't retrieve value for external link '%s'\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME2);
+                printf("    couldn't retrieve value for external link '%s'\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME2);
                 PART_ERROR(H5Lmove_external_check);
             }
 
             if (H5Lunpack_elink_val(new_link_val, new_info.u.val_size, &unpack_flags, &new_filename,
                                     &new_objname) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack moved external link's value buffer\n");
+                printf("    couldn't unpack moved external link's value buffer\n");
                 PART_ERROR(H5Lmove_external_check);
             }
 
             if (HDstrncmp(new_filename, orig_filename, strlen(orig_filename)) < 0) {
                 H5_FAILED();
-                HDprintf("    moved external link's filename '%s' doesn't match original external link's "
-                         "filename '%s'\n",
-                         new_filename, orig_filename);
+                printf("    moved external link's filename '%s' doesn't match original external link's "
+                       "filename '%s'\n",
+                       new_filename, orig_filename);
                 PART_ERROR(H5Lmove_external_check);
             }
 
             if (HDstrncmp(new_objname, orig_objname, strlen(orig_objname)) < 0) {
                 H5_FAILED();
-                HDprintf("    moved external link's object name '%s' doesn't match original external link's "
-                         "object name '%s'\n",
-                         new_objname, orig_objname);
+                printf("    moved external link's object name '%s' doesn't match original external link's "
+                       "object name '%s'\n",
+                       new_objname, orig_objname);
                 PART_ERROR(H5Lmove_external_check);
             }
 
@@ -10503,13 +10385,13 @@ test_move_link(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
@@ -10517,21 +10399,21 @@ test_move_link(void)
             if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME3,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3);
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME3);
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link did not exist\n");
+                printf("    external link did not exist\n");
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
@@ -10539,14 +10421,14 @@ test_move_link(void)
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    external link existed in target group before move!\n");
+                printf("    external link existed in target group before move!\n");
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
@@ -10554,35 +10436,35 @@ test_move_link(void)
             if (H5Lmove(H5L_SAME_LOC, MOVE_LINK_TEST_EXTERN_LINK_NAME3, src_grp_id,
                         MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3);
+                printf("    failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3);
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
             /* Ensure the link has been renamed */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME3);
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    original external link existed in target group after move!\n");
+                printf("    original external link existed in target group after move!\n");
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link did not exist after move!\n");
+                printf("    external link did not exist after move!\n");
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
@@ -10590,35 +10472,35 @@ test_move_link(void)
             if (H5Lmove(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5L_SAME_LOC,
                         MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME);
+                printf("    failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
             /* Verify the link has been renamed back */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME3);
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original external link did not exist after moving the link back!\n");
+                printf("    original external link did not exist after moving the link back!\n");
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if old external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME);
+                printf("    couldn't determine if old external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME);
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    renamed external link exists after moving the link back!\n");
+                printf("    renamed external link exists after moving the link back!\n");
                 PART_ERROR(H5Lmove_external_same_loc);
             }
 
@@ -10642,13 +10524,13 @@ test_move_link(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lmove_external_rename);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lmove_external_rename);
             }
 
@@ -10656,35 +10538,35 @@ test_move_link(void)
             if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME4,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME4);
+                printf("    couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME4);
                 PART_ERROR(H5Lmove_external_rename);
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME4, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME4);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME4);
                 PART_ERROR(H5Lmove_external_rename);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link did not exist\n");
+                printf("    external link did not exist\n");
                 PART_ERROR(H5Lmove_external_rename);
             }
 
             /* Verify the renamed link doesn't currently exist in the source group */
             if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if renamed external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME);
+                printf("    couldn't determine if renamed external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME);
                 PART_ERROR(H5Lmove_external_rename);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    renamed external link existed in source group before move!\n");
+                printf("    renamed external link existed in source group before move!\n");
                 PART_ERROR(H5Lmove_external_rename);
             }
 
@@ -10692,35 +10574,35 @@ test_move_link(void)
             if (H5Lmove(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME4, src_grp_id,
                         MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to rename link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME4);
+                printf("    failed to rename link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME4);
                 PART_ERROR(H5Lmove_external_rename);
             }
 
             /* Verify the link has been renamed */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if renamed external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME);
+                printf("    couldn't determine if renamed external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME);
                 PART_ERROR(H5Lmove_external_rename);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    renamed external link did not exist\n");
+                printf("    renamed external link did not exist\n");
                 PART_ERROR(H5Lmove_external_rename);
             }
 
             /* Verify the old link is gone */
             if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME4, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if old external link '%s' exists\n",
-                         MOVE_LINK_TEST_EXTERN_LINK_NAME4);
+                printf("    couldn't determine if old external link '%s' exists\n",
+                       MOVE_LINK_TEST_EXTERN_LINK_NAME4);
                 PART_ERROR(H5Lmove_external_rename);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    old external link exists\n");
+                printf("    old external link exists\n");
                 PART_ERROR(H5Lmove_external_rename);
             }
 
@@ -10840,53 +10722,53 @@ test_move_links_into_group_with_links(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, hard link, or creation order aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, link, hard link, or creation order aren't "
+               "supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for link creation order tracking\n");
+        printf("    couldn't create GCPL for link creation order tracking\n");
         goto error;
     }
 
     if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't set link creation order tracking\n");
+        printf("    couldn't set link creation order tracking\n");
         goto error;
     }
 
     if ((src_grp_id = H5Gcreate2(group_id, MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SRC_GRP_NAME, H5P_DEFAULT,
                                  gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SRC_GRP_NAME);
+        printf("    couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SRC_GRP_NAME);
         goto error;
     }
 
     if ((dst_grp_id = H5Gcreate2(group_id, MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_DST_GRP_NAME, H5P_DEFAULT,
                                  gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_DST_GRP_NAME);
+        printf("    couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_DST_GRP_NAME);
         goto error;
     }
 
@@ -10896,7 +10778,7 @@ test_move_links_into_group_with_links(void)
 
         if (H5Lcreate_hard(src_grp_id, ".", src_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create link '%s' in source group\n", link_name);
+            printf("    couldn't create link '%s' in source group\n", link_name);
             goto error;
         }
 
@@ -10904,21 +10786,21 @@ test_move_links_into_group_with_links(void)
         memset(&link_info, 0, sizeof(link_info));
         if (H5Lget_info2(src_grp_id, link_name, &link_info, H5P_DEFAULT) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve info for link '%s'\n", link_name);
+            printf("    failed to retrieve info for link '%s'\n", link_name);
             goto error;
         }
 
         if (!link_info.corder_valid) {
             H5_FAILED();
-            HDprintf("    creation order value for newly-created link '%s' was marked as not valid!\n",
-                     link_name);
+            printf("    creation order value for newly-created link '%s' was marked as not valid!\n",
+                   link_name);
             goto error;
         }
 
         if (link_info.corder != (int64_t)i) {
             H5_FAILED();
-            HDprintf("    creation order value %lld for link '%s' did not match expected value %lld\n",
-                     (long long)link_info.corder, link_name, (long long)i);
+            printf("    creation order value %lld for link '%s' did not match expected value %lld\n",
+                   (long long)link_info.corder, link_name, (long long)i);
             goto error;
         }
     }
@@ -10929,7 +10811,7 @@ test_move_links_into_group_with_links(void)
 
         if (H5Lcreate_hard(dst_grp_id, ".", dst_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create link '%s' in destination group\n", link_name);
+            printf("    couldn't create link '%s' in destination group\n", link_name);
             goto error;
         }
     }
@@ -10940,7 +10822,7 @@ test_move_links_into_group_with_links(void)
 
         if (H5Lmove(src_grp_id, link_name, dst_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
             H5_FAILED();
-            HDprintf("    failed to move link '%s' from source group to destination group\n", link_name);
+            printf("    failed to move link '%s' from source group to destination group\n", link_name);
             goto error;
         }
 
@@ -10948,22 +10830,22 @@ test_move_links_into_group_with_links(void)
         memset(&link_info, 0, sizeof(link_info));
         if (H5Lget_info2(dst_grp_id, link_name, &link_info, H5P_DEFAULT) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve info for link '%s'\n", link_name);
+            printf("    failed to retrieve info for link '%s'\n", link_name);
             goto error;
         }
 
         if (!link_info.corder_valid) {
             H5_FAILED();
-            HDprintf("    creation order value for moved link '%s' was marked as not valid!\n", link_name);
+            printf("    creation order value for moved link '%s' was marked as not valid!\n", link_name);
             goto error;
         }
 
         if (link_info.corder != (int64_t)(i + MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_NUM_LINKS)) {
             H5_FAILED();
-            HDprintf("    creation order value for moved link '%s' was not adjusted after move! It should "
-                     "have been %lld but was %lld\n",
-                     link_name, (long long)(i + MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_NUM_LINKS),
-                     (long long)link_info.corder);
+            printf("    creation order value for moved link '%s' was not adjusted after move! It should "
+                   "have been %lld but was %lld\n",
+                   link_name, (long long)(i + MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_NUM_LINKS),
+                   (long long)link_info.corder);
             goto error;
         }
     }
@@ -11043,54 +10925,54 @@ test_move_link_reset_grp_max_crt_order(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, hard link, or creation order aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, link, hard link, or creation order aren't "
+               "supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for link creation order tracking\n");
+        printf("    couldn't create GCPL for link creation order tracking\n");
         goto error;
     }
 
     if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't set link creation order tracking\n");
+        printf("    couldn't set link creation order tracking\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((src_grp_id = H5Gcreate2(group_id, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SRC_GRP_NAME, H5P_DEFAULT,
                                  gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SRC_GRP_NAME);
+        printf("    couldn't create group '%s'\n", MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SRC_GRP_NAME);
         goto error;
     }
 
     if ((dst_grp_id = H5Gcreate2(group_id, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_DST_GRP_NAME, H5P_DEFAULT,
                                  gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_DST_GRP_NAME);
+        printf("    couldn't create group '%s'\n", MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_DST_GRP_NAME);
         goto error;
     }
 
@@ -11100,7 +10982,7 @@ test_move_link_reset_grp_max_crt_order(void)
 
         if (H5Lcreate_hard(src_grp_id, ".", src_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create hard link '%s' in source group\n", link_name);
+            printf("    couldn't create hard link '%s' in source group\n", link_name);
             goto error;
         }
     }
@@ -11114,15 +10996,15 @@ test_move_link_reset_grp_max_crt_order(void)
 
         if (H5Gget_info(src_grp_id, &grp_info) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve source group's info\n");
+            printf("    failed to retrieve source group's info\n");
             goto error;
         }
 
         if (grp_info.max_corder != MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS) {
             H5_FAILED();
-            HDprintf("    source group's maximum creation order value got adjusted to %lld during link "
-                     "moving; value should have remained at %d\n",
-                     (long long)grp_info.max_corder, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS);
+            printf("    source group's maximum creation order value got adjusted to %lld during link "
+                   "moving; value should have remained at %d\n",
+                   (long long)grp_info.max_corder, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS);
             goto error;
         }
 
@@ -11130,7 +11012,7 @@ test_move_link_reset_grp_max_crt_order(void)
 
         if (H5Lmove(src_grp_id, link_name, dst_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
             H5_FAILED();
-            HDprintf("    failed to move link '%s' to destination group\n", link_name);
+            printf("    failed to move link '%s' to destination group\n", link_name);
             goto error;
         }
     }
@@ -11143,15 +11025,15 @@ test_move_link_reset_grp_max_crt_order(void)
 
     if (H5Gget_info(src_grp_id, &grp_info) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve source group's info\n");
+        printf("    failed to retrieve source group's info\n");
         goto error;
     }
 
     if (grp_info.max_corder != 0) {
         H5_FAILED();
-        HDprintf("    source group's maximum creation order value didn't reset to 0 after moving all links "
-                 "out of it; value is still %lld\n",
-                 (long long)grp_info.max_corder);
+        printf("    source group's maximum creation order value didn't reset to 0 after moving all links "
+               "out of it; value is still %lld\n",
+               (long long)grp_info.max_corder);
         goto error;
     }
 
@@ -11160,15 +11042,15 @@ test_move_link_reset_grp_max_crt_order(void)
 
     if (H5Gget_info(dst_grp_id, &grp_info) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve destination group's info\n");
+        printf("    failed to retrieve destination group's info\n");
         goto error;
     }
 
     if (grp_info.max_corder != MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS) {
         H5_FAILED();
-        HDprintf("    destination group's maximum creation order value of %lld didn't match expected value "
-                 "of %d after moving all links into it\n",
-                 (long long)grp_info.max_corder, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS);
+        printf("    destination group's maximum creation order value of %lld didn't match expected value "
+               "of %d after moving all links into it\n",
+               (long long)grp_info.max_corder, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS);
         goto error;
     }
 
@@ -11225,8 +11107,8 @@ test_move_link_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or hard link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, link, or hard link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -11234,41 +11116,41 @@ test_move_link_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, MOVE_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((src_grp_id = H5Gcreate2(group_id, MOVE_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME, H5P_DEFAULT,
                                  H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME);
         goto error;
     }
 
     if ((dst_grp_id = H5Gcreate2(group_id, MOVE_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME, H5P_DEFAULT,
                                  H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME);
         goto error;
     }
 
     if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                        H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create hard link '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+        printf("    couldn't create hard link '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
@@ -11276,14 +11158,14 @@ test_move_link_invalid_params(void)
     if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if hard link '%s' exists\n",
-                 MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+        printf("    couldn't determine if hard link '%s' exists\n",
+               MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    hard link did not exist\n");
+        printf("    hard link did not exist\n");
         goto error;
     }
 
@@ -11291,14 +11173,14 @@ test_move_link_invalid_params(void)
     if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if hard link '%s' exists\n",
-                 MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+        printf("    couldn't determine if hard link '%s' exists\n",
+               MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
     if (link_exists) {
         H5_FAILED();
-        HDprintf("    hard link existed in target group before move!\n");
+        printf("    hard link existed in target group before move!\n");
         goto error;
     }
 
@@ -11319,7 +11201,7 @@ test_move_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lmove succeeded with an invalid source location ID!\n");
+                printf("    H5Lmove succeeded with an invalid source location ID!\n");
                 PART_ERROR(H5Lmove_invalid_src_loc_id);
             }
 
@@ -11340,7 +11222,7 @@ test_move_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lmove succeeded with a NULL source name!\n");
+                printf("    H5Lmove succeeded with a NULL source name!\n");
                 PART_ERROR(H5Lmove_invalid_src_name);
             }
 
@@ -11353,7 +11235,7 @@ test_move_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lmove succeeded with an invalid source name of ''!\n");
+                printf("    H5Lmove succeeded with an invalid source name of ''!\n");
                 PART_ERROR(H5Lmove_invalid_src_name);
             }
 
@@ -11374,7 +11256,7 @@ test_move_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lmove succeeded with an invalid destination location ID!\n");
+                printf("    H5Lmove succeeded with an invalid destination location ID!\n");
                 PART_ERROR(H5Lmove_invalid_dst_loc_id);
             }
 
@@ -11395,7 +11277,7 @@ test_move_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lmove succeeded with a NULL destination name!\n");
+                printf("    H5Lmove succeeded with a NULL destination name!\n");
                 PART_ERROR(H5Lmove_invalid_dst_name);
             }
 
@@ -11408,7 +11290,7 @@ test_move_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lmove succeeded with an invalid destination name of ''!\n");
+                printf("    H5Lmove succeeded with an invalid destination name of ''!\n");
                 PART_ERROR(H5Lmove_invalid_dst_name);
             }
 
@@ -11429,7 +11311,7 @@ test_move_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lmove succeeded with an invalid LCPL!\n");
+                printf("    H5Lmove succeeded with an invalid LCPL!\n");
                 PART_ERROR(H5Lmove_invalid_lcpl);
             }
 
@@ -11450,7 +11332,7 @@ test_move_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lmove succeeded with an invalid LAPL!\n");
+                printf("    H5Lmove succeeded with an invalid LAPL!\n");
                 PART_ERROR(H5Lmove_invalid_lapl);
             }
 
@@ -11466,28 +11348,28 @@ test_move_link_invalid_params(void)
             if ((link_exists =
                      H5Lexists(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lmove_existence);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link didn't exist in source group after invalid move!\n");
+                printf("    hard link didn't exist in source group after invalid move!\n");
                 PART_ERROR(H5Lmove_existence);
             }
 
             if ((link_exists =
                      H5Lexists(dst_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lmove_existence);
             }
 
             if (link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link existed in target group after invalid move!\n");
+                printf("    hard link existed in target group after invalid move!\n");
                 PART_ERROR(H5Lmove_existence);
             }
 
@@ -11510,7 +11392,7 @@ test_move_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lmove succeeded with an invalid same location!\n");
+                printf("    H5Lmove succeeded with an invalid same location!\n");
                 PART_ERROR(H5Lmove_same_location);
             }
 
@@ -11527,7 +11409,7 @@ test_move_link_invalid_params(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lmove_across_files);
             }
 
@@ -11541,7 +11423,7 @@ test_move_link_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lmove succeeded in moving a hard link across files!\n");
+                printf("    H5Lmove succeeded in moving a hard link across files!\n");
                 PART_ERROR(H5Lmove_across_files);
             }
 
@@ -11549,21 +11431,21 @@ test_move_link_invalid_params(void)
             if ((link_exists =
                      H5Lexists(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if original link '%s' exists after invalid link move\n",
-                         MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if original link '%s' exists after invalid link move\n",
+                       MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lmove_across_files);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    original link '%s' didn't exist after failed move!\n",
-                         MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+                printf("    original link '%s' didn't exist after failed move!\n",
+                       MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lmove_across_files);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close a file!\n");
+                printf("    failed to close a file!\n");
                 PART_ERROR(H5Lmove_across_files);
             }
 
@@ -11632,8 +11514,8 @@ test_get_link_val(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, soft link, external link, or creation "
-                 "order aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, soft link, external link, or creation "
+               "order aren't supported with this connector\n");
         return 0;
     }
 
@@ -11641,26 +11523,26 @@ test_get_link_val(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for link creation order tracking\n");
+        printf("    couldn't create GCPL for link creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set link creation order tracking\n");
+            printf("    couldn't set link creation order tracking\n");
             goto error;
         }
     }
@@ -11668,7 +11550,7 @@ test_get_link_val(void)
     if ((group_id = H5Gcreate2(container_group, GET_LINK_VAL_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -11687,59 +11569,59 @@ test_get_link_val(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP1_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP1_NAME);
                 PART_ERROR(H5Lget_val_soft);
             }
 
             if (H5Lcreate_soft(link_target, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_soft);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_soft);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_soft);
             }
 
             if (H5Lget_info2(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, &link_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info\n");
+                printf("    failed to retrieve soft link's info\n");
                 PART_ERROR(H5Lget_val_soft);
             }
 
             link_val_size = strlen(link_target) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu did not match expected size of %zu\n", link_info.u.val_size,
-                         link_val_size);
+                printf("    link value size %zu did not match expected size of %zu\n", link_info.u.val_size,
+                       link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Lget_val(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, link_val_buf,
                            GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value\n");
+                printf("    couldn't get soft link value\n");
                 PART_ERROR(H5Lget_val_soft);
             }
 
             if (HDstrncmp(link_val_buf, link_target, link_val_size)) {
                 H5_FAILED();
-                HDprintf("    soft link value did not match\n");
+                printf("    soft link value did not match\n");
                 PART_ERROR(H5Lget_val_soft);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP1_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP1_NAME);
                 PART_ERROR(H5Lget_val_soft);
             }
 
@@ -11767,88 +11649,88 @@ test_get_link_val(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_val_external);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_val_external);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP2_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP2_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP2_NAME);
                 PART_ERROR(H5Lget_val_external);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_obj_name, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_external);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_external);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    external link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_external);
             }
 
             if (H5Lget_info2(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, &link_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info\n");
+                printf("    failed to retrieve external link's info\n");
                 PART_ERROR(H5Lget_val_external);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu did not match expected size of %zu\n", link_info.u.val_size,
-                         link_val_size);
+                printf("    link value size %zu did not match expected size of %zu\n", link_info.u.val_size,
+                       link_val_size);
                 PART_ERROR(H5Lget_val_external);
             }
 
             if (H5Lget_val(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, link_val_buf,
                            GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value\n");
+                printf("    couldn't get external link value\n");
                 PART_ERROR(H5Lget_val_external);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_external);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_external);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name, strlen(ext_obj_name) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name);
                 PART_ERROR(H5Lget_val_external);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP2_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP2_NAME);
                 PART_ERROR(H5Lget_val_external);
             }
 
@@ -11896,14 +11778,14 @@ test_get_link_val(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP4_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP4_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP4_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
@@ -11911,58 +11793,58 @@ test_get_link_val(void)
             if (H5Lcreate_soft(link_target_a, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Lcreate_soft(link_target_b, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Lcreate_soft(link_target_c, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             /* Verify the links exist */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
@@ -11971,15 +11853,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info at index %d\n", 0);
+                printf("    failed to retrieve soft link's info at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             link_val_size = strlen(link_target_a) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 0, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 0, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
@@ -11987,14 +11869,14 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value at index %d\n", 0);
+                printf("    couldn't get soft link value at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if (HDstrncmp(link_val_buf, link_target_a, strlen(link_target_a) + 1)) {
                 H5_FAILED();
-                HDprintf("    link value '%s' for link at index %d did not match expected value '%s'\n",
-                         link_val_buf, 0, link_target_a);
+                printf("    link value '%s' for link at index %d did not match expected value '%s'\n",
+                       link_val_buf, 0, link_target_a);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
@@ -12002,15 +11884,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info at index %d\n", 1);
+                printf("    failed to retrieve soft link's info at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             link_val_size = strlen(link_target_b) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 1, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 1, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
@@ -12018,14 +11900,14 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value at index %d\n", 1);
+                printf("    couldn't get soft link value at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if (HDstrncmp(link_val_buf, link_target_b, strlen(link_target_b) + 1)) {
                 H5_FAILED();
-                HDprintf("    link value '%s' for link at index %d did not match expected value '%s'\n",
-                         link_val_buf, 1, link_target_b);
+                printf("    link value '%s' for link at index %d did not match expected value '%s'\n",
+                       link_val_buf, 1, link_target_b);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
@@ -12033,15 +11915,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info at index %d\n", 2);
+                printf("    failed to retrieve soft link's info at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             link_val_size = strlen(link_target_c) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 2, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 2, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
@@ -12049,20 +11931,20 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value at index %d\n", 2);
+                printf("    couldn't get soft link value at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if (HDstrncmp(link_val_buf, link_target_c, strlen(link_target_c) + 1)) {
                 H5_FAILED();
-                HDprintf("    link value '%s' for link at index %d did not match expected value '%s'\n",
-                         link_val_buf, 2, link_target_c);
+                printf("    link value '%s' for link at index %d did not match expected value '%s'\n",
+                       link_val_buf, 2, link_target_c);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP4_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP4_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing);
             }
 
@@ -12090,14 +11972,14 @@ test_get_link_val(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP5_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP5_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP5_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
@@ -12105,58 +11987,58 @@ test_get_link_val(void)
             if (H5Lcreate_soft(link_target_a, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             if (H5Lcreate_soft(link_target_b, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             if (H5Lcreate_soft(link_target_c, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             /* Verify the links exist */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
@@ -12165,15 +12047,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info at index %d\n", 2);
+                printf("    failed to retrieve soft link's info at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             link_val_size = strlen(link_target_a) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 2, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 2, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
@@ -12181,14 +12063,14 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value at index %d\n", 2);
+                printf("    couldn't get soft link value at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             if (HDstrncmp(link_val_buf, link_target_a, strlen(link_target_a) + 1)) {
                 H5_FAILED();
-                HDprintf("    link value '%s' for link at index %d did not match expected value '%s'\n",
-                         link_val_buf, 2, link_target_a);
+                printf("    link value '%s' for link at index %d did not match expected value '%s'\n",
+                       link_val_buf, 2, link_target_a);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
@@ -12196,15 +12078,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info at index %d\n", 1);
+                printf("    failed to retrieve soft link's info at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             link_val_size = strlen(link_target_b) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 1, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 1, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
@@ -12212,14 +12094,14 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value at index %d\n", 1);
+                printf("    couldn't get soft link value at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             if (HDstrncmp(link_val_buf, link_target_b, strlen(link_target_b) + 1)) {
                 H5_FAILED();
-                HDprintf("    link value '%s' for link at index %d did not match expected value '%s'\n",
-                         link_val_buf, 1, link_target_b);
+                printf("    link value '%s' for link at index %d did not match expected value '%s'\n",
+                       link_val_buf, 1, link_target_b);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
@@ -12227,15 +12109,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info at index %d\n", 0);
+                printf("    failed to retrieve soft link's info at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             link_val_size = strlen(link_target_c) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 0, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 0, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
@@ -12243,20 +12125,20 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value at index %d\n", 0);
+                printf("    couldn't get soft link value at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             if (HDstrncmp(link_val_buf, link_target_c, strlen(link_target_c) + 1)) {
                 H5_FAILED();
-                HDprintf("    link value '%s' for link at index %d did not match expected value '%s'\n",
-                         link_val_buf, 0, link_target_c);
+                printf("    link value '%s' for link at index %d did not match expected value '%s'\n",
+                       link_val_buf, 0, link_target_c);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP5_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP5_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing);
             }
 
@@ -12285,7 +12167,7 @@ test_get_link_val(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP6_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP6_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP6_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
@@ -12293,58 +12175,58 @@ test_get_link_val(void)
             if (H5Lcreate_soft(link_target_a, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             if (H5Lcreate_soft(link_target_b, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             if (H5Lcreate_soft(link_target_c, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             /* Verify the links exist */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
@@ -12353,15 +12235,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info at index %d\n", 0);
+                printf("    failed to retrieve soft link's info at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             link_val_size = strlen(link_target_a) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 0, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 0, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
@@ -12369,14 +12251,14 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value at index %d\n", 0);
+                printf("    couldn't get soft link value at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             if (HDstrncmp(link_val_buf, link_target_a, strlen(link_target_a) + 1)) {
                 H5_FAILED();
-                HDprintf("    link value '%s' for link at index %d did not match expected value '%s'\n",
-                         link_val_buf, 0, link_target_a);
+                printf("    link value '%s' for link at index %d did not match expected value '%s'\n",
+                       link_val_buf, 0, link_target_a);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
@@ -12384,15 +12266,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info at index %d\n", 1);
+                printf("    failed to retrieve soft link's info at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             link_val_size = strlen(link_target_b) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 1, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 1, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
@@ -12400,14 +12282,14 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value at index %d\n", 1);
+                printf("    couldn't get soft link value at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             if (HDstrncmp(link_val_buf, link_target_b, strlen(link_target_b) + 1)) {
                 H5_FAILED();
-                HDprintf("    link value '%s' for link at index %d did not match expected value '%s'\n",
-                         link_val_buf, 1, link_target_b);
+                printf("    link value '%s' for link at index %d did not match expected value '%s'\n",
+                       link_val_buf, 1, link_target_b);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
@@ -12415,15 +12297,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info at index %d\n", 2);
+                printf("    failed to retrieve soft link's info at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             link_val_size = strlen(link_target_c) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 2, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 2, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
@@ -12431,20 +12313,20 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value at index %d\n", 2);
+                printf("    couldn't get soft link value at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             if (HDstrncmp(link_val_buf, link_target_c, strlen(link_target_c) + 1)) {
                 H5_FAILED();
-                HDprintf("    link value '%s' for link at index %d did not match expected value '%s'\n",
-                         link_val_buf, 2, link_target_c);
+                printf("    link value '%s' for link at index %d did not match expected value '%s'\n",
+                       link_val_buf, 2, link_target_c);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP6_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP6_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing);
             }
 
@@ -12473,7 +12355,7 @@ test_get_link_val(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP7_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP7_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP7_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
@@ -12481,58 +12363,58 @@ test_get_link_val(void)
             if (H5Lcreate_soft(link_target_a, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             if (H5Lcreate_soft(link_target_b, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             if (H5Lcreate_soft(link_target_c, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             /* Verify the links exist */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
@@ -12541,15 +12423,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info at index %d\n", 2);
+                printf("    failed to retrieve soft link's info at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             link_val_size = strlen(link_target_a) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 2, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 2, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
@@ -12557,14 +12439,14 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value at index %d\n", 2);
+                printf("    couldn't get soft link value at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             if (HDstrncmp(link_val_buf, link_target_a, strlen(link_target_a) + 1)) {
                 H5_FAILED();
-                HDprintf("    link value '%s' for link at index %d did not match expected value '%s'\n",
-                         link_val_buf, 2, link_target_a);
+                printf("    link value '%s' for link at index %d did not match expected value '%s'\n",
+                       link_val_buf, 2, link_target_a);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
@@ -12572,15 +12454,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info at index %d\n", 1);
+                printf("    failed to retrieve soft link's info at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             link_val_size = strlen(link_target_b) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 1, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 1, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
@@ -12588,14 +12470,14 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value at index %d\n", 1);
+                printf("    couldn't get soft link value at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             if (HDstrncmp(link_val_buf, link_target_b, strlen(link_target_b) + 1)) {
                 H5_FAILED();
-                HDprintf("    link value '%s' for link at index %d did not match expected value '%s'\n",
-                         link_val_buf, 1, link_target_b);
+                printf("    link value '%s' for link at index %d did not match expected value '%s'\n",
+                       link_val_buf, 1, link_target_b);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
@@ -12603,15 +12485,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve soft link's info at index %d\n", 0);
+                printf("    failed to retrieve soft link's info at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             link_val_size = strlen(link_target_c) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 0, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 0, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
@@ -12619,20 +12501,20 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link value at index %d\n", 0);
+                printf("    couldn't get soft link value at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             if (HDstrncmp(link_val_buf, link_target_c, strlen(link_target_c) + 1)) {
                 H5_FAILED();
-                HDprintf("    link value '%s' for link at index %d did not match expected value '%s'\n",
-                         link_val_buf, 0, link_target_c);
+                printf("    link value '%s' for link at index %d did not match expected value '%s'\n",
+                       link_val_buf, 0, link_target_c);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP7_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP7_NAME);
                 PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing);
             }
 
@@ -12657,7 +12539,7 @@ test_get_link_val(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
@@ -12666,20 +12548,20 @@ test_get_link_val(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP8_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP8_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP8_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
@@ -12687,58 +12569,58 @@ test_get_link_val(void)
             if (H5Lcreate_external(ext_link_filename, ext_obj_name_a, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_obj_name_b, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_obj_name_c, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             /* Verify the links exist */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
@@ -12747,15 +12629,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info at index %d\n", 0);
+                printf("    failed to retrieve external link's info at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_a) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 0, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 0, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
@@ -12763,28 +12645,28 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value at index %d\n", 0);
+                printf("    couldn't get external link value at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name_a, strlen(ext_obj_name_a) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name_a);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name_a);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
@@ -12792,15 +12674,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info at index %d\n", 1);
+                printf("    failed to retrieve external link's info at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_b) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 1, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 1, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
@@ -12808,28 +12690,28 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value at index %d\n", 1);
+                printf("    couldn't get external link value at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name_b, strlen(ext_obj_name_b) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name_b);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name_b);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
@@ -12837,15 +12719,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info at index %d\n", 2);
+                printf("    failed to retrieve external link's info at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_c) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 2, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 2, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
@@ -12853,34 +12735,34 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value at index %d\n", 2);
+                printf("    couldn't get external link value at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name_c, strlen(ext_obj_name_c) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name_c);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name_c);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP8_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP8_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing);
             }
 
@@ -12907,7 +12789,7 @@ test_get_link_val(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
@@ -12916,20 +12798,20 @@ test_get_link_val(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP9_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP9_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP9_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
@@ -12937,58 +12819,58 @@ test_get_link_val(void)
             if (H5Lcreate_external(ext_link_filename, ext_obj_name_a, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_obj_name_b, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_obj_name_c, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             /* Verify the links exist */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
@@ -12997,15 +12879,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info at index %d\n", 2);
+                printf("    failed to retrieve external link's info at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_a) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d not match expected size of %zu\n",
-                         link_info.u.val_size, 2, link_val_size);
+                printf("    link value size %zu for link at index %d not match expected size of %zu\n",
+                       link_info.u.val_size, 2, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
@@ -13013,28 +12895,28 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value at index %d\n", 2);
+                printf("    couldn't get external link value at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name_a, strlen(ext_obj_name_a) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name_a);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name_a);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
@@ -13042,15 +12924,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info at index %d\n", 1);
+                printf("    failed to retrieve external link's info at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_b) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 1, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 1, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
@@ -13058,28 +12940,28 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value at index %d\n", 1);
+                printf("    couldn't get external link value at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name_b, strlen(ext_obj_name_b) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name_b);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name_b);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
@@ -13087,15 +12969,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info at index %d\n", 0);
+                printf("    failed to retrieve external link's info at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_c) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 0, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 0, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
@@ -13103,34 +12985,34 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value at index %d\n", 0);
+                printf("    couldn't get external link value at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name_c, strlen(ext_obj_name_c) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name_c);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name_c);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP9_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP9_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing);
             }
 
@@ -13160,20 +13042,20 @@ test_get_link_val(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP10_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP10_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP10_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
@@ -13181,58 +13063,58 @@ test_get_link_val(void)
             if (H5Lcreate_external(ext_link_filename, ext_obj_name_a, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_obj_name_b, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_obj_name_c, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             /* Verify the links exist */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
@@ -13241,15 +13123,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info at index %d\n", 0);
+                printf("    failed to retrieve external link's info at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_a) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 0, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 0, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
@@ -13257,28 +13139,28 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value at index %d\n", 0);
+                printf("    couldn't get external link value at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name_a, strlen(ext_obj_name_a) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name_a);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name_a);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
@@ -13286,15 +13168,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info at index %d\n", 1);
+                printf("    failed to retrieve external link's info at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_b) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 1, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 1, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
@@ -13302,28 +13184,28 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value at index %d\n", 1);
+                printf("    couldn't get external link value at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name_b, strlen(ext_obj_name_b) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name_b);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name_b);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
@@ -13331,15 +13213,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info at index %d\n", 2);
+                printf("    failed to retrieve external link's info at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_c) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 2, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 2, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
@@ -13347,34 +13229,34 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value at index %d\n", 2);
+                printf("    couldn't get external link value at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name_c, strlen(ext_obj_name_c) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name_c);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name_c);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP10_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP10_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing);
             }
 
@@ -13404,20 +13286,20 @@ test_get_link_val(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP11_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP11_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP11_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
@@ -13425,58 +13307,58 @@ test_get_link_val(void)
             if (H5Lcreate_external(ext_link_filename, ext_obj_name_a, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_obj_name_b, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_obj_name_c, subgroup_id,
                                    GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             /* Verify the links exist */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
+                printf("    couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
+                printf("    link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
@@ -13485,15 +13367,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info at index %d\n", 2);
+                printf("    failed to retrieve external link's info at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_a) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 2, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 2, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
@@ -13501,28 +13383,28 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value at index %d\n", 2);
+                printf("    couldn't get external link value at index %d\n", 2);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name_a, strlen(ext_obj_name_a) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name_a);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name_a);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
@@ -13530,15 +13412,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info at index %d\n", 1);
+                printf("    failed to retrieve external link's info at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_b) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 1, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 1, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
@@ -13546,28 +13428,28 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value at index %d\n", 1);
+                printf("    couldn't get external link value at index %d\n", 1);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name_b, strlen(ext_obj_name_b) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name_b);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name_b);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
@@ -13575,15 +13457,15 @@ test_get_link_val(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve external link's info at index %d\n", 0);
+                printf("    failed to retrieve external link's info at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_c) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link value size %zu for link at index %d did not match expected size of %zu\n",
-                         link_info.u.val_size, 0, link_val_size);
+                printf("    link value size %zu for link at index %d did not match expected size of %zu\n",
+                       link_info.u.val_size, 0, link_val_size);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
@@ -13591,34 +13473,34 @@ test_get_link_val(void)
             if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_val_buf,
                                   GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link value at index %d\n", 0);
+                printf("    couldn't get external link value at index %d\n", 0);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath,
                                     &ext_link_val) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't unpack external link value buffer\n");
+                printf("    couldn't unpack external link value buffer\n");
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link target file '%s' did not match expected '%s'\n",
-                         ext_link_filepath, ext_link_filename);
+                printf("    external link target file '%s' did not match expected '%s'\n", ext_link_filepath,
+                       ext_link_filename);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (HDstrncmp(ext_link_val, ext_obj_name_c, strlen(ext_obj_name_c) + 1)) {
                 H5_FAILED();
-                HDprintf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
-                         ext_obj_name_c);
+                printf("    external link value '%s' did not match expected '%s'\n", ext_link_val,
+                       ext_obj_name_c);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP11_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP11_NAME);
                 PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing);
             }
 
@@ -13754,8 +13636,8 @@ test_get_link_val_invalid_params(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, soft link, external link, or creation "
-                 "order aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, soft link, external link, or creation "
+               "order aren't supported with this connector\n");
         return 0;
     }
 
@@ -13763,34 +13645,33 @@ test_get_link_val_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, GET_LINK_VAL_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 GET_LINK_VAL_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", GET_LINK_VAL_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
     if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_VAL_INVALID_PARAMS_TEST_GROUP_NAME, group_id,
                        GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME);
+        printf("    couldn't create soft link '%s'\n", GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME);
         goto error;
     }
 
@@ -13798,21 +13679,21 @@ test_get_link_val_invalid_params(void)
     if ((link_exists = H5Lexists(group_id, GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n",
-                 GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n",
+               GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link did not exist\n");
+        printf("    link did not exist\n");
         goto error;
     }
 
     link_val_buf_size = 100;
     if (NULL == (link_val_buf = (char *)HDmalloc(link_val_buf_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for storing link value\n");
+        printf("    couldn't allocate buffer for storing link value\n");
         goto error;
     }
 
@@ -13835,7 +13716,7 @@ test_get_link_val_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_val succeeded with an invalid location ID\n");
+                printf("    H5Lget_val succeeded with an invalid location ID\n");
                 PART_ERROR(H5Lget_val_invalid_loc_id);
             }
 
@@ -13855,7 +13736,7 @@ test_get_link_val_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_val succeeded with a NULL link name\n");
+                printf("    H5Lget_val succeeded with a NULL link name\n");
                 PART_ERROR(H5Lget_val_invalid_link_name);
             }
 
@@ -13867,7 +13748,7 @@ test_get_link_val_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_val succeeded with an invalid link name of ''\n");
+                printf("    H5Lget_val succeeded with an invalid link name of ''\n");
                 PART_ERROR(H5Lget_val_invalid_link_name);
             }
 
@@ -13888,7 +13769,7 @@ test_get_link_val_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_val succeeded with an invalid LAPL\n");
+                printf("    H5Lget_val succeeded with an invalid LAPL\n");
                 PART_ERROR(H5Lget_val_invalid_lapl);
             }
 
@@ -13911,7 +13792,7 @@ test_get_link_val_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_val_by_idx succeeded with an invalid location ID!\n");
+                printf("    H5Lget_val_by_idx succeeded with an invalid location ID!\n");
                 PART_ERROR(H5Lget_val_by_idx_invalid_loc_id);
             }
 
@@ -13932,7 +13813,7 @@ test_get_link_val_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_val_by_idx succeeded with a NULL group name!\n");
+                printf("    H5Lget_val_by_idx succeeded with a NULL group name!\n");
                 PART_ERROR(H5Lget_val_by_idx_invalid_grp_name);
             }
 
@@ -13945,7 +13826,7 @@ test_get_link_val_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_val_by_idx succeeded with an invalid group name of ''!\n");
+                printf("    H5Lget_val_by_idx succeeded with an invalid group name of ''!\n");
                 PART_ERROR(H5Lget_val_by_idx_invalid_grp_name);
             }
 
@@ -13966,7 +13847,7 @@ test_get_link_val_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_val_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
+                printf("    H5Lget_val_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Lget_val_by_idx_invalid_index_type);
             }
 
@@ -13979,7 +13860,7 @@ test_get_link_val_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_val_by_idx succeeded with invalid index type H5_INDEX_N!\n");
+                printf("    H5Lget_val_by_idx succeeded with invalid index type H5_INDEX_N!\n");
                 PART_ERROR(H5Lget_val_by_idx_invalid_index_type);
             }
 
@@ -14000,8 +13881,7 @@ test_get_link_val_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    H5Lget_val_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
+                printf("    H5Lget_val_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Lget_val_by_idx_invalid_iter_order);
             }
 
@@ -14014,7 +13894,7 @@ test_get_link_val_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_val_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n");
+                printf("    H5Lget_val_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n");
                 PART_ERROR(H5Lget_val_by_idx_invalid_iter_order);
             }
 
@@ -14035,7 +13915,7 @@ test_get_link_val_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_val_by_idx succeeded with an invalid LAPL!\n");
+                printf("    H5Lget_val_by_idx succeeded with an invalid LAPL!\n");
                 PART_ERROR(H5Lget_val_by_idx_invalid_lapl);
             }
 
@@ -14105,8 +13985,8 @@ test_get_link_info(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, soft link, hard link, or external link "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, soft link, hard link, or external link "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -14114,26 +13994,26 @@ test_get_link_info(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for link creation order tracking\n");
+        printf("    couldn't create GCPL for link creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set link creation order tracking\n");
+            printf("    couldn't set link creation order tracking\n");
             goto error;
         }
     }
@@ -14141,7 +14021,7 @@ test_get_link_info(void)
     if ((group_id = H5Gcreate2(container_group, GET_LINK_INFO_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", GET_LINK_INFO_TEST_GROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", GET_LINK_INFO_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -14158,54 +14038,54 @@ test_get_link_info(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP1_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP1_NAME);
                 PART_ERROR(H5Lget_info_hard);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_hard);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_hard);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link did not exist\n");
+                printf("    hard link did not exist\n");
                 PART_ERROR(H5Lget_info_hard);
             }
 
             if (H5Lget_info2(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, &link_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info\n");
+                printf("    couldn't get hard link info\n");
                 PART_ERROR(H5Lget_info_hard);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_hard);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 0)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)0);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)0);
                     PART_ERROR(H5Lget_info_hard);
                 }
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP1_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP1_NAME);
                 PART_ERROR(H5Lget_info_hard);
             }
 
@@ -14229,7 +14109,7 @@ test_get_link_info(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP2_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP2_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP2_NAME);
                 PART_ERROR(H5Lget_info_soft);
             }
 
@@ -14238,32 +14118,32 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_soft);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_soft);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link did not exist\n");
+                printf("    soft link did not exist\n");
                 PART_ERROR(H5Lget_info_soft);
             }
 
             if (H5Lget_info2(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, &link_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info\n");
+                printf("    couldn't get soft link info\n");
                 PART_ERROR(H5Lget_info_soft);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_soft);
             }
 
@@ -14272,23 +14152,23 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%zu' did not match expected value '%zu'\n",
-                         link_info.u.val_size, link_val_size);
+                printf("    link's value size '%zu' did not match expected value '%zu'\n",
+                       link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_soft);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 0)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)0);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)0);
                     PART_ERROR(H5Lget_info_soft);
                 }
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP2_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP2_NAME);
                 PART_ERROR(H5Lget_info_soft);
             }
 
@@ -14314,75 +14194,75 @@ test_get_link_info(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_info_external);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_info_external);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP3_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP3_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP3_NAME);
                 PART_ERROR(H5Lget_info_external);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_external);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_external);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link did not exist\n");
+                printf("    external link did not exist\n");
                 PART_ERROR(H5Lget_info_external);
             }
 
             if (H5Lget_info2(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, &link_info, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info\n");
+                printf("    couldn't get external link info\n");
                 PART_ERROR(H5Lget_info_external);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_external);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_external);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 0)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)0);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)0);
                     PART_ERROR(H5Lget_info_external);
                 }
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP3_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP3_NAME);
                 PART_ERROR(H5Lget_info_external);
             }
 
@@ -14423,14 +14303,14 @@ test_get_link_info(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP5_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP5_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP5_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
@@ -14438,64 +14318,64 @@ test_get_link_info(void)
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
@@ -14504,20 +14384,20 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info for index %d\n", 0);
+                printf("    couldn't get hard link info for index %d\n", 0);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 0)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)0);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)0);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
@@ -14525,20 +14405,20 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info for index %d\n", 1);
+                printf("    couldn't get hard link info for index %d\n", 1);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 1)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)1);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)1);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
@@ -14546,26 +14426,26 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info for index %d\n", 2);
+                printf("    couldn't get hard link info for index %d\n", 2);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 2)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)2);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)2);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP5_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP5_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing);
             }
 
@@ -14586,14 +14466,14 @@ test_get_link_info(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP6_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP6_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP6_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
@@ -14601,64 +14481,64 @@ test_get_link_info(void)
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
@@ -14667,20 +14547,20 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info for index %d\n", 2);
+                printf("    couldn't get hard link info for index %d\n", 2);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 0)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)0);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)0);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
@@ -14688,20 +14568,20 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info for index %d\n", 1);
+                printf("    couldn't get hard link info for index %d\n", 1);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 1)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)1);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)1);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
@@ -14709,26 +14589,26 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info for index %d\n", 0);
+                printf("    couldn't get hard link info for index %d\n", 0);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 2)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)2);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)2);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP6_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP6_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing);
             }
 
@@ -14750,7 +14630,7 @@ test_get_link_info(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP7_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP7_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP7_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
@@ -14758,64 +14638,64 @@ test_get_link_info(void)
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
@@ -14824,21 +14704,21 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info for index %d\n", 0);
+                printf("    couldn't get hard link info for index %d\n", 0);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 0)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)0);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)0);
                     PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
                 }
             }
@@ -14847,21 +14727,21 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info for index %d\n", 1);
+                printf("    couldn't get hard link info for index %d\n", 1);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 1)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)1);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)1);
                     PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
                 }
             }
@@ -14870,28 +14750,28 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info for index %d\n", 2);
+                printf("    couldn't get hard link info for index %d\n", 2);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 2)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)2);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)2);
                     PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
                 }
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP7_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP7_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing);
             }
 
@@ -14913,7 +14793,7 @@ test_get_link_info(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP8_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP8_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP8_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
@@ -14921,64 +14801,64 @@ test_get_link_info(void)
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3);
+                printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
@@ -14987,21 +14867,21 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info for index %d\n", 2);
+                printf("    couldn't get hard link info for index %d\n", 2);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 0)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)0);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)0);
                     PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
                 }
             }
@@ -15010,21 +14890,21 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info for index %d\n", 1);
+                printf("    couldn't get hard link info for index %d\n", 1);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 1)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)1);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)1);
                     PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
                 }
             }
@@ -15033,28 +14913,28 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get hard link info for index %d\n", 0);
+                printf("    couldn't get hard link info for index %d\n", 0);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 2)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)2);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)2);
                     PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
                 }
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP8_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP8_NAME);
                 PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing);
             }
 
@@ -15075,14 +14955,14 @@ test_get_link_info(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP9_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP9_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP9_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
@@ -15092,7 +14972,7 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
@@ -15101,7 +14981,7 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
@@ -15110,50 +14990,50 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
@@ -15162,13 +15042,13 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info for index %d\n", 0);
+                printf("    couldn't get soft link info for index %d\n", 0);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
@@ -15177,15 +15057,15 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%zu' did not match expected value '%zu'\n",
-                         link_info.u.val_size, link_val_size);
+                printf("    link's value size '%zu' did not match expected value '%zu'\n",
+                       link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 0)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)0);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)0);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
@@ -15193,13 +15073,13 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info for index %d\n", 1);
+                printf("    couldn't get soft link info for index %d\n", 1);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
@@ -15208,15 +15088,15 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%zu' did not match expected value '%zu'\n",
-                         link_info.u.val_size, link_val_size);
+                printf("    link's value size '%zu' did not match expected value '%zu'\n",
+                       link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 1)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)1);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)1);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
@@ -15224,13 +15104,13 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info for index %d\n", 2);
+                printf("    couldn't get soft link info for index %d\n", 2);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
@@ -15239,21 +15119,21 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%zu' did not match expected value '%zu'\n",
-                         link_info.u.val_size, link_val_size);
+                printf("    link's value size '%zu' did not match expected value '%zu'\n",
+                       link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 2)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)2);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)2);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP9_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP9_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing);
             }
 
@@ -15274,14 +15154,14 @@ test_get_link_info(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP10_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP10_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP10_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
@@ -15291,7 +15171,7 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
@@ -15300,7 +15180,7 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
@@ -15309,50 +15189,50 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
@@ -15361,13 +15241,13 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info for index %d\n", 2);
+                printf("    couldn't get soft link info for index %d\n", 2);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
@@ -15376,15 +15256,15 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%zu' did not match expected value '%zu'\n",
-                         link_info.u.val_size, link_val_size);
+                printf("    link's value size '%zu' did not match expected value '%zu'\n",
+                       link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 0)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)0);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)0);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
@@ -15392,13 +15272,13 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info for index %d\n", 1);
+                printf("    couldn't get soft link info for index %d\n", 1);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
@@ -15407,15 +15287,15 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%zu' did not match expected value '%zu'\n",
-                         link_info.u.val_size, link_val_size);
+                printf("    link's value size '%zu' did not match expected value '%zu'\n",
+                       link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 1)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)1);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)1);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
@@ -15423,13 +15303,13 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info for index %d\n", 0);
+                printf("    couldn't get soft link info for index %d\n", 0);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
@@ -15438,21 +15318,21 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%zu' did not match expected value '%zu'\n",
-                         link_info.u.val_size, link_val_size);
+                printf("    link's value size '%zu' did not match expected value '%zu'\n",
+                       link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 2)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)2);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)2);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP10_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP10_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing);
             }
 
@@ -15474,7 +15354,7 @@ test_get_link_info(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP11_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP11_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP11_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
@@ -15484,7 +15364,7 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
@@ -15493,7 +15373,7 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
@@ -15502,50 +15382,50 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
@@ -15554,13 +15434,13 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info for index %d\n", 0);
+                printf("    couldn't get soft link info for index %d\n", 0);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
@@ -15569,16 +15449,16 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%zu' did not match expected value '%zu'\n",
-                         link_info.u.val_size, link_val_size);
+                printf("    link's value size '%zu' did not match expected value '%zu'\n",
+                       link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 0)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)0);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)0);
                     PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
                 }
             }
@@ -15587,13 +15467,13 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info for index %d\n", 1);
+                printf("    couldn't get soft link info for index %d\n", 1);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
@@ -15602,16 +15482,16 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%zu' did not match expected value '%zu'\n",
-                         link_info.u.val_size, link_val_size);
+                printf("    link's value size '%zu' did not match expected value '%zu'\n",
+                       link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 1)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)1);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)1);
                     PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
                 }
             }
@@ -15620,13 +15500,13 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info for index %d\n", 2);
+                printf("    couldn't get soft link info for index %d\n", 2);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
@@ -15635,23 +15515,23 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%zu' did not match expected value '%zu'\n",
-                         link_info.u.val_size, link_val_size);
+                printf("    link's value size '%zu' did not match expected value '%zu'\n",
+                       link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 2)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)2);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)2);
                     PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
                 }
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP11_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP11_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing);
             }
 
@@ -15673,7 +15553,7 @@ test_get_link_info(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP12_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP12_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP12_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
@@ -15683,7 +15563,7 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
@@ -15692,7 +15572,7 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
@@ -15701,50 +15581,50 @@ test_get_link_info(void)
                                subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
@@ -15753,13 +15633,13 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info for index %d\n", 2);
+                printf("    couldn't get soft link info for index %d\n", 2);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
@@ -15768,16 +15648,16 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 0)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)0);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)0);
                     PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
                 }
             }
@@ -15786,13 +15666,13 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info for index %d\n", 1);
+                printf("    couldn't get soft link info for index %d\n", 1);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
@@ -15801,16 +15681,16 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 1)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)1);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)1);
                     PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
                 }
             }
@@ -15819,13 +15699,13 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get soft link info for index %d\n", 0);
+                printf("    couldn't get soft link info for index %d\n", 0);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_SOFT) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
@@ -15834,23 +15714,23 @@ test_get_link_info(void)
                             1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 2)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)2);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)2);
                     PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
                 }
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP12_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP12_NAME);
                 PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing);
             }
 
@@ -15871,7 +15751,7 @@ test_get_link_info(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
@@ -15880,20 +15760,20 @@ test_get_link_info(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP13_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP13_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP13_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
@@ -15901,64 +15781,64 @@ test_get_link_info(void)
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    external link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME2);
+                printf("    external link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME3);
+                printf("    external link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
@@ -15967,28 +15847,28 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info for index %d\n", 0);
+                printf("    couldn't get external link info for index %d\n", 0);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 0)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)0);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)0);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
@@ -15996,28 +15876,28 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info for index %d\n", 1);
+                printf("    couldn't get external link info for index %d\n", 1);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 1)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)1);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)1);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
@@ -16025,34 +15905,34 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info for index %d\n", 2);
+                printf("    couldn't get external link info for index %d\n", 2);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 2)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)2);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)2);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP13_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP13_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing);
             }
 
@@ -16075,7 +15955,7 @@ test_get_link_info(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
@@ -16084,20 +15964,20 @@ test_get_link_info(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP14_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP14_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP14_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
@@ -16105,64 +15985,64 @@ test_get_link_info(void)
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    external link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME2);
+                printf("    external link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME3);
+                printf("    external link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
@@ -16171,28 +16051,28 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info for index %d\n", 2);
+                printf("    couldn't get external link info for index %d\n", 2);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 0)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)0);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)0);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
@@ -16200,28 +16080,28 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info for index %d\n", 1);
+                printf("    couldn't get external link info for index %d\n", 1);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 1)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)1);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)1);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
@@ -16229,34 +16109,34 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info for index %d\n", 0);
+                printf("    couldn't get external link info for index %d\n", 0);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (link_info.corder_valid && (link_info.corder != 2)) {
                 H5_FAILED();
-                HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                         (long long)link_info.corder, (long long)2);
+                printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                       (long long)link_info.corder, (long long)2);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP14_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP14_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing);
             }
 
@@ -16282,20 +16162,20 @@ test_get_link_info(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP15_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP15_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP15_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
@@ -16303,64 +16183,64 @@ test_get_link_info(void)
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    external link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME2);
+                printf("    external link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME3);
+                printf("    external link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
@@ -16369,29 +16249,29 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info for index %d\n", 0);
+                printf("    couldn't get external link info for index %d\n", 0);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 0)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)0);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)0);
                     PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
                 }
             }
@@ -16400,29 +16280,29 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info for index %d\n", 1);
+                printf("    couldn't get external link info for index %d\n", 1);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 1)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)1);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)1);
                     PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
                 }
             }
@@ -16431,36 +16311,36 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info for index %d\n", 2);
+                printf("    couldn't get external link info for index %d\n", 2);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 2)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)2);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)2);
                     PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
                 }
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP15_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP15_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing);
             }
 
@@ -16486,20 +16366,20 @@ test_get_link_info(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP16_NAME, H5P_DEFAULT, gcpl_id,
                                           H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP16_NAME);
+                printf("    couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP16_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
@@ -16507,64 +16387,64 @@ test_get_link_info(void)
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id,
                                    GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3);
+                printf("    couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME);
+                printf("    external link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME2);
+                printf("    external link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME2);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before deletion\n",
-                         GET_LINK_INFO_TEST_EXT_LINK_NAME3);
+                printf("    external link '%s' did not exist before deletion\n",
+                       GET_LINK_INFO_TEST_EXT_LINK_NAME3);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
@@ -16573,29 +16453,29 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info for index %d\n", 2);
+                printf("    couldn't get external link info for index %d\n", 2);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 0)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)0);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)0);
                     PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
                 }
             }
@@ -16604,29 +16484,29 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info for index %d\n", 1);
+                printf("    couldn't get external link info for index %d\n", 1);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 1)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)1);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)1);
                     PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
                 }
             }
@@ -16635,36 +16515,36 @@ test_get_link_info(void)
             if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get external link info for index %d\n", 0);
+                printf("    couldn't get external link info for index %d\n", 0);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if (link_info.type != H5L_TYPE_EXTERNAL) {
                 H5_FAILED();
-                HDprintf("    incorrect link type returned\n");
+                printf("    incorrect link type returned\n");
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1;
             if (link_info.u.val_size != link_val_size) {
                 H5_FAILED();
-                HDprintf("    link's value size '%lld' did not match expected value '%zu'\n",
-                         (long long)link_info.u.val_size, link_val_size);
+                printf("    link's value size '%lld' did not match expected value '%zu'\n",
+                       (long long)link_info.u.val_size, link_val_size);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
             if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
                 if (link_info.corder_valid && (link_info.corder != 2)) {
                     H5_FAILED();
-                    HDprintf("    link's creation order value '%lld' did not match expected value '%lld'\n",
-                             (long long)link_info.corder, (long long)2);
+                    printf("    link's creation order value '%lld' did not match expected value '%lld'\n",
+                           (long long)link_info.corder, (long long)2);
                     PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
                 }
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP16_NAME);
+                printf("    failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP16_NAME);
                 PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing);
             }
 
@@ -16798,8 +16678,8 @@ test_get_link_info_invalid_params(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, or hard link "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, or hard link "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -16807,34 +16687,33 @@ test_get_link_info_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, GET_LINK_INFO_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 GET_LINK_INFO_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", GET_LINK_INFO_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
     if (H5Lcreate_hard(group_id, ".", group_id, GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                        H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create hard link '%s'\n", GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+        printf("    couldn't create hard link '%s'\n", GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
@@ -16842,14 +16721,14 @@ test_get_link_info_invalid_params(void)
     if ((link_exists = H5Lexists(group_id, GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if hard link '%s' exists\n",
-                 GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+        printf("    couldn't determine if hard link '%s' exists\n",
+               GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    hard link did not exist\n");
+        printf("    hard link did not exist\n");
         goto error;
     }
 
@@ -16872,7 +16751,7 @@ test_get_link_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_info2 succeeded with an invalid location ID!\n");
+                printf("    H5Lget_info2 succeeded with an invalid location ID!\n");
                 PART_ERROR(H5Lget_info_invalid_loc_id);
             }
 
@@ -16892,7 +16771,7 @@ test_get_link_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_info2 succeeded with a NULL link name!\n");
+                printf("    H5Lget_info2 succeeded with a NULL link name!\n");
                 PART_ERROR(H5Lget_info_invalid_link_name);
             }
 
@@ -16904,7 +16783,7 @@ test_get_link_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_info2 succeeded with an invalid link name of ''!\n");
+                printf("    H5Lget_info2 succeeded with an invalid link name of ''!\n");
                 PART_ERROR(H5Lget_info_invalid_link_name);
             }
 
@@ -16925,7 +16804,7 @@ test_get_link_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_info2 succeeded with an invalid LAPL!\n");
+                printf("    H5Lget_info2 succeeded with an invalid LAPL!\n");
                 PART_ERROR(H5Lget_info_invalid_lapl);
             }
 
@@ -16948,7 +16827,7 @@ test_get_link_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_info_by_idx2 succeeded with an invalid location ID!\n");
+                printf("    H5Lget_info_by_idx2 succeeded with an invalid location ID!\n");
                 PART_ERROR(H5Lget_info_by_idx_invalid_loc_id);
             }
 
@@ -16969,7 +16848,7 @@ test_get_link_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_info_by_idx2 succeeded with a NULL group name!\n");
+                printf("    H5Lget_info_by_idx2 succeeded with a NULL group name!\n");
                 PART_ERROR(H5Lget_info_by_idx_invalid_grp_name);
             }
 
@@ -16982,7 +16861,7 @@ test_get_link_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_info_by_idx2 succeeded with an invalid group name of ''!\n");
+                printf("    H5Lget_info_by_idx2 succeeded with an invalid group name of ''!\n");
                 PART_ERROR(H5Lget_info_by_idx_invalid_grp_name);
             }
 
@@ -17003,7 +16882,7 @@ test_get_link_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_info_by_idx2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
+                printf("    H5Lget_info_by_idx2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Lget_info_by_idx_invalid_index_type);
             }
 
@@ -17016,7 +16895,7 @@ test_get_link_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_info_by_idx2 succeeded with invalid index type H5_INDEX_N!\n");
+                printf("    H5Lget_info_by_idx2 succeeded with invalid index type H5_INDEX_N!\n");
                 PART_ERROR(H5Lget_info_by_idx_invalid_index_type);
             }
 
@@ -17037,7 +16916,7 @@ test_get_link_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    H5Lget_info_by_idx2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Lget_info_by_idx_invalid_iter_order);
             }
@@ -17051,7 +16930,7 @@ test_get_link_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_info_by_idx2 succeeded with invalid iteration ordering H5_ITER_N!\n");
+                printf("    H5Lget_info_by_idx2 succeeded with invalid iteration ordering H5_ITER_N!\n");
                 PART_ERROR(H5Lget_info_by_idx_invalid_iter_order);
             }
 
@@ -17072,7 +16951,7 @@ test_get_link_info_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_info_by_idx2 succeeded with an invalid LAPL!\n");
+                printf("    H5Lget_info_by_idx2 succeeded with an invalid LAPL!\n");
                 PART_ERROR(H5Lget_info_by_idx_invalid_lapl);
             }
 
@@ -17134,8 +17013,8 @@ test_get_link_name(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, soft link, hard link, or external link "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, soft link, hard link, or external link "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -17143,26 +17022,26 @@ test_get_link_name(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for link creation order tracking\n");
+        printf("    couldn't create GCPL for link creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set link creation order tracking\n");
+            printf("    couldn't set link creation order tracking\n");
             goto error;
         }
     }
@@ -17170,7 +17049,7 @@ test_get_link_name(void)
     if ((group_id = H5Gcreate2(container_group, GET_LINK_NAME_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_GROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -17184,7 +17063,7 @@ test_get_link_name(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
@@ -17192,8 +17071,8 @@ test_get_link_name(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n",
-                         GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME);
+                printf("    couldn't create container subgroup '%s'\n",
+                       GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
@@ -17201,64 +17080,64 @@ test_get_link_name(void)
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
@@ -17266,72 +17145,72 @@ test_get_link_name(void)
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3,
                           strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2,
                           strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME,
                           strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group\n");
+                printf("    failed to close group\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing);
             }
 
@@ -17352,7 +17231,7 @@ test_get_link_name(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
@@ -17360,8 +17239,8 @@ test_get_link_name(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME2, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n",
-                         GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME2);
+                printf("    couldn't create container subgroup '%s'\n",
+                       GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
@@ -17369,64 +17248,64 @@ test_get_link_name(void)
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
@@ -17434,72 +17313,72 @@ test_get_link_name(void)
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME,
                           strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2,
                           strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3,
                           strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group\n");
+                printf("    failed to close group\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing);
             }
 
@@ -17522,8 +17401,8 @@ test_get_link_name(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME3, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n",
-                         GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME3);
+                printf("    couldn't create container subgroup '%s'\n",
+                       GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
@@ -17531,64 +17410,64 @@ test_get_link_name(void)
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
@@ -17596,72 +17475,72 @@ test_get_link_name(void)
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME,
                           strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2,
                           strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3,
                           strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group\n");
+                printf("    failed to close group\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing);
             }
 
@@ -17684,8 +17563,8 @@ test_get_link_name(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME4, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n",
-                         GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME4);
+                printf("    couldn't create container subgroup '%s'\n",
+                       GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME4);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
@@ -17693,64 +17572,64 @@ test_get_link_name(void)
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    hard link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    hard link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if hard link '%s' exists\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    couldn't determine if hard link '%s' exists\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    hard link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    hard link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
@@ -17758,72 +17637,72 @@ test_get_link_name(void)
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3,
                           strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME3);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2,
                           strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME2);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME,
                           strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_HARD_LINK_NAME);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_HARD_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group\n");
+                printf("    failed to close group\n");
                 PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing);
             }
 
@@ -17844,7 +17723,7 @@ test_get_link_name(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
@@ -17852,8 +17731,8 @@ test_get_link_name(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n",
-                         GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME);
+                printf("    couldn't create container subgroup '%s'\n",
+                       GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
@@ -17861,64 +17740,64 @@ test_get_link_name(void)
             if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id,
                                GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id,
                                GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id,
                                GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
@@ -17926,72 +17805,72 @@ test_get_link_name(void)
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3,
                           strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2,
                           strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME,
                           strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group\n");
+                printf("    failed to close group\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing);
             }
 
@@ -18012,7 +17891,7 @@ test_get_link_name(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
@@ -18020,8 +17899,8 @@ test_get_link_name(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME2, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n",
-                         GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME2);
+                printf("    couldn't create container subgroup '%s'\n",
+                       GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
@@ -18029,64 +17908,64 @@ test_get_link_name(void)
             if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id,
                                GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id,
                                GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id,
                                GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
@@ -18094,72 +17973,72 @@ test_get_link_name(void)
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME,
                           strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2,
                           strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3,
                           strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group\n");
+                printf("    failed to close group\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing);
             }
 
@@ -18182,8 +18061,8 @@ test_get_link_name(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME3, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n",
-                         GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME3);
+                printf("    couldn't create container subgroup '%s'\n",
+                       GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
@@ -18191,64 +18070,64 @@ test_get_link_name(void)
             if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id,
                                GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id,
                                GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id,
                                GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
@@ -18256,72 +18135,72 @@ test_get_link_name(void)
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME,
                           strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2,
                           strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3,
                           strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group\n");
+                printf("    failed to close group\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing);
             }
 
@@ -18344,8 +18223,8 @@ test_get_link_name(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME4, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n",
-                         GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME4);
+                printf("    couldn't create container subgroup '%s'\n",
+                       GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME4);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
@@ -18353,64 +18232,64 @@ test_get_link_name(void)
             if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id,
                                GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id,
                                GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id,
                                GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             /* Verify the links have been created */
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    soft link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    soft link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if soft link '%s' exists\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    couldn't determine if soft link '%s' exists\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    soft link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    soft link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
@@ -18418,72 +18297,72 @@ test_get_link_name(void)
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3,
                           strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2,
                           strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME,
                           strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_SOFT_LINK_NAME);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group\n");
+                printf("    failed to close group\n");
                 PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing);
             }
 
@@ -18504,7 +18383,7 @@ test_get_link_name(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
@@ -18514,13 +18393,13 @@ test_get_link_name(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
@@ -18528,8 +18407,8 @@ test_get_link_name(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME);
+                printf("    couldn't create container subgroup '%s'\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
@@ -18537,21 +18416,21 @@ test_get_link_name(void)
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id,
                                    GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id,
                                    GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
@@ -18559,45 +18438,45 @@ test_get_link_name(void)
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
@@ -18605,72 +18484,72 @@ test_get_link_name(void)
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3,
                           strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2,
                           strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME,
                           strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group\n");
+                printf("    failed to close group\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing);
             }
 
@@ -18693,7 +18572,7 @@ test_get_link_name(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
@@ -18703,13 +18582,13 @@ test_get_link_name(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
@@ -18717,8 +18596,8 @@ test_get_link_name(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME2, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME2);
+                printf("    couldn't create container subgroup '%s'\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
@@ -18726,21 +18605,21 @@ test_get_link_name(void)
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id,
                                    GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id,
                                    GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
@@ -18748,45 +18627,45 @@ test_get_link_name(void)
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
@@ -18794,72 +18673,72 @@ test_get_link_name(void)
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME,
                           strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2,
                           strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3,
                           strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group\n");
+                printf("    failed to close group\n");
                 PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing);
             }
 
@@ -18886,13 +18765,13 @@ test_get_link_name(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
@@ -18900,8 +18779,8 @@ test_get_link_name(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME3, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME3);
+                printf("    couldn't create container subgroup '%s'\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
@@ -18909,21 +18788,21 @@ test_get_link_name(void)
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id,
                                    GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id,
                                    GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
@@ -18931,45 +18810,45 @@ test_get_link_name(void)
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
@@ -18977,72 +18856,72 @@ test_get_link_name(void)
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME,
                           strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2,
                           strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3,
                           strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group\n");
+                printf("    failed to close group\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing);
             }
 
@@ -19069,13 +18948,13 @@ test_get_link_name(void)
 
             if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+                printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (H5Fclose(ext_file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close file '%s'\n", ext_link_filename);
+                printf("    couldn't close file '%s'\n", ext_link_filename);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
@@ -19083,8 +18962,8 @@ test_get_link_name(void)
             if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME4, H5P_DEFAULT,
                                           gcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container subgroup '%s'\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME4);
+                printf("    couldn't create container subgroup '%s'\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME4);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
@@ -19092,21 +18971,21 @@ test_get_link_name(void)
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME,
                                    H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id,
                                    GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id,
                                    GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
@@ -19114,45 +18993,45 @@ test_get_link_name(void)
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    external link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    external link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if external link '%s' exists\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    couldn't determine if external link '%s' exists\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    external link '%s' did not exist before name retrieval\n",
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    external link '%s' did not exist before name retrieval\n",
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
@@ -19160,72 +19039,72 @@ test_get_link_name(void)
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3,
                           strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2,
                           strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2,
                                                          NULL, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name size\n");
+                printf("    failed to retrieve link name size\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_name_buf,
                                    (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve link name\n");
+                printf("    failed to retrieve link name\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME,
                           strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME) + 1)) {
                 H5_FAILED();
-                HDprintf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
-                         GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
+                printf("    link name '%s' did not match expected name '%s'\n", link_name_buf,
+                       GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME);
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
             if (H5Gclose(subgroup_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group\n");
+                printf("    failed to close group\n");
                 PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing);
             }
 
@@ -19369,8 +19248,8 @@ test_get_link_name_invalid_params(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, soft link, hard link, or external link "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, soft link, hard link, or external link "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -19378,28 +19257,27 @@ test_get_link_name_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, GET_LINK_NAME_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 GET_LINK_NAME_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", GET_LINK_NAME_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
     if (H5Lcreate_hard(group_id, ".", group_id, GET_LINK_NAME_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT,
                        H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    failed to create hard link '%s'\n", GET_LINK_NAME_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+        printf("    failed to create hard link '%s'\n", GET_LINK_NAME_INVALID_PARAMS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
@@ -19407,20 +19285,20 @@ test_get_link_name_invalid_params(void)
     if ((link_exists = H5Lexists(group_id, GET_LINK_NAME_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link exists\n");
+        printf("    couldn't determine if link exists\n");
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link did not exist\n");
+        printf("    link did not exist\n");
         goto error;
     }
 
     if ((ret = H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, link_name_buf_size,
                                   H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve link name size\n");
+        printf("    failed to retrieve link name size\n");
         goto error;
     }
 
@@ -19445,7 +19323,7 @@ test_get_link_name_invalid_params(void)
 
             if (ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_name_by_idx succeeded with an invalid location ID!\n");
+                printf("    H5Lget_name_by_idx succeeded with an invalid location ID!\n");
                 PART_ERROR(H5Lget_name_by_idx_invalid_loc_id);
             }
 
@@ -19466,7 +19344,7 @@ test_get_link_name_invalid_params(void)
 
             if (ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_name_by_idx succeeded with a NULL group name!\n");
+                printf("    H5Lget_name_by_idx succeeded with a NULL group name!\n");
                 PART_ERROR(H5Lget_name_by_idx_invalid_grp_name);
             }
 
@@ -19479,7 +19357,7 @@ test_get_link_name_invalid_params(void)
 
             if (ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_name_by_idx succeeded with an invalid group name of ''!\n");
+                printf("    H5Lget_name_by_idx succeeded with an invalid group name of ''!\n");
                 PART_ERROR(H5Lget_name_by_idx_invalid_grp_name);
             }
 
@@ -19500,7 +19378,7 @@ test_get_link_name_invalid_params(void)
 
             if (ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_name_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
+                printf("    H5Lget_name_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Lget_name_by_idx_invalid_index_type);
             }
 
@@ -19513,7 +19391,7 @@ test_get_link_name_invalid_params(void)
 
             if (ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_name_by_idx succeeded with invalid index type H5_INDEX_N!\n");
+                printf("    H5Lget_name_by_idx succeeded with invalid index type H5_INDEX_N!\n");
                 PART_ERROR(H5Lget_name_by_idx_invalid_index_type);
             }
 
@@ -19534,8 +19412,7 @@ test_get_link_name_invalid_params(void)
 
             if (ret >= 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    H5Lget_name_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
+                printf("    H5Lget_name_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Lget_name_by_idx_invalid_iter_order);
             }
 
@@ -19548,7 +19425,7 @@ test_get_link_name_invalid_params(void)
 
             if (ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_name_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n");
+                printf("    H5Lget_name_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n");
                 PART_ERROR(H5Lget_name_by_idx_invalid_iter_order);
             }
 
@@ -19569,7 +19446,7 @@ test_get_link_name_invalid_params(void)
 
             if (ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lget_name_by_idx succeeded with an invalid LAPL!\n");
+                printf("    H5Lget_name_by_idx succeeded with an invalid LAPL!\n");
                 PART_ERROR(H5Lget_name_by_idx_invalid_lapl);
             }
 
@@ -19637,8 +19514,8 @@ test_link_iterate_hard_links(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, link, or iterate aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, link, or iterate aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -19646,26 +19523,26 @@ test_link_iterate_hard_links(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for link creation order tracking\n");
+        printf("    couldn't create GCPL for link creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set link creation order tracking\n");
+            printf("    couldn't set link creation order tracking\n");
             goto error;
         }
     }
@@ -19673,7 +19550,7 @@ test_link_iterate_hard_links(void)
     if ((group_id = H5Gcreate2(container_group, LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -19694,26 +19571,26 @@ test_link_iterate_hard_links(void)
         if ((dset_id = H5Dcreate2(group_id, dset_name, dset_dtype, dset_dspace, H5P_DEFAULT, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create hard link '%s'\n", dset_name);
+            printf("    couldn't create hard link '%s'\n", dset_name);
             goto error;
         }
 
         /* Verify the link has been created */
         if ((link_exists = H5Lexists(group_id, dset_name, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't determine if link '%s' exists\n", dset_name);
+            printf("    couldn't determine if link '%s' exists\n", dset_name);
             goto error;
         }
 
         if (!link_exists) {
             H5_FAILED();
-            HDprintf("    link '%s' did not exist\n", dset_name);
+            printf("    link '%s' did not exist\n", dset_name);
             goto error;
         }
 
         if (H5Dclose(dset_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close dataset '%s'\n", dset_name);
+            printf("    couldn't close dataset '%s'\n", dset_name);
             goto error;
         }
     }
@@ -19738,13 +19615,13 @@ test_link_iterate_hard_links(void)
             /* Test basic link iteration capability using both index types and both index orders */
             if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_hard_links_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type name in increasing order failed\n");
+                printf("    H5Literate2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Literate_link_name_increasing);
             }
 
             if (i != LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_name_increasing);
             }
 
@@ -19761,13 +19638,13 @@ test_link_iterate_hard_links(void)
 
             if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_hard_links_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type name in decreasing order failed\n");
+                printf("    H5Literate2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Literate_link_name_decreasing);
             }
 
             if (i != 2 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_name_decreasing);
             }
 
@@ -19781,7 +19658,7 @@ test_link_iterate_hard_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_link_creation_increasing);
             }
 
@@ -19791,13 +19668,13 @@ test_link_iterate_hard_links(void)
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_hard_links_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type creation order in increasing order failed\n");
+                printf("    H5Literate2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Literate_link_creation_increasing);
             }
 
             if (i != 3 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_creation_increasing);
             }
 
@@ -19811,7 +19688,7 @@ test_link_iterate_hard_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_link_creation_decreasing);
             }
 
@@ -19821,13 +19698,13 @@ test_link_iterate_hard_links(void)
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_hard_links_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type creation order in decreasing order failed\n");
+                printf("    H5Literate2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Literate_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_creation_decreasing);
             }
 
@@ -19846,13 +19723,13 @@ test_link_iterate_hard_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_hard_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Literate_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Literate_by_name_link_name_increasing);
             }
 
             if (i != LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_link_name_increasing);
             }
 
@@ -19871,13 +19748,13 @@ test_link_iterate_hard_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_hard_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Literate_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Literate_by_name_link_name_decreasing);
             }
 
             if (i != 2 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_link_name_decreasing);
             }
 
@@ -19891,7 +19768,7 @@ test_link_iterate_hard_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_by_name_creation_increasing);
             }
 
@@ -19902,13 +19779,13 @@ test_link_iterate_hard_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_hard_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Literate_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Literate_by_name_creation_increasing);
             }
 
             if (i != 3 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_creation_increasing);
             }
 
@@ -19922,7 +19799,7 @@ test_link_iterate_hard_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_by_name_creation_decreasing);
             }
 
@@ -19933,13 +19810,13 @@ test_link_iterate_hard_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_hard_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Literate_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Literate_by_name_creation_decreasing);
             }
 
             if (i != 4 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_creation_decreasing);
             }
 
@@ -20007,8 +19884,8 @@ test_link_iterate_soft_links(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, soft link, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, soft link, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -20016,26 +19893,26 @@ test_link_iterate_soft_links(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for link creation order tracking\n");
+        printf("    couldn't create GCPL for link creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set link creation order tracking\n");
+            printf("    couldn't set link creation order tracking\n");
             goto error;
         }
     }
@@ -20043,7 +19920,7 @@ test_link_iterate_soft_links(void)
     if ((group_id = H5Gcreate2(container_group, LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -20060,20 +19937,20 @@ test_link_iterate_soft_links(void)
 
         if (H5Lcreate_soft(link_target, group_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create soft link '%s'\n", link_name);
+            printf("    couldn't create soft link '%s'\n", link_name);
             goto error;
         }
 
         /* Verify the link has been created */
         if ((link_exists = H5Lexists(group_id, link_name, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't determine if link '%s' exists\n", link_name);
+            printf("    couldn't determine if link '%s' exists\n", link_name);
             goto error;
         }
 
         if (!link_exists) {
             H5_FAILED();
-            HDprintf("    link '%s' did not exist\n", link_name);
+            printf("    link '%s' did not exist\n", link_name);
             goto error;
         }
     }
@@ -20098,13 +19975,13 @@ test_link_iterate_soft_links(void)
             /* Test basic link iteration capability using both index types and both index orders */
             if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_soft_links_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type name in increasing order failed\n");
+                printf("    H5Literate2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Literate_link_name_increasing);
             }
 
             if (i != LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_name_increasing);
             }
 
@@ -20121,13 +19998,13 @@ test_link_iterate_soft_links(void)
 
             if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_soft_links_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type name in decreasing order failed\n");
+                printf("    H5Literate2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Literate_link_name_decreasing);
             }
 
             if (i != 2 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_name_decreasing);
             }
 
@@ -20141,7 +20018,7 @@ test_link_iterate_soft_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_link_creation_increasing);
             }
 
@@ -20151,13 +20028,13 @@ test_link_iterate_soft_links(void)
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_soft_links_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type creation order in increasing order failed\n");
+                printf("    H5Literate2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Literate_link_creation_increasing);
             }
 
             if (i != 3 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_creation_increasing);
             }
 
@@ -20171,7 +20048,7 @@ test_link_iterate_soft_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_link_creation_decreasing);
             }
 
@@ -20181,13 +20058,13 @@ test_link_iterate_soft_links(void)
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_soft_links_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type creation order in decreasing order failed\n");
+                printf("    H5Literate2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Literate_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_creation_decreasing);
             }
 
@@ -20206,13 +20083,13 @@ test_link_iterate_soft_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_soft_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Literate_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Literate_by_name_link_name_increasing);
             }
 
             if (i != LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_link_name_increasing);
             }
 
@@ -20231,13 +20108,13 @@ test_link_iterate_soft_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_soft_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Literate_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Literate_by_name_link_name_decreasing);
             }
 
             if (i != 2 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_link_name_decreasing);
             }
 
@@ -20251,7 +20128,7 @@ test_link_iterate_soft_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_by_name_creation_increasing);
             }
 
@@ -20262,13 +20139,13 @@ test_link_iterate_soft_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_soft_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Literate_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Literate_by_name_creation_increasing);
             }
 
             if (i != 3 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_creation_increasing);
             }
 
@@ -20282,7 +20159,7 @@ test_link_iterate_soft_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_by_name_creation_decreasing);
             }
 
@@ -20293,13 +20170,13 @@ test_link_iterate_soft_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_soft_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Literate_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Literate_by_name_creation_decreasing);
             }
 
             if (i != 4 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_creation_decreasing);
             }
 
@@ -20361,8 +20238,8 @@ test_link_iterate_external_links(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, external link, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, external link, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -20372,7 +20249,7 @@ test_link_iterate_external_links(void)
 
     if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+        printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
         goto error;
     }
 
@@ -20381,26 +20258,26 @@ test_link_iterate_external_links(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for link creation order tracking\n");
+        printf("    couldn't create GCPL for link creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set link creation order tracking\n");
+            printf("    couldn't set link creation order tracking\n");
             goto error;
         }
     }
@@ -20408,7 +20285,7 @@ test_link_iterate_external_links(void)
     if ((group_id = H5Gcreate2(container_group, LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -20421,20 +20298,20 @@ test_link_iterate_external_links(void)
 
         if (H5Lcreate_external(ext_link_filename, "/", group_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create external link '%s'\n", link_name);
+            printf("    couldn't create external link '%s'\n", link_name);
             goto error;
         }
 
         /* Verify the link has been created */
         if ((link_exists = H5Lexists(group_id, link_name, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't determine if link '%s' exists\n", link_name);
+            printf("    couldn't determine if link '%s' exists\n", link_name);
             goto error;
         }
 
         if (!link_exists) {
             H5_FAILED();
-            HDprintf("    link '%s' did not exist\n", link_name);
+            printf("    link '%s' did not exist\n", link_name);
             goto error;
         }
     }
@@ -20460,13 +20337,13 @@ test_link_iterate_external_links(void)
             if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_external_links_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type name in increasing order failed\n");
+                printf("    H5Literate2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Literate_link_name_increasing);
             }
 
             if (i != LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_name_increasing);
             }
 
@@ -20484,13 +20361,13 @@ test_link_iterate_external_links(void)
             if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_external_links_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type name in decreasing order failed\n");
+                printf("    H5Literate2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Literate_link_name_decreasing);
             }
 
             if (i != 2 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_name_decreasing);
             }
 
@@ -20504,7 +20381,7 @@ test_link_iterate_external_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_link_creation_increasing);
             }
 
@@ -20514,13 +20391,13 @@ test_link_iterate_external_links(void)
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_external_links_cb,
                             &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type creation order in increasing order failed\n");
+                printf("    H5Literate2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Literate_link_creation_increasing);
             }
 
             if (i != 3 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_creation_increasing);
             }
 
@@ -20534,7 +20411,7 @@ test_link_iterate_external_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_link_creation_decreasing);
             }
 
@@ -20544,13 +20421,13 @@ test_link_iterate_external_links(void)
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_external_links_cb,
                             &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type creation order in decreasing order failed\n");
+                printf("    H5Literate2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Literate_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_creation_decreasing);
             }
 
@@ -20569,13 +20446,13 @@ test_link_iterate_external_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_external_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Literate_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Literate_by_name_link_name_increasing);
             }
 
             if (i != LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_link_name_increasing);
             }
 
@@ -20594,13 +20471,13 @@ test_link_iterate_external_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_external_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Literate_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Literate_by_name_link_name_decreasing);
             }
 
             if (i != 2 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_link_name_decreasing);
             }
 
@@ -20614,7 +20491,7 @@ test_link_iterate_external_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_by_name_creation_increasing);
             }
 
@@ -20626,13 +20503,13 @@ test_link_iterate_external_links(void)
                                     H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_external_links_cb, &i,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Literate_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Literate_by_name_creation_increasing);
             }
 
             if (i != 3 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_creation_increasing);
             }
 
@@ -20646,7 +20523,7 @@ test_link_iterate_external_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_by_name_creation_decreasing);
             }
 
@@ -20658,13 +20535,13 @@ test_link_iterate_external_links(void)
                                     H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_external_links_cb, &i,
                                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Literate_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Literate_by_name_creation_decreasing);
             }
 
             if (i != 4 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_creation_decreasing);
             }
 
@@ -20758,8 +20635,8 @@ test_link_iterate_mixed_links(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, soft link, external link, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, soft link, external link, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -20769,7 +20646,7 @@ test_link_iterate_mixed_links(void)
 
     if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+        printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
         goto error;
     }
 
@@ -20778,26 +20655,26 @@ test_link_iterate_mixed_links(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for link creation order tracking\n");
+        printf("    couldn't create GCPL for link creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set link creation order tracking\n");
+            printf("    couldn't set link creation order tracking\n");
             goto error;
         }
     }
@@ -20805,7 +20682,7 @@ test_link_iterate_mixed_links(void)
     if ((group_id = H5Gcreate2(container_group, LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -20819,7 +20696,7 @@ test_link_iterate_mixed_links(void)
     if ((dset_id = H5Dcreate2(group_id, LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME, dset_dtype, dset_dspace,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create hard link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME);
+        printf("    couldn't create hard link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
@@ -20827,51 +20704,51 @@ test_link_iterate_mixed_links(void)
                        "/" LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME,
                        group_id, LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME);
+        printf("    couldn't create soft link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME);
         goto error;
     }
 
     if (H5Lcreate_external(ext_link_filename, "/", group_id, LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME,
                            H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create external link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME);
+        printf("    couldn't create external link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME);
         goto error;
     }
 
     /* Verify the links have been created */
     if ((link_exists = H5Lexists(group_id, LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    first link did not exist\n");
+        printf("    first link did not exist\n");
         goto error;
     }
 
     if ((link_exists = H5Lexists(group_id, LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    second link did not exist\n");
+        printf("    second link did not exist\n");
         goto error;
     }
 
     if ((link_exists = H5Lexists(group_id, LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    third link did not exist\n");
+        printf("    third link did not exist\n");
         goto error;
     }
 
@@ -20895,13 +20772,13 @@ test_link_iterate_mixed_links(void)
             /* Test basic link iteration capability using both index types and both index orders */
             if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_mixed_links_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type name in increasing order failed\n");
+                printf("    H5Literate2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Literate_link_name_increasing);
             }
 
             if (i != LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_name_increasing);
             }
 
@@ -20918,13 +20795,13 @@ test_link_iterate_mixed_links(void)
 
             if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_mixed_links_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type name in decreasing order failed\n");
+                printf("    H5Literate2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Literate_link_name_decreasing);
             }
 
             if (i != 2 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_name_decreasing);
             }
 
@@ -20938,7 +20815,7 @@ test_link_iterate_mixed_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_link_creation_increasing);
             }
 
@@ -20948,13 +20825,13 @@ test_link_iterate_mixed_links(void)
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_mixed_links_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type creation order in increasing order failed\n");
+                printf("    H5Literate2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Literate_link_creation_increasing);
             }
 
             if (i != 3 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_creation_increasing);
             }
 
@@ -20968,7 +20845,7 @@ test_link_iterate_mixed_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_link_creation_decreasing);
             }
 
@@ -20978,13 +20855,13 @@ test_link_iterate_mixed_links(void)
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_mixed_links_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type creation order in decreasing order failed\n");
+                printf("    H5Literate2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Literate_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_link_creation_decreasing);
             }
 
@@ -21002,13 +20879,13 @@ test_link_iterate_mixed_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_mixed_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Literate_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Literate_by_name_link_name_increasing);
             }
 
             if (i != LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_link_name_increasing);
             }
 
@@ -21027,13 +20904,13 @@ test_link_iterate_mixed_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_mixed_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Literate_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Literate_by_name_link_name_decreasing);
             }
 
             if (i != 2 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_link_name_decreasing);
             }
 
@@ -21047,7 +20924,7 @@ test_link_iterate_mixed_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_by_name_creation_increasing);
             }
 
@@ -21058,13 +20935,13 @@ test_link_iterate_mixed_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_mixed_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Literate_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Literate_by_name_creation_increasing);
             }
 
             if (i != 3 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_creation_increasing);
             }
 
@@ -21078,7 +20955,7 @@ test_link_iterate_mixed_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_by_name_creation_decreasing);
             }
 
@@ -21089,13 +20966,13 @@ test_link_iterate_mixed_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_mixed_links_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Literate_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Literate_by_name_creation_decreasing);
             }
 
             if (i != 4 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not iterated over!\n");
+                printf("    some links were not iterated over!\n");
                 PART_ERROR(H5Literate_by_name_creation_decreasing);
             }
 
@@ -21109,7 +20986,7 @@ test_link_iterate_mixed_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_index_saving_increasing);
             }
 
@@ -21120,20 +20997,20 @@ test_link_iterate_mixed_links(void)
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, &saved_idx, link_iter_idx_saving_cb,
                             &halted) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 index-saving capability test failed\n");
+                printf("    H5Literate2 index-saving capability test failed\n");
                 PART_ERROR(H5Literate_index_saving_increasing);
             }
 
             if (saved_idx != 2) {
                 H5_FAILED();
-                HDprintf("    saved index after iteration was wrong\n");
+                printf("    saved index after iteration was wrong\n");
                 PART_ERROR(H5Literate_index_saving_increasing);
             }
 
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, &saved_idx, link_iter_idx_saving_cb,
                             &halted) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't finish iterating when beginning from saved index\n");
+                printf("    couldn't finish iterating when beginning from saved index\n");
                 PART_ERROR(H5Literate_index_saving_increasing);
             }
 
@@ -21147,7 +21024,7 @@ test_link_iterate_mixed_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_index_saving_decreasing);
             }
 
@@ -21157,20 +21034,20 @@ test_link_iterate_mixed_links(void)
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, &saved_idx, link_iter_idx_saving_cb,
                             &halted) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 index-saving capability test failed\n");
+                printf("    H5Literate2 index-saving capability test failed\n");
                 PART_ERROR(H5Literate_index_saving_decreasing);
             }
 
             if (saved_idx != 2) {
                 H5_FAILED();
-                HDprintf("    saved index after iteration was wrong\n");
+                printf("    saved index after iteration was wrong\n");
                 PART_ERROR(H5Literate_index_saving_decreasing);
             }
 
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, &saved_idx, link_iter_idx_saving_cb,
                             &halted) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't finish iterating when beginning from saved index\n");
+                printf("    couldn't finish iterating when beginning from saved index\n");
                 PART_ERROR(H5Literate_index_saving_decreasing);
             }
 
@@ -21244,9 +21121,8 @@ test_link_iterate_invalid_params(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, dataset, link, soft link, external link, or iterate "
-            "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, link, soft link, external link, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -21256,7 +21132,7 @@ test_link_iterate_invalid_params(void)
 
     if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+        printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
         goto error;
     }
 
@@ -21265,21 +21141,20 @@ test_link_iterate_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -21293,7 +21168,7 @@ test_link_iterate_invalid_params(void)
     if ((dset_id = H5Dcreate2(group_id, LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME, dset_dtype, dset_dspace,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create hard link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+        printf("    couldn't create hard link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
@@ -21302,50 +21177,48 @@ test_link_iterate_invalid_params(void)
                        group_id, LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME, H5P_DEFAULT,
                        H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME);
+        printf("    couldn't create soft link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME);
         goto error;
     }
     if (H5Lcreate_external(ext_link_filename, "/", group_id, LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME,
                            H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create external link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME);
+        printf("    couldn't create external link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME);
         goto error;
     }
     /* Verify the links have been created */
     if ((link_exists = H5Lexists(group_id, LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n",
-                 LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    first link did not exist\n");
+        printf("    first link did not exist\n");
         goto error;
     }
 
     if ((link_exists = H5Lexists(group_id, LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n",
-                 LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    second link did not exist\n");
+        printf("    second link did not exist\n");
         goto error;
     }
     if ((link_exists = H5Lexists(group_id, LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' exists\n", LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME);
+        printf("    couldn't determine if link '%s' exists\n", LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    third link did not exist\n");
+        printf("    third link did not exist\n");
         goto error;
     }
 
@@ -21368,7 +21241,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 succeeded with an invalid group ID!\n");
+                printf("    H5Literate2 succeeded with an invalid group ID!\n");
                 PART_ERROR(H5Literate_invalid_grp_id);
             }
 
@@ -21389,7 +21262,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
+                printf("    H5Literate2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Literate_invalid_index_type);
             }
 
@@ -21402,7 +21275,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 succeeded with invalid index type H5_INDEX_N!\n");
+                printf("    H5Literate2 succeeded with invalid index type H5_INDEX_N!\n");
                 PART_ERROR(H5Literate_invalid_index_type);
             }
 
@@ -21423,7 +21296,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
+                printf("    H5Literate2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Literate_invalid_iter_order);
             }
 
@@ -21436,7 +21309,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 succeeded with invalid iteration ordering H5_ITER_N!\n");
+                printf("    H5Literate2 succeeded with invalid iteration ordering H5_ITER_N!\n");
                 PART_ERROR(H5Literate_invalid_iter_order);
             }
 
@@ -21458,7 +21331,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 succeeded with an invalid location ID!\n");
+                printf("    H5Literate_by_name2 succeeded with an invalid location ID!\n");
                 PART_ERROR(H5Literate_by_name_invalid_loc_id);
             }
 
@@ -21479,7 +21352,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 succeeded with a NULL group name!\n");
+                printf("    H5Literate_by_name2 succeeded with a NULL group name!\n");
                 PART_ERROR(H5Literate_by_name_invalid_grp_name);
             }
 
@@ -21492,7 +21365,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 succeeded with an invalid group name of ''!\n");
+                printf("    H5Literate_by_name2 succeeded with an invalid group name of ''!\n");
                 PART_ERROR(H5Literate_by_name_invalid_grp_name);
             }
 
@@ -21514,7 +21387,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
+                printf("    H5Literate_by_name2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Literate_by_name_invalid_index_type);
             }
 
@@ -21528,7 +21401,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 succeeded with invalid index type H5_INDEX_N!\n");
+                printf("    H5Literate_by_name2 succeeded with invalid index type H5_INDEX_N!\n");
                 PART_ERROR(H5Literate_by_name_invalid_index_type);
             }
 
@@ -21550,7 +21423,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    H5Literate_by_name2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Literate_by_name_invalid_iter_order);
             }
@@ -21565,7 +21438,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 succeeded with invalid iteration ordering H5_ITER_N!\n");
+                printf("    H5Literate_by_name2 succeeded with invalid iteration ordering H5_ITER_N!\n");
                 PART_ERROR(H5Literate_by_name_invalid_iter_order);
             }
 
@@ -21587,7 +21460,7 @@ test_link_iterate_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 succeeded with an invalid LAPL!\n");
+                printf("    H5Literate_by_name2 succeeded with an invalid LAPL!\n");
                 PART_ERROR(H5Literate_by_name_invalid_lapl);
             }
 
@@ -21648,8 +21521,8 @@ test_link_iterate_0_links(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or iterate aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, or iterate aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -21657,26 +21530,26 @@ test_link_iterate_0_links(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create GCPL for link creation order tracking\n");
+        printf("    couldn't create GCPL for link creation order tracking\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set link creation order tracking\n");
+            printf("    couldn't set link creation order tracking\n");
             goto error;
         }
     }
@@ -21684,7 +21557,7 @@ test_link_iterate_0_links(void)
     if ((group_id = H5Gcreate2(container_group, LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -21699,7 +21572,7 @@ test_link_iterate_0_links(void)
             /* Test basic link iteration capability using both index types and both index orders */
             if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_0_links_cb, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type name in increasing order failed\n");
+                printf("    H5Literate2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Literate_0_links_name_increasing);
             }
 
@@ -21713,7 +21586,7 @@ test_link_iterate_0_links(void)
 
             if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_0_links_cb, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type name in decreasing order failed\n");
+                printf("    H5Literate2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Literate_0_links_name_decreasing);
             }
 
@@ -21727,14 +21600,14 @@ test_link_iterate_0_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_0_links_creation_increasing);
             }
 
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_0_links_cb, NULL) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type creation order in increasing order failed\n");
+                printf("    H5Literate2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Literate_0_links_creation_increasing);
             }
 
@@ -21748,14 +21621,14 @@ test_link_iterate_0_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_0_links_creation_decreasing);
             }
 
             if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_0_links_cb, NULL) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate2 by index type creation order in decreasing order failed\n");
+                printf("    H5Literate2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Literate_0_links_creation_decreasing);
             }
 
@@ -21771,7 +21644,7 @@ test_link_iterate_0_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME,
                     H5_ITER_INC, NULL, link_iter_0_links_cb, NULL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Literate_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Literate_by_name_0_links_name_increasing);
             }
 
@@ -21787,7 +21660,7 @@ test_link_iterate_0_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME,
                     H5_ITER_DEC, NULL, link_iter_0_links_cb, NULL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Literate_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Literate_by_name_0_links_name_decreasing);
             }
 
@@ -21801,7 +21674,7 @@ test_link_iterate_0_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_by_name_0_links_creation_increasing);
             }
 
@@ -21809,7 +21682,7 @@ test_link_iterate_0_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_0_links_cb, NULL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Literate_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Literate_by_name_0_links_creation_increasing);
             }
 
@@ -21823,7 +21696,7 @@ test_link_iterate_0_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Literate_by_name_0_links_creation_decreasing);
             }
 
@@ -21831,7 +21704,7 @@ test_link_iterate_0_links(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_0_links_cb, NULL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Literate_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Literate_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Literate_by_name_0_links_creation_decreasing);
             }
 
@@ -21896,8 +21769,8 @@ test_link_visit_hard_links_no_cycles(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or link iterate aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, or link iterate aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -21905,26 +21778,26 @@ test_link_visit_hard_links_no_cycles(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -21932,8 +21805,8 @@ test_link_visit_hard_links_no_cycles(void)
     if ((group_id = H5Gcreate2(container_group, LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME,
                                H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -21955,7 +21828,7 @@ test_link_visit_hard_links_no_cycles(void)
 
         if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create subgroup '%s'\n", grp_name);
+            printf("    couldn't create subgroup '%s'\n", grp_name);
             goto error;
         }
 
@@ -21970,33 +21843,33 @@ test_link_visit_hard_links_no_cycles(void)
             if ((dset_id = H5Dcreate2(subgroup_id, dset_name, dset_dtype, dset_dspace, H5P_DEFAULT,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", dset_name);
+                printf("    couldn't create hard link '%s'\n", dset_name);
                 goto error;
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(subgroup_id, dset_name, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", dset_name);
+                printf("    couldn't determine if link '%s' exists\n", dset_name);
                 goto error;
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", dset_name);
+                printf("    link '%s' did not exist\n", dset_name);
                 goto error;
             }
 
             if (H5Dclose(dset_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close dataset '%s'\n", dset_name);
+                printf("    couldn't close dataset '%s'\n", dset_name);
                 goto error;
             }
         }
 
         if (H5Gclose(subgroup_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close subgroup '%s'\n", grp_name);
+            printf("    couldn't close subgroup '%s'\n", grp_name);
             goto error;
         }
     }
@@ -22020,13 +21893,13 @@ test_link_visit_hard_links_no_cycles(void)
 
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_hard_links_no_cycles_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_increasing);
             }
 
@@ -22043,13 +21916,13 @@ test_link_visit_hard_links_no_cycles(void)
 
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_hard_links_no_cycles_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing);
             }
 
@@ -22063,7 +21936,7 @@ test_link_visit_hard_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_no_cycles_link_creation_increasing);
             }
 
@@ -22073,13 +21946,13 @@ test_link_visit_hard_links_no_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_hard_links_no_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing);
             }
 
@@ -22093,7 +21966,7 @@ test_link_visit_hard_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_no_cycles_link_creation_decreasing);
             }
 
@@ -22103,13 +21976,13 @@ test_link_visit_hard_links_no_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_hard_links_no_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing);
             }
 
@@ -22128,13 +22001,13 @@ test_link_visit_hard_links_no_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, link_visit_hard_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing);
             }
 
@@ -22153,13 +22026,13 @@ test_link_visit_hard_links_no_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, link_visit_hard_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing);
             }
 
@@ -22173,7 +22046,7 @@ test_link_visit_hard_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_increasing);
             }
 
@@ -22185,13 +22058,13 @@ test_link_visit_hard_links_no_cycles(void)
                     H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_hard_links_no_cycles_cb, &i,
                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing);
             }
 
@@ -22205,7 +22078,7 @@ test_link_visit_hard_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_decreasing);
             }
 
@@ -22217,13 +22090,13 @@ test_link_visit_hard_links_no_cycles(void)
                     H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_hard_links_no_cycles_cb, &i,
                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing);
             }
 
@@ -22294,8 +22167,8 @@ test_link_visit_soft_links_no_cycles(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, soft link, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, soft link, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -22303,26 +22176,26 @@ test_link_visit_soft_links_no_cycles(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -22330,8 +22203,8 @@ test_link_visit_soft_links_no_cycles(void)
     if ((group_id = H5Gcreate2(container_group, LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME,
                                H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -22346,7 +22219,7 @@ test_link_visit_soft_links_no_cycles(void)
 
         if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create subgroup '%s'\n", grp_name);
+            printf("    couldn't create subgroup '%s'\n", grp_name);
             goto error;
         }
 
@@ -22364,27 +22237,27 @@ test_link_visit_soft_links_no_cycles(void)
 
             if (H5Lcreate_soft(link_target, subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", link_name);
+                printf("    couldn't create soft link '%s'\n", link_name);
                 goto error;
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", link_name);
+                printf("    couldn't determine if link '%s' exists\n", link_name);
                 goto error;
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", link_name);
+                printf("    link '%s' did not exist\n", link_name);
                 goto error;
             }
         }
 
         if (H5Gclose(subgroup_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close subgroup '%s'\n", grp_name);
+            printf("    couldn't close subgroup '%s'\n", grp_name);
             goto error;
         }
     }
@@ -22408,13 +22281,13 @@ test_link_visit_soft_links_no_cycles(void)
 
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_soft_links_no_cycles_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_increasing);
             }
 
@@ -22431,13 +22304,13 @@ test_link_visit_soft_links_no_cycles(void)
 
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_soft_links_no_cycles_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing);
             }
 
@@ -22451,7 +22324,7 @@ test_link_visit_soft_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_no_cycles_link_creation_increasing);
             }
 
@@ -22461,13 +22334,13 @@ test_link_visit_soft_links_no_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_soft_links_no_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing);
             }
 
@@ -22481,7 +22354,7 @@ test_link_visit_soft_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_no_cycles_link_creation_decreasing);
             }
 
@@ -22491,13 +22364,13 @@ test_link_visit_soft_links_no_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_soft_links_no_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing);
             }
 
@@ -22515,13 +22388,13 @@ test_link_visit_soft_links_no_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, link_visit_soft_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing);
             }
 
@@ -22540,13 +22413,13 @@ test_link_visit_soft_links_no_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, link_visit_soft_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing);
             }
 
@@ -22560,7 +22433,7 @@ test_link_visit_soft_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_increasing);
             }
 
@@ -22572,13 +22445,13 @@ test_link_visit_soft_links_no_cycles(void)
                     H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_soft_links_no_cycles_cb, &i,
                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing);
             }
 
@@ -22592,7 +22465,7 @@ test_link_visit_soft_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_decreasing);
             }
 
@@ -22604,13 +22477,13 @@ test_link_visit_soft_links_no_cycles(void)
                     H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_soft_links_no_cycles_cb, &i,
                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing);
             }
 
@@ -22675,8 +22548,8 @@ test_link_visit_external_links_no_cycles(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, external link, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, external link, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -22686,7 +22559,7 @@ test_link_visit_external_links_no_cycles(void)
 
     if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+        printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
         goto error;
     }
 
@@ -22695,26 +22568,26 @@ test_link_visit_external_links_no_cycles(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -22722,8 +22595,8 @@ test_link_visit_external_links_no_cycles(void)
     if ((group_id = H5Gcreate2(container_group, LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -22738,7 +22611,7 @@ test_link_visit_external_links_no_cycles(void)
 
         if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create subgroup '%s'\n", grp_name);
+            printf("    couldn't create subgroup '%s'\n", grp_name);
             goto error;
         }
 
@@ -22753,27 +22626,27 @@ test_link_visit_external_links_no_cycles(void)
             if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", link_name);
+                printf("    couldn't create external link '%s'\n", link_name);
                 goto error;
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", link_name);
+                printf("    couldn't determine if link '%s' exists\n", link_name);
                 goto error;
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", link_name);
+                printf("    link '%s' did not exist\n", link_name);
                 goto error;
             }
         }
 
         if (H5Gclose(subgroup_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close subgroup '%s'\n", grp_name);
+            printf("    couldn't close subgroup '%s'\n", grp_name);
             goto error;
         }
     }
@@ -22798,13 +22671,13 @@ test_link_visit_external_links_no_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_external_links_no_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_increasing);
             }
 
@@ -22822,13 +22695,13 @@ test_link_visit_external_links_no_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_external_links_no_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing);
             }
 
@@ -22842,7 +22715,7 @@ test_link_visit_external_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_no_cycles_link_creation_increasing);
             }
 
@@ -22852,13 +22725,13 @@ test_link_visit_external_links_no_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_external_links_no_cycles_cb,
                           &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing);
             }
 
@@ -22872,7 +22745,7 @@ test_link_visit_external_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_no_cycles_link_creation_decreasing);
             }
 
@@ -22882,13 +22755,13 @@ test_link_visit_external_links_no_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_external_links_no_cycles_cb,
                           &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing);
             }
 
@@ -22908,13 +22781,13 @@ test_link_visit_external_links_no_cycles(void)
                     H5_INDEX_NAME, H5_ITER_INC, link_visit_external_links_no_cycles_cb, &i,
                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing);
             }
 
@@ -22934,13 +22807,13 @@ test_link_visit_external_links_no_cycles(void)
                     H5_INDEX_NAME, H5_ITER_DEC, link_visit_external_links_no_cycles_cb, &i,
                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing);
             }
 
@@ -22954,7 +22827,7 @@ test_link_visit_external_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_increasing);
             }
 
@@ -22966,13 +22839,13 @@ test_link_visit_external_links_no_cycles(void)
                     H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_external_links_no_cycles_cb, &i,
                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing);
             }
 
@@ -22986,7 +22859,7 @@ test_link_visit_external_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_decreasing);
             }
 
@@ -22998,13 +22871,13 @@ test_link_visit_external_links_no_cycles(void)
                     H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_external_links_no_cycles_cb, &i,
                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing);
             }
 
@@ -23102,7 +22975,7 @@ test_link_visit_mixed_links_no_cycles(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) {
         SKIPPED();
-        HDprintf(
+        printf(
             "    API functions for basic file, group, link, hard link, soft link, external link, or iterate "
             "aren't supported with this connector\n");
         return 0;
@@ -23114,7 +22987,7 @@ test_link_visit_mixed_links_no_cycles(void)
 
     if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+        printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
         goto error;
     }
 
@@ -23123,26 +22996,26 @@ test_link_visit_mixed_links_no_cycles(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -23150,24 +23023,24 @@ test_link_visit_mixed_links_no_cycles(void)
     if ((group_id = H5Gcreate2(container_group, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME,
                                H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((subgroup1 = H5Gcreate2(group_id, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2, H5P_DEFAULT,
                                 gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create first subgroup '%s'\n",
-                 LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2);
+        printf("    couldn't create first subgroup '%s'\n",
+               LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2);
         goto error;
     }
 
     if ((subgroup2 = H5Gcreate2(group_id, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3, H5P_DEFAULT,
                                 gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create second subgroup '%s'\n",
-                 LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3);
+        printf("    couldn't create second subgroup '%s'\n",
+               LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3);
         goto error;
     }
 
@@ -23181,7 +23054,7 @@ test_link_visit_mixed_links_no_cycles(void)
     if ((dset_id = H5Dcreate2(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME, dset_dtype,
                               fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create first dataset '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME);
+        printf("    couldn't create first dataset '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME);
     }
 
     if (H5Dclose(dset_id) < 0)
@@ -23190,7 +23063,7 @@ test_link_visit_mixed_links_no_cycles(void)
     if ((dset_id = H5Dcreate2(subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME2, dset_dtype,
                               fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create second dataset '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME);
+        printf("    couldn't create second dataset '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME);
     }
 
     if (H5Dclose(dset_id) < 0)
@@ -23199,30 +23072,29 @@ test_link_visit_mixed_links_no_cycles(void)
     if (H5Lcreate_hard(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME, subgroup1,
                        LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create first hard link '%s'\n",
-                 LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1);
+        printf("    couldn't create first hard link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1);
         goto error;
     }
 
     if (H5Lcreate_soft(LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME, subgroup1,
                        LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2);
+        printf("    couldn't create soft link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2);
         goto error;
     }
 
     if (H5Lcreate_external(ext_link_filename, "/", subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3,
                            H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create external link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3);
+        printf("    couldn't create external link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3);
         goto error;
     }
 
     if (H5Lcreate_hard(subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME2, subgroup2,
                        LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create second hard link '%s'\n",
-                 LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4);
+        printf("    couldn't create second hard link '%s'\n",
+               LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4);
         goto error;
     }
 
@@ -23230,56 +23102,56 @@ test_link_visit_mixed_links_no_cycles(void)
     if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if first link '%s' exists\n",
-                 LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1);
+        printf("    couldn't determine if first link '%s' exists\n",
+               LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link 1 did not exist\n");
+        printf("    link 1 did not exist\n");
         goto error;
     }
 
     if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if second link '%s' exists\n",
-                 LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2);
+        printf("    couldn't determine if second link '%s' exists\n",
+               LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link 2 did not exist\n");
+        printf("    link 2 did not exist\n");
         goto error;
     }
 
     if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if third link '%s' exists\n",
-                 LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3);
+        printf("    couldn't determine if third link '%s' exists\n",
+               LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link 3 did not exist\n");
+        printf("    link 3 did not exist\n");
         goto error;
     }
 
     if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if fourth link '%s' exists\n",
-                 LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4);
+        printf("    couldn't determine if fourth link '%s' exists\n",
+               LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link 4 did not exist\n");
+        printf("    link 4 did not exist\n");
         goto error;
     }
 
@@ -23303,13 +23175,13 @@ test_link_visit_mixed_links_no_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_mixed_links_no_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_increasing);
             }
 
@@ -23327,13 +23199,13 @@ test_link_visit_mixed_links_no_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_mixed_links_no_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing);
             }
 
@@ -23347,7 +23219,7 @@ test_link_visit_mixed_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_no_cycles_link_creation_increasing);
             }
 
@@ -23357,13 +23229,13 @@ test_link_visit_mixed_links_no_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_mixed_links_no_cycles_cb,
                           &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing);
             }
 
@@ -23377,7 +23249,7 @@ test_link_visit_mixed_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_no_cycles_link_creation_decreasing);
             }
 
@@ -23387,13 +23259,13 @@ test_link_visit_mixed_links_no_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_mixed_links_no_cycles_cb,
                           &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing);
             }
 
@@ -23411,13 +23283,13 @@ test_link_visit_mixed_links_no_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, link_visit_mixed_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing);
             }
 
@@ -23436,13 +23308,13 @@ test_link_visit_mixed_links_no_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, link_visit_mixed_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing);
             }
 
@@ -23456,7 +23328,7 @@ test_link_visit_mixed_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_increasing);
             }
 
@@ -23468,13 +23340,13 @@ test_link_visit_mixed_links_no_cycles(void)
                     H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_mixed_links_no_cycles_cb, &i,
                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing);
             }
 
@@ -23488,7 +23360,7 @@ test_link_visit_mixed_links_no_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_decreasing);
             }
 
@@ -23500,13 +23372,13 @@ test_link_visit_mixed_links_no_cycles(void)
                     H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_mixed_links_no_cycles_cb, &i,
                     H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing);
             }
 
@@ -23581,8 +23453,8 @@ test_link_visit_hard_links_cycles(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, hard link, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, hard link, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -23590,26 +23462,26 @@ test_link_visit_hard_links_cycles(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -23617,8 +23489,8 @@ test_link_visit_hard_links_cycles(void)
     if ((group_id = H5Gcreate2(container_group, LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -23633,7 +23505,7 @@ test_link_visit_hard_links_cycles(void)
 
         if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create subgroup '%s'\n", grp_name);
+            printf("    couldn't create subgroup '%s'\n", grp_name);
             goto error;
         }
 
@@ -23647,27 +23519,27 @@ test_link_visit_hard_links_cycles(void)
 
             if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create hard link '%s'\n", link_name);
+                printf("    couldn't create hard link '%s'\n", link_name);
                 goto error;
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", link_name);
+                printf("    couldn't determine if link '%s' exists\n", link_name);
                 goto error;
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", link_name);
+                printf("    link '%s' did not exist\n", link_name);
                 goto error;
             }
         }
 
         if (H5Gclose(subgroup_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close subgroup '%s'\n", grp_name);
+            printf("    couldn't close subgroup '%s'\n", grp_name);
             goto error;
         }
     }
@@ -23691,13 +23563,13 @@ test_link_visit_hard_links_cycles(void)
 
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_hard_links_cycles_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_increasing);
             }
 
@@ -23714,13 +23586,13 @@ test_link_visit_hard_links_cycles(void)
 
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_hard_links_cycles_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_decreasing);
             }
 
@@ -23734,7 +23606,7 @@ test_link_visit_hard_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_cycles_link_creation_increasing);
             }
 
@@ -23744,13 +23616,13 @@ test_link_visit_hard_links_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_hard_links_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_increasing);
             }
 
@@ -23764,7 +23636,7 @@ test_link_visit_hard_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_cycles_link_creation_decreasing);
             }
 
@@ -23774,13 +23646,13 @@ test_link_visit_hard_links_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_hard_links_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_decreasing);
             }
 
@@ -23798,13 +23670,13 @@ test_link_visit_hard_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, link_visit_hard_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing);
             }
 
@@ -23823,13 +23695,13 @@ test_link_visit_hard_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, link_visit_hard_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing);
             }
 
@@ -23843,7 +23715,7 @@ test_link_visit_hard_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_increasing);
             }
 
@@ -23854,13 +23726,13 @@ test_link_visit_hard_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_hard_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing);
             }
 
@@ -23874,7 +23746,7 @@ test_link_visit_hard_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_decreasing);
             }
 
@@ -23885,13 +23757,13 @@ test_link_visit_hard_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_hard_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing);
             }
 
@@ -23954,8 +23826,8 @@ test_link_visit_soft_links_cycles(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, soft link, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, soft link, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -23963,26 +23835,26 @@ test_link_visit_soft_links_cycles(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -23990,8 +23862,8 @@ test_link_visit_soft_links_cycles(void)
     if ((group_id = H5Gcreate2(container_group, LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -24006,7 +23878,7 @@ test_link_visit_soft_links_cycles(void)
 
         if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create subgroup '%s'\n", grp_name);
+            printf("    couldn't create subgroup '%s'\n", grp_name);
             goto error;
         }
 
@@ -24025,27 +23897,27 @@ test_link_visit_soft_links_cycles(void)
 
             if (H5Lcreate_soft(link_target, subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", link_name);
+                printf("    couldn't create soft link '%s'\n", link_name);
                 goto error;
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", link_name);
+                printf("    couldn't determine if link '%s' exists\n", link_name);
                 goto error;
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", link_name);
+                printf("    link '%s' did not exist\n", link_name);
                 goto error;
             }
         }
 
         if (H5Gclose(subgroup_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close subgroup '%s'\n", grp_name);
+            printf("    couldn't close subgroup '%s'\n", grp_name);
             goto error;
         }
     }
@@ -24069,13 +23941,13 @@ test_link_visit_soft_links_cycles(void)
 
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_soft_links_cycles_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_increasing);
             }
 
@@ -24092,13 +23964,13 @@ test_link_visit_soft_links_cycles(void)
 
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_soft_links_cycles_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_decreasing);
             }
 
@@ -24112,7 +23984,7 @@ test_link_visit_soft_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_cycles_link_creation_increasing);
             }
 
@@ -24122,13 +23994,13 @@ test_link_visit_soft_links_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_soft_links_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_increasing);
             }
 
@@ -24142,7 +24014,7 @@ test_link_visit_soft_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_cycles_link_creation_decreasing);
             }
 
@@ -24152,13 +24024,13 @@ test_link_visit_soft_links_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_soft_links_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_decreasing);
             }
 
@@ -24177,13 +24049,13 @@ test_link_visit_soft_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, link_visit_soft_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing);
             }
 
@@ -24202,13 +24074,13 @@ test_link_visit_soft_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, link_visit_soft_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing);
             }
 
@@ -24222,7 +24094,7 @@ test_link_visit_soft_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_increasing);
             }
 
@@ -24233,13 +24105,13 @@ test_link_visit_soft_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_soft_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing);
             }
 
@@ -24253,7 +24125,7 @@ test_link_visit_soft_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_decreasing);
             }
 
@@ -24264,13 +24136,13 @@ test_link_visit_soft_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_soft_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing);
             }
 
@@ -24334,8 +24206,8 @@ test_link_visit_external_links_cycles(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, link, external link, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, external link, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -24343,26 +24215,26 @@ test_link_visit_external_links_cycles(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -24370,8 +24242,8 @@ test_link_visit_external_links_cycles(void)
     if ((group_id = H5Gcreate2(container_group, LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -24386,7 +24258,7 @@ test_link_visit_external_links_cycles(void)
 
         if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create subgroup '%s'\n", grp_name);
+            printf("    couldn't create subgroup '%s'\n", grp_name);
             goto error;
         }
 
@@ -24406,27 +24278,27 @@ test_link_visit_external_links_cycles(void)
             if (H5Lcreate_external(H5_api_test_filename, link_target_obj, subgroup_id, link_name, H5P_DEFAULT,
                                    H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create external link '%s'\n", link_name);
+                printf("    couldn't create external link '%s'\n", link_name);
                 goto error;
             }
 
             /* Verify the link has been created */
             if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' exists\n", link_name);
+                printf("    couldn't determine if link '%s' exists\n", link_name);
                 goto error;
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' did not exist\n", link_name);
+                printf("    link '%s' did not exist\n", link_name);
                 goto error;
             }
         }
 
         if (H5Gclose(subgroup_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close subgroup '%s'\n", grp_name);
+            printf("    couldn't close subgroup '%s'\n", grp_name);
             goto error;
         }
     }
@@ -24451,13 +24323,13 @@ test_link_visit_external_links_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_external_links_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_increasing);
             }
 
@@ -24475,13 +24347,13 @@ test_link_visit_external_links_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_external_links_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_decreasing);
             }
 
@@ -24495,7 +24367,7 @@ test_link_visit_external_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_cycles_link_creation_increasing);
             }
 
@@ -24505,13 +24377,13 @@ test_link_visit_external_links_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_external_links_cycles_cb,
                           &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_increasing);
             }
 
@@ -24525,7 +24397,7 @@ test_link_visit_external_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_cycles_link_creation_decreasing);
             }
 
@@ -24535,13 +24407,13 @@ test_link_visit_external_links_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_external_links_cycles_cb,
                           &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_decreasing);
             }
 
@@ -24560,13 +24432,13 @@ test_link_visit_external_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, link_visit_external_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing);
             }
 
@@ -24585,13 +24457,13 @@ test_link_visit_external_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, link_visit_external_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing);
             }
 
@@ -24605,7 +24477,7 @@ test_link_visit_external_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_increasing);
             }
 
@@ -24617,13 +24489,13 @@ test_link_visit_external_links_cycles(void)
                                   H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_external_links_cycles_cb, &i,
                                   H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing);
             }
 
@@ -24637,7 +24509,7 @@ test_link_visit_external_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_decreasing);
             }
 
@@ -24649,13 +24521,13 @@ test_link_visit_external_links_cycles(void)
                                   H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_external_links_cycles_cb, &i,
                                   H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing);
             }
 
@@ -24744,9 +24616,8 @@ test_link_visit_mixed_links_cycles(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, link, hard link, soft link, external link, iterate, "
-            "or user defined link aren't supported with this connector\n");
+        printf("    API functions for basic file, group, link, hard link, soft link, external link, iterate, "
+               "or user defined link aren't supported with this connector\n");
         return 0;
     }
 
@@ -24756,7 +24627,7 @@ test_link_visit_mixed_links_cycles(void)
 
     if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+        printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
         goto error;
     }
 
@@ -24765,26 +24636,26 @@ test_link_visit_mixed_links_cycles(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -24792,31 +24663,30 @@ test_link_visit_mixed_links_cycles(void)
     if ((group_id = H5Gcreate2(container_group, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((subgroup1 = H5Gcreate2(group_id, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2, H5P_DEFAULT,
                                 gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create first subgroup '%s'\n",
-                 LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2);
+        printf("    couldn't create first subgroup '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2);
         goto error;
     }
 
     if ((subgroup2 = H5Gcreate2(group_id, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3, H5P_DEFAULT,
                                 gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create second subgroup '%s'\n",
-                 LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3);
+        printf("    couldn't create second subgroup '%s'\n",
+               LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3);
         goto error;
     }
 
     if (H5Lcreate_hard(group_id, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2, subgroup1,
                        LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create first hard link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1);
+        printf("    couldn't create first hard link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1);
         goto error;
     }
 
@@ -24825,74 +24695,74 @@ test_link_visit_mixed_links_cycles(void)
                        subgroup1, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2, H5P_DEFAULT,
                        H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2);
+        printf("    couldn't create soft link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2);
         goto error;
     }
 
     if (H5Lcreate_external(ext_link_filename, "/", subgroup2, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3,
                            H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create external link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3);
+        printf("    couldn't create external link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3);
         goto error;
     }
 
     if (H5Lcreate_hard(group_id, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3, subgroup2,
                        LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create second hard link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4);
+        printf("    couldn't create second hard link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4);
         goto error;
     }
 
     /* Verify the links have been created */
     if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if first link '%s' exists\n",
-                 LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1);
+        printf("    couldn't determine if first link '%s' exists\n",
+               LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    first link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1);
+        printf("    first link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1);
         goto error;
     }
 
     if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if second link '%s' exists\n",
-                 LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2);
+        printf("    couldn't determine if second link '%s' exists\n",
+               LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    second link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2);
+        printf("    second link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2);
         goto error;
     }
 
     if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if third link '%s' exists\n",
-                 LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3);
+        printf("    couldn't determine if third link '%s' exists\n",
+               LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    third link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3);
+        printf("    third link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3);
         goto error;
     }
 
     if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if fourth link '%s' exists\n",
-                 LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4);
+        printf("    couldn't determine if fourth link '%s' exists\n",
+               LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    fourth link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4);
+        printf("    fourth link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4);
         goto error;
     }
 
@@ -24915,13 +24785,13 @@ test_link_visit_mixed_links_cycles(void)
 
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_mixed_links_cycles_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_increasing);
             }
 
@@ -24938,13 +24808,13 @@ test_link_visit_mixed_links_cycles(void)
 
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_mixed_links_cycles_cb, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_name_decreasing);
             }
 
@@ -24958,7 +24828,7 @@ test_link_visit_mixed_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_cycles_link_creation_increasing);
             }
 
@@ -24968,13 +24838,13 @@ test_link_visit_mixed_links_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_mixed_links_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_increasing);
             }
 
@@ -24988,7 +24858,7 @@ test_link_visit_mixed_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_cycles_link_creation_decreasing);
             }
 
@@ -24998,13 +24868,13 @@ test_link_visit_mixed_links_cycles(void)
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_mixed_links_cycles_cb, &i) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_cycles_link_creation_decreasing);
             }
 
@@ -25022,13 +24892,13 @@ test_link_visit_mixed_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_INC, link_visit_mixed_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing);
             }
 
             if (i != LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing);
             }
 
@@ -25047,13 +24917,13 @@ test_link_visit_mixed_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_NAME, H5_ITER_DEC, link_visit_mixed_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing);
             }
 
             if (i != 2 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing);
             }
 
@@ -25067,7 +24937,7 @@ test_link_visit_mixed_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_increasing);
             }
 
@@ -25078,13 +24948,13 @@ test_link_visit_mixed_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_mixed_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing);
             }
 
             if (i != 3 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing);
             }
 
@@ -25098,7 +24968,7 @@ test_link_visit_mixed_links_cycles(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_decreasing);
             }
 
@@ -25109,13 +24979,13 @@ test_link_visit_mixed_links_cycles(void)
                     file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME,
                     H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_mixed_links_cycles_cb, &i, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing);
             }
 
             if (i != 4 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) {
                 H5_FAILED();
-                HDprintf("    some links were not visited!\n");
+                printf("    some links were not visited!\n");
                 PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing);
             }
 
@@ -25183,8 +25053,8 @@ test_link_visit_invalid_params(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, link, external link, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, link, external link, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -25194,7 +25064,7 @@ test_link_visit_invalid_params(void)
 
     if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
+        printf("    couldn't create file '%s' for external link to reference\n", ext_link_filename);
         goto error;
     }
 
@@ -25203,35 +25073,34 @@ test_link_visit_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((subgroup1 = H5Gcreate2(group_id, LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME2, H5P_DEFAULT,
                                 H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create first subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME2);
+        printf("    couldn't create first subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME2);
         goto error;
     }
 
     if ((subgroup2 = H5Gcreate2(group_id, LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME3, H5P_DEFAULT,
                                 H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create second subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME3);
+        printf("    couldn't create second subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME3);
         goto error;
     }
 
@@ -25245,7 +25114,7 @@ test_link_visit_invalid_params(void)
     if ((dset_id = H5Dcreate2(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype, fspace_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create first dataset '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME);
+        printf("    couldn't create first dataset '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME);
     }
 
     if (H5Dclose(dset_id) < 0)
@@ -25254,7 +25123,7 @@ test_link_visit_invalid_params(void)
     if ((dset_id = H5Dcreate2(subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype, fspace_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create second dataset '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME);
+        printf("    couldn't create second dataset '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME);
     }
 
     if (H5Dclose(dset_id) < 0)
@@ -25263,79 +25132,79 @@ test_link_visit_invalid_params(void)
     if (H5Lcreate_hard(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, subgroup1,
                        LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create first hard link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1);
+        printf("    couldn't create first hard link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1);
         goto error;
     }
 
     if (H5Lcreate_soft(LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, subgroup1,
                        LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2);
+        printf("    couldn't create soft link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2);
         goto error;
     }
     if (H5Lcreate_external(ext_link_filename, "/", subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3,
                            H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create external link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3);
+        printf("    couldn't create external link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3);
         goto error;
     }
     if (H5Lcreate_hard(subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, subgroup2,
                        LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create second hard link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4);
+        printf("    couldn't create second hard link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4);
         goto error;
     }
 
     /* Verify the links have been created */
     if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if first link '%s' exists\n",
-                 LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1);
+        printf("    couldn't determine if first link '%s' exists\n",
+               LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link 1 did not exist\n");
+        printf("    link 1 did not exist\n");
         goto error;
     }
 
     if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if second link '%s' exists\n",
-                 LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2);
+        printf("    couldn't determine if second link '%s' exists\n",
+               LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link 2 did not exist\n");
+        printf("    link 2 did not exist\n");
         goto error;
     }
 
     if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if third link '%s' exists\n",
-                 LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3);
+        printf("    couldn't determine if third link '%s' exists\n",
+               LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link 3 did not exist\n");
+        printf("    link 3 did not exist\n");
         goto error;
     }
 
     if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if fourth link '%s' exists\n",
-                 LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4);
+        printf("    couldn't determine if fourth link '%s' exists\n",
+               LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4);
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    link 4 did not exist\n");
+        printf("    link 4 did not exist\n");
         goto error;
     }
 
@@ -25356,7 +25225,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 succeeded with an invalid group ID!\n");
+                printf("    H5Lvisit2 succeeded with an invalid group ID!\n");
                 PART_ERROR(H5Lvisit_invalid_grp_id);
             }
 
@@ -25377,7 +25246,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
+                printf("    H5Lvisit2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Lvisit_invalid_index_type);
             }
 
@@ -25389,7 +25258,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 succeeded with invalid index type H5_INDEX_N!\n");
+                printf("    H5Lvisit2 succeeded with invalid index type H5_INDEX_N!\n");
                 PART_ERROR(H5Lvisit_invalid_index_type);
             }
 
@@ -25410,7 +25279,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
+                printf("    H5Lvisit2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Lvisit_invalid_iter_order);
             }
 
@@ -25422,7 +25291,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 succeeded with invalid iteration ordering H5_ITER_N!\n");
+                printf("    H5Lvisit2 succeeded with invalid iteration ordering H5_ITER_N!\n");
                 PART_ERROR(H5Lvisit_invalid_iter_order);
             }
 
@@ -25445,7 +25314,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 succeeded with an invalid location ID!\n");
+                printf("    H5Lvisit_by_name2 succeeded with an invalid location ID!\n");
                 PART_ERROR(H5Lvisit_by_name_invalid_loc_id);
             }
 
@@ -25466,7 +25335,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 succeeded with a NULL group name!\n");
+                printf("    H5Lvisit_by_name2 succeeded with a NULL group name!\n");
                 PART_ERROR(H5Lvisit_by_name_invalid_grp_name);
             }
 
@@ -25479,7 +25348,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 succeeded with an invalid group name of ''!\n");
+                printf("    H5Lvisit_by_name2 succeeded with an invalid group name of ''!\n");
                 PART_ERROR(H5Lvisit_by_name_invalid_grp_name);
             }
 
@@ -25501,7 +25370,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
+                printf("    H5Lvisit_by_name2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Lvisit_by_name_invalid_index_type);
             }
 
@@ -25515,7 +25384,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 succeeded with invalid index type H5_INDEX_N!\n");
+                printf("    H5Lvisit_by_name2 succeeded with invalid index type H5_INDEX_N!\n");
                 PART_ERROR(H5Lvisit_by_name_invalid_index_type);
             }
 
@@ -25537,8 +25406,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    H5Lvisit_by_name2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
+                printf("    H5Lvisit_by_name2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Lvisit_by_name_invalid_iter_order);
             }
 
@@ -25552,7 +25420,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 succeeded with invalid iteration ordering H5_ITER_N!\n");
+                printf("    H5Lvisit_by_name2 succeeded with invalid iteration ordering H5_ITER_N!\n");
                 PART_ERROR(H5Lvisit_by_name_invalid_iter_order);
             }
 
@@ -25574,7 +25442,7 @@ test_link_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 succeeded with an invalid LAPL!\n");
+                printf("    H5Lvisit_by_name2 succeeded with an invalid LAPL!\n");
                 PART_ERROR(H5Lvisit_by_name_invalid_lapl);
             }
 
@@ -25640,8 +25508,8 @@ test_link_visit_0_links(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or link iterate aren't supported "
-                 "with this connector\n");
+        printf("    API functions for basic file, group, or link iterate aren't supported "
+               "with this connector\n");
         return 0;
     }
 
@@ -25649,26 +25517,26 @@ test_link_visit_0_links(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -25676,7 +25544,7 @@ test_link_visit_0_links(void)
     if ((group_id = H5Gcreate2(container_group, LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -25690,7 +25558,7 @@ test_link_visit_0_links(void)
 
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_0_links_cb, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_0_links_name_increasing);
             }
 
@@ -25704,7 +25572,7 @@ test_link_visit_0_links(void)
 
             if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_0_links_cb, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_0_links_name_decreasing);
             }
 
@@ -25718,13 +25586,13 @@ test_link_visit_0_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_0_links_creation_increasing);
             }
 
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_0_links_cb, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_0_links_creation_increasing);
             }
 
@@ -25738,13 +25606,13 @@ test_link_visit_0_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_0_links_creation_decreasing);
             }
 
             if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_0_links_cb, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_0_links_creation_decreasing);
             }
 
@@ -25759,7 +25627,7 @@ test_link_visit_0_links(void)
             if (H5Lvisit_by_name2(file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME,
                                   H5_INDEX_NAME, H5_ITER_INC, link_visit_0_links_cb, NULL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_0_links_name_increasing);
             }
 
@@ -25774,7 +25642,7 @@ test_link_visit_0_links(void)
             if (H5Lvisit_by_name2(file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME,
                                   H5_INDEX_NAME, H5_ITER_DEC, link_visit_0_links_cb, NULL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type name in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_0_links_name_decreasing);
             }
 
@@ -25788,7 +25656,7 @@ test_link_visit_0_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_0_links_creation_increasing);
             }
 
@@ -25796,7 +25664,7 @@ test_link_visit_0_links(void)
                                   H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_0_links_cb, NULL,
                                   H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in increasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_0_links_creation_increasing);
             }
 
@@ -25810,7 +25678,7 @@ test_link_visit_0_links(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Lvisit_by_name_0_links_creation_decreasing);
             }
 
@@ -25818,7 +25686,7 @@ test_link_visit_0_links(void)
                                   H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_0_links_cb, NULL,
                                   H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
+                printf("    H5Lvisit_by_name2 by index type creation order in decreasing order failed\n");
                 PART_ERROR(H5Lvisit_by_name_0_links_creation_decreasing);
             }
 
@@ -25875,7 +25743,7 @@ link_iter_hard_links_cb(hid_t group_id, const char *name, const H5L_info2_t *inf
 
     if (H5L_TYPE_HARD != info->type) {
         ret_val = H5_ITER_ERROR;
-        HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
+        printf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
         goto done;
     }
 
@@ -25905,7 +25773,7 @@ link_iter_hard_links_cb(hid_t group_id, const char *name, const H5L_info2_t *inf
     }
 
     if (HDstrncmp(name, expected_link_name, LINK_ITER_HARD_LINKS_TEST_BUF_SIZE)) {
-        HDprintf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
+        printf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
         ret_val = H5_ITER_ERROR;
         goto done;
     }
@@ -25935,7 +25803,7 @@ link_iter_soft_links_cb(hid_t group_id, const char *name, const H5L_info2_t *inf
 
     if (H5L_TYPE_SOFT != info->type) {
         ret_val = H5_ITER_ERROR;
-        HDprintf("    link type for link '%s' was not H5L_TYPE_SOFT!\n", name);
+        printf("    link type for link '%s' was not H5L_TYPE_SOFT!\n", name);
         goto done;
     }
 
@@ -25965,7 +25833,7 @@ link_iter_soft_links_cb(hid_t group_id, const char *name, const H5L_info2_t *inf
     }
 
     if (HDstrncmp(name, expected_link_name, LINK_ITER_SOFT_LINKS_TEST_BUF_SIZE)) {
-        HDprintf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
+        printf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
         ret_val = H5_ITER_ERROR;
         goto done;
     }
@@ -25992,8 +25860,8 @@ link_iter_external_links_cb(hid_t group_id, const char *name, const H5L_info2_t
 
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for external links aren't supported with this "
-                 "connector\n");
+        printf("    API functions for external links aren't supported with this "
+               "connector\n");
         return 1;
     }
 
@@ -26002,7 +25870,7 @@ link_iter_external_links_cb(hid_t group_id, const char *name, const H5L_info2_t
 
     if (H5L_TYPE_EXTERNAL != info->type) {
         ret_val = H5_ITER_ERROR;
-        HDprintf("    link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name);
+        printf("    link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name);
         goto done;
     }
 
@@ -26032,7 +25900,7 @@ link_iter_external_links_cb(hid_t group_id, const char *name, const H5L_info2_t
     }
 
     if (HDstrncmp(name, expected_link_name, LINK_ITER_EXT_LINKS_TEST_BUF_SIZE)) {
-        HDprintf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
+        printf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
         ret_val = H5_ITER_ERROR;
         goto done;
     }
@@ -26057,8 +25925,8 @@ link_iter_mixed_links_cb(hid_t group_id, const char *name, const H5L_info2_t *in
 
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for external or user-defined link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for external or user-defined link aren't supported with this "
+               "connector\n");
         return 1;
     }
 
@@ -26069,7 +25937,7 @@ link_iter_mixed_links_cb(hid_t group_id, const char *name, const H5L_info2_t *in
         (counter_val == 1 || counter_val == 4 || counter_val == 6 || counter_val == 11)) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
         }
 
         goto done;
@@ -26079,7 +25947,7 @@ link_iter_mixed_links_cb(hid_t group_id, const char *name, const H5L_info2_t *in
              (counter_val == 2 || counter_val == 3 || counter_val == 7 || counter_val == 10)) {
         if (H5L_TYPE_SOFT != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_SOFT!\n", name);
+            printf("    link type for link '%s' was not H5L_TYPE_SOFT!\n", name);
         }
 
         goto done;
@@ -26089,13 +25957,13 @@ link_iter_mixed_links_cb(hid_t group_id, const char *name, const H5L_info2_t *in
              (counter_val == 0 || counter_val == 5 || counter_val == 8 || counter_val == 9)) {
         if (H5L_TYPE_EXTERNAL != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name);
+            printf("    link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name);
         }
 
         goto done;
     }
 
-    HDprintf("    link name '%s' didn't match known names or came in an incorrect order\n", name);
+    printf("    link name '%s' didn't match known names or came in an incorrect order\n", name);
 
     ret_val = -1;
 
@@ -26146,8 +26014,8 @@ link_iter_idx_saving_cb(hid_t group_id, const char *name, const H5L_info2_t *inf
 
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for external or user-defined link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for external or user-defined link aren't supported with this "
+               "connector\n");
         return 1;
     }
 
@@ -26163,7 +26031,7 @@ link_iter_idx_saving_cb(hid_t group_id, const char *name, const H5L_info2_t *inf
                    strlen(LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME) + 1)) {
         if (H5L_TYPE_HARD != info->type) {
             H5_FAILED();
-            HDprintf("    link type did not match\n");
+            printf("    link type did not match\n");
             goto error;
         }
     }
@@ -26171,7 +26039,7 @@ link_iter_idx_saving_cb(hid_t group_id, const char *name, const H5L_info2_t *inf
                         strlen(LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME) + 1)) {
         if (H5L_TYPE_SOFT != info->type) {
             H5_FAILED();
-            HDprintf("    link type did not match\n");
+            printf("    link type did not match\n");
             goto error;
         }
     }
@@ -26179,13 +26047,13 @@ link_iter_idx_saving_cb(hid_t group_id, const char *name, const H5L_info2_t *inf
                         strlen(LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME) + 1)) {
         if (H5L_TYPE_EXTERNAL != info->type) {
             H5_FAILED();
-            HDprintf("    link type did not match\n");
+            printf("    link type did not match\n");
             goto error;
         }
     }
     else {
         H5_FAILED();
-        HDprintf("    link name didn't match known names\n");
+        printf("    link name didn't match known names\n");
         goto error;
     }
 
@@ -26217,7 +26085,7 @@ link_visit_hard_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_i
 
     if (H5L_TYPE_HARD != info->type) {
         ret_val = H5_ITER_ERROR;
-        HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
+        printf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
         goto done;
     }
 
@@ -26287,7 +26155,7 @@ link_visit_hard_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_i
     }
 
     if (HDstrncmp(name, expected_link_name, LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_BUF_SIZE)) {
-        HDprintf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
+        printf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
         ret_val = H5_ITER_ERROR;
         goto done;
     }
@@ -26324,14 +26192,14 @@ link_visit_soft_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_i
     if (is_subgroup_link) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = H5_ITER_ERROR;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
             goto done;
         }
     }
     else {
         if (H5L_TYPE_SOFT != info->type) {
             ret_val = H5_ITER_ERROR;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_SOFT!\n", name);
+            printf("    link type for link '%s' was not H5L_TYPE_SOFT!\n", name);
             goto done;
         }
     }
@@ -26400,7 +26268,7 @@ link_visit_soft_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_i
     }
 
     if (HDstrncmp(name, expected_link_name, LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_BUF_SIZE)) {
-        HDprintf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
+        printf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
         ret_val = H5_ITER_ERROR;
         goto done;
     }
@@ -26431,8 +26299,8 @@ link_visit_external_links_no_cycles_cb(hid_t group_id, const char *name, const H
 
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for external links aren't supported with this "
-                 "connector\n");
+        printf("    API functions for external links aren't supported with this "
+               "connector\n");
         return 1;
     }
 
@@ -26445,14 +26313,14 @@ link_visit_external_links_no_cycles_cb(hid_t group_id, const char *name, const H
     if (is_subgroup_link) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = H5_ITER_ERROR;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
             goto done;
         }
     }
     else {
         if (H5L_TYPE_EXTERNAL != info->type) {
             ret_val = H5_ITER_ERROR;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name);
+            printf("    link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name);
             goto done;
         }
     }
@@ -26521,7 +26389,7 @@ link_visit_external_links_no_cycles_cb(hid_t group_id, const char *name, const H
     }
 
     if (HDstrncmp(name, expected_link_name, LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_BUF_SIZE)) {
-        HDprintf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
+        printf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
         ret_val = H5_ITER_ERROR;
         goto done;
     }
@@ -26546,8 +26414,8 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_
 
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for external or user-defined link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for external or user-defined link aren't supported with this "
+               "connector\n");
         return 1;
     }
 
@@ -26563,9 +26431,9 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_
         (counter_val == 2 || counter_val == 14 || counter_val == 18 || counter_val == 30)) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
-                     LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2
-                     "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
+                   LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2
+                   "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1);
         }
 
         goto done;
@@ -26579,9 +26447,9 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_
              (counter_val == 3 || counter_val == 13 || counter_val == 19 || counter_val == 29)) {
         if (H5L_TYPE_SOFT != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_SOFT!\n",
-                     LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2
-                     "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2);
+            printf("    link type for link '%s' was not H5L_TYPE_SOFT!\n",
+                   LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2
+                   "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2);
         }
 
         goto done;
@@ -26595,9 +26463,9 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_
              (counter_val == 6 || counter_val == 10 || counter_val == 22 || counter_val == 26)) {
         if (H5L_TYPE_EXTERNAL != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_EXTERNAL!\n",
-                     LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3
-                     "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3);
+            printf("    link type for link '%s' was not H5L_TYPE_EXTERNAL!\n",
+                   LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3
+                   "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3);
         }
 
         goto done;
@@ -26611,9 +26479,9 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_
              (counter_val == 7 || counter_val == 9 || counter_val == 23 || counter_val == 25)) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
-                     LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3
-                     "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
+                   LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3
+                   "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4);
         }
 
         goto done;
@@ -26627,9 +26495,9 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_
              (counter_val == 1 || counter_val == 15 || counter_val == 17 || counter_val == 31)) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
-                     LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2
-                     "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
+                   LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2
+                   "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME);
         }
 
         goto done;
@@ -26643,9 +26511,9 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_
              (counter_val == 5 || counter_val == 11 || counter_val == 21 || counter_val == 27)) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
-                     LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3
-                     "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME2);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
+                   LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3
+                   "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME2);
         }
 
         goto done;
@@ -26655,8 +26523,8 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_
              (counter_val == 0 || counter_val == 12 || counter_val == 16 || counter_val == 28)) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
-                     LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
+                   LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2);
         }
 
         goto done;
@@ -26666,14 +26534,14 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_
              (counter_val == 4 || counter_val == 8 || counter_val == 20 || counter_val == 24)) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
-                     LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
+                   LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3);
         }
 
         goto done;
     }
 
-    HDprintf("    link name '%s' didn't match known names or came in an incorrect order\n", name);
+    printf("    link name '%s' didn't match known names or came in an incorrect order\n", name);
 
     ret_val = -1;
 
@@ -26705,7 +26573,7 @@ link_visit_hard_links_cycles_cb(hid_t group_id, const char *name, const H5L_info
 
     if (H5L_TYPE_HARD != info->type) {
         ret_val = H5_ITER_ERROR;
-        HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
+        printf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
         goto done;
     }
 
@@ -26775,7 +26643,7 @@ link_visit_hard_links_cycles_cb(hid_t group_id, const char *name, const H5L_info
     }
 
     if (HDstrncmp(name, expected_link_name, LINK_VISIT_HARD_LINKS_CYCLE_TEST_BUF_SIZE)) {
-        HDprintf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
+        printf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
         ret_val = H5_ITER_ERROR;
         goto done;
     }
@@ -26812,14 +26680,14 @@ link_visit_soft_links_cycles_cb(hid_t group_id, const char *name, const H5L_info
     if (is_subgroup_link) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = H5_ITER_ERROR;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
             goto done;
         }
     }
     else {
         if (H5L_TYPE_SOFT != info->type) {
             ret_val = H5_ITER_ERROR;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_SOFT!\n", name);
+            printf("    link type for link '%s' was not H5L_TYPE_SOFT!\n", name);
             goto done;
         }
     }
@@ -26888,7 +26756,7 @@ link_visit_soft_links_cycles_cb(hid_t group_id, const char *name, const H5L_info
     }
 
     if (HDstrncmp(name, expected_link_name, LINK_VISIT_SOFT_LINKS_CYCLE_TEST_BUF_SIZE)) {
-        HDprintf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
+        printf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
         ret_val = H5_ITER_ERROR;
         goto done;
     }
@@ -26918,8 +26786,8 @@ link_visit_external_links_cycles_cb(hid_t group_id, const char *name, const H5L_
 
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for external links aren't supported with this "
-                 "connector\n");
+        printf("    API functions for external links aren't supported with this "
+               "connector\n");
         return 1;
     }
 
@@ -26932,14 +26800,14 @@ link_visit_external_links_cycles_cb(hid_t group_id, const char *name, const H5L_
     if (is_subgroup_link) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = H5_ITER_ERROR;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n", name);
             goto done;
         }
     }
     else {
         if (H5L_TYPE_EXTERNAL != info->type) {
             ret_val = H5_ITER_ERROR;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name);
+            printf("    link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name);
             goto done;
         }
     }
@@ -27008,7 +26876,7 @@ link_visit_external_links_cycles_cb(hid_t group_id, const char *name, const H5L_
     }
 
     if (HDstrncmp(name, expected_link_name, LINK_VISIT_EXT_LINKS_CYCLE_TEST_BUF_SIZE)) {
-        HDprintf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
+        printf("    link name '%s' didn't match expected name '%s'\n", name, expected_link_name);
         ret_val = H5_ITER_ERROR;
         goto done;
     }
@@ -27033,8 +26901,8 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf
 
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for external or user-defined link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for external or user-defined link aren't supported with this "
+               "connector\n");
         return 1;
     }
 
@@ -27050,9 +26918,9 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf
         (counter_val == 1 || counter_val == 11 || counter_val == 13 || counter_val == 23)) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
-                     LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2
-                     "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
+                   LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2
+                   "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1);
         }
 
         goto done;
@@ -27066,9 +26934,9 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf
              (counter_val == 2 || counter_val == 10 || counter_val == 14 || counter_val == 22)) {
         if (H5L_TYPE_SOFT != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_SOFT!\n",
-                     LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2
-                     "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2);
+            printf("    link type for link '%s' was not H5L_TYPE_SOFT!\n",
+                   LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2
+                   "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2);
         }
 
         goto done;
@@ -27082,9 +26950,9 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf
              (counter_val == 4 || counter_val == 8 || counter_val == 16 || counter_val == 20)) {
         if (H5L_TYPE_EXTERNAL != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_EXTERNAL!\n",
-                     LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3
-                     "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3);
+            printf("    link type for link '%s' was not H5L_TYPE_EXTERNAL!\n",
+                   LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3
+                   "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3);
         }
 
         goto done;
@@ -27098,9 +26966,9 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf
              (counter_val == 5 || counter_val == 7 || counter_val == 17 || counter_val == 19)) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
-                     LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3
-                     "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
+                   LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3
+                   "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4);
         }
 
         goto done;
@@ -27110,8 +26978,8 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf
              (counter_val == 0 || counter_val == 9 || counter_val == 12 || counter_val == 21)) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
-                     LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
+                   LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2);
         }
 
         goto done;
@@ -27121,14 +26989,14 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf
              (counter_val == 3 || counter_val == 6 || counter_val == 15 || counter_val == 18)) {
         if (H5L_TYPE_HARD != info->type) {
             ret_val = -1;
-            HDprintf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
-                     LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3);
+            printf("    link type for link '%s' was not H5L_TYPE_HARD!\n",
+                   LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3);
         }
 
         goto done;
     }
 
-    HDprintf("    link name '%s' didn't match known names or came in an incorrect order\n", name);
+    printf("    link name '%s' didn't match known names or came in an incorrect order\n", name);
 
     ret_val = -1;
 
@@ -27184,19 +27052,19 @@ H5_api_link_test(void)
     size_t i;
     int    nerrors;
 
-    HDprintf("**********************************************\n");
-    HDprintf("*                                            *\n");
-    HDprintf("*              API Link Tests                *\n");
-    HDprintf("*                                            *\n");
-    HDprintf("**********************************************\n\n");
+    printf("**********************************************\n");
+    printf("*                                            *\n");
+    printf("*              API Link Tests                *\n");
+    printf("*                                            *\n");
+    printf("**********************************************\n\n");
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(link_tests); i++) {
         nerrors += (*link_tests[i])() ? 1 : 0;
     }
 
-    HDprintf("\n");
+    printf("\n");
 
-    HDprintf("Cleaning up testing files\n");
+    printf("Cleaning up testing files\n");
     cleanup_files();
 
     return nerrors;
diff --git a/test/API/H5_api_misc_test.c b/test/API/H5_api_misc_test.c
index 256550b..37b98ab 100644
--- a/test/API/H5_api_misc_test.c
+++ b/test/API/H5_api_misc_test.c
@@ -44,20 +44,19 @@ test_open_link_without_leading_slash(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
@@ -71,7 +70,7 @@ test_open_link_without_leading_slash(void)
     if ((dset_id = H5Dcreate2(container_group, OPEN_LINK_WITHOUT_SLASH_DSET_NAME, dset_dtype, space_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset\n");
+        printf("    couldn't create dataset\n");
         goto error;
     }
 
@@ -86,20 +85,20 @@ test_open_link_without_leading_slash(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((group_id = H5Gopen2(file_id, "/", H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open root group\n");
+        printf("    couldn't open root group\n");
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, MISCELLANEOUS_TEST_GROUP_NAME "/" OPEN_LINK_WITHOUT_SLASH_DSET_NAME,
                             H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset\n");
+        printf("    couldn't open dataset\n");
         goto error;
     }
 
@@ -149,8 +148,8 @@ test_object_creation_by_absolute_path(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, link, or stored datatype aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, link, or stored datatype aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -158,13 +157,13 @@ test_object_creation_by_absolute_path(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
@@ -172,7 +171,7 @@ test_object_creation_by_absolute_path(void)
     if ((group_id = H5Gcreate2(container_group, OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_CONTAINER_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group\n");
+        printf("    couldn't create container group\n");
         goto error;
     }
 
@@ -181,13 +180,13 @@ test_object_creation_by_absolute_path(void)
                                  "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_CONTAINER_GROUP_NAME,
                                  H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link exists\n");
+        printf("    couldn't determine if link exists\n");
         goto error;
     }
 
     if (!link_exists) {
         H5_FAILED();
-        HDprintf("    container group didn't exist at the correct location\n");
+        printf("    container group didn't exist at the correct location\n");
         goto error;
     }
 
@@ -206,7 +205,7 @@ test_object_creation_by_absolute_path(void)
                                            "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_SUBGROUP_NAME,
                                            H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create subgroup by absolute pathname\n");
+                printf("    couldn't create subgroup by absolute pathname\n");
                 PART_ERROR(H5Gcreate_using_absolute_path);
             }
 
@@ -216,13 +215,13 @@ test_object_creation_by_absolute_path(void)
                                          "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_SUBGROUP_NAME,
                                          H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link exists\n");
+                printf("    couldn't determine if link exists\n");
                 PART_ERROR(H5Gcreate_using_absolute_path);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    subgroup didn't exist at the correct location\n");
+                printf("    subgroup didn't exist at the correct location\n");
                 PART_ERROR(H5Gcreate_using_absolute_path);
             }
 
@@ -238,13 +237,13 @@ test_object_creation_by_absolute_path(void)
             if ((fspace_id = generate_random_dataspace(OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DSET_SPACE_RANK,
                                                        NULL, NULL, FALSE)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to generate dataspace\n");
+                printf("    failed to generate dataspace\n");
                 PART_ERROR(H5Dcreate_using_absolute_path);
             }
 
             if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to generate datatype\n");
+                printf("    failed to generate datatype\n");
                 PART_ERROR(H5Dcreate_using_absolute_path);
             }
 
@@ -255,7 +254,7 @@ test_object_creation_by_absolute_path(void)
                                       "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DSET_NAME,
                                       dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset\n");
+                printf("    couldn't create dataset\n");
                 PART_ERROR(H5Dcreate_using_absolute_path);
             }
 
@@ -266,13 +265,13 @@ test_object_creation_by_absolute_path(void)
                                          "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DSET_NAME,
                                          H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link exists\n");
+                printf("    couldn't determine if link exists\n");
                 PART_ERROR(H5Dcreate_using_absolute_path);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    dataset didn't exist at the correct location\n");
+                printf("    dataset didn't exist at the correct location\n");
                 PART_ERROR(H5Dcreate_using_absolute_path);
             }
 
@@ -287,7 +286,7 @@ test_object_creation_by_absolute_path(void)
             /* Try to create a committed datatype in the same fashion as the preceding dataset */
             if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create datatype\n");
+                printf("    couldn't create datatype\n");
                 PART_ERROR(H5Tcommit_using_absolute_path);
             }
 
@@ -298,7 +297,7 @@ test_object_creation_by_absolute_path(void)
                            "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DTYPE_NAME,
                            dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't commit datatype\n");
+                printf("    couldn't commit datatype\n");
                 PART_ERROR(H5Tcommit_using_absolute_path);
             }
 
@@ -309,13 +308,13 @@ test_object_creation_by_absolute_path(void)
                                          "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DTYPE_NAME,
                                          H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link exists\n");
+                printf("    couldn't determine if link exists\n");
                 PART_ERROR(H5Tcommit_using_absolute_path);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    datatype didn't exist at the correct location\n");
+                printf("    datatype didn't exist at the correct location\n");
                 PART_ERROR(H5Tcommit_using_absolute_path);
             }
 
@@ -384,8 +383,8 @@ test_absolute_vs_relative_path(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, dataset, or link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
@@ -393,13 +392,13 @@ test_absolute_vs_relative_path(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
@@ -407,7 +406,7 @@ test_absolute_vs_relative_path(void)
     if ((group_id = H5Gcreate2(container_group, ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container group\n");
+        printf("    couldn't create container group\n");
         goto error;
     }
 
@@ -443,7 +442,7 @@ test_absolute_vs_relative_path(void)
                                        "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET1_NAME,
                                        dset_dtype1, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset by absolute path from root\n");
+                printf("    couldn't create dataset by absolute path from root\n");
                 PART_ERROR(H5Dcreate_absolute_from_root);
             }
 
@@ -453,13 +452,13 @@ test_absolute_vs_relative_path(void)
                                          "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET1_NAME,
                                          H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link exists\n");
+                printf("    couldn't determine if link exists\n");
                 PART_ERROR(H5Dcreate_absolute_from_root);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    didn't exist at the correct location\n");
+                printf("    didn't exist at the correct location\n");
                 PART_ERROR(H5Dcreate_absolute_from_root);
             }
 
@@ -479,7 +478,7 @@ test_absolute_vs_relative_path(void)
                                        "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET4_NAME,
                                        dset_dtype4, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset by absolute path from container group\n");
+                printf("    couldn't create dataset by absolute path from container group\n");
                 PART_ERROR(H5Dcreate_absolute_from_nonroot);
             }
 
@@ -489,13 +488,13 @@ test_absolute_vs_relative_path(void)
                                          "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET4_NAME,
                                          H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link exists\n");
+                printf("    couldn't determine if link exists\n");
                 PART_ERROR(H5Dcreate_absolute_from_nonroot);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    didn't exist at the correct location\n");
+                printf("    didn't exist at the correct location\n");
                 PART_ERROR(H5Dcreate_absolute_from_nonroot);
             }
 
@@ -523,7 +522,7 @@ test_absolute_vs_relative_path(void)
             if ((dset_id5 = H5Dcreate2(group_id, ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET5_NAME, dset_dtype5,
                                        fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset by relative path from container group\n");
+                printf("    couldn't create dataset by relative path from container group\n");
                 PART_ERROR(H5Dcreate_relative_from_nonroot);
             }
 
@@ -534,7 +533,7 @@ test_absolute_vs_relative_path(void)
                                        "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET2_NAME,
                                        dset_dtype2, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset by relative path from container group\n");
+                printf("    couldn't create dataset by relative path from container group\n");
                 PART_ERROR(H5Dcreate_relative_from_nonroot);
             }
 
@@ -544,13 +543,13 @@ test_absolute_vs_relative_path(void)
                                          "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET2_NAME,
                                          H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link exists\n");
+                printf("    couldn't determine if link exists\n");
                 PART_ERROR(H5Dcreate_relative_from_nonroot);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    didn't exist at the correct location\n");
+                printf("    didn't exist at the correct location\n");
                 PART_ERROR(H5Dcreate_relative_from_nonroot);
             }
 
@@ -560,13 +559,13 @@ test_absolute_vs_relative_path(void)
                                          "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET5_NAME,
                                          H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link exists\n");
+                printf("    couldn't determine if link exists\n");
                 PART_ERROR(H5Dcreate_relative_from_nonroot);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    didn't exist at the correct location\n");
+                printf("    didn't exist at the correct location\n");
                 PART_ERROR(H5Dcreate_relative_from_nonroot);
             }
 
@@ -585,7 +584,7 @@ test_absolute_vs_relative_path(void)
                                        "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET3_NAME,
                                        dset_dtype3, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset by relative path from root with leading '.'\n");
+                printf("    couldn't create dataset by relative path from root with leading '.'\n");
                 PART_ERROR(H5Dcreate_relative_leading_dot_root);
             }
 
@@ -595,13 +594,13 @@ test_absolute_vs_relative_path(void)
                                          "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET3_NAME,
                                          H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link exists\n");
+                printf("    couldn't determine if link exists\n");
                 PART_ERROR(H5Dcreate_relative_leading_dot_root);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    didn't exist at the correct location\n");
+                printf("    didn't exist at the correct location\n");
                 PART_ERROR(H5Dcreate_relative_leading_dot_root);
             }
 
@@ -617,7 +616,7 @@ test_absolute_vs_relative_path(void)
             if ((dset_id6 = H5Dcreate2(group_id, "./" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET6_NAME, dset_dtype6,
                                        fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    couldn't create dataset by relative path from container group with leading '.'\n");
                 PART_ERROR(H5Dcreate_relative_leading_dot_nonroot);
             }
@@ -628,13 +627,13 @@ test_absolute_vs_relative_path(void)
                                          "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET6_NAME,
                                          H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link exists\n");
+                printf("    couldn't determine if link exists\n");
                 PART_ERROR(H5Dcreate_relative_leading_dot_nonroot);
             }
 
             if (!link_exists) {
                 H5_FAILED();
-                HDprintf("    didn't exist at the correct location\n");
+                printf("    didn't exist at the correct location\n");
                 PART_ERROR(H5Dcreate_relative_leading_dot_nonroot);
             }
 
@@ -729,8 +728,8 @@ test_dot_for_object_name(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or stored datatype aren't supported with "
-                 "this connector\n");
+        printf("    API functions for basic file, group, dataset, or stored datatype aren't supported with "
+               "this connector\n");
         return 0;
     }
 
@@ -738,26 +737,26 @@ test_dot_for_object_name(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", MISCELLANEOUS_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", MISCELLANEOUS_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((subgroup_id = H5Gcreate2(container_group, DOT_AS_OBJECT_NAME_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                   H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", DOT_AS_OBJECT_NAME_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", DOT_AS_OBJECT_NAME_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create data space\n");
+        printf("    couldn't create data space\n");
         goto error;
     }
 
@@ -778,7 +777,7 @@ test_dot_for_object_name(void)
 
             if (group_id >= 0) {
                 H5_FAILED();
-                HDprintf("    a group was created with '.' as the name!\n");
+                printf("    a group was created with '.' as the name!\n");
                 PART_ERROR(H5Gcreate_dot_as_name);
             }
 
@@ -800,7 +799,7 @@ test_dot_for_object_name(void)
 
             if (dset_id >= 0) {
                 H5_FAILED();
-                HDprintf("    a dataset was created with '.' as the name!\n");
+                printf("    a dataset was created with '.' as the name!\n");
                 PART_ERROR(H5Dcreate_dot_as_name);
             }
 
@@ -814,7 +813,7 @@ test_dot_for_object_name(void)
 
             if ((dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't copy a native datatype\n");
+                printf("    couldn't copy a native datatype\n");
                 PART_ERROR(H5Tcommit_dot_as_name);
             }
 
@@ -827,13 +826,13 @@ test_dot_for_object_name(void)
 
             if (ret >= 0) {
                 H5_FAILED();
-                HDprintf("    a named datatype was committed with '.' as the name!\n");
+                printf("    a named datatype was committed with '.' as the name!\n");
                 PART_ERROR(H5Tcommit_dot_as_name);
             }
 
             if (H5Tclose(dtype_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close datatype\n");
+                printf("    failed to close datatype\n");
                 PART_ERROR(H5Tcommit_dot_as_name);
             }
 
@@ -918,8 +917,7 @@ test_symbols_in_compound_field_name(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -928,20 +926,20 @@ test_symbols_in_compound_field_name(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file\n");
+        printf("    couldn't open file\n");
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group\n");
+        printf("    couldn't open container group\n");
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_SUBGROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group\n");
+        printf("    couldn't create container sub-group\n");
         goto error;
     }
 
@@ -962,14 +960,14 @@ test_symbols_in_compound_field_name(void)
 
     if ((compound_type = H5Tcreate(H5T_COMPOUND, total_type_size)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create compound datatype\n");
+        printf("    couldn't create compound datatype\n");
         goto error;
     }
 
     for (i = 0, next_offset = 0; i < COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_NUM_SUBTYPES; i++) {
         if (H5Tinsert(compound_type, member_names[i], next_offset, type_pool[i]) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't insert compound member %zu\n", i);
+            printf("    couldn't insert compound member %zu\n", i);
             goto error;
         }
 
@@ -986,7 +984,7 @@ test_symbols_in_compound_field_name(void)
     if ((dset_id = H5Dcreate2(group_id, COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_DSET_NAME, compound_type,
                               fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset\n");
+        printf("    couldn't create dataset\n");
         goto error;
     }
 
@@ -996,7 +994,7 @@ test_symbols_in_compound_field_name(void)
     if ((dset_id = H5Dopen2(group_id, COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_DSET_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    failed to open dataset\n");
+        printf("    failed to open dataset\n");
         goto error;
     }
 
@@ -1044,17 +1042,17 @@ H5_api_misc_test(void)
     size_t i;
     int    nerrors;
 
-    HDprintf("**********************************************\n");
-    HDprintf("*                                            *\n");
-    HDprintf("*          API Miscellaneous Tests           *\n");
-    HDprintf("*                                            *\n");
-    HDprintf("**********************************************\n\n");
+    printf("**********************************************\n");
+    printf("*                                            *\n");
+    printf("*          API Miscellaneous Tests           *\n");
+    printf("*                                            *\n");
+    printf("**********************************************\n\n");
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(misc_tests); i++) {
         nerrors += (*misc_tests[i])() ? 1 : 0;
     }
 
-    HDprintf("\n");
+    printf("\n");
 
     return nerrors;
 }
diff --git a/test/API/H5_api_object_test.c b/test/API/H5_api_object_test.c
index 8055ad9..268e65c 100644
--- a/test/API/H5_api_object_test.c
+++ b/test/API/H5_api_object_test.c
@@ -126,27 +126,27 @@ test_open_object(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, dataset, or stored datatype aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, object, dataset, or stored datatype aren't "
+               "supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_OPEN_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", OBJECT_OPEN_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", OBJECT_OPEN_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -167,7 +167,7 @@ test_open_object(void)
             if ((group_id2 = H5Gcreate2(group_id, OBJECT_OPEN_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                         H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create group '%s'\n", OBJECT_OPEN_TEST_GRP_NAME);
+                printf("    couldn't create group '%s'\n", OBJECT_OPEN_TEST_GRP_NAME);
                 PART_ERROR(H5Oopen_group);
             }
 
@@ -179,19 +179,19 @@ test_open_object(void)
 
             if ((group_id2 = H5Oopen(group_id, OBJECT_OPEN_TEST_GRP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open group '%s' with H5Oopen\n", OBJECT_OPEN_TEST_GRP_NAME);
+                printf("    couldn't open group '%s' with H5Oopen\n", OBJECT_OPEN_TEST_GRP_NAME);
                 PART_ERROR(H5Oopen_group);
             }
 
             if (H5Iget_type(group_id2) != H5I_GROUP) {
                 H5_FAILED();
-                HDprintf("    ID is not a group\n");
+                printf("    ID is not a group\n");
                 PART_ERROR(H5Oopen_group);
             }
 
             if (H5Gclose(group_id2) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close group opened with H5Oopen\n");
+                printf("    couldn't close group opened with H5Oopen\n");
                 PART_ERROR(H5Oopen_group);
             }
 
@@ -206,7 +206,7 @@ test_open_object(void)
             if ((dset_id = H5Dcreate2(group_id, OBJECT_OPEN_TEST_DSET_NAME, dset_dtype, fspace_id,
                                       H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n", OBJECT_OPEN_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n", OBJECT_OPEN_TEST_DSET_NAME);
                 PART_ERROR(H5Oopen_dset);
             }
 
@@ -218,19 +218,19 @@ test_open_object(void)
 
             if ((dset_id = H5Oopen(group_id, OBJECT_OPEN_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s' with H5Oopen\n", OBJECT_OPEN_TEST_DSET_NAME);
+                printf("    couldn't open dataset '%s' with H5Oopen\n", OBJECT_OPEN_TEST_DSET_NAME);
                 PART_ERROR(H5Oopen_dset);
             }
 
             if (H5Iget_type(dset_id) != H5I_DATASET) {
                 H5_FAILED();
-                HDprintf("    ID is not a dataset\n");
+                printf("    ID is not a dataset\n");
                 PART_ERROR(H5Oopen_dset);
             }
 
             if (H5Dclose(dset_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close dataset opened with H5Oopen\n");
+                printf("    couldn't close dataset opened with H5Oopen\n");
                 PART_ERROR(H5Oopen_dset);
             }
 
@@ -244,14 +244,14 @@ test_open_object(void)
 
             if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create datatype '%s'\n", OBJECT_OPEN_TEST_TYPE_NAME);
+                printf("    couldn't create datatype '%s'\n", OBJECT_OPEN_TEST_TYPE_NAME);
                 PART_ERROR(H5Oopen_dtype);
             }
 
             if (H5Tcommit2(group_id, OBJECT_OPEN_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT,
                            H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't commit datatype '%s'\n", OBJECT_OPEN_TEST_TYPE_NAME);
+                printf("    couldn't commit datatype '%s'\n", OBJECT_OPEN_TEST_TYPE_NAME);
                 PART_ERROR(H5Oopen_dtype);
             }
 
@@ -263,19 +263,19 @@ test_open_object(void)
 
             if ((type_id = H5Oopen(group_id, OBJECT_OPEN_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open datatype '%s' with H5Oopen\n", OBJECT_OPEN_TEST_TYPE_NAME);
+                printf("    couldn't open datatype '%s' with H5Oopen\n", OBJECT_OPEN_TEST_TYPE_NAME);
                 PART_ERROR(H5Oopen_dtype);
             }
 
             if (H5Iget_type(type_id) != H5I_DATATYPE) {
                 H5_FAILED();
-                HDprintf("    ID is not a dataset\n");
+                printf("    ID is not a dataset\n");
                 PART_ERROR(H5Oopen_dtype);
             }
 
             if (H5Tclose(type_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close committed datatype opened with H5Oopen\n");
+                printf("    couldn't close committed datatype opened with H5Oopen\n");
                 PART_ERROR(H5Oopen_dtype);
             }
 
@@ -315,7 +315,7 @@ test_open_object(void)
             if ((group_id2 = H5Oopen_by_idx(container_group, OBJECT_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME,
                                             H5_ITER_INC, 1, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open group '%s' with H5Oopen_by_idx\n", OBJECT_OPEN_TEST_GRP_NAME);
+                printf("    couldn't open group '%s' with H5Oopen_by_idx\n", OBJECT_OPEN_TEST_GRP_NAME);
                 PART_ERROR(H5Oopen_by_idx_group);
             }
 
@@ -330,7 +330,7 @@ test_open_object(void)
             if ((dset_id = H5Oopen_by_idx(container_group, OBJECT_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME,
                                           H5_ITER_INC, 0, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s' with H5Oopen_by_idx\n", OBJECT_OPEN_TEST_DSET_NAME);
+                printf("    couldn't open dataset '%s' with H5Oopen_by_idx\n", OBJECT_OPEN_TEST_DSET_NAME);
                 PART_ERROR(H5Oopen_by_idx_dset);
             }
 
@@ -345,8 +345,8 @@ test_open_object(void)
             if ((type_id = H5Oopen_by_idx(container_group, OBJECT_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME,
                                           H5_ITER_INC, 2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open committed datatype '%s' with H5Oopen_by_idx\n",
-                         OBJECT_OPEN_TEST_TYPE_NAME);
+                printf("    couldn't open committed datatype '%s' with H5Oopen_by_idx\n",
+                       OBJECT_OPEN_TEST_TYPE_NAME);
                 PART_ERROR(H5Oopen_by_idx_dtype);
             }
 
@@ -434,8 +434,8 @@ test_open_object_invalid_params(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or object aren't supported with "
-                 "this connector\n");
+        printf("    API functions for basic file, group, or object aren't supported with "
+               "this connector\n");
         return 0;
     }
 
@@ -443,26 +443,26 @@ test_open_object_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -470,15 +470,14 @@ test_open_object_invalid_params(void)
     if ((group_id = H5Gcreate2(container_group, OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id2 = H5Gcreate2(group_id, OBJECT_OPEN_INVALID_PARAMS_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                 H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_OPEN_INVALID_PARAMS_TEST_GRP_NAME);
+        printf("    couldn't create group '%s'\n", OBJECT_OPEN_INVALID_PARAMS_TEST_GRP_NAME);
         goto error;
     }
 
@@ -501,7 +500,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen succeeded with an invalid location ID!\n");
+                printf("    H5Oopen succeeded with an invalid location ID!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_invalid_loc_id);
             }
@@ -522,7 +521,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen succeeded with a NULL object name!\n");
+                printf("    H5Oopen succeeded with a NULL object name!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_invalid_obj_name);
             }
@@ -535,7 +534,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen succeeded with an invalid object name of ''!\n");
+                printf("    H5Oopen succeeded with an invalid object name of ''!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_invalid_obj_name);
             }
@@ -556,7 +555,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen succeeded with an invalid LAPL!\n");
+                printf("    H5Oopen succeeded with an invalid LAPL!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_invalid_lapl);
             }
@@ -578,7 +577,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen_by_idx succeeded with an invalid location ID!\n");
+                printf("    H5Oopen_by_idx succeeded with an invalid location ID!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_by_idx_invalid_loc_id);
             }
@@ -599,7 +598,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen_by_idx succeeded with a NULL group name!\n");
+                printf("    H5Oopen_by_idx succeeded with a NULL group name!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_by_idx_invalid_grp_name);
             }
@@ -612,7 +611,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen_by_idx succeeded with an invalid group name of ''!\n");
+                printf("    H5Oopen_by_idx succeeded with an invalid group name of ''!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_by_idx_invalid_grp_name);
             }
@@ -634,7 +633,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
+                printf("    H5Oopen_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_by_idx_invalid_index_type);
             }
@@ -648,7 +647,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen_by_idx succeeded with invalid index type H5_INDEX_N!\n");
+                printf("    H5Oopen_by_idx succeeded with invalid index type H5_INDEX_N!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_by_idx_invalid_index_type);
             }
@@ -670,8 +669,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    H5Oopen_by_idx succeeded with an invalid iteration ordering H5_ITER_UNKNOWN!\n");
+                printf("    H5Oopen_by_idx succeeded with an invalid iteration ordering H5_ITER_UNKNOWN!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_by_idx_invalid_iter_order);
             }
@@ -685,7 +683,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen_by_idx succeeded with an invalid iteration ordering H5_ITER_N!\n");
+                printf("    H5Oopen_by_idx succeeded with an invalid iteration ordering H5_ITER_N!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_by_idx_invalid_iter_order);
             }
@@ -707,7 +705,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen_by_idx succeeded with an invalid LAPL!\n");
+                printf("    H5Oopen_by_idx succeeded with an invalid LAPL!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_by_idx_invalid_lapl);
             }
@@ -728,7 +726,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen_by_token succeeded with an invalid location ID!\n");
+                printf("    H5Oopen_by_token succeeded with an invalid location ID!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_by_token_invalid_loc_id);
             }
@@ -749,7 +747,7 @@ test_open_object_invalid_params(void)
 
             if (group_id2 >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oopen_by_token succeeded with an invalid token!\n");
+                printf("    H5Oopen_by_token succeeded with an invalid token!\n");
                 H5Gclose(group_id2);
                 PART_ERROR(H5Oopen_by_token_invalid_token);
             }
@@ -812,8 +810,8 @@ test_object_exists(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, dataset, stored datatype or soft link "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, object, dataset, stored datatype or soft link "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -821,20 +819,20 @@ test_object_exists(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_EXISTS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", OBJECT_EXISTS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", OBJECT_EXISTS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -859,25 +857,25 @@ test_object_exists(void)
             if ((group_id2 = H5Gcreate2(group_id, OBJECT_EXISTS_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                         H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create group '%s'\n", OBJECT_EXISTS_TEST_GRP_NAME);
+                printf("    couldn't create group '%s'\n", OBJECT_EXISTS_TEST_GRP_NAME);
                 PART_ERROR(H5Oexists_by_name_group);
             }
 
             if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_GRP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_GRP_NAME);
+                printf("    couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_GRP_NAME);
                 PART_ERROR(H5Oexists_by_name_group);
             }
 
             if (!object_exists) {
                 H5_FAILED();
-                HDprintf("    object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_GRP_NAME);
+                printf("    object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_GRP_NAME);
                 PART_ERROR(H5Oexists_by_name_group);
             }
 
             if (H5Gclose(group_id2) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close group\n");
+                printf("    couldn't close group\n");
                 PART_ERROR(H5Oexists_by_name_group);
             }
 
@@ -892,26 +890,26 @@ test_object_exists(void)
             if ((dset_id = H5Dcreate2(group_id, OBJECT_EXISTS_TEST_DSET_NAME, dset_dtype, fspace_id,
                                       H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n", OBJECT_EXISTS_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n", OBJECT_EXISTS_TEST_DSET_NAME);
                 PART_ERROR(H5Oexists_by_name_dset);
             }
 
             if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_DSET_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_DSET_NAME);
+                printf("    couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_DSET_NAME);
                 PART_ERROR(H5Oexists_by_name_dset);
             }
 
             if (!object_exists) {
                 H5_FAILED();
-                HDprintf("    object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_DSET_NAME);
+                printf("    object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_DSET_NAME);
                 PART_ERROR(H5Oexists_by_name_dset);
             }
 
             if (H5Dclose(dset_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close dataset\n");
+                printf("    couldn't close dataset\n");
                 PART_ERROR(H5Oexists_by_name_dset);
             }
 
@@ -925,33 +923,33 @@ test_object_exists(void)
 
             if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create datatype '%s'\n", OBJECT_EXISTS_TEST_TYPE_NAME);
+                printf("    couldn't create datatype '%s'\n", OBJECT_EXISTS_TEST_TYPE_NAME);
                 PART_ERROR(H5Oexists_by_name_dtype);
             }
 
             if (H5Tcommit2(group_id, OBJECT_EXISTS_TEST_TYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT,
                            H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't commit datatype '%s'\n", OBJECT_EXISTS_TEST_TYPE_NAME);
+                printf("    couldn't commit datatype '%s'\n", OBJECT_EXISTS_TEST_TYPE_NAME);
                 PART_ERROR(H5Oexists_by_name_dtype);
             }
 
             if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_TYPE_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_TYPE_NAME);
+                printf("    couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_TYPE_NAME);
                 PART_ERROR(H5Oexists_by_name_dtype);
             }
 
             if (!object_exists) {
                 H5_FAILED();
-                HDprintf("    object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_TYPE_NAME);
+                printf("    object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_TYPE_NAME);
                 PART_ERROR(H5Oexists_by_name_dtype);
             }
 
             if (H5Tclose(dtype_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close datatype\n");
+                printf("    couldn't close datatype\n");
                 PART_ERROR(H5Oexists_by_name_dtype);
             }
 
@@ -966,20 +964,20 @@ test_object_exists(void)
             if (H5Lcreate_soft("/" OBJECT_TEST_GROUP_NAME "/" OBJECT_EXISTS_TEST_SUBGROUP_NAME, group_id,
                                OBJECT_EXISTS_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Oexists_by_name_soft_link);
             }
 
             if ((object_exists =
                      H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME);
+                printf("    couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Oexists_by_name_soft_link);
             }
 
             if (!object_exists) {
                 H5_FAILED();
-                HDprintf("    object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME);
+                printf("    object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Oexists_by_name_soft_link);
             }
 
@@ -995,22 +993,22 @@ test_object_exists(void)
                     "/" OBJECT_TEST_GROUP_NAME "/" OBJECT_EXISTS_TEST_SUBGROUP_NAME "/non_existent_object",
                     group_id, OBJECT_EXISTS_TEST_DANGLING_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create soft link '%s'\n", OBJECT_EXISTS_TEST_DANGLING_LINK_NAME);
+                printf("    couldn't create soft link '%s'\n", OBJECT_EXISTS_TEST_DANGLING_LINK_NAME);
                 PART_ERROR(H5Oexists_by_name_dangling_soft_link);
             }
 
             if ((object_exists =
                      H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_DANGLING_LINK_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if object '%s' exists\n",
-                         "/" OBJECT_TEST_GROUP_NAME "/" OBJECT_EXISTS_TEST_SUBGROUP_NAME
-                         "/non_existent_object");
+                printf("    couldn't determine if object '%s' exists\n",
+                       "/" OBJECT_TEST_GROUP_NAME "/" OBJECT_EXISTS_TEST_SUBGROUP_NAME
+                       "/non_existent_object");
                 PART_ERROR(H5Oexists_by_name_dangling_soft_link);
             }
 
             if (object_exists) {
                 H5_FAILED();
-                HDprintf("    object pointed to by dangling soft link should not have existed!\n");
+                printf("    object pointed to by dangling soft link should not have existed!\n");
                 PART_ERROR(H5Oexists_by_name_dangling_soft_link);
             }
 
@@ -1072,7 +1070,7 @@ test_object_exists_invalid_params(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or object aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or object aren't supported with this connector\n");
         return 0;
     }
 
@@ -1080,28 +1078,28 @@ test_object_exists_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_EXISTS_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 OBJECT_EXISTS_INVALID_PARAMS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               OBJECT_EXISTS_INVALID_PARAMS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((group_id2 = H5Gcreate2(group_id, OBJECT_EXISTS_INVALID_PARAMS_TEST_GRP_NAME, H5P_DEFAULT,
                                 H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_EXISTS_INVALID_PARAMS_TEST_GRP_NAME);
+        printf("    couldn't create group '%s'\n", OBJECT_EXISTS_INVALID_PARAMS_TEST_GRP_NAME);
         goto error;
     }
 
@@ -1125,7 +1123,7 @@ test_object_exists_invalid_params(void)
 
             if (object_exists >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oexists_by_name succeeded with an invalid location ID!\n");
+                printf("    H5Oexists_by_name succeeded with an invalid location ID!\n");
                 PART_ERROR(H5Oexists_by_name_invalid_loc_id);
             }
 
@@ -1145,7 +1143,7 @@ test_object_exists_invalid_params(void)
 
             if (object_exists >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oexists_by_name succeeded with a NULL object name!\n");
+                printf("    H5Oexists_by_name succeeded with a NULL object name!\n");
                 PART_ERROR(H5Oexists_by_name_invalid_obj_name);
             }
 
@@ -1157,7 +1155,7 @@ test_object_exists_invalid_params(void)
 
             if (object_exists >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oexists_by_name succeeded with an invalid object name of ''!\n");
+                printf("    H5Oexists_by_name succeeded with an invalid object name of ''!\n");
                 PART_ERROR(H5Oexists_by_name_invalid_obj_name);
             }
 
@@ -1178,7 +1176,7 @@ test_object_exists_invalid_params(void)
 
             if (object_exists >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oexists_by_name succeeded with an invalid LAPL!\n");
+                printf("    H5Oexists_by_name succeeded with an invalid LAPL!\n");
                 PART_ERROR(H5Oexists_by_name_invalid_lapl);
             }
 
@@ -1263,8 +1261,8 @@ test_link_object(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, dataset, or stored datatype aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, object, dataset, or stored datatype aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -1272,20 +1270,20 @@ test_link_object(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", OBJECT_LINK_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", OBJECT_LINK_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -1305,13 +1303,13 @@ test_link_object(void)
 
             if ((group_id2 = H5Gcreate_anon(group_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create an anonymous group\n");
+                printf("    couldn't create an anonymous group\n");
                 PART_ERROR(H5Olink_group);
             }
 
             if (H5Olink(group_id2, group_id, OBJECT_LINK_TEST_GROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't link the anonymous group\n");
+                printf("    couldn't link the anonymous group\n");
                 PART_ERROR(H5Olink_group);
             }
 
@@ -1325,13 +1323,13 @@ test_link_object(void)
 
             if ((dset_id = H5Dcreate_anon(group_id, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create an anonymous dataset\n");
+                printf("    couldn't create an anonymous dataset\n");
                 PART_ERROR(H5Olink_dataset);
             }
 
             if (H5Olink(dset_id, group_id, OBJECT_LINK_TEST_DSET_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't link the anonymous dataset\n");
+                printf("    couldn't link the anonymous dataset\n");
                 PART_ERROR(H5Olink_dataset);
             }
 
@@ -1345,13 +1343,13 @@ test_link_object(void)
 
             if (H5Tcommit_anon(group_id, dset_dtype, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create an anonymous datatype\n");
+                printf("    couldn't create an anonymous datatype\n");
                 PART_ERROR(H5Olink_datatype);
             }
 
             if (H5Olink(dset_dtype, group_id, OBJECT_LINK_TEST_DTYPE_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't link the anonymous datatype\n");
+                printf("    couldn't link the anonymous datatype\n");
                 PART_ERROR(H5Olink_datatype);
             }
 
@@ -1418,7 +1416,7 @@ test_link_object_invalid_params(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or object aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or object aren't supported with this connector\n");
         return 0;
     }
 
@@ -1426,26 +1424,26 @@ test_link_object_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", OBJECT_LINK_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", OBJECT_LINK_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id2 = H5Gcreate_anon(group_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create an anonymous group\n");
+        printf("    couldn't create an anonymous group\n");
         goto error;
     }
 
@@ -1466,7 +1464,7 @@ test_link_object_invalid_params(void)
 
             if (status >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Olink succeeded with an invalid object ID!\n");
+                printf("    H5Olink succeeded with an invalid object ID!\n");
                 PART_ERROR(H5Olink_invalid_object_id);
             }
 
@@ -1487,7 +1485,7 @@ test_link_object_invalid_params(void)
 
             if (status >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Olink succeeded with an invalid location ID!\n");
+                printf("    H5Olink succeeded with an invalid location ID!\n");
                 PART_ERROR(H5Olink_invalid_location);
             }
 
@@ -1507,7 +1505,7 @@ test_link_object_invalid_params(void)
 
             if (status >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Olink succeeded with NULL as the object name!\n");
+                printf("    H5Olink succeeded with NULL as the object name!\n");
                 PART_ERROR(H5Olink_invalid_name);
             }
 
@@ -1519,7 +1517,7 @@ test_link_object_invalid_params(void)
 
             if (status >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Olink succeeded with an invalid object name of ''!\n");
+                printf("    H5Olink succeeded with an invalid object name of ''!\n");
                 PART_ERROR(H5Olink_invalid_name);
             }
 
@@ -1540,7 +1538,7 @@ test_link_object_invalid_params(void)
 
             if (status >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Olink succeeded with an invalid LCPL!\n");
+                printf("    H5Olink succeeded with an invalid LCPL!\n");
                 PART_ERROR(H5Olink_invalid_lcpl);
             }
 
@@ -1561,7 +1559,7 @@ test_link_object_invalid_params(void)
 
             if (status >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Olink succeeded with an invalid LAPL!\n");
+                printf("    H5Olink succeeded with an invalid LAPL!\n");
                 PART_ERROR(H5Olink_invalid_lapl);
             }
 
@@ -1621,8 +1619,8 @@ test_incr_decr_object_refcount(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, stored datatype, or object  "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, stored datatype, or object  "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -1630,20 +1628,20 @@ test_incr_decr_object_refcount(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_REF_COUNT_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", OBJECT_REF_COUNT_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", OBJECT_REF_COUNT_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -1664,15 +1662,15 @@ test_incr_decr_object_refcount(void)
             if ((group_id2 = H5Gcreate2(group_id, OBJECT_REF_COUNT_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                         H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create group '%s'\n", OBJECT_REF_COUNT_TEST_GRP_NAME);
+                printf("    couldn't create group '%s'\n", OBJECT_REF_COUNT_TEST_GRP_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_group);
             }
 
             /* Increment the reference count */
             if (H5Oincr_refcount(group_id2) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't increment reference count for the group '%s' \n",
-                         OBJECT_REF_COUNT_TEST_GRP_NAME);
+                printf("    couldn't increment reference count for the group '%s' \n",
+                       OBJECT_REF_COUNT_TEST_GRP_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_group);
             }
 
@@ -1680,23 +1678,23 @@ test_incr_decr_object_refcount(void)
             if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_GRP_NAME, &oinfo, H5O_INFO_BASIC,
                                      H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get reference count for the group '%s' \n",
-                         OBJECT_REF_COUNT_TEST_GRP_NAME);
+                printf("    couldn't get reference count for the group '%s' \n",
+                       OBJECT_REF_COUNT_TEST_GRP_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_group);
             }
 
             if (oinfo.rc != 2) {
                 H5_FAILED();
-                HDprintf("    the reference count for the group '%s' isn't 2: %d\n",
-                         OBJECT_REF_COUNT_TEST_GRP_NAME, oinfo.rc);
+                printf("    the reference count for the group '%s' isn't 2: %d\n",
+                       OBJECT_REF_COUNT_TEST_GRP_NAME, oinfo.rc);
                 PART_ERROR(H5Oincr_decr_refcount_group);
             }
 
             /* Decrement the reference count */
             if (H5Odecr_refcount(group_id2) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't decrement reference count for the group '%s' \n",
-                         OBJECT_REF_COUNT_TEST_GRP_NAME);
+                printf("    couldn't decrement reference count for the group '%s' \n",
+                       OBJECT_REF_COUNT_TEST_GRP_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_group);
             }
 
@@ -1704,21 +1702,21 @@ test_incr_decr_object_refcount(void)
             if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_GRP_NAME, &oinfo, H5O_INFO_BASIC,
                                      H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get reference count for the group '%s' \n",
-                         OBJECT_REF_COUNT_TEST_GRP_NAME);
+                printf("    couldn't get reference count for the group '%s' \n",
+                       OBJECT_REF_COUNT_TEST_GRP_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_group);
             }
 
             if (oinfo.rc != 1) {
                 H5_FAILED();
-                HDprintf("    the reference count for the group '%s' isn't 1: %d\n",
-                         OBJECT_REF_COUNT_TEST_GRP_NAME, oinfo.rc);
+                printf("    the reference count for the group '%s' isn't 1: %d\n",
+                       OBJECT_REF_COUNT_TEST_GRP_NAME, oinfo.rc);
                 PART_ERROR(H5Oincr_decr_refcount_group);
             }
 
             if (H5Gclose(group_id2) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close group\n");
+                printf("    couldn't close group\n");
                 PART_ERROR(H5Oincr_decr_refcount_group);
             }
 
@@ -1733,15 +1731,15 @@ test_incr_decr_object_refcount(void)
             if ((dset_id = H5Dcreate2(group_id, OBJECT_REF_COUNT_TEST_DSET_NAME, dset_dtype, fspace_id,
                                       H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n", OBJECT_REF_COUNT_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n", OBJECT_REF_COUNT_TEST_DSET_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_dset);
             }
 
             /* Increment the reference count */
             if (H5Oincr_refcount(dset_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't increment reference count for the dataset '%s' \n",
-                         OBJECT_REF_COUNT_TEST_DSET_NAME);
+                printf("    couldn't increment reference count for the dataset '%s' \n",
+                       OBJECT_REF_COUNT_TEST_DSET_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_dset);
             }
 
@@ -1749,23 +1747,23 @@ test_incr_decr_object_refcount(void)
             if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_DSET_NAME, &oinfo, H5O_INFO_BASIC,
                                      H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get reference count for the dataset '%s' \n",
-                         OBJECT_REF_COUNT_TEST_DSET_NAME);
+                printf("    couldn't get reference count for the dataset '%s' \n",
+                       OBJECT_REF_COUNT_TEST_DSET_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_dset);
             }
 
             if (oinfo.rc != 2) {
                 H5_FAILED();
-                HDprintf("    the reference count for the dataset '%s' isn't 2: %d\n",
-                         OBJECT_REF_COUNT_TEST_DSET_NAME, oinfo.rc);
+                printf("    the reference count for the dataset '%s' isn't 2: %d\n",
+                       OBJECT_REF_COUNT_TEST_DSET_NAME, oinfo.rc);
                 PART_ERROR(H5Oincr_decr_refcount_dset);
             }
 
             /* Decrement the reference count */
             if (H5Odecr_refcount(dset_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't decrement reference count for the dataset '%s' \n",
-                         OBJECT_REF_COUNT_TEST_DSET_NAME);
+                printf("    couldn't decrement reference count for the dataset '%s' \n",
+                       OBJECT_REF_COUNT_TEST_DSET_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_dset);
             }
 
@@ -1773,21 +1771,21 @@ test_incr_decr_object_refcount(void)
             if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_DSET_NAME, &oinfo, H5O_INFO_BASIC,
                                      H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get reference count for the dataset '%s' \n",
-                         OBJECT_REF_COUNT_TEST_DSET_NAME);
+                printf("    couldn't get reference count for the dataset '%s' \n",
+                       OBJECT_REF_COUNT_TEST_DSET_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_dset);
             }
 
             if (oinfo.rc != 1) {
                 H5_FAILED();
-                HDprintf("    the reference count for the dataset '%s' isn't 1: %d\n",
-                         OBJECT_REF_COUNT_TEST_DSET_NAME, oinfo.rc);
+                printf("    the reference count for the dataset '%s' isn't 1: %d\n",
+                       OBJECT_REF_COUNT_TEST_DSET_NAME, oinfo.rc);
                 PART_ERROR(H5Oincr_decr_refcount_dset);
             }
 
             if (H5Dclose(dset_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close dataset\n");
+                printf("    couldn't close dataset\n");
                 PART_ERROR(H5Oincr_decr_refcount_dset);
             }
 
@@ -1802,15 +1800,15 @@ test_incr_decr_object_refcount(void)
             if (H5Tcommit2(group_id, OBJECT_REF_COUNT_TEST_TYPE_NAME, dset_dtype, H5P_DEFAULT, H5P_DEFAULT,
                            H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't commit datatype '%s'\n", OBJECT_REF_COUNT_TEST_TYPE_NAME);
+                printf("    couldn't commit datatype '%s'\n", OBJECT_REF_COUNT_TEST_TYPE_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_dtype);
             }
 
             /* Increment the reference count */
             if (H5Oincr_refcount(dset_dtype) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't increment reference count for the datatype '%s' \n",
-                         OBJECT_REF_COUNT_TEST_TYPE_NAME);
+                printf("    couldn't increment reference count for the datatype '%s' \n",
+                       OBJECT_REF_COUNT_TEST_TYPE_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_dtype);
             }
 
@@ -1818,23 +1816,23 @@ test_incr_decr_object_refcount(void)
             if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_TYPE_NAME, &oinfo, H5O_INFO_BASIC,
                                      H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get reference count for the datatype '%s' \n",
-                         OBJECT_REF_COUNT_TEST_TYPE_NAME);
+                printf("    couldn't get reference count for the datatype '%s' \n",
+                       OBJECT_REF_COUNT_TEST_TYPE_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_dtype);
             }
 
             if (oinfo.rc != 2) {
                 H5_FAILED();
-                HDprintf("    the reference count for the datatype '%s' isn't 2: %d\n",
-                         OBJECT_REF_COUNT_TEST_TYPE_NAME, oinfo.rc);
+                printf("    the reference count for the datatype '%s' isn't 2: %d\n",
+                       OBJECT_REF_COUNT_TEST_TYPE_NAME, oinfo.rc);
                 PART_ERROR(H5Oincr_decr_refcount_dtype);
             }
 
             /* Decrement the reference count */
             if (H5Odecr_refcount(dset_dtype) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't decrement reference count for the datatype '%s' \n",
-                         OBJECT_REF_COUNT_TEST_TYPE_NAME);
+                printf("    couldn't decrement reference count for the datatype '%s' \n",
+                       OBJECT_REF_COUNT_TEST_TYPE_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_dtype);
             }
 
@@ -1842,21 +1840,21 @@ test_incr_decr_object_refcount(void)
             if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_TYPE_NAME, &oinfo, H5O_INFO_BASIC,
                                      H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get reference count for the datatype '%s' \n",
-                         OBJECT_REF_COUNT_TEST_TYPE_NAME);
+                printf("    couldn't get reference count for the datatype '%s' \n",
+                       OBJECT_REF_COUNT_TEST_TYPE_NAME);
                 PART_ERROR(H5Oincr_decr_refcount_dtype);
             }
 
             if (oinfo.rc != 1) {
                 H5_FAILED();
-                HDprintf("    the reference count for the datatype '%s' isn't 1: %d\n",
-                         OBJECT_REF_COUNT_TEST_TYPE_NAME, oinfo.rc);
+                printf("    the reference count for the datatype '%s' isn't 1: %d\n",
+                       OBJECT_REF_COUNT_TEST_TYPE_NAME, oinfo.rc);
                 PART_ERROR(H5Oincr_decr_refcount_dtype);
             }
 
             if (H5Tclose(dset_dtype) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close datatype\n");
+                printf("    couldn't close datatype\n");
                 PART_ERROR(H5Oincr_decr_refcount_dtype);
             }
 
@@ -1911,7 +1909,7 @@ test_incr_decr_object_refcount_invalid_params(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for more object aren't supported with this connector\n");
+        printf("    API functions for more object aren't supported with this connector\n");
         return 0;
     }
 
@@ -1929,7 +1927,7 @@ test_incr_decr_object_refcount_invalid_params(void)
 
             if (status >= 0) {
                 H5_FAILED();
-                HDprintf("    incremented the reference count for an invalid object ID\n");
+                printf("    incremented the reference count for an invalid object ID\n");
                 PART_ERROR(H5Oincr_refcount_invalid_param);
             }
 
@@ -1949,7 +1947,7 @@ test_incr_decr_object_refcount_invalid_params(void)
 
             if (status >= 0) {
                 H5_FAILED();
-                HDprintf("    decremented the reference count for an invalid object ID\n");
+                printf("    decremented the reference count for an invalid object ID\n");
                 PART_ERROR(H5Odecr_refcount_invalid_param);
             }
 
@@ -1998,8 +1996,8 @@ test_object_copy_basic(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, link, dataset, attribute, iterate, or "
-                 "stored datatype aren't supported with this connector\n");
+        printf("    API functions for basic file, group, object, link, dataset, attribute, iterate, or "
+               "stored datatype aren't supported with this connector\n");
         return 0;
     }
 
@@ -2007,20 +2005,20 @@ test_object_copy_basic(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_BASIC_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", OBJECT_COPY_BASIC_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", OBJECT_COPY_BASIC_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -2036,7 +2034,7 @@ test_object_copy_basic(void)
     if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_BASIC_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                 H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_COPY_BASIC_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", OBJECT_COPY_BASIC_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2047,8 +2045,8 @@ test_object_copy_basic(void)
 
         if ((tmp_group_id = H5Gcreate2(group_id2, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create group '%s' under group '%s'\n", grp_name,
-                     OBJECT_COPY_BASIC_TEST_GROUP_NAME);
+            printf("    couldn't create group '%s' under group '%s'\n", grp_name,
+                   OBJECT_COPY_BASIC_TEST_GROUP_NAME);
             goto error;
         }
 
@@ -2057,15 +2055,15 @@ test_object_copy_basic(void)
             if (H5Gclose(H5Gcreate2(tmp_group_id, OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME, H5P_DEFAULT,
                                     H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create nested group '%s' under group '%s'\n",
-                         OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME, grp_name);
+                printf("    couldn't create nested group '%s' under group '%s'\n",
+                       OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME, grp_name);
                 goto error;
             }
         }
 
         if (H5Gclose(tmp_group_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close group '%s'\n", grp_name);
+            printf("    couldn't close group '%s'\n", grp_name);
             goto error;
         }
     }
@@ -2078,14 +2076,14 @@ test_object_copy_basic(void)
         if ((tmp_attr_id = H5Acreate2(group_id2, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT,
                                       H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s' on group '%s'\n", attr_name,
-                     OBJECT_COPY_BASIC_TEST_GROUP_NAME);
+            printf("    couldn't create attribute '%s' on group '%s'\n", attr_name,
+                   OBJECT_COPY_BASIC_TEST_GROUP_NAME);
             goto error;
         }
 
         if (H5Aclose(tmp_attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close attribute '%s'\n", attr_name);
+            printf("    couldn't close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -2094,7 +2092,7 @@ test_object_copy_basic(void)
     if ((dset_id = H5Dcreate2(group_id, OBJECT_COPY_BASIC_TEST_DSET_NAME, dset_dtype, space_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", OBJECT_COPY_BASIC_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", OBJECT_COPY_BASIC_TEST_DSET_NAME);
         goto error;
     }
 
@@ -2106,14 +2104,14 @@ test_object_copy_basic(void)
         if ((tmp_attr_id = H5Acreate2(dset_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT,
                                       H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s' on dataset '%s'\n", attr_name,
-                     OBJECT_COPY_BASIC_TEST_DSET_NAME);
+            printf("    couldn't create attribute '%s' on dataset '%s'\n", attr_name,
+                   OBJECT_COPY_BASIC_TEST_DSET_NAME);
             goto error;
         }
 
         if (H5Aclose(tmp_attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close attribute '%s'\n", attr_name);
+            printf("    couldn't close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -2121,14 +2119,14 @@ test_object_copy_basic(void)
     /* Create the test committed datatype object, along with the attributes attached to it. */
     if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype\n");
+        printf("    couldn't create datatype\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, OBJECT_COPY_BASIC_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT,
                    H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", OBJECT_COPY_BASIC_TEST_DTYPE_NAME);
+        printf("    couldn't commit datatype '%s'\n", OBJECT_COPY_BASIC_TEST_DTYPE_NAME);
         goto error;
     }
 
@@ -2140,14 +2138,14 @@ test_object_copy_basic(void)
         if ((tmp_attr_id = H5Acreate2(dtype_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT,
                                       H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s' on committed datatype '%s'\n", attr_name,
-                     OBJECT_COPY_BASIC_TEST_DTYPE_NAME);
+            printf("    couldn't create attribute '%s' on committed datatype '%s'\n", attr_name,
+                   OBJECT_COPY_BASIC_TEST_DTYPE_NAME);
             goto error;
         }
 
         if (H5Aclose(tmp_attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close attribute '%s'\n", attr_name);
+            printf("    couldn't close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -2163,30 +2161,30 @@ test_object_copy_basic(void)
             if (H5Ocopy(group_id, OBJECT_COPY_BASIC_TEST_GROUP_NAME, group_id,
                         OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy group '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_GROUP_NAME,
-                         OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME);
+                printf("    failed to copy group '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_GROUP_NAME,
+                       OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_group);
             }
 
             if ((object_link_exists =
                      H5Lexists(group_id, OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' to copied group exists\n",
-                         OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME);
+                printf("    couldn't determine if link '%s' to copied group exists\n",
+                       OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_group);
             }
 
             if (!object_link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' to copied group didn't exist!\n",
-                         OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME);
+                printf("    link '%s' to copied group didn't exist!\n",
+                       OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_group);
             }
 
             /* Ensure that the new group has all the members of the copied group, and all its attributes */
             if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to open group copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME);
+                printf("    failed to open group copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_group);
             }
 
@@ -2200,14 +2198,14 @@ test_object_copy_basic(void)
 
             if (H5Gget_info(tmp_group_id, &group_info) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve group info\n");
+                printf("    failed to retrieve group info\n");
                 PART_ERROR(H5Ocopy_group);
             }
 
             if (group_info.nlinks != OBJECT_COPY_BASIC_TEST_NUM_NESTED_OBJS) {
                 H5_FAILED();
-                HDprintf("    copied group contained %d members instead of %d members after a deep copy!\n",
-                         (int)group_info.nlinks, OBJECT_COPY_BASIC_TEST_NUM_NESTED_OBJS);
+                printf("    copied group contained %d members instead of %d members after a deep copy!\n",
+                       (int)group_info.nlinks, OBJECT_COPY_BASIC_TEST_NUM_NESTED_OBJS);
                 PART_ERROR(H5Ocopy_group);
             }
 
@@ -2221,13 +2219,13 @@ test_object_copy_basic(void)
 
             if (H5Oget_info3(tmp_group_id, &object_info, H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve object info\n");
+                printf("    failed to retrieve object info\n");
                 PART_ERROR(H5Ocopy_group);
             }
 
             if (object_info.num_attrs == 0) {
                 H5_FAILED();
-                HDprintf("    copied group didn't contain any attributes after copy operation!\n");
+                printf("    copied group didn't contain any attributes after copy operation!\n");
                 PART_ERROR(H5Ocopy_group);
             }
 
@@ -2236,13 +2234,13 @@ test_object_copy_basic(void)
             if (H5Aiterate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL,
                             object_copy_attribute_iter_callback, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to iterate over copied group's attributes\n");
+                printf("    failed to iterate over copied group's attributes\n");
                 PART_ERROR(H5Ocopy_group);
             }
 
             if (i != OBJECT_COPY_BASIC_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    number of attributes on copied group (%llu) didn't match expected number (%llu)!\n",
                     (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS);
                 PART_ERROR(H5Ocopy_group);
@@ -2250,7 +2248,7 @@ test_object_copy_basic(void)
 
             if (H5Gclose(tmp_group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group copy\n");
+                printf("    failed to close group copy\n");
                 PART_ERROR(H5Ocopy_group);
             }
 
@@ -2267,8 +2265,7 @@ test_object_copy_basic(void)
 
                 if ((tmp_group_id = H5Gopen2(group_id, grp_name, H5P_DEFAULT)) < 0) {
                     H5_FAILED();
-                    HDprintf("    failed to open group '%s'\n",
-                             OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME);
+                    printf("    failed to open group '%s'\n", OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME);
                     PART_ERROR(H5Ocopy_group);
                 }
 
@@ -2282,21 +2279,20 @@ test_object_copy_basic(void)
 
                 if (H5Gget_info(tmp_group_id, &group_info) < 0) {
                     H5_FAILED();
-                    HDprintf("    failed to retrieve group info\n");
+                    printf("    failed to retrieve group info\n");
                     PART_ERROR(H5Ocopy_group);
                 }
 
                 if (group_info.nlinks != 1) {
                     H5_FAILED();
-                    HDprintf("    copied group's immediate members didn't contain nested members after a "
-                             "deep copy!\n");
+                    printf("    copied group's immediate members didn't contain nested members after a "
+                           "deep copy!\n");
                     PART_ERROR(H5Ocopy_group);
                 }
 
                 if (H5Gclose(tmp_group_id) < 0) {
                     H5_FAILED();
-                    HDprintf("    failed to close group '%s'\n",
-                             OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME);
+                    printf("    failed to close group '%s'\n", OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME);
                     PART_ERROR(H5Ocopy_group);
                 }
             }
@@ -2321,30 +2317,30 @@ test_object_copy_basic(void)
             if (H5Ocopy(group_id, OBJECT_COPY_BASIC_TEST_DSET_NAME, group_id,
                         OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy dataset '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_DSET_NAME,
-                         OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME);
+                printf("    failed to copy dataset '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_DSET_NAME,
+                       OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME);
                 PART_ERROR(H5Ocopy_dset);
             }
 
             if ((object_link_exists =
                      H5Lexists(group_id, OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' to copied dataset exists\n",
-                         OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME);
+                printf("    couldn't determine if link '%s' to copied dataset exists\n",
+                       OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME);
                 PART_ERROR(H5Ocopy_dset);
             }
 
             if (!object_link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' to copied dataset didn't exist!\n",
-                         OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME);
+                printf("    link '%s' to copied dataset didn't exist!\n",
+                       OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME);
                 PART_ERROR(H5Ocopy_dset);
             }
 
             /* Ensure that the new dataset has all of the attributes of the copied dataset */
             if ((tmp_dset_id = H5Dopen2(group_id, OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to open dataset copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME);
+                printf("    failed to open dataset copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME);
                 PART_ERROR(H5Ocopy_dset);
             }
 
@@ -2358,13 +2354,13 @@ test_object_copy_basic(void)
 
             if (H5Oget_info3(tmp_dset_id, &object_info, H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve object info\n");
+                printf("    failed to retrieve object info\n");
                 PART_ERROR(H5Ocopy_dset);
             }
 
             if (object_info.num_attrs == 0) {
                 H5_FAILED();
-                HDprintf("    copied dataset didn't contain any attributes after copy operation!\n");
+                printf("    copied dataset didn't contain any attributes after copy operation!\n");
                 PART_ERROR(H5Ocopy_dset);
             }
 
@@ -2373,21 +2369,21 @@ test_object_copy_basic(void)
             if (H5Aiterate2(tmp_dset_id, H5_INDEX_NAME, H5_ITER_INC, NULL,
                             object_copy_attribute_iter_callback, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to iterate over copied dataset's attributes\n");
+                printf("    failed to iterate over copied dataset's attributes\n");
                 PART_ERROR(H5Ocopy_dset);
             }
 
             if (i != OBJECT_COPY_BASIC_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    number of attributes on copied dataset (%llu) didn't match expected number "
-                         "(%llu)!\n",
-                         (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS);
+                printf("    number of attributes on copied dataset (%llu) didn't match expected number "
+                       "(%llu)!\n",
+                       (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS);
                 PART_ERROR(H5Ocopy_dset);
             }
 
             if (H5Dclose(tmp_dset_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close dataset copy\n");
+                printf("    failed to close dataset copy\n");
                 PART_ERROR(H5Ocopy_dset);
             }
 
@@ -2411,30 +2407,30 @@ test_object_copy_basic(void)
             if (H5Ocopy(group_id, OBJECT_COPY_BASIC_TEST_DTYPE_NAME, group_id,
                         OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy datatype '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_DTYPE_NAME,
-                         OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME);
+                printf("    failed to copy datatype '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_DTYPE_NAME,
+                       OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME);
                 PART_ERROR(H5Ocopy_dtype);
             }
 
             if ((object_link_exists =
                      H5Lexists(group_id, OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' to copied datatype exists\n",
-                         OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME);
+                printf("    couldn't determine if link '%s' to copied datatype exists\n",
+                       OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME);
                 PART_ERROR(H5Ocopy_dtype);
             }
 
             if (!object_link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' to copied datatype didn't exist!\n",
-                         OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME);
+                printf("    link '%s' to copied datatype didn't exist!\n",
+                       OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME);
                 PART_ERROR(H5Ocopy_dtype);
             }
 
             /* Ensure that the new committed datatype has all the attributes of the copied datatype */
             if ((tmp_dtype_id = H5Topen2(group_id, OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to open datatype copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME);
+                printf("    failed to open datatype copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME);
                 PART_ERROR(H5Ocopy_dtype);
             }
 
@@ -2448,14 +2444,13 @@ test_object_copy_basic(void)
 
             if (H5Oget_info3(tmp_dtype_id, &object_info, H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve object info\n");
+                printf("    failed to retrieve object info\n");
                 PART_ERROR(H5Ocopy_dtype);
             }
 
             if (object_info.num_attrs == 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    copied committed datatype didn't contain any attributes after copy operation!\n");
+                printf("    copied committed datatype didn't contain any attributes after copy operation!\n");
                 PART_ERROR(H5Ocopy_dtype);
             }
 
@@ -2464,21 +2459,21 @@ test_object_copy_basic(void)
             if (H5Aiterate2(tmp_dtype_id, H5_INDEX_NAME, H5_ITER_INC, NULL,
                             object_copy_attribute_iter_callback, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to iterate over copied datatype's attributes\n");
+                printf("    failed to iterate over copied datatype's attributes\n");
                 PART_ERROR(H5Ocopy_dtype);
             }
 
             if (i != OBJECT_COPY_BASIC_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    number of attributes on copied datatype (%llu) didn't match expected number "
-                         "(%llu)!\n",
-                         (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS);
+                printf("    number of attributes on copied datatype (%llu) didn't match expected number "
+                       "(%llu)!\n",
+                       (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS);
                 PART_ERROR(H5Ocopy_dtype);
             }
 
             if (H5Tclose(tmp_dtype_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close datatype copy\n");
+                printf("    failed to close datatype copy\n");
                 PART_ERROR(H5Ocopy_dtype);
             }
 
@@ -2569,8 +2564,8 @@ test_object_copy_already_existing(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, dataset, or stored datatype aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, object, dataset, or stored datatype aren't "
+               "supported with this connector\n");
         return 0;
     }
 
@@ -2578,21 +2573,21 @@ test_object_copy_already_existing(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_ALREADY_EXISTING_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 OBJECT_COPY_ALREADY_EXISTING_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               OBJECT_COPY_ALREADY_EXISTING_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -2606,7 +2601,7 @@ test_object_copy_already_existing(void)
     if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_GROUP_NAME, H5P_DEFAULT,
                                 H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2614,21 +2609,21 @@ test_object_copy_already_existing(void)
     if ((dset_id = H5Dcreate2(group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_DSET_NAME, dset_dtype, space_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_DSET_NAME);
         goto error;
     }
 
     /* Create the test committed datatype object */
     if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype\n");
+        printf("    couldn't create datatype\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT,
                    H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_DTYPE_NAME);
+        printf("    couldn't commit datatype '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_DTYPE_NAME);
         goto error;
     }
 
@@ -2649,7 +2644,7 @@ test_object_copy_already_existing(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    group copy succeeded in location where group already exists!\n");
+                printf("    group copy succeeded in location where group already exists!\n");
                 PART_ERROR(H5Ocopy_already_existing_group);
             }
 
@@ -2670,7 +2665,7 @@ test_object_copy_already_existing(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    dataset copy succeeded in location where dataset already exists!\n");
+                printf("    dataset copy succeeded in location where dataset already exists!\n");
                 PART_ERROR(H5Ocopy_already_existing_dset);
             }
 
@@ -2691,8 +2686,8 @@ test_object_copy_already_existing(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    committed datatype copy succeeded in location where committed datatype already "
-                         "exists!\n");
+                printf("    committed datatype copy succeeded in location where committed datatype already "
+                       "exists!\n");
                 PART_ERROR(H5Ocopy_already_existing_dtype);
             }
 
@@ -2766,27 +2761,27 @@ test_object_copy_shallow_group_copy(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, or link aren't supported with this "
-                 "connector\n");
+        printf("    API functions for basic file, group, object, or link aren't supported with this "
+               "connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_SHALLOW_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", OBJECT_COPY_SHALLOW_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", OBJECT_COPY_SHALLOW_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -2794,7 +2789,7 @@ test_object_copy_shallow_group_copy(void)
     if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_SHALLOW_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                 H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_COPY_SHALLOW_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", OBJECT_COPY_SHALLOW_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2805,8 +2800,8 @@ test_object_copy_shallow_group_copy(void)
 
         if ((tmp_group_id = H5Gcreate2(group_id2, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create group '%s' under group '%s'\n", grp_name,
-                     OBJECT_COPY_SHALLOW_TEST_GROUP_NAME);
+            printf("    couldn't create group '%s' under group '%s'\n", grp_name,
+                   OBJECT_COPY_SHALLOW_TEST_GROUP_NAME);
             goto error;
         }
 
@@ -2815,50 +2810,50 @@ test_object_copy_shallow_group_copy(void)
             if (H5Gclose(H5Gcreate2(tmp_group_id, OBJECT_COPY_SHALLOW_TEST_DEEP_NESTED_GROUP_NAME,
                                     H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create nested group '%s' under group '%s'\n",
-                         OBJECT_COPY_SHALLOW_TEST_DEEP_NESTED_GROUP_NAME, grp_name);
+                printf("    couldn't create nested group '%s' under group '%s'\n",
+                       OBJECT_COPY_SHALLOW_TEST_DEEP_NESTED_GROUP_NAME, grp_name);
                 goto error;
             }
         }
 
         if (H5Gclose(tmp_group_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close group '%s'\n", grp_name);
+            printf("    couldn't close group '%s'\n", grp_name);
             goto error;
         }
     }
 
     if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create OCopyPL\n");
+        printf("    couldn't create OCopyPL\n");
         goto error;
     }
 
     if (H5Pset_copy_object(ocpypl_id, H5O_COPY_SHALLOW_HIERARCHY_FLAG) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't set object copying options\n");
+        printf("    couldn't set object copying options\n");
         goto error;
     }
 
     if (H5Ocopy(group_id, OBJECT_COPY_SHALLOW_TEST_GROUP_NAME, group_id,
                 OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME, ocpypl_id, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    failed to copy group '%s' to '%s'\n", OBJECT_COPY_SHALLOW_TEST_GROUP_NAME,
-                 OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME);
+        printf("    failed to copy group '%s' to '%s'\n", OBJECT_COPY_SHALLOW_TEST_GROUP_NAME,
+               OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME);
         goto error;
     }
 
     if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't determine if link '%s' to copied group exists\n",
-                 OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME);
+        printf("    couldn't determine if link '%s' to copied group exists\n",
+               OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME);
         goto error;
     }
 
     if (!object_link_exists) {
         H5_FAILED();
-        HDprintf("    link '%s' to copied group didn't exist!\n", OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME);
+        printf("    link '%s' to copied group didn't exist!\n", OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME);
         goto error;
     }
 
@@ -2867,7 +2862,7 @@ test_object_copy_shallow_group_copy(void)
      */
     if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to open group copy '%s'\n", OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME);
+        printf("    failed to open group copy '%s'\n", OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME);
         goto error;
     }
 
@@ -2881,14 +2876,14 @@ test_object_copy_shallow_group_copy(void)
 
     if (H5Gget_info(tmp_group_id, &group_info) < 0) {
         H5_FAILED();
-        HDprintf("    failed to retrieve group info\n");
+        printf("    failed to retrieve group info\n");
         goto error;
     }
 
     if (group_info.nlinks != OBJECT_COPY_SHALLOW_TEST_NUM_NESTED_OBJS) {
         H5_FAILED();
-        HDprintf("    copied group contained %d members instead of %d members after a shallow copy!\n",
-                 (int)group_info.nlinks, OBJECT_COPY_SHALLOW_TEST_NUM_NESTED_OBJS);
+        printf("    copied group contained %d members instead of %d members after a shallow copy!\n",
+               (int)group_info.nlinks, OBJECT_COPY_SHALLOW_TEST_NUM_NESTED_OBJS);
         goto error;
     }
 
@@ -2908,7 +2903,7 @@ test_object_copy_shallow_group_copy(void)
 
         if ((tmp_group_id = H5Gopen2(group_id, grp_name, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to open group '%s'\n", grp_name);
+            printf("    failed to open group '%s'\n", grp_name);
             goto error;
         }
 
@@ -2922,19 +2917,19 @@ test_object_copy_shallow_group_copy(void)
 
         if (H5Gget_info(tmp_group_id, &group_info) < 0) {
             H5_FAILED();
-            HDprintf("    failed to retrieve group info\n");
+            printf("    failed to retrieve group info\n");
             goto error;
         }
 
         if (group_info.nlinks != 0) {
             H5_FAILED();
-            HDprintf("    copied group's immediate members contained nested members after a shallow copy!\n");
+            printf("    copied group's immediate members contained nested members after a shallow copy!\n");
             goto error;
         }
 
         if (H5Gclose(tmp_group_id) < 0) {
             H5_FAILED();
-            HDprintf("    failed to close group '%s'\n", grp_name);
+            printf("    failed to close group '%s'\n", grp_name);
             goto error;
         }
     }
@@ -3003,8 +2998,8 @@ test_object_copy_no_attributes(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, link, dataset, attribute, or stored "
-                 "datatype aren't supported with this connector\n");
+        printf("    API functions for basic file, group, object, link, dataset, attribute, or stored "
+               "datatype aren't supported with this connector\n");
         return 0;
     }
 
@@ -3012,20 +3007,20 @@ test_object_copy_no_attributes(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_NO_ATTRS_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -3042,7 +3037,7 @@ test_object_copy_no_attributes(void)
     if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                 H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -3054,14 +3049,14 @@ test_object_copy_no_attributes(void)
         if ((attr_id = H5Acreate2(group_id2, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s' on group '%s'\n", attr_name,
-                     OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME);
+            printf("    couldn't create attribute '%s' on group '%s'\n", attr_name,
+                   OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME);
             goto error;
         }
 
         if (H5Aclose(attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close attribute '%s'\n", attr_name);
+            printf("    couldn't close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -3070,7 +3065,7 @@ test_object_copy_no_attributes(void)
     if ((dset_id = H5Dcreate2(group_id, OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME, dset_dtype, space_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME);
         goto error;
     }
 
@@ -3082,14 +3077,14 @@ test_object_copy_no_attributes(void)
         if ((attr_id = H5Acreate2(dset_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s' on dataset '%s'\n", attr_name,
-                     OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME);
+            printf("    couldn't create attribute '%s' on dataset '%s'\n", attr_name,
+                   OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME);
             goto error;
         }
 
         if (H5Aclose(attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close attribute '%s'\n", attr_name);
+            printf("    couldn't close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -3097,14 +3092,14 @@ test_object_copy_no_attributes(void)
     /* Create the test committed datatype object, along with the attributes attached to it. */
     if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype\n");
+        printf("    couldn't create datatype\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT,
                    H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME);
+        printf("    couldn't commit datatype '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME);
         goto error;
     }
 
@@ -3116,14 +3111,14 @@ test_object_copy_no_attributes(void)
         if ((attr_id = H5Acreate2(dtype_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s' on committed datatype '%s'\n", attr_name,
-                     OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME);
+            printf("    couldn't create attribute '%s' on committed datatype '%s'\n", attr_name,
+                   OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME);
             goto error;
         }
 
         if (H5Aclose(attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close attribute '%s'\n", attr_name);
+            printf("    couldn't close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -3138,36 +3133,36 @@ test_object_copy_no_attributes(void)
 
             if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create OCopyPL\n");
+                printf("    couldn't create OCopyPL\n");
                 PART_ERROR(H5Ocopy_group_no_attributes);
             }
 
             if (H5Pset_copy_object(ocpypl_id, H5O_COPY_WITHOUT_ATTR_FLAG) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set object copying options\n");
+                printf("    couldn't set object copying options\n");
                 PART_ERROR(H5Ocopy_group_no_attributes);
             }
 
             if (H5Ocopy(group_id, OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME, group_id,
                         OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME, ocpypl_id, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy group '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME,
-                         OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME);
+                printf("    failed to copy group '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME,
+                       OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_group_no_attributes);
             }
 
             if ((object_link_exists =
                      H5Lexists(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' to copied group exists\n",
-                         OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME);
+                printf("    couldn't determine if link '%s' to copied group exists\n",
+                       OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_group_no_attributes);
             }
 
             if (!object_link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' to copied group didn't exist!\n",
-                         OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME);
+                printf("    link '%s' to copied group didn't exist!\n",
+                       OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_group_no_attributes);
             }
 
@@ -3175,7 +3170,7 @@ test_object_copy_no_attributes(void)
             if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    failed to open group copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME);
+                printf("    failed to open group copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_group_no_attributes);
             }
 
@@ -3189,25 +3184,25 @@ test_object_copy_no_attributes(void)
 
             if (H5Oget_info3(tmp_group_id, &object_info, H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve object info\n");
+                printf("    failed to retrieve object info\n");
                 PART_ERROR(H5Ocopy_group_no_attributes);
             }
 
             if (object_info.num_attrs != 0) {
                 H5_FAILED();
-                HDprintf("    copied group contained attributes after a non-attribute copy!\n");
+                printf("    copied group contained attributes after a non-attribute copy!\n");
                 PART_ERROR(H5Ocopy_group_no_attributes);
             }
 
             if (H5Pclose(ocpypl_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close OCopyPL\n");
+                printf("    failed to close OCopyPL\n");
                 PART_ERROR(H5Ocopy_group_no_attributes);
             }
 
             if (H5Gclose(tmp_group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group copy\n");
+                printf("    failed to close group copy\n");
                 PART_ERROR(H5Ocopy_group_no_attributes);
             }
 
@@ -3238,36 +3233,36 @@ test_object_copy_no_attributes(void)
 
             if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create OCopyPL\n");
+                printf("    couldn't create OCopyPL\n");
                 PART_ERROR(H5Ocopy_dset_no_attributes);
             }
 
             if (H5Pset_copy_object(ocpypl_id, H5O_COPY_WITHOUT_ATTR_FLAG) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set object copying options\n");
+                printf("    couldn't set object copying options\n");
                 PART_ERROR(H5Ocopy_dset_no_attributes);
             }
 
             if (H5Ocopy(group_id, OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME, group_id,
                         OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME, ocpypl_id, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy dataset '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME,
-                         OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME);
+                printf("    failed to copy dataset '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME,
+                       OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME);
                 PART_ERROR(H5Ocopy_dset_no_attributes);
             }
 
             if ((object_link_exists =
                      H5Lexists(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' to copied dataset exists\n",
-                         OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME);
+                printf("    couldn't determine if link '%s' to copied dataset exists\n",
+                       OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME);
                 PART_ERROR(H5Ocopy_dset_no_attributes);
             }
 
             if (!object_link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' to copied dataset didn't exist!\n",
-                         OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME);
+                printf("    link '%s' to copied dataset didn't exist!\n",
+                       OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME);
                 PART_ERROR(H5Ocopy_dset_no_attributes);
             }
 
@@ -3275,7 +3270,7 @@ test_object_copy_no_attributes(void)
             if ((tmp_dset_id = H5Dopen2(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    failed to open dataset copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME);
+                printf("    failed to open dataset copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME);
                 PART_ERROR(H5Ocopy_dset_no_attributes);
             }
 
@@ -3289,25 +3284,25 @@ test_object_copy_no_attributes(void)
 
             if (H5Oget_info3(tmp_dset_id, &object_info, H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve object info\n");
+                printf("    failed to retrieve object info\n");
                 PART_ERROR(H5Ocopy_dset_no_attributes);
             }
 
             if (object_info.num_attrs != 0) {
                 H5_FAILED();
-                HDprintf("    copied dataset contained attributes after a non-attribute copy!\n");
+                printf("    copied dataset contained attributes after a non-attribute copy!\n");
                 PART_ERROR(H5Ocopy_dset_no_attributes);
             }
 
             if (H5Pclose(ocpypl_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close OCopyPL\n");
+                printf("    failed to close OCopyPL\n");
                 PART_ERROR(H5Ocopy_dset_no_attributes);
             }
 
             if (H5Dclose(tmp_dset_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close dataset copy\n");
+                printf("    failed to close dataset copy\n");
                 PART_ERROR(H5Ocopy_dset_no_attributes);
             }
 
@@ -3338,36 +3333,36 @@ test_object_copy_no_attributes(void)
 
             if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create OCopyPL\n");
+                printf("    couldn't create OCopyPL\n");
                 PART_ERROR(H5Ocopy_dtype_no_attributes);
             }
 
             if (H5Pset_copy_object(ocpypl_id, H5O_COPY_WITHOUT_ATTR_FLAG) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set object copying options\n");
+                printf("    couldn't set object copying options\n");
                 PART_ERROR(H5Ocopy_dtype_no_attributes);
             }
 
             if (H5Ocopy(group_id, OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME, group_id,
                         OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME, ocpypl_id, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy datatype '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME,
-                         OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME);
+                printf("    failed to copy datatype '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME,
+                       OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME);
                 PART_ERROR(H5Ocopy_dtype_no_attributes);
             }
 
             if ((object_link_exists =
                      H5Lexists(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' to copied datatype exists\n",
-                         OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME);
+                printf("    couldn't determine if link '%s' to copied datatype exists\n",
+                       OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME);
                 PART_ERROR(H5Ocopy_dtype_no_attributes);
             }
 
             if (!object_link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' to copied datatype didn't exist!\n",
-                         OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME);
+                printf("    link '%s' to copied datatype didn't exist!\n",
+                       OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME);
                 PART_ERROR(H5Ocopy_dtype_no_attributes);
             }
 
@@ -3375,7 +3370,7 @@ test_object_copy_no_attributes(void)
             if ((tmp_dtype_id = H5Topen2(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    failed to open dataset copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME);
+                printf("    failed to open dataset copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME);
                 PART_ERROR(H5Ocopy_dtype_no_attributes);
             }
 
@@ -3389,25 +3384,25 @@ test_object_copy_no_attributes(void)
 
             if (H5Oget_info3(tmp_dtype_id, &object_info, H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve object info\n");
+                printf("    failed to retrieve object info\n");
                 PART_ERROR(H5Ocopy_dtype_no_attributes);
             }
 
             if (object_info.num_attrs != 0) {
                 H5_FAILED();
-                HDprintf("    copied committed datatype contained attributes after a non-attribute copy!\n");
+                printf("    copied committed datatype contained attributes after a non-attribute copy!\n");
                 PART_ERROR(H5Ocopy_dtype_no_attributes);
             }
 
             if (H5Pclose(ocpypl_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close OCopyPL\n");
+                printf("    failed to close OCopyPL\n");
                 PART_ERROR(H5Ocopy_dtype_no_attributes);
             }
 
             if (H5Tclose(tmp_dtype_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close datatype copy\n");
+                printf("    failed to close datatype copy\n");
                 PART_ERROR(H5Ocopy_dtype_no_attributes);
             }
 
@@ -3511,8 +3506,8 @@ test_object_copy_by_soft_link(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, link, dataset, attribute, iterate, or "
-                 "soft link aren't supported with this connector\n");
+        printf("    API functions for basic file, group, object, link, dataset, attribute, iterate, or "
+               "soft link aren't supported with this connector\n");
         return 0;
     }
 
@@ -3520,20 +3515,20 @@ test_object_copy_by_soft_link(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_SOFT_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -3545,7 +3540,7 @@ test_object_copy_by_soft_link(void)
     if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                 H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -3556,8 +3551,8 @@ test_object_copy_by_soft_link(void)
 
         if ((tmp_group_id = H5Gcreate2(group_id2, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create group '%s' under group '%s'\n", grp_name,
-                     OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME);
+            printf("    couldn't create group '%s' under group '%s'\n", grp_name,
+                   OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME);
             goto error;
         }
 
@@ -3566,15 +3561,15 @@ test_object_copy_by_soft_link(void)
             if (H5Gclose(H5Gcreate2(tmp_group_id, OBJECT_COPY_SOFT_LINK_TEST_DEEP_NESTED_GROUP_NAME,
                                     H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create nested group '%s' under group '%s'\n",
-                         OBJECT_COPY_SOFT_LINK_TEST_DEEP_NESTED_GROUP_NAME, grp_name);
+                printf("    couldn't create nested group '%s' under group '%s'\n",
+                       OBJECT_COPY_SOFT_LINK_TEST_DEEP_NESTED_GROUP_NAME, grp_name);
                 goto error;
             }
         }
 
         if (H5Gclose(tmp_group_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close group '%s'\n", grp_name);
+            printf("    couldn't close group '%s'\n", grp_name);
             goto error;
         }
     }
@@ -3587,14 +3582,14 @@ test_object_copy_by_soft_link(void)
         if ((attr_id = H5Acreate2(group_id2, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s' on group '%s'\n", attr_name,
-                     OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME);
+            printf("    couldn't create attribute '%s' on group '%s'\n", attr_name,
+                   OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME);
             goto error;
         }
 
         if (H5Aclose(attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close attribute '%s'\n", attr_name);
+            printf("    couldn't close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -3612,31 +3607,31 @@ test_object_copy_by_soft_link(void)
                                group_id, OBJECT_COPY_SOFT_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create soft link '%s' to group for copying\n",
-                         OBJECT_COPY_SOFT_LINK_TEST_SOFT_LINK_NAME);
+                printf("    failed to create soft link '%s' to group for copying\n",
+                       OBJECT_COPY_SOFT_LINK_TEST_SOFT_LINK_NAME);
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
 
             if (H5Ocopy(group_id, OBJECT_COPY_SOFT_LINK_TEST_SOFT_LINK_NAME, group_id,
                         OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy group '%s' to '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME,
-                         OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME);
+                printf("    failed to copy group '%s' to '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME,
+                       OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
 
             if ((object_link_exists =
                      H5Lexists(group_id, OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' to copied group exists\n",
-                         OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME);
+                printf("    couldn't determine if link '%s' to copied group exists\n",
+                       OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
 
             if (!object_link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' to copied group didn't exist!\n",
-                         OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME);
+                printf("    link '%s' to copied group didn't exist!\n",
+                       OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
 
@@ -3645,14 +3640,14 @@ test_object_copy_by_soft_link(void)
             if (H5Lget_info2(group_id, OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME, &link_info, H5P_DEFAULT) <
                 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve info for link '%s'\n",
-                         OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME);
+                printf("    failed to retrieve info for link '%s'\n",
+                       OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
 
             if (link_info.type != H5L_TYPE_HARD) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    after group copy through soft link, group's new link type wasn't H5L_TYPE_HARD!\n");
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
@@ -3664,7 +3659,7 @@ test_object_copy_by_soft_link(void)
             if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    failed to open group copy '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME);
+                printf("    failed to open group copy '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
 
@@ -3678,15 +3673,14 @@ test_object_copy_by_soft_link(void)
 
             if (H5Gget_info(tmp_group_id, &group_info) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve group info\n");
+                printf("    failed to retrieve group info\n");
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
 
             if (group_info.nlinks != OBJECT_COPY_SOFT_LINK_TEST_NUM_NESTED_OBJS) {
                 H5_FAILED();
-                HDprintf(
-                    "    copied group contained %d members instead of %d members after a shallow copy!\n",
-                    (int)group_info.nlinks, OBJECT_COPY_SOFT_LINK_TEST_NUM_NESTED_OBJS);
+                printf("    copied group contained %d members instead of %d members after a shallow copy!\n",
+                       (int)group_info.nlinks, OBJECT_COPY_SOFT_LINK_TEST_NUM_NESTED_OBJS);
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
 
@@ -3700,13 +3694,13 @@ test_object_copy_by_soft_link(void)
 
             if (H5Oget_info3(tmp_group_id, &object_info, H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve object info\n");
+                printf("    failed to retrieve object info\n");
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
 
             if (object_info.num_attrs == 0) {
                 H5_FAILED();
-                HDprintf("    copied group didn't contain any attributes after copy operation!\n");
+                printf("    copied group didn't contain any attributes after copy operation!\n");
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
 
@@ -3715,13 +3709,13 @@ test_object_copy_by_soft_link(void)
             if (H5Aiterate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL,
                             object_copy_attribute_iter_callback, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to iterate over copied group's attributes\n");
+                printf("    failed to iterate over copied group's attributes\n");
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
 
             if (i != OBJECT_COPY_SOFT_LINK_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    number of attributes on copied group (%llu) didn't match expected number (%llu)!\n",
                     (unsigned long long)i, (unsigned long long)OBJECT_COPY_SOFT_LINK_TEST_NUM_ATTRS);
                 PART_ERROR(H5Ocopy_through_soft_link);
@@ -3729,7 +3723,7 @@ test_object_copy_by_soft_link(void)
 
             if (H5Gclose(tmp_group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group copy\n");
+                printf("    failed to close group copy\n");
                 PART_ERROR(H5Ocopy_through_soft_link);
             }
 
@@ -3757,8 +3751,8 @@ test_object_copy_by_soft_link(void)
                                group_id, OBJECT_COPY_SOFT_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT,
                                H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create dangling soft link '%s'\n",
-                         OBJECT_COPY_SOFT_LINK_TEST_DANGLING_LINK_NAME);
+                printf("    failed to create dangling soft link '%s'\n",
+                       OBJECT_COPY_SOFT_LINK_TEST_DANGLING_LINK_NAME);
                 PART_ERROR(H5Ocopy_through_dangling_soft_link);
             }
 
@@ -3772,7 +3766,7 @@ test_object_copy_by_soft_link(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    copied non-existent object through use of a dangling soft link!\n");
+                printf("    copied non-existent object through use of a dangling soft link!\n");
                 PART_ERROR(H5Ocopy_through_dangling_soft_link);
             }
 
@@ -3841,9 +3835,9 @@ test_object_copy_group_with_soft_links(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, link, iterate, or soft link aren't "
-                 "supported with "
-                 "this connector\n");
+        printf("    API functions for basic file, group, object, link, iterate, or soft link aren't "
+               "supported with "
+               "this connector\n");
         return 0;
     }
 
@@ -3851,21 +3845,21 @@ test_object_copy_group_with_soft_links(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -3873,7 +3867,7 @@ test_object_copy_group_with_soft_links(void)
     if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME, H5P_DEFAULT,
                                 H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -3893,20 +3887,20 @@ test_object_copy_group_with_soft_links(void)
 
         if ((tmp_group_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create group '%s' under group '%s'\n", grp_name,
-                     OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME);
+            printf("    couldn't create group '%s' under group '%s'\n", grp_name,
+                   OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME);
             goto error;
         }
 
         if (H5Lcreate_soft(lnk_target, group_id2, lnk_name, H5P_DEFAULT, H5P_DEFAULT) < 0) {
             H5_FAILED();
-            HDprintf("    failed to create soft link '%s'\n", lnk_name);
+            printf("    failed to create soft link '%s'\n", lnk_name);
             goto error;
         }
 
         if (H5Gclose(tmp_group_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close group '%s'\n", grp_name);
+            printf("    couldn't close group '%s'\n", grp_name);
             goto error;
         }
     }
@@ -3923,9 +3917,9 @@ test_object_copy_group_with_soft_links(void)
                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME, H5P_DEFAULT,
                         H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy group '%s' to '%s'\n",
-                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME,
-                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME);
+                printf("    failed to copy group '%s' to '%s'\n",
+                       OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME,
+                       OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME);
                 PART_ERROR(H5Ocopy_dont_expand_soft_links);
             }
 
@@ -3933,15 +3927,15 @@ test_object_copy_group_with_soft_links(void)
                      H5Lexists(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME,
                                H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' to copied group exists\n",
-                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME);
+                printf("    couldn't determine if link '%s' to copied group exists\n",
+                       OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME);
                 PART_ERROR(H5Ocopy_dont_expand_soft_links);
             }
 
             if (!object_link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' to copied group didn't exist!\n",
-                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME);
+                printf("    link '%s' to copied group didn't exist!\n",
+                       OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME);
                 PART_ERROR(H5Ocopy_dont_expand_soft_links);
             }
 
@@ -3950,8 +3944,8 @@ test_object_copy_group_with_soft_links(void)
                      H5Gopen2(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME,
                               H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to open group copy '%s'\n",
-                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME);
+                printf("    failed to open group copy '%s'\n",
+                       OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME);
                 PART_ERROR(H5Ocopy_dont_expand_soft_links);
             }
 
@@ -3965,14 +3959,14 @@ test_object_copy_group_with_soft_links(void)
 
             if (H5Gget_info(tmp_group_id, &group_info) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve group info\n");
+                printf("    failed to retrieve group info\n");
                 PART_ERROR(H5Ocopy_dont_expand_soft_links);
             }
 
             if (group_info.nlinks != OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS) {
                 H5_FAILED();
-                HDprintf("    copied group contained %d members instead of %d members after copy!\n",
-                         (int)group_info.nlinks, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS);
+                printf("    copied group contained %d members instead of %d members after copy!\n",
+                       (int)group_info.nlinks, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS);
                 PART_ERROR(H5Ocopy_dont_expand_soft_links);
             }
 
@@ -3984,22 +3978,22 @@ test_object_copy_group_with_soft_links(void)
             if (H5Literate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL,
                             object_copy_soft_link_non_expand_callback, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to iterate over links in group '%s'\n",
-                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME);
+                printf("    failed to iterate over links in group '%s'\n",
+                       OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME);
                 PART_ERROR(H5Ocopy_dont_expand_soft_links);
             }
 
             if (i != OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS) {
                 H5_FAILED();
-                HDprintf("    number of links in copied group (%llu) didn't match expected number (%llu)!\n",
-                         (unsigned long long)i,
-                         (unsigned long long)OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS);
+                printf("    number of links in copied group (%llu) didn't match expected number (%llu)!\n",
+                       (unsigned long long)i,
+                       (unsigned long long)OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS);
                 PART_ERROR(H5Ocopy_dont_expand_soft_links);
             }
 
             if (H5Gclose(tmp_group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group copy\n");
+                printf("    failed to close group copy\n");
                 PART_ERROR(H5Ocopy_dont_expand_soft_links);
             }
 
@@ -4022,13 +4016,13 @@ test_object_copy_group_with_soft_links(void)
 
             if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create OCopyPL\n");
+                printf("    couldn't create OCopyPL\n");
                 PART_ERROR(H5Ocopy_expand_soft_links);
             }
 
             if (H5Pset_copy_object(ocpypl_id, H5O_COPY_EXPAND_SOFT_LINK_FLAG) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set object copying options\n");
+                printf("    couldn't set object copying options\n");
                 PART_ERROR(H5Ocopy_expand_soft_links);
             }
 
@@ -4036,24 +4030,24 @@ test_object_copy_group_with_soft_links(void)
                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME, ocpypl_id,
                         H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy group '%s' to '%s'\n",
-                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME,
-                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME);
+                printf("    failed to copy group '%s' to '%s'\n",
+                       OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME,
+                       OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME);
                 PART_ERROR(H5Ocopy_expand_soft_links);
             }
 
             if ((object_link_exists = H5Lexists(
                      group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' to copied group exists\n",
-                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME);
+                printf("    couldn't determine if link '%s' to copied group exists\n",
+                       OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME);
                 PART_ERROR(H5Ocopy_expand_soft_links);
             }
 
             if (!object_link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' to copied group didn't exist!\n",
-                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME);
+                printf("    link '%s' to copied group didn't exist!\n",
+                       OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME);
                 PART_ERROR(H5Ocopy_expand_soft_links);
             }
 
@@ -4061,8 +4055,8 @@ test_object_copy_group_with_soft_links(void)
             if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME,
                                          H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to open group copy '%s'\n",
-                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME);
+                printf("    failed to open group copy '%s'\n",
+                       OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME);
                 PART_ERROR(H5Ocopy_expand_soft_links);
             }
 
@@ -4076,14 +4070,14 @@ test_object_copy_group_with_soft_links(void)
 
             if (H5Gget_info(tmp_group_id, &group_info) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve group info\n");
+                printf("    failed to retrieve group info\n");
                 PART_ERROR(H5Ocopy_expand_soft_links);
             }
 
             if (group_info.nlinks != OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS) {
                 H5_FAILED();
-                HDprintf("    copied group contained %d members instead of %d members after copy!\n",
-                         (int)group_info.nlinks, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS);
+                printf("    copied group contained %d members instead of %d members after copy!\n",
+                       (int)group_info.nlinks, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS);
                 PART_ERROR(H5Ocopy_expand_soft_links);
             }
 
@@ -4096,28 +4090,28 @@ test_object_copy_group_with_soft_links(void)
             if (H5Literate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL,
                             object_copy_soft_link_expand_callback, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to iterate over links in group '%s'\n",
-                         OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME);
+                printf("    failed to iterate over links in group '%s'\n",
+                       OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME);
                 PART_ERROR(H5Ocopy_expand_soft_links);
             }
 
             if (i != OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS) {
                 H5_FAILED();
-                HDprintf("    number of links in copied group (%llu) didn't match expected number (%llu)!\n",
-                         (unsigned long long)i,
-                         (unsigned long long)OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS);
+                printf("    number of links in copied group (%llu) didn't match expected number (%llu)!\n",
+                       (unsigned long long)i,
+                       (unsigned long long)OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS);
                 PART_ERROR(H5Ocopy_expand_soft_links);
             }
 
             if (H5Pclose(ocpypl_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close OCopyPL\n");
+                printf("    failed to close OCopyPL\n");
                 PART_ERROR(H5Ocopy_expand_soft_links);
             }
 
             if (H5Gclose(tmp_group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group copy\n");
+                printf("    failed to close group copy\n");
                 PART_ERROR(H5Ocopy_expand_soft_links);
             }
 
@@ -4211,8 +4205,8 @@ test_object_copy_between_files(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, link, dataset, attribute, stored "
-                 "datatype, or iterate aren't supported with this connector\n");
+        printf("    API functions for basic file, group, object, link, dataset, attribute, stored "
+               "datatype, or iterate aren't supported with this connector\n");
         return 0;
     }
 
@@ -4224,27 +4218,26 @@ test_object_copy_between_files(void)
     if ((file_id2 = H5Fcreate(OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s'\n", H5_api_test_filename);
+        printf("    couldn't create file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_BETWEEN_FILES_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 OBJECT_COPY_BETWEEN_FILES_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -4262,7 +4255,7 @@ test_object_copy_between_files(void)
     if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                 H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -4273,8 +4266,8 @@ test_object_copy_between_files(void)
 
         if ((tmp_group_id = H5Gcreate2(group_id2, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create group '%s' under group '%s'\n", grp_name,
-                     OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME);
+            printf("    couldn't create group '%s' under group '%s'\n", grp_name,
+                   OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME);
             goto error;
         }
 
@@ -4283,15 +4276,15 @@ test_object_copy_between_files(void)
             if (H5Gclose(H5Gcreate2(tmp_group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DEEP_NESTED_GROUP_NAME,
                                     H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create nested group '%s' under group '%s'\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_DEEP_NESTED_GROUP_NAME, grp_name);
+                printf("    couldn't create nested group '%s' under group '%s'\n",
+                       OBJECT_COPY_BETWEEN_FILES_TEST_DEEP_NESTED_GROUP_NAME, grp_name);
                 goto error;
             }
         }
 
         if (H5Gclose(tmp_group_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close group '%s'\n", grp_name);
+            printf("    couldn't close group '%s'\n", grp_name);
             goto error;
         }
     }
@@ -4304,14 +4297,14 @@ test_object_copy_between_files(void)
         if ((attr_id = H5Acreate2(group_id2, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s' on group '%s'\n", attr_name,
-                     OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME);
+            printf("    couldn't create attribute '%s' on group '%s'\n", attr_name,
+                   OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME);
             goto error;
         }
 
         if (H5Aclose(attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close attribute '%s'\n", attr_name);
+            printf("    couldn't close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -4320,7 +4313,7 @@ test_object_copy_between_files(void)
     if ((dset_id = H5Dcreate2(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME, dset_dtype, space_id,
                               H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME);
         goto error;
     }
 
@@ -4332,14 +4325,14 @@ test_object_copy_between_files(void)
         if ((attr_id = H5Acreate2(dset_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s' on dataset '%s'\n", attr_name,
-                     OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME);
+            printf("    couldn't create attribute '%s' on dataset '%s'\n", attr_name,
+                   OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME);
             goto error;
         }
 
         if (H5Aclose(attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close attribute '%s'\n", attr_name);
+            printf("    couldn't close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -4347,14 +4340,14 @@ test_object_copy_between_files(void)
     /* Create the test committed datatype object, along with the attributes attached to it. */
     if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype\n");
+        printf("    couldn't create datatype\n");
         goto error;
     }
 
     if (H5Tcommit2(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT,
                    H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME);
+        printf("    couldn't commit datatype '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME);
         goto error;
     }
 
@@ -4366,14 +4359,14 @@ test_object_copy_between_files(void)
         if ((attr_id = H5Acreate2(dtype_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create attribute '%s' on committed datatype '%s'\n", attr_name,
-                     OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME);
+            printf("    couldn't create attribute '%s' on committed datatype '%s'\n", attr_name,
+                   OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME);
             goto error;
         }
 
         if (H5Aclose(attr_id) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't close attribute '%s'\n", attr_name);
+            printf("    couldn't close attribute '%s'\n", attr_name);
             goto error;
         }
     }
@@ -4389,25 +4382,25 @@ test_object_copy_between_files(void)
             if (H5Ocopy(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME, file_id2,
                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy group '%s' to second file '%s'\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME,
-                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME);
+                printf("    failed to copy group '%s' to second file '%s'\n",
+                       OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME,
+                       OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_group_between_files);
             }
 
             if ((object_link_exists =
                      H5Lexists(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' to copied group exists\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME);
+                printf("    couldn't determine if link '%s' to copied group exists\n",
+                       OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_group_between_files);
             }
 
             if (!object_link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' to copied group in second file '%s' didn't exist!\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME,
-                         OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME);
+                printf("    link '%s' to copied group in second file '%s' didn't exist!\n",
+                       OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME,
+                       OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME);
                 PART_ERROR(H5Ocopy_group_between_files);
             }
 
@@ -4415,8 +4408,7 @@ test_object_copy_between_files(void)
             if ((tmp_group_id =
                      H5Gopen2(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to open group copy '%s'\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME);
+                printf("    failed to open group copy '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME);
                 PART_ERROR(H5Ocopy_group_between_files);
             }
 
@@ -4430,14 +4422,14 @@ test_object_copy_between_files(void)
 
             if (H5Gget_info(tmp_group_id, &group_info) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve group info\n");
+                printf("    failed to retrieve group info\n");
                 PART_ERROR(H5Ocopy_group_between_files);
             }
 
             if (group_info.nlinks != OBJECT_COPY_BETWEEN_FILES_TEST_NUM_NESTED_OBJS) {
                 H5_FAILED();
-                HDprintf("    copied group contained %d members instead of %d members after a deep copy!\n",
-                         (int)group_info.nlinks, OBJECT_COPY_BETWEEN_FILES_TEST_NUM_NESTED_OBJS);
+                printf("    copied group contained %d members instead of %d members after a deep copy!\n",
+                       (int)group_info.nlinks, OBJECT_COPY_BETWEEN_FILES_TEST_NUM_NESTED_OBJS);
                 PART_ERROR(H5Ocopy_group_between_files);
             }
 
@@ -4451,13 +4443,13 @@ test_object_copy_between_files(void)
 
             if (H5Oget_info3(tmp_group_id, &object_info, H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve object info\n");
+                printf("    failed to retrieve object info\n");
                 PART_ERROR(H5Ocopy_group_between_files);
             }
 
             if (object_info.num_attrs == 0) {
                 H5_FAILED();
-                HDprintf("    copied group didn't contain any attributes after copy operation!\n");
+                printf("    copied group didn't contain any attributes after copy operation!\n");
                 PART_ERROR(H5Ocopy_group_between_files);
             }
 
@@ -4466,13 +4458,13 @@ test_object_copy_between_files(void)
             if (H5Aiterate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL,
                             object_copy_attribute_iter_callback, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to iterate over copied group's attributes\n");
+                printf("    failed to iterate over copied group's attributes\n");
                 PART_ERROR(H5Ocopy_group_between_files);
             }
 
             if (i != OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf(
+                printf(
                     "    number of attributes on copied group (%llu) didn't match expected number (%llu)!\n",
                     (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS);
                 PART_ERROR(H5Ocopy_group_between_files);
@@ -4480,7 +4472,7 @@ test_object_copy_between_files(void)
 
             if (H5Gclose(tmp_group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close group copy\n");
+                printf("    failed to close group copy\n");
                 PART_ERROR(H5Ocopy_group_between_files);
             }
 
@@ -4497,7 +4489,7 @@ test_object_copy_between_files(void)
 
                 if ((tmp_group_id = H5Gopen2(file_id2, grp_name, H5P_DEFAULT)) < 0) {
                     H5_FAILED();
-                    HDprintf("    failed to open group '%s'\n", grp_name);
+                    printf("    failed to open group '%s'\n", grp_name);
                     PART_ERROR(H5Ocopy_group_between_files);
                 }
 
@@ -4511,20 +4503,20 @@ test_object_copy_between_files(void)
 
                 if (H5Gget_info(tmp_group_id, &group_info) < 0) {
                     H5_FAILED();
-                    HDprintf("    failed to retrieve group info\n");
+                    printf("    failed to retrieve group info\n");
                     PART_ERROR(H5Ocopy_group_between_files);
                 }
 
                 if (group_info.nlinks != 1) {
                     H5_FAILED();
-                    HDprintf("    copied group's immediate members didn't contain nested members after a "
-                             "deep copy!\n");
+                    printf("    copied group's immediate members didn't contain nested members after a "
+                           "deep copy!\n");
                     PART_ERROR(H5Ocopy_group_between_files);
                 }
 
                 if (H5Gclose(tmp_group_id) < 0) {
                     H5_FAILED();
-                    HDprintf("    failed to close group '%s'\n", grp_name);
+                    printf("    failed to close group '%s'\n", grp_name);
                     PART_ERROR(H5Ocopy_group_between_files);
                 }
             }
@@ -4549,25 +4541,25 @@ test_object_copy_between_files(void)
             if (H5Ocopy(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME, file_id2,
                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy dataset '%s' to second file '%s'\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME,
-                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME);
+                printf("    failed to copy dataset '%s' to second file '%s'\n",
+                       OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME,
+                       OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME);
                 PART_ERROR(H5Ocopy_dset_between_files);
             }
 
             if ((object_link_exists =
                      H5Lexists(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' to copied dataset exists\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME);
+                printf("    couldn't determine if link '%s' to copied dataset exists\n",
+                       OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME);
                 PART_ERROR(H5Ocopy_dset_between_files);
             }
 
             if (!object_link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' to copied dataset in second file '%s' didn't exist!\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME,
-                         OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME);
+                printf("    link '%s' to copied dataset in second file '%s' didn't exist!\n",
+                       OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME,
+                       OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME);
                 PART_ERROR(H5Ocopy_dset_between_files);
             }
 
@@ -4575,8 +4567,8 @@ test_object_copy_between_files(void)
             if ((tmp_dset_id =
                      H5Dopen2(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to open dataset copy '%s'\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME);
+                printf("    failed to open dataset copy '%s'\n",
+                       OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME);
                 PART_ERROR(H5Ocopy_dset_between_files);
             }
 
@@ -4590,13 +4582,13 @@ test_object_copy_between_files(void)
 
             if (H5Oget_info3(tmp_dset_id, &object_info, H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve object info\n");
+                printf("    failed to retrieve object info\n");
                 PART_ERROR(H5Ocopy_dset_between_files);
             }
 
             if (object_info.num_attrs == 0) {
                 H5_FAILED();
-                HDprintf("    copied dataset didn't contain any attributes after copy operation!\n");
+                printf("    copied dataset didn't contain any attributes after copy operation!\n");
                 PART_ERROR(H5Ocopy_dset_between_files);
             }
 
@@ -4605,21 +4597,21 @@ test_object_copy_between_files(void)
             if (H5Aiterate2(tmp_dset_id, H5_INDEX_NAME, H5_ITER_INC, NULL,
                             object_copy_attribute_iter_callback, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to iterate over copied dataset's attributes\n");
+                printf("    failed to iterate over copied dataset's attributes\n");
                 PART_ERROR(H5Ocopy_dset_between_files);
             }
 
             if (i != OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    number of attributes on copied dataset (%llu) didn't match expected number "
-                         "(%llu)!\n",
-                         (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS);
+                printf("    number of attributes on copied dataset (%llu) didn't match expected number "
+                       "(%llu)!\n",
+                       (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS);
                 PART_ERROR(H5Ocopy_dset_between_files);
             }
 
             if (H5Dclose(tmp_dset_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close dataset copy\n");
+                printf("    failed to close dataset copy\n");
                 PART_ERROR(H5Ocopy_dset_between_files);
             }
 
@@ -4643,25 +4635,25 @@ test_object_copy_between_files(void)
             if (H5Ocopy(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME, file_id2,
                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to copy committed datatype '%s' to second file '%s'\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME,
-                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME);
+                printf("    failed to copy committed datatype '%s' to second file '%s'\n",
+                       OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME,
+                       OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME);
                 PART_ERROR(H5Ocopy_dtype_between_files);
             }
 
             if ((object_link_exists =
                      H5Lexists(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if link '%s' to copied committed datatype exists\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME);
+                printf("    couldn't determine if link '%s' to copied committed datatype exists\n",
+                       OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME);
                 PART_ERROR(H5Ocopy_dtype_between_files);
             }
 
             if (!object_link_exists) {
                 H5_FAILED();
-                HDprintf("    link '%s' to copied committed datatype in second file '%s' didn't exist!\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME,
-                         OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME);
+                printf("    link '%s' to copied committed datatype in second file '%s' didn't exist!\n",
+                       OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME,
+                       OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME);
                 PART_ERROR(H5Ocopy_dtype_between_files);
             }
 
@@ -4670,8 +4662,8 @@ test_object_copy_between_files(void)
             if ((tmp_dtype_id =
                      H5Topen2(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to open committed datatype copy '%s'\n",
-                         OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME);
+                printf("    failed to open committed datatype copy '%s'\n",
+                       OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME);
                 PART_ERROR(H5Ocopy_dtype_between_files);
             }
 
@@ -4685,14 +4677,13 @@ test_object_copy_between_files(void)
 
             if (H5Oget_info3(tmp_dtype_id, &object_info, H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve object info\n");
+                printf("    failed to retrieve object info\n");
                 PART_ERROR(H5Ocopy_dtype_between_files);
             }
 
             if (object_info.num_attrs == 0) {
                 H5_FAILED();
-                HDprintf(
-                    "    copied committed datatype didn't contain any attributes after copy operation!\n");
+                printf("    copied committed datatype didn't contain any attributes after copy operation!\n");
                 PART_ERROR(H5Ocopy_dtype_between_files);
             }
 
@@ -4701,21 +4692,21 @@ test_object_copy_between_files(void)
             if (H5Aiterate2(tmp_dtype_id, H5_INDEX_NAME, H5_ITER_INC, NULL,
                             object_copy_attribute_iter_callback, &i) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to iterate over copied datatype's attributes\n");
+                printf("    failed to iterate over copied datatype's attributes\n");
                 PART_ERROR(H5Ocopy_dtype_between_files);
             }
 
             if (i != OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS) {
                 H5_FAILED();
-                HDprintf("    number of attributes on copied datatype (%llu) didn't match expected number "
-                         "(%llu)!\n",
-                         (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS);
+                printf("    number of attributes on copied datatype (%llu) didn't match expected number "
+                       "(%llu)!\n",
+                       (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS);
                 PART_ERROR(H5Ocopy_dtype_between_files);
             }
 
             if (H5Tclose(tmp_dtype_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close committed datatype copy\n");
+                printf("    failed to close committed datatype copy\n");
                 PART_ERROR(H5Ocopy_dtype_between_files);
             }
 
@@ -4803,7 +4794,7 @@ test_object_copy_invalid_params(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or object aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or object aren't supported with this connector\n");
         return 0;
     }
 
@@ -4811,28 +4802,28 @@ test_object_copy_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n",
-                 OBJECT_COPY_INVALID_PARAMS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n",
+               OBJECT_COPY_INVALID_PARAMS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                 H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -4853,7 +4844,7 @@ test_object_copy_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ocopy succeeded with an invalid source location ID!\n");
+                printf("    H5Ocopy succeeded with an invalid source location ID!\n");
                 PART_ERROR(H5Ocopy_invalid_src_loc_id);
             }
 
@@ -4874,7 +4865,7 @@ test_object_copy_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ocopy succeeded with a NULL source object name!\n");
+                printf("    H5Ocopy succeeded with a NULL source object name!\n");
                 PART_ERROR(H5Ocopy_invalid_src_obj_name);
             }
 
@@ -4887,7 +4878,7 @@ test_object_copy_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ocopy succeeded with an invalid source object name of ''!\n");
+                printf("    H5Ocopy succeeded with an invalid source object name of ''!\n");
                 PART_ERROR(H5Ocopy_invalid_src_obj_name);
             }
 
@@ -4908,7 +4899,7 @@ test_object_copy_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ocopy succeeded with an invalid destination location ID!\n");
+                printf("    H5Ocopy succeeded with an invalid destination location ID!\n");
                 PART_ERROR(H5Ocopy_invalid_dst_loc_id);
             }
 
@@ -4929,7 +4920,7 @@ test_object_copy_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ocopy succeeded with a NULL destination object name!\n");
+                printf("    H5Ocopy succeeded with a NULL destination object name!\n");
                 PART_ERROR(H5Ocopy_invalid_dst_obj_name);
             }
 
@@ -4942,7 +4933,7 @@ test_object_copy_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ocopy succeeded with an invalid destination object name of ''!\n");
+                printf("    H5Ocopy succeeded with an invalid destination object name of ''!\n");
                 PART_ERROR(H5Ocopy_invalid_dst_obj_name);
             }
 
@@ -4963,7 +4954,7 @@ test_object_copy_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ocopy succeeded with an invalid OcpyPL!\n");
+                printf("    H5Ocopy succeeded with an invalid OcpyPL!\n");
                 PART_ERROR(H5Ocopy_invalid_ocpypl);
             }
 
@@ -4984,7 +4975,7 @@ test_object_copy_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ocopy succeeded with an invalid LCPL!\n");
+                printf("    H5Ocopy succeeded with an invalid LCPL!\n");
                 PART_ERROR(H5Ocopy_invalid_lcpl);
             }
 
@@ -5075,8 +5066,8 @@ test_object_visit(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, dataset, attribute, stored datatype, or "
-                 "iterate aren't supported with this connector\n");
+        printf("    API functions for basic file, group, object, dataset, attribute, stored datatype, or "
+               "iterate aren't supported with this connector\n");
         return 0;
     }
 
@@ -5084,26 +5075,26 @@ test_object_visit(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -5111,7 +5102,7 @@ test_object_visit(void)
     if ((group_id = H5Gcreate2(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", OBJECT_VISIT_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", OBJECT_VISIT_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -5123,28 +5114,28 @@ test_object_visit(void)
 
     if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create datatype '%s'\n", OBJECT_VISIT_TEST_TYPE_NAME);
+        printf("    couldn't create datatype '%s'\n", OBJECT_VISIT_TEST_TYPE_NAME);
         goto error;
     }
 
     if ((group_id2 = H5Gcreate2(group_id, OBJECT_VISIT_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_VISIT_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", OBJECT_VISIT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dcreate2(group_id, OBJECT_VISIT_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", OBJECT_VISIT_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", OBJECT_VISIT_TEST_DSET_NAME);
         goto error;
     }
 
     if (H5Tcommit2(group_id, OBJECT_VISIT_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't commit datatype '%s'\n", OBJECT_VISIT_TEST_TYPE_NAME);
+        printf("    couldn't commit datatype '%s'\n", OBJECT_VISIT_TEST_TYPE_NAME);
         goto error;
     }
 
@@ -5168,13 +5159,13 @@ test_object_visit(void)
             if (H5Ovisit3(group_id, H5_INDEX_NAME, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit by object name in increasing order failed\n");
+                printf("    H5Ovisit by object name in increasing order failed\n");
                 PART_ERROR(H5Ovisit_obj_name_increasing);
             }
 
             if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_obj_name_increasing);
             }
 
@@ -5192,13 +5183,13 @@ test_object_visit(void)
             if (H5Ovisit3(group_id, H5_INDEX_NAME, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL) <
                 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit by object name in decreasing order failed\n");
+                printf("    H5Ovisit by object name in decreasing order failed\n");
                 PART_ERROR(H5Ovisit_obj_name_decreasing);
             }
 
             if (i != 2 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_obj_name_decreasing);
             }
 
@@ -5212,7 +5203,7 @@ test_object_visit(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ovisit_create_order_increasing);
             }
 
@@ -5222,13 +5213,13 @@ test_object_visit(void)
             if (H5Ovisit3(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_callback, &i,
                           H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit by creation order in increasing order failed\n");
+                printf("    H5Ovisit by creation order in increasing order failed\n");
                 PART_ERROR(H5Ovisit_create_order_increasing);
             }
 
             if (i != 3 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_create_order_increasing);
             }
 
@@ -5242,7 +5233,7 @@ test_object_visit(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ovisit_create_order_decreasing);
             }
 
@@ -5252,13 +5243,13 @@ test_object_visit(void)
             if (H5Ovisit3(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_callback, &i,
                           H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit by creation order in decreasing order failed\n");
+                printf("    H5Ovisit by creation order in decreasing order failed\n");
                 PART_ERROR(H5Ovisit_create_order_decreasing);
             }
 
             if (i != 4 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_create_order_decreasing);
             }
 
@@ -5286,7 +5277,7 @@ test_object_visit(void)
             if (H5Ovisit3(dset_id, H5_INDEX_NAME, H5_ITER_INC, object_visit_dset_callback, NULL,
                           H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit failed\n");
+                printf("    H5Ovisit failed\n");
                 PART_ERROR(H5Ovisit_dset);
             }
 
@@ -5301,7 +5292,7 @@ test_object_visit(void)
             if (H5Ovisit3(type_id, H5_INDEX_NAME, H5_ITER_INC, object_visit_dtype_callback, NULL,
                           H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit failed\n");
+                printf("    H5Ovisit failed\n");
                 PART_ERROR(H5Ovisit_dtype);
             }
 
@@ -5320,13 +5311,13 @@ test_object_visit(void)
             if (H5Ovisit_by_name3(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, object_visit_callback, &i,
                                   H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by object name in increasing order failed\n");
+                printf("    H5Ovisit_by_name by object name in increasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_increasing);
             }
 
             if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_increasing);
             }
 
@@ -5336,13 +5327,13 @@ test_object_visit(void)
             if (H5Ovisit_by_name3(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5_INDEX_NAME,
                                   H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by object name in increasing order failed\n");
+                printf("    H5Ovisit_by_name by object name in increasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_increasing);
             }
 
             if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_increasing);
             }
 
@@ -5361,13 +5352,13 @@ test_object_visit(void)
             if (H5Ovisit_by_name3(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, object_visit_callback, &i,
                                   H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by object name in decreasing order failed\n");
+                printf("    H5Ovisit_by_name by object name in decreasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_decreasing);
             }
 
             if (i != 2 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_decreasing);
             }
 
@@ -5377,13 +5368,13 @@ test_object_visit(void)
             if (H5Ovisit_by_name3(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5_INDEX_NAME,
                                   H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by object name in decreasing order failed\n");
+                printf("    H5Ovisit_by_name by object name in decreasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_decreasing);
             }
 
             if (i != 2 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_decreasing);
             }
 
@@ -5397,7 +5388,7 @@ test_object_visit(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ovisit_by_name_create_order_increasing);
             }
 
@@ -5408,13 +5399,13 @@ test_object_visit(void)
             if (H5Ovisit_by_name3(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_callback, &i,
                                   H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by creation order in increasing order failed\n");
+                printf("    H5Ovisit_by_name by creation order in increasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_increasing);
             }
 
             if (i != 3 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_increasing);
             }
 
@@ -5424,13 +5415,13 @@ test_object_visit(void)
             if (H5Ovisit_by_name3(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER,
                                   H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by creation order in increasing order failed\n");
+                printf("    H5Ovisit_by_name by creation order in increasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_increasing);
             }
 
             if (i != 3 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_increasing);
             }
 
@@ -5444,7 +5435,7 @@ test_object_visit(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ovisit_by_name_create_order_decreasing);
             }
 
@@ -5455,13 +5446,13 @@ test_object_visit(void)
             if (H5Ovisit_by_name3(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_callback, &i,
                                   H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by creation order in decreasing order failed\n");
+                printf("    H5Ovisit_by_name by creation order in decreasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_decreasing);
             }
 
             if (i != 4 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_decreasing);
             }
 
@@ -5471,13 +5462,13 @@ test_object_visit(void)
             if (H5Ovisit_by_name3(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER,
                                   H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by creation order in decreasing order failed\n");
+                printf("    H5Ovisit_by_name by creation order in decreasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_decreasing);
             }
 
             if (i != 4 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_decreasing);
             }
 
@@ -5505,7 +5496,7 @@ test_object_visit(void)
             if (H5Ovisit_by_name3(group_id, OBJECT_VISIT_TEST_DSET_NAME, H5_INDEX_NAME, H5_ITER_INC,
                                   object_visit_dset_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name failed\n");
+                printf("    H5Ovisit_by_name failed\n");
                 PART_ERROR(H5Ovisit_by_name_dset);
             }
 
@@ -5520,7 +5511,7 @@ test_object_visit(void)
             if (H5Ovisit_by_name3(group_id, OBJECT_VISIT_TEST_TYPE_NAME, H5_INDEX_NAME, H5_ITER_INC,
                                   object_visit_dtype_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name failed\n");
+                printf("    H5Ovisit_by_name failed\n");
                 PART_ERROR(H5Ovisit_by_name_dtype);
             }
 
@@ -5599,8 +5590,8 @@ test_object_visit_soft_link(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, soft link, or iterate "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, object, soft link, or iterate "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -5608,26 +5599,26 @@ test_object_visit_soft_link(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create a GCPL\n");
+        printf("    couldn't create a GCPL\n");
         goto error;
     }
 
     if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) {
         if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't enable link creation order tracking and indexing on GCPL\n");
+            printf("    couldn't enable link creation order tracking and indexing on GCPL\n");
             goto error;
         }
     }
@@ -5635,7 +5626,7 @@ test_object_visit_soft_link(void)
     if ((group_id = H5Gcreate2(container_group, OBJECT_VISIT_SOFT_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_SUBGROUP_NAME);
         goto error;
     }
 
@@ -5643,7 +5634,7 @@ test_object_visit_soft_link(void)
     if ((subgroup_id = H5Gcreate2(group_id, OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME1, H5P_DEFAULT, gcpl_id,
                                   H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME1);
+        printf("    couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME1);
         goto error;
     }
 
@@ -5651,7 +5642,7 @@ test_object_visit_soft_link(void)
     if ((subgroup_id2 = H5Gcreate2(group_id, OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2, H5P_DEFAULT, gcpl_id,
                                    H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2);
+        printf("    couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2);
         goto error;
     }
 
@@ -5659,45 +5650,45 @@ test_object_visit_soft_link(void)
     if ((linked_group_id = H5Gcreate2(subgroup_id2, OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1, H5P_DEFAULT,
                                       gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1);
+        printf("    couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1);
         goto error;
     }
 
     if (H5Gclose(linked_group_id) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1);
+        printf("    couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1);
         goto error;
     }
 
     if ((linked_group_id = H5Gcreate2(subgroup_id2, OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2, H5P_DEFAULT,
                                       gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2);
+        printf("    couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2);
         goto error;
     }
 
     if (H5Gclose(linked_group_id) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2);
+        printf("    couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2);
         goto error;
     }
 
     if ((linked_group_id = H5Gcreate2(subgroup_id2, OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3, H5P_DEFAULT,
                                       gcpl_id, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3);
+        printf("    couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3);
         goto error;
     }
 
     if (H5Gclose(linked_group_id) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3);
+        printf("    couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3);
         goto error;
     }
 
     if (H5Gclose(subgroup_id2) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2);
+        printf("    couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2);
         goto error;
     }
 
@@ -5706,7 +5697,7 @@ test_object_visit_soft_link(void)
                        "/" OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2 "/" OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1,
                        subgroup_id, OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME1);
+        printf("    couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME1);
         goto error;
     }
 
@@ -5714,7 +5705,7 @@ test_object_visit_soft_link(void)
                        "/" OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2 "/" OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2,
                        subgroup_id, OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME2);
+        printf("    couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME2);
         goto error;
     }
 
@@ -5722,7 +5713,7 @@ test_object_visit_soft_link(void)
                        "/" OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2 "/" OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3,
                        subgroup_id, OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME3);
+        printf("    couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME3);
         goto error;
     }
 
@@ -5746,13 +5737,13 @@ test_object_visit_soft_link(void)
             if (H5Ovisit3(subgroup_id, H5_INDEX_NAME, H5_ITER_INC, object_visit_soft_link_callback, &i,
                           H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit by object name in increasing order failed\n");
+                printf("    H5Ovisit by object name in increasing order failed\n");
                 PART_ERROR(H5Ovisit_obj_name_increasing);
             }
 
             if (i != OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_obj_name_increasing);
             }
 
@@ -5770,13 +5761,13 @@ test_object_visit_soft_link(void)
             if (H5Ovisit3(subgroup_id, H5_INDEX_NAME, H5_ITER_DEC, object_visit_soft_link_callback, &i,
                           H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit by object name in decreasing order failed\n");
+                printf("    H5Ovisit by object name in decreasing order failed\n");
                 PART_ERROR(H5Ovisit_obj_name_decreasing);
             }
 
             if (i != 2 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_obj_name_decreasing);
             }
 
@@ -5790,7 +5781,7 @@ test_object_visit_soft_link(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ovisit_create_order_increasing);
             }
 
@@ -5800,13 +5791,13 @@ test_object_visit_soft_link(void)
             if (H5Ovisit3(subgroup_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_soft_link_callback, &i,
                           H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit by creation order in increasing order failed\n");
+                printf("    H5Ovisit by creation order in increasing order failed\n");
                 PART_ERROR(H5Ovisit_create_order_increasing);
             }
 
             if (i != 3 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_create_order_increasing);
             }
 
@@ -5820,7 +5811,7 @@ test_object_visit_soft_link(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ovisit_create_order_decreasing);
             }
 
@@ -5830,13 +5821,13 @@ test_object_visit_soft_link(void)
             if (H5Ovisit3(subgroup_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_soft_link_callback, &i,
                           H5O_INFO_ALL) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit by creation order in decreasing order failed\n");
+                printf("    H5Ovisit by creation order in decreasing order failed\n");
                 PART_ERROR(H5Ovisit_create_order_decreasing);
             }
 
             if (i != 4 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_create_order_decreasing);
             }
 
@@ -5855,13 +5846,13 @@ test_object_visit_soft_link(void)
             if (H5Ovisit_by_name3(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC,
                                   object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by object name in increasing order failed\n");
+                printf("    H5Ovisit_by_name by object name in increasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_increasing);
             }
 
             if (i != OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_increasing);
             }
 
@@ -5873,13 +5864,13 @@ test_object_visit_soft_link(void)
                                   H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL,
                                   H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by object name in increasing order failed\n");
+                printf("    H5Ovisit_by_name by object name in increasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_increasing);
             }
 
             if (i != OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_increasing);
             }
 
@@ -5898,13 +5889,13 @@ test_object_visit_soft_link(void)
             if (H5Ovisit_by_name3(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC,
                                   object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by object name in decreasing order failed\n");
+                printf("    H5Ovisit_by_name by object name in decreasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_decreasing);
             }
 
             if (i != 2 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_decreasing);
             }
 
@@ -5916,13 +5907,13 @@ test_object_visit_soft_link(void)
                                   H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL,
                                   H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by object name in decreasing order failed\n");
+                printf("    H5Ovisit_by_name by object name in decreasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_decreasing);
             }
 
             if (i != 2 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_obj_name_decreasing);
             }
 
@@ -5936,7 +5927,7 @@ test_object_visit_soft_link(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ovisit_by_name_create_order_increasing);
             }
 
@@ -5947,13 +5938,13 @@ test_object_visit_soft_link(void)
             if (H5Ovisit_by_name3(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC,
                                   object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by creation order in increasing order failed\n");
+                printf("    H5Ovisit_by_name by creation order in increasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_increasing);
             }
 
             if (i != 3 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_increasing);
             }
 
@@ -5965,13 +5956,13 @@ test_object_visit_soft_link(void)
                                   H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL,
                                   H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by creation order in increasing order failed\n");
+                printf("    H5Ovisit_by_name by creation order in increasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_increasing);
             }
 
             if (i != 3 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_increasing);
             }
 
@@ -5985,7 +5976,7 @@ test_object_visit_soft_link(void)
 
             if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
                 SKIPPED();
-                HDprintf("    creation order tracking isn't supported with this VOL connector\n");
+                printf("    creation order tracking isn't supported with this VOL connector\n");
                 PART_EMPTY(H5Ovisit_by_name_create_order_decreasing);
             }
 
@@ -5996,13 +5987,13 @@ test_object_visit_soft_link(void)
             if (H5Ovisit_by_name3(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC,
                                   object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by creation order in decreasing order failed\n");
+                printf("    H5Ovisit_by_name by creation order in decreasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_decreasing);
             }
 
             if (i != 4 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_decreasing);
             }
 
@@ -6014,13 +6005,13 @@ test_object_visit_soft_link(void)
                                   H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL,
                                   H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name by creation order in decreasing order failed\n");
+                printf("    H5Ovisit_by_name by creation order in decreasing order failed\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_decreasing);
             }
 
             if (i != 4 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) {
                 H5_FAILED();
-                HDprintf("    some objects were not visited!\n");
+                printf("    some objects were not visited!\n");
                 PART_ERROR(H5Ovisit_by_name_create_order_decreasing);
             }
 
@@ -6081,8 +6072,7 @@ test_object_visit_invalid_params(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or iterate aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or iterate aren't supported with this connector\n");
         return 0;
     }
 
@@ -6090,28 +6080,28 @@ test_object_visit_invalid_params(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 OBJECT_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               OBJECT_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME);
         goto error;
     }
 
     if ((group_id2 = H5Gcreate2(group_id, OBJECT_VISIT_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT,
                                 H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create group '%s'\n", OBJECT_VISIT_INVALID_PARAMS_TEST_GROUP_NAME);
+        printf("    couldn't create group '%s'\n", OBJECT_VISIT_INVALID_PARAMS_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -6132,7 +6122,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit succeeded with an invalid object ID!\n");
+                printf("    H5Ovisit succeeded with an invalid object ID!\n");
                 PART_ERROR(H5Ovisit_invalid_obj_id);
             }
 
@@ -6153,7 +6143,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
+                printf("    H5Ovisit succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Ovisit_invalid_index_type);
             }
 
@@ -6166,7 +6156,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit succeeded with invalid index type H5_INDEX_N!\n");
+                printf("    H5Ovisit succeeded with invalid index type H5_INDEX_N!\n");
                 PART_ERROR(H5Ovisit_invalid_index_type);
             }
 
@@ -6187,7 +6177,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
+                printf("    H5Ovisit succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Ovisit_invalid_iter_order);
             }
 
@@ -6200,7 +6190,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit succeeded with invalid iteration ordering H5_ITER_N!\n");
+                printf("    H5Ovisit succeeded with invalid iteration ordering H5_ITER_N!\n");
                 PART_ERROR(H5Ovisit_invalid_iter_order);
             }
 
@@ -6221,7 +6211,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name succeeded with an invalid location ID!\n");
+                printf("    H5Ovisit_by_name succeeded with an invalid location ID!\n");
                 PART_ERROR(H5Ovisit_by_name_invalid_loc_id);
             }
 
@@ -6242,7 +6232,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name succeeded with a NULL object name!\n");
+                printf("    H5Ovisit_by_name succeeded with a NULL object name!\n");
                 PART_ERROR(H5Ovisit_by_name_invalid_obj_name);
             }
 
@@ -6255,7 +6245,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name succeeded with an invalid object name of ''!\n");
+                printf("    H5Ovisit_by_name succeeded with an invalid object name of ''!\n");
                 PART_ERROR(H5Ovisit_by_name_invalid_obj_name);
             }
 
@@ -6276,7 +6266,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
+                printf("    H5Ovisit_by_name succeeded with invalid index type H5_INDEX_UNKNOWN!\n");
                 PART_ERROR(H5Ovisit_by_name_invalid_index_type);
             }
 
@@ -6289,7 +6279,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name succeeded with invalid index type H5_INDEX_N!\n");
+                printf("    H5Ovisit_by_name succeeded with invalid index type H5_INDEX_N!\n");
                 PART_ERROR(H5Ovisit_by_name_invalid_index_type);
             }
 
@@ -6310,7 +6300,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
+                printf("    H5Ovisit_by_name succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n");
                 PART_ERROR(H5Ovisit_by_name_invalid_iter_order);
             }
 
@@ -6323,7 +6313,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name succeeded with invalid iteration ordering H5_ITER_N!\n");
+                printf("    H5Ovisit_by_name succeeded with invalid iteration ordering H5_ITER_N!\n");
                 PART_ERROR(H5Ovisit_by_name_invalid_iter_order);
             }
 
@@ -6344,7 +6334,7 @@ test_object_visit_invalid_params(void)
 
             if (err_ret >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Ovisit_by_name succeeded with an invalid LAPL!\n");
+                printf("    H5Ovisit_by_name succeeded with an invalid LAPL!\n");
                 PART_ERROR(H5Ovisit_by_name_invalid_lapl);
             }
 
@@ -6404,8 +6394,8 @@ test_close_object(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, object, dataset, attribute, or stored datatype "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, object, dataset, attribute, or stored datatype "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -6413,20 +6403,20 @@ test_close_object(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_CLOSE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container subgroup '%s'\n", OBJECT_CLOSE_TEST_GROUP_NAME);
+        printf("    couldn't create container subgroup '%s'\n", OBJECT_CLOSE_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -6447,7 +6437,7 @@ test_close_object(void)
             if ((group_id2 = H5Gcreate2(group_id, OBJECT_CLOSE_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                         H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create group '%s'\n", OBJECT_CLOSE_TEST_GRP_NAME);
+                printf("    couldn't create group '%s'\n", OBJECT_CLOSE_TEST_GRP_NAME);
                 PART_ERROR(H5Oclose_group);
             }
 
@@ -6459,13 +6449,13 @@ test_close_object(void)
 
             if ((group_id2 = H5Oopen(group_id, OBJECT_CLOSE_TEST_GRP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open group '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_GRP_NAME);
+                printf("    couldn't open group '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_GRP_NAME);
                 PART_ERROR(H5Oclose_group);
             }
 
             if (H5Oclose(group_id2) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close group '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_GRP_NAME);
+                printf("    couldn't close group '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_GRP_NAME);
                 PART_ERROR(H5Oclose_group);
             }
 
@@ -6480,7 +6470,7 @@ test_close_object(void)
             if ((dset_id = H5Dcreate2(group_id, OBJECT_CLOSE_TEST_DSET_NAME, dset_dtype, fspace_id,
                                       H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n", OBJECT_CLOSE_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n", OBJECT_CLOSE_TEST_DSET_NAME);
                 PART_ERROR(H5Oclose_dset);
             }
 
@@ -6492,13 +6482,13 @@ test_close_object(void)
 
             if ((dset_id = H5Oopen(group_id, OBJECT_CLOSE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_DSET_NAME);
+                printf("    couldn't open dataset '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_DSET_NAME);
                 PART_ERROR(H5Oclose_dset);
             }
 
             if (H5Oclose(dset_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close dataset '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_DSET_NAME);
+                printf("    couldn't close dataset '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_DSET_NAME);
                 PART_ERROR(H5Oclose_dset);
             }
 
@@ -6512,14 +6502,14 @@ test_close_object(void)
 
             if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create datatype '%s'\n", OBJECT_CLOSE_TEST_TYPE_NAME);
+                printf("    couldn't create datatype '%s'\n", OBJECT_CLOSE_TEST_TYPE_NAME);
                 PART_ERROR(H5Oclose_dtype);
             }
 
             if (H5Tcommit2(group_id, OBJECT_CLOSE_TEST_TYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT,
                            H5P_DEFAULT) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't commit datatype '%s'\n", OBJECT_CLOSE_TEST_TYPE_NAME);
+                printf("    couldn't commit datatype '%s'\n", OBJECT_CLOSE_TEST_TYPE_NAME);
                 PART_ERROR(H5Oclose_dtype);
             }
 
@@ -6531,13 +6521,13 @@ test_close_object(void)
 
             if ((dtype_id = H5Oopen(group_id, OBJECT_CLOSE_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open datatype '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_TYPE_NAME);
+                printf("    couldn't open datatype '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_TYPE_NAME);
                 PART_ERROR(H5Oclose_dtype);
             }
 
             if (H5Oclose(dtype_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't close datatype '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_TYPE_NAME);
+                printf("    couldn't close datatype '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_TYPE_NAME);
                 PART_ERROR(H5Oclose_dtype);
             }
 
@@ -6596,13 +6586,13 @@ test_close_object_invalid_params(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file or object aren't supported with this connector\n");
+        printf("    API functions for basic file or object aren't supported with this connector\n");
         return 0;
     }
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
@@ -6614,7 +6604,7 @@ test_close_object_invalid_params(void)
 
     if (err_ret >= 0) {
         H5_FAILED();
-        HDprintf("    H5Oclose succeeded with an invalid object ID!\n");
+        printf("    H5Oclose succeeded with an invalid object ID!\n");
         goto error;
     }
 
@@ -6656,8 +6646,8 @@ test_close_invalid_objects(void)
     if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, or object "
-                 "aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or object "
+               "aren't supported with this connector\n");
         return 0;
     }
 
@@ -6668,20 +6658,20 @@ test_close_invalid_objects(void)
 
     if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, OBJECT_CLOSE_INVALID_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", OBJECT_OPEN_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", OBJECT_OPEN_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -6712,7 +6702,7 @@ test_close_invalid_objects(void)
 
             if (status >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oclose succeeded with an invalid object (file)!\n");
+                printf("    H5Oclose succeeded with an invalid object (file)!\n");
                 PART_ERROR(H5Oclose_file);
             }
 
@@ -6732,7 +6722,7 @@ test_close_invalid_objects(void)
 
             if (status >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oclose succeeded with an invalid object (property list)!\n");
+                printf("    H5Oclose succeeded with an invalid object (property list)!\n");
                 PART_ERROR(H5Oclose_plist);
             }
 
@@ -6752,7 +6742,7 @@ test_close_invalid_objects(void)
 
             if (status >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oclose succeeded with an invalid object (data space)!\n");
+                printf("    H5Oclose succeeded with an invalid object (data space)!\n");
                 PART_ERROR(H5Oclose_dspace);
             }
 
@@ -6772,7 +6762,7 @@ test_close_invalid_objects(void)
 
             if (status >= 0) {
                 H5_FAILED();
-                HDprintf("    H5Oclose succeeded with an invalid object (attribute)!\n");
+                printf("    H5Oclose succeeded with an invalid object (attribute)!\n");
                 PART_ERROR(H5Oclose_attribute);
             }
 
@@ -6894,31 +6884,31 @@ object_copy_attribute_iter_callback(hid_t location_id, const char *attr_name, co
     snprintf(expected_name, 256, "attr%d", (int)(*counter));
 
     if (HDstrncmp(attr_name, expected_name, 256)) {
-        HDprintf("    attribute name '%s' did not match expected name '%s'\n", attr_name, expected_name);
+        printf("    attribute name '%s' did not match expected name '%s'\n", attr_name, expected_name);
         ret_value = H5_ITER_ERROR;
         goto done;
     }
 
     if ((attr_id = H5Aopen(location_id, attr_name, H5P_DEFAULT)) < 0) {
-        HDprintf("    failed to open attribute '%s'\n", attr_name);
+        printf("    failed to open attribute '%s'\n", attr_name);
         ret_value = H5_ITER_ERROR;
         goto done;
     }
 
     if ((attr_type = H5Aget_type(attr_id)) < 0) {
-        HDprintf("    failed to retrieve attribute's datatype\n");
+        printf("    failed to retrieve attribute's datatype\n");
         ret_value = H5_ITER_ERROR;
         goto done;
     }
 
     if ((types_equal = H5Tequal(attr_type, H5T_NATIVE_INT)) < 0) {
-        HDprintf("    failed to determine if attribute's datatype matched what is expected\n");
+        printf("    failed to determine if attribute's datatype matched what is expected\n");
         ret_value = H5_ITER_ERROR;
         goto done;
     }
 
     if (!types_equal) {
-        HDprintf("    attribute datatype did not match expected H5T_NATIVE_INT\n");
+        printf("    attribute datatype did not match expected H5T_NATIVE_INT\n");
         ret_value = H5_ITER_ERROR;
         goto done;
     }
@@ -6950,20 +6940,20 @@ object_copy_soft_link_non_expand_callback(hid_t group, const char *name, const H
 
     /* Make sure the link type is soft */
     if (H5L_TYPE_SOFT != info->type) {
-        HDprintf("    link type was not H5L_TYPE_SOFT; link must have been expanded!\n");
+        printf("    link type was not H5L_TYPE_SOFT; link must have been expanded!\n");
         ret_value = H5_ITER_ERROR;
         goto done;
     }
 
     if (NULL == (link_val_buf = calloc(1, info->u.val_size))) {
-        HDprintf("    failed to allocate buffer for link value\n");
+        printf("    failed to allocate buffer for link value\n");
         ret_value = H5_ITER_ERROR;
         goto done;
     }
 
     /* Retrieve the link's value */
     if (H5Lget_val(group, name, link_val_buf, info->u.val_size, H5P_DEFAULT) < 0) {
-        HDprintf("    failed to retrieve value of link '%s'\n", name);
+        printf("    failed to retrieve value of link '%s'\n", name);
         ret_value = H5_ITER_ERROR;
         goto done;
     }
@@ -6974,8 +6964,8 @@ object_copy_soft_link_non_expand_callback(hid_t group, const char *name, const H
              (int)(*counter));
 
     if (strncmp(link_val_buf, expected_link_val, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_BUF_SIZE)) {
-        HDprintf("    value '%s' for link '%s' did not match expected value '%s'\n", (char *)link_val_buf,
-                 name, expected_link_val);
+        printf("    value '%s' for link '%s' did not match expected value '%s'\n", (char *)link_val_buf, name,
+               expected_link_val);
         ret_value = H5_ITER_ERROR;
         goto done;
     }
@@ -7005,7 +6995,7 @@ object_copy_soft_link_expand_callback(hid_t group, const char *name, const H5L_i
 
     /* Make sure the link type is hard */
     if (H5L_TYPE_HARD != info->type) {
-        HDprintf("    link type was not H5L_TYPE_HARD; link must not have been expanded!\n");
+        printf("    link type was not H5L_TYPE_HARD; link must not have been expanded!\n");
         ret_value = H5_ITER_ERROR;
         goto done;
     }
@@ -7014,7 +7004,7 @@ object_copy_soft_link_expand_callback(hid_t group, const char *name, const H5L_i
     snprintf(expected_link_name, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_BUF_SIZE, "link%d", (int)(*counter));
 
     if (strncmp(name, expected_link_name, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_BUF_SIZE)) {
-        HDprintf("    link name '%s' did not match expected name '%s'\n", name, expected_link_name);
+        printf("    link name '%s' did not match expected name '%s'\n", name, expected_link_name);
         ret_value = H5_ITER_ERROR;
         goto done;
     }
@@ -7043,31 +7033,31 @@ object_visit_callback(hid_t o_id, const char *name, const H5O_info2_t *object_in
         if (H5O_TYPE_GROUP == object_info->type)
             goto done;
         else
-            HDprintf("    type for object '%s' was not H5O_TYPE_GROUP\n", name);
+            printf("    type for object '%s' was not H5O_TYPE_GROUP\n", name);
     }
     else if (!HDstrncmp(name, OBJECT_VISIT_TEST_GROUP_NAME, strlen(OBJECT_VISIT_TEST_GROUP_NAME) + 1) &&
              (counter_val == 2 || counter_val == 6 || counter_val == 9 || counter_val == 15)) {
         if (H5O_TYPE_GROUP == object_info->type)
             goto done;
         else
-            HDprintf("    type for object '%s' was not H5O_TYPE_GROUP\n", name);
+            printf("    type for object '%s' was not H5O_TYPE_GROUP\n", name);
     }
     else if (!HDstrncmp(name, OBJECT_VISIT_TEST_DSET_NAME, strlen(OBJECT_VISIT_TEST_DSET_NAME) + 1) &&
              (counter_val == 1 || counter_val == 7 || counter_val == 10 || counter_val == 14)) {
         if (H5O_TYPE_DATASET == object_info->type)
             goto done;
         else
-            HDprintf("    type for object '%s' was not H5O_TYPE_DATASET\n", name);
+            printf("    type for object '%s' was not H5O_TYPE_DATASET\n", name);
     }
     else if (!HDstrncmp(name, OBJECT_VISIT_TEST_TYPE_NAME, strlen(OBJECT_VISIT_TEST_TYPE_NAME) + 1) &&
              (counter_val == 3 || counter_val == 5 || counter_val == 11 || counter_val == 13)) {
         if (H5O_TYPE_NAMED_DATATYPE == object_info->type)
             goto done;
         else
-            HDprintf("    type for object '%s' was not H5O_TYPE_NAMED_DATATYPE\n", name);
+            printf("    type for object '%s' was not H5O_TYPE_NAMED_DATATYPE\n", name);
     }
     else
-        HDprintf("    object '%s' didn't match known names or came in an incorrect order\n", name);
+        printf("    object '%s' didn't match known names or came in an incorrect order\n", name);
 
     ret_val = -1;
 
@@ -7089,12 +7079,12 @@ object_visit_dset_callback(hid_t o_id, const char *name, const H5O_info2_t *obje
     UNUSED(op_data);
 
     if (HDstrncmp(name, ".", strlen(".") + 1)) {
-        HDprintf("    object '%s' didn't match known names\n", name);
+        printf("    object '%s' didn't match known names\n", name);
         return -1;
     }
 
     if (H5O_TYPE_DATASET != object_info->type) {
-        HDprintf("    object type was not H5O_TYPE_DATASET\n");
+        printf("    object type was not H5O_TYPE_DATASET\n");
         return -1;
     }
 
@@ -7113,12 +7103,12 @@ object_visit_dtype_callback(hid_t o_id, const char *name, const H5O_info2_t *obj
     UNUSED(op_data);
 
     if (HDstrncmp(name, ".", strlen(".") + 1)) {
-        HDprintf("    object '%s' didn't match known names\n", name);
+        printf("    object '%s' didn't match known names\n", name);
         return -1;
     }
 
     if (H5O_TYPE_NAMED_DATATYPE != object_info->type) {
-        HDprintf("    object type was not H5O_TYPE_NAMED_DATATYPE\n");
+        printf("    object type was not H5O_TYPE_NAMED_DATATYPE\n");
         return -1;
     }
 
@@ -7142,10 +7132,10 @@ object_visit_soft_link_callback(hid_t o_id, const char *name, const H5O_info2_t
         if (H5O_TYPE_GROUP == object_info->type)
             goto done;
         else
-            HDprintf("    type for object '%s' was not H5O_TYPE_GROUP\n", name);
+            printf("    type for object '%s' was not H5O_TYPE_GROUP\n", name);
     }
     else
-        HDprintf("    object '%s' didn't match known names or came in an incorrect order\n", name);
+        printf("    object '%s' didn't match known names or came in an incorrect order\n", name);
 
     ret_val = -1;
 
@@ -7185,19 +7175,19 @@ H5_api_object_test(void)
     size_t i;
     int    nerrors;
 
-    HDprintf("**********************************************\n");
-    HDprintf("*                                            *\n");
-    HDprintf("*              API Object Tests              *\n");
-    HDprintf("*                                            *\n");
-    HDprintf("**********************************************\n\n");
+    printf("**********************************************\n");
+    printf("*                                            *\n");
+    printf("*              API Object Tests              *\n");
+    printf("*                                            *\n");
+    printf("**********************************************\n\n");
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(object_tests); i++) {
         nerrors += (*object_tests[i])() ? 1 : 0;
     }
 
-    HDprintf("\n");
+    printf("\n");
 
-    HDprintf("Cleaning up testing files\n");
+    printf("Cleaning up testing files\n");
     cleanup_files();
 
     return nerrors;
diff --git a/test/API/H5_api_test.c b/test/API/H5_api_test.c
index 3719524..411062e 100644
--- a/test/API/H5_api_test.c
+++ b/test/API/H5_api_test.c
@@ -162,7 +162,7 @@ main(int argc, char **argv)
                TEST_FILE_NAME);
 
     if (NULL == (vol_connector_string = HDgetenv(HDF5_VOL_CONNECTOR))) {
-        HDprintf("No VOL connector selected; using native VOL connector\n");
+        printf("No VOL connector selected; using native VOL connector\n");
         vol_connector_name = "native";
         vol_connector_info = NULL;
     }
@@ -170,13 +170,13 @@ main(int argc, char **argv)
         char *token;
 
         if (NULL == (vol_connector_string_copy = HDstrdup(vol_connector_string))) {
-            HDfprintf(stderr, "Unable to copy VOL connector string\n");
+            fprintf(stderr, "Unable to copy VOL connector string\n");
             err_occurred = TRUE;
             goto done;
         }
 
         if (NULL == (token = HDstrtok(vol_connector_string_copy, " "))) {
-            HDfprintf(stderr, "Error while parsing VOL connector string\n");
+            fprintf(stderr, "Error while parsing VOL connector string\n");
             err_occurred = TRUE;
             goto done;
         }
@@ -188,15 +188,15 @@ main(int argc, char **argv)
         }
     }
 
-    HDprintf("Running API tests with VOL connector '%s' and info string '%s'\n\n", vol_connector_name,
-             vol_connector_info ? vol_connector_info : "");
-    HDprintf("Test parameters:\n");
-    HDprintf("  - Test file name: '%s'\n", H5_api_test_filename);
-    HDprintf("  - Test seed: %u\n", seed);
-    HDprintf("\n\n");
+    printf("Running API tests with VOL connector '%s' and info string '%s'\n\n", vol_connector_name,
+           vol_connector_info ? vol_connector_info : "");
+    printf("Test parameters:\n");
+    printf("  - Test file name: '%s'\n", H5_api_test_filename);
+    printf("  - Test seed: %u\n", seed);
+    printf("\n\n");
 
     if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
-        HDfprintf(stderr, "Unable to create FAPL\n");
+        fprintf(stderr, "Unable to create FAPL\n");
         err_occurred = TRUE;
         goto done;
     }
@@ -212,14 +212,14 @@ main(int argc, char **argv)
         htri_t is_registered;
 
         if ((is_registered = H5VLis_connector_registered_by_name(vol_connector_name)) < 0) {
-            HDfprintf(stderr, "Unable to determine if VOL connector is registered\n");
+            fprintf(stderr, "Unable to determine if VOL connector is registered\n");
             err_occurred = TRUE;
             goto done;
         }
 
         if (!is_registered) {
-            HDfprintf(stderr, "Specified VOL connector '%s' wasn't correctly registered!\n",
-                      vol_connector_name);
+            fprintf(stderr, "Specified VOL connector '%s' wasn't correctly registered!\n",
+                    vol_connector_name);
             err_occurred = TRUE;
             goto done;
         }
@@ -230,19 +230,19 @@ main(int argc, char **argv)
              * for the registered connector before running the tests.
              */
             if (H5Pget_vol_id(fapl_id, &default_con_id) < 0) {
-                HDfprintf(stderr, "Couldn't retrieve ID of VOL connector set on default FAPL\n");
+                fprintf(stderr, "Couldn't retrieve ID of VOL connector set on default FAPL\n");
                 err_occurred = TRUE;
                 goto done;
             }
 
             if ((registered_con_id = H5VLget_connector_id_by_name(vol_connector_name)) < 0) {
-                HDfprintf(stderr, "Couldn't retrieve ID of registered VOL connector\n");
+                fprintf(stderr, "Couldn't retrieve ID of registered VOL connector\n");
                 err_occurred = TRUE;
                 goto done;
             }
 
             if (default_con_id != registered_con_id) {
-                HDfprintf(stderr, "VOL connector set on default FAPL didn't match specified VOL connector\n");
+                fprintf(stderr, "VOL connector set on default FAPL didn't match specified VOL connector\n");
                 err_occurred = TRUE;
                 goto done;
             }
@@ -254,7 +254,7 @@ main(int argc, char **argv)
      */
     vol_cap_flags_g = H5VL_CAP_FLAG_NONE;
     if (H5Pget_vol_cap_flags(fapl_id, &vol_cap_flags_g) < 0) {
-        HDfprintf(stderr, "Unable to retrieve VOL connector capability flags\n");
+        fprintf(stderr, "Unable to retrieve VOL connector capability flags\n");
         err_occurred = TRUE;
         goto done;
     }
@@ -264,7 +264,7 @@ main(int argc, char **argv)
      * except for those which test file creation.
      */
     if (create_test_container(H5_api_test_filename, vol_cap_flags_g) < 0) {
-        HDfprintf(stderr, "Unable to create testing container file '%s'\n", H5_api_test_filename);
+        fprintf(stderr, "Unable to create testing container file '%s'\n", H5_api_test_filename);
         err_occurred = TRUE;
         goto done;
     }
@@ -272,36 +272,34 @@ main(int argc, char **argv)
     /* Run all the tests that are enabled */
     H5_api_test_run();
 
-    HDprintf("Cleaning up testing files\n");
+    printf("Cleaning up testing files\n");
     H5Fdelete(H5_api_test_filename, fapl_id);
 
     if (n_tests_run_g > 0) {
-        HDprintf("%zu/%zu (%.2f%%) API tests passed with VOL connector '%s'\n", n_tests_passed_g,
-                 n_tests_run_g, ((double)n_tests_passed_g / (double)n_tests_run_g * 100.0),
-                 vol_connector_name);
-        HDprintf("%zu/%zu (%.2f%%) API tests did not pass with VOL connector '%s'\n", n_tests_failed_g,
-                 n_tests_run_g, ((double)n_tests_failed_g / (double)n_tests_run_g * 100.0),
-                 vol_connector_name);
-        HDprintf("%zu/%zu (%.2f%%) API tests were skipped with VOL connector '%s'\n", n_tests_skipped_g,
-                 n_tests_run_g, ((double)n_tests_skipped_g / (double)n_tests_run_g * 100.0),
-                 vol_connector_name);
+        printf("%zu/%zu (%.2f%%) API tests passed with VOL connector '%s'\n", n_tests_passed_g, n_tests_run_g,
+               ((double)n_tests_passed_g / (double)n_tests_run_g * 100.0), vol_connector_name);
+        printf("%zu/%zu (%.2f%%) API tests did not pass with VOL connector '%s'\n", n_tests_failed_g,
+               n_tests_run_g, ((double)n_tests_failed_g / (double)n_tests_run_g * 100.0), vol_connector_name);
+        printf("%zu/%zu (%.2f%%) API tests were skipped with VOL connector '%s'\n", n_tests_skipped_g,
+               n_tests_run_g, ((double)n_tests_skipped_g / (double)n_tests_run_g * 100.0),
+               vol_connector_name);
     }
 
 done:
     HDfree(vol_connector_string_copy);
 
     if (default_con_id >= 0 && H5VLclose(default_con_id) < 0) {
-        HDfprintf(stderr, "Unable to close VOL connector ID\n");
+        fprintf(stderr, "Unable to close VOL connector ID\n");
         err_occurred = TRUE;
     }
 
     if (registered_con_id >= 0 && H5VLclose(registered_con_id) < 0) {
-        HDfprintf(stderr, "Unable to close VOL connector ID\n");
+        fprintf(stderr, "Unable to close VOL connector ID\n");
         err_occurred = TRUE;
     }
 
     if (fapl_id >= 0 && H5Pclose(fapl_id) < 0) {
-        HDfprintf(stderr, "Unable to close FAPL\n");
+        fprintf(stderr, "Unable to close FAPL\n");
         err_occurred = TRUE;
     }
 
diff --git a/test/API/H5_api_test_util.c b/test/API/H5_api_test_util.c
index c37a9ed..cab1de3 100644
--- a/test/API/H5_api_test_util.c
+++ b/test/API/H5_api_test_util.c
@@ -167,13 +167,13 @@ roll_datatype:
             gen_func = generate_random_datatype_array;
             break;
         default:
-            HDprintf("    invalid datatype class\n");
+            printf("    invalid datatype class\n");
             goto done;
             break;
     }
 
     if ((datatype = (gen_func)(parent_class, is_compact)) < 0) {
-        HDprintf("    couldn't generate datatype\n");
+        printf("    couldn't generate datatype\n");
         goto done;
     }
 
@@ -185,7 +185,7 @@ roll_datatype:
      */
     if (depth == 1) {
         if (0 == (type_size = H5Tget_size(datatype))) {
-            HDprintf("    failed to retrieve datatype's size\n");
+            printf("    failed to retrieve datatype's size\n");
             H5Tclose(datatype);
             datatype = H5I_INVALID_HID;
             goto done;
@@ -267,12 +267,12 @@ generate_random_datatype_integer(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_
             type_to_copy = H5T_STD_U64LE;
             break;
         default:
-            HDprintf("    invalid value for predefined integer type; should not happen\n");
+            printf("    invalid value for predefined integer type; should not happen\n");
             goto done;
     }
 
     if ((datatype = H5Tcopy(type_to_copy)) < 0) {
-        HDprintf("    couldn't copy predefined integer type\n");
+        printf("    couldn't copy predefined integer type\n");
         goto done;
     }
 
@@ -281,7 +281,7 @@ generate_random_datatype_integer(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_
 done:
     if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) {
         if (H5Tclose(datatype) < 0)
-            HDprintf("    couldn't close datatype\n");
+            printf("    couldn't close datatype\n");
     }
 
     return ret_value;
@@ -309,12 +309,12 @@ generate_random_datatype_float(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t
             break;
 
         default:
-            HDprintf("    invalid value for floating point type; should not happen\n");
+            printf("    invalid value for floating point type; should not happen\n");
             goto done;
     }
 
     if ((datatype = H5Tcopy(type_to_copy)) < 0) {
-        HDprintf("    couldn't copy predefined floating-point type\n");
+        printf("    couldn't copy predefined floating-point type\n");
         goto done;
     }
 
@@ -323,7 +323,7 @@ generate_random_datatype_float(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t
 done:
     if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) {
         if (H5Tclose(datatype) < 0)
-            HDprintf("    couldn't close datatype\n");
+            printf("    couldn't close datatype\n");
     }
 
     return ret_value;
@@ -344,12 +344,12 @@ generate_random_datatype_string(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t
     if (0 == (rand() % 2)) {
 #endif
     if ((datatype = H5Tcreate(H5T_STRING, (size_t)(rand() % STRING_TYPE_MAX_SIZE) + 1)) < 0) {
-        HDprintf("    couldn't create fixed-length string datatype\n");
+        printf("    couldn't create fixed-length string datatype\n");
         goto done;
     }
 
     if (H5Tset_strpad(datatype, H5T_STR_NULLPAD) < 0) {
-        HDprintf("    couldn't set H5T_STR_NULLPAD for fixed-length string type\n");
+        printf("    couldn't set H5T_STR_NULLPAD for fixed-length string type\n");
         goto done;
     }
 #if 0 /* Currently, all VL types are disabled */
@@ -358,20 +358,20 @@ generate_random_datatype_string(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t
 
             if ((datatype = H5Tcreate(H5T_STRING, H5T_VARIABLE)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create variable-length string datatype\n");
+                printf("    couldn't create variable-length string datatype\n");
                 goto done;
             }
 
             if (H5Tset_strpad(datatype, H5T_STR_NULLTERM) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set H5T_STR_NULLTERM for variable-length string type\n");
+                printf("    couldn't set H5T_STR_NULLTERM for variable-length string type\n");
                 goto done;
             }
     }
 #endif
 
     if (H5Tset_cset(datatype, H5T_CSET_ASCII) < 0) {
-        HDprintf("    couldn't set string datatype character set\n");
+        printf("    couldn't set string datatype character set\n");
         goto done;
     }
 
@@ -380,7 +380,7 @@ generate_random_datatype_string(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t
 done:
     if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) {
         if (H5Tclose(datatype) < 0)
-            HDprintf("    couldn't close datatype\n");
+            printf("    couldn't close datatype\n");
     }
 
     return ret_value;
@@ -400,7 +400,7 @@ generate_random_datatype_compound(H5T_class_t H5_ATTR_UNUSED parent_class, hbool
         compound_members[i] = H5I_INVALID_HID;
 
     if ((datatype = H5Tcreate(H5T_COMPOUND, 1)) < 0) {
-        HDprintf("    couldn't create compound datatype\n");
+        printf("    couldn't create compound datatype\n");
         goto done;
     }
 
@@ -413,24 +413,24 @@ generate_random_datatype_compound(H5T_class_t H5_ATTR_UNUSED parent_class, hbool
         HDsnprintf(member_name, 256, "compound_member%zu", i);
 
         if ((compound_members[i] = generate_random_datatype(H5T_COMPOUND, is_compact)) < 0) {
-            HDprintf("    couldn't create compound datatype member %zu\n", i);
+            printf("    couldn't create compound datatype member %zu\n", i);
             goto done;
         }
 
         if (!(member_size = H5Tget_size(compound_members[i]))) {
-            HDprintf("    couldn't get compound member %zu size\n", i);
+            printf("    couldn't get compound member %zu size\n", i);
             goto done;
         }
 
         compound_size += member_size;
 
         if (H5Tset_size(datatype, compound_size) < 0) {
-            HDprintf("    couldn't set size for compound datatype\n");
+            printf("    couldn't set size for compound datatype\n");
             goto done;
         }
 
         if (H5Tinsert(datatype, member_name, next_offset, compound_members[i]) < 0) {
-            HDprintf("    couldn't insert compound datatype member %zu\n", i);
+            printf("    couldn't insert compound datatype member %zu\n", i);
             goto done;
         }
 
@@ -442,13 +442,13 @@ generate_random_datatype_compound(H5T_class_t H5_ATTR_UNUSED parent_class, hbool
 done:
     for (size_t i = 0; i < COMPOUND_TYPE_MAX_MEMBERS; i++) {
         if (compound_members[i] > 0 && H5Tclose(compound_members[i]) < 0) {
-            HDprintf("    couldn't close compound member %zu\n", i);
+            printf("    couldn't close compound member %zu\n", i);
         }
     }
 
     if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) {
         if (H5Tclose(datatype) < 0)
-            HDprintf("    couldn't close datatype\n");
+            printf("    couldn't close datatype\n");
     }
 
     return ret_value;
@@ -464,7 +464,7 @@ generate_random_datatype_reference(H5T_class_t H5_ATTR_UNUSED parent_class, hboo
     if (0 == (rand() % 2)) {
 #endif
     if ((datatype = H5Tcopy(H5T_STD_REF_OBJ)) < 0) {
-        HDprintf("    couldn't copy object reference datatype\n");
+        printf("    couldn't copy object reference datatype\n");
         goto done;
     }
 #if 0 /* Region references are currently unsupported */
@@ -472,7 +472,7 @@ generate_random_datatype_reference(H5T_class_t H5_ATTR_UNUSED parent_class, hboo
     else {
         if ((datatype = H5Tcopy(H5T_STD_REF_DSETREG)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't copy region reference datatype\n");
+            printf("    couldn't copy region reference datatype\n");
             goto done;
         }
     }
@@ -483,7 +483,7 @@ generate_random_datatype_reference(H5T_class_t H5_ATTR_UNUSED parent_class, hboo
 done:
     if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) {
         if (H5Tclose(datatype) < 0)
-            HDprintf("    couldn't close datatype\n");
+            printf("    couldn't close datatype\n");
     }
 
     return ret_value;
@@ -498,14 +498,14 @@ generate_random_datatype_enum(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t H
     hid_t  ret_value        = H5I_INVALID_HID;
 
     if ((datatype = H5Tenum_create(H5T_NATIVE_INT)) < 0) {
-        HDprintf("    couldn't create enum datatype\n");
+        printf("    couldn't create enum datatype\n");
         goto done;
     }
 
     num_members = (size_t)(rand() % ENUM_TYPE_MAX_MEMBERS + 1);
 
     if (NULL == (enum_member_vals = HDmalloc(num_members * sizeof(int)))) {
-        HDprintf("    couldn't allocate space for enum members\n");
+        printf("    couldn't allocate space for enum members\n");
         goto done;
     }
 
@@ -529,7 +529,7 @@ generate_random_datatype_enum(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t H
         enum_member_vals[i] = enum_val;
 
         if (H5Tenum_insert(datatype, name, &enum_val) < 0) {
-            HDprintf("    couldn't insert member into enum datatype\n");
+            printf("    couldn't insert member into enum datatype\n");
             goto done;
         }
     }
@@ -541,7 +541,7 @@ done:
 
     if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) {
         if (H5Tclose(datatype) < 0)
-            HDprintf("    couldn't close datatype\n");
+            printf("    couldn't close datatype\n");
     }
 
     return ret_value;
@@ -559,7 +559,7 @@ generate_random_datatype_array(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t
     ndims = (unsigned)(rand() % ARRAY_TYPE_MAX_DIMS + 1);
 
     if (NULL == (array_dims = HDmalloc(ndims * sizeof(*array_dims)))) {
-        HDprintf("    couldn't allocate space for array datatype dims\n");
+        printf("    couldn't allocate space for array datatype dims\n");
         goto done;
     }
 
@@ -567,12 +567,12 @@ generate_random_datatype_array(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t
         array_dims[i] = (hsize_t)(rand() % MAX_DIM_SIZE + 1);
 
     if ((base_datatype = generate_random_datatype(H5T_ARRAY, is_compact)) < 0) {
-        HDprintf("    couldn't create array base datatype\n");
+        printf("    couldn't create array base datatype\n");
         goto done;
     }
 
     if ((datatype = H5Tarray_create2(base_datatype, ndims, array_dims)) < 0) {
-        HDprintf("    couldn't create array datatype\n");
+        printf("    couldn't create array datatype\n");
         goto done;
     }
 
@@ -583,12 +583,12 @@ done:
 
     if (base_datatype >= 0) {
         if (H5Tclose(base_datatype) < 0)
-            HDprintf("    couldn't close array base datatype\n");
+            printf("    couldn't close array base datatype\n");
     }
 
     if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) {
         if (H5Tclose(datatype) < 0)
-            HDprintf("    couldn't close datatype\n");
+            printf("    couldn't close datatype\n");
     }
 
     return ret_value;
@@ -608,8 +608,8 @@ generate_random_dataspace(int rank, const hsize_t *max_dims, hsize_t *dims_out,
     if (rank < 0)
         TEST_ERROR;
     if (is_compact && (rank > COMPACT_SPACE_MAX_DIMS)) {
-        HDprintf("    current rank of compact dataspace (%lld) exceeds maximum dimensionality (%lld)\n",
-                 (long long)rank, (long long)COMPACT_SPACE_MAX_DIMS);
+        printf("    current rank of compact dataspace (%lld) exceeds maximum dimensionality (%lld)\n",
+               (long long)rank, (long long)COMPACT_SPACE_MAX_DIMS);
         TEST_ERROR;
     }
 
@@ -643,12 +643,12 @@ create_test_container(char *filename, uint64_t vol_cap_flags)
     hid_t group_id = H5I_INVALID_HID;
 
     if (!(vol_cap_flags & H5VL_CAP_FLAG_FILE_BASIC)) {
-        HDprintf("   VOL connector doesn't support file creation\n");
+        printf("   VOL connector doesn't support file creation\n");
         goto error;
     }
 
     if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        HDprintf("    couldn't create testing container file '%s'\n", filename);
+        printf("    couldn't create testing container file '%s'\n", filename);
         goto error;
     }
 
@@ -658,49 +658,49 @@ create_test_container(char *filename, uint64_t vol_cap_flags)
          */
         if ((group_id = H5Gcreate2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >=
             0) {
-            HDprintf("    created container group for Group tests\n");
+            printf("    created container group for Group tests\n");
             H5Gclose(group_id);
         }
 
         if ((group_id = H5Gcreate2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                    H5P_DEFAULT)) >= 0) {
-            HDprintf("    created container group for Attribute tests\n");
+            printf("    created container group for Attribute tests\n");
             H5Gclose(group_id);
         }
 
         if ((group_id =
                  H5Gcreate2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
-            HDprintf("    created container group for Dataset tests\n");
+            printf("    created container group for Dataset tests\n");
             H5Gclose(group_id);
         }
 
         if ((group_id =
                  H5Gcreate2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
-            HDprintf("    created container group for Datatype tests\n");
+            printf("    created container group for Datatype tests\n");
             H5Gclose(group_id);
         }
 
         if ((group_id = H5Gcreate2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >=
             0) {
-            HDprintf("    created container group for Link tests\n");
+            printf("    created container group for Link tests\n");
             H5Gclose(group_id);
         }
 
         if ((group_id = H5Gcreate2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >=
             0) {
-            HDprintf("    created container group for Object tests\n");
+            printf("    created container group for Object tests\n");
             H5Gclose(group_id);
         }
 
         if ((group_id = H5Gcreate2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT,
                                    H5P_DEFAULT)) >= 0) {
-            HDprintf("    created container group for Miscellaneous tests\n");
+            printf("    created container group for Miscellaneous tests\n");
             H5Gclose(group_id);
         }
     }
 
     if (H5Fclose(file_id) < 0) {
-        HDprintf("    failed to close testing container\n");
+        printf("    failed to close testing container\n");
         goto error;
     }
 
@@ -729,23 +729,23 @@ prefix_filename(const char *prefix, const char *filename, char **filename_out)
     herr_t ret_value = SUCCEED;
 
     if (!prefix) {
-        HDprintf("    invalid file prefix\n");
+        printf("    invalid file prefix\n");
         ret_value = FAIL;
         goto done;
     }
     if (!filename || (*filename == '\0')) {
-        HDprintf("    invalid filename\n");
+        printf("    invalid filename\n");
         ret_value = FAIL;
         goto done;
     }
     if (!filename_out) {
-        HDprintf("    invalid filename_out buffer\n");
+        printf("    invalid filename_out buffer\n");
         ret_value = FAIL;
         goto done;
     }
 
     if (NULL == (out_buf = HDmalloc(H5_API_TEST_FILENAME_MAX_LENGTH))) {
-        HDprintf("    couldn't allocated filename buffer\n");
+        printf("    couldn't allocated filename buffer\n");
         ret_value = FAIL;
         goto done;
     }
@@ -772,7 +772,7 @@ remove_test_file(const char *prefix, const char *filename)
 
     if (prefix) {
         if (prefix_filename(prefix, filename, &prefixed_filename) < 0) {
-            HDprintf("    couldn't prefix filename\n");
+            printf("    couldn't prefix filename\n");
             ret_value = FAIL;
             goto done;
         }
@@ -783,7 +783,7 @@ remove_test_file(const char *prefix, const char *filename)
         test_file = filename;
 
     if (H5Fdelete(test_file, H5P_DEFAULT) < 0) {
-        HDprintf("    couldn't remove file '%s'\n", test_file);
+        printf("    couldn't remove file '%s'\n", test_file);
         ret_value = FAIL;
         goto done;
     }
diff --git a/test/API/tarray.c b/test/API/tarray.c
index 214a022..5780c66 100644
--- a/test/API/tarray.c
+++ b/test/API/tarray.c
@@ -1938,7 +1938,7 @@ test_compat(void)
     if (h5_driver_is_default_vfd_compatible(H5P_DEFAULT, &driver_is_default_compatible) < 0)
         TestErrPrintf("can't check if VFD is default VFD compatible\n");
     if (!driver_is_default_compatible) {
-        HDprintf(" -- SKIPPED --\n");
+        printf(" -- SKIPPED --\n");
         return;
     }
 
@@ -2194,7 +2194,7 @@ test_compat(void)
         CHECK_I(ret, "H5Fclose");
     } /* end if */
     else
-        HDprintf("***cannot open the pre-created compound datatype test file (%s)\n", testfile);
+        printf("***cannot open the pre-created compound datatype test file (%s)\n", testfile);
 
 } /* end test_compat() */
 #endif
diff --git a/test/API/tattr.c b/test/API/tattr.c
index 476e32b..43d76ab 100644
--- a/test/API/tattr.c
+++ b/test/API/tattr.c
@@ -576,7 +576,7 @@ test_attr_flush(hid_t fapl)
             TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n", rdata, 0.0);
     }
     else {
-        HDprintf("** SKIPPED attribute pre-read due to fill values not being supported **\n");
+        printf("** SKIPPED attribute pre-read due to fill values not being supported **\n");
     }
 
     ret = H5Awrite(att, H5T_NATIVE_DOUBLE, &wdata);
@@ -936,10 +936,10 @@ test_attr_compound_read(hid_t fapl)
     for (i = 0; i < ATTR4_DIM1; i++)
         for (j = 0; j < ATTR4_DIM2; j++)
             if (HDmemcmp(&attr_data4[i][j], &read_data4[i][j], sizeof(struct attr4_struct)) != 0) {
-                HDprintf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n",
-                         __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i);
-                HDprintf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n",
-                         __LINE__, i, j, attr_data4[i][j].d, i, j, read_data4[i][j].d);
+                printf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n",
+                       __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i);
+                printf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n",
+                       __LINE__, i, j, attr_data4[i][j].d, i, j, read_data4[i][j].d);
                 TestErrPrintf(
                     "%d: attribute data different: attr_data4[%d][%d].c=%c, read_data4[%d][%d].c=%c\n",
                     __LINE__, i, j, attr_data4[i][j].c, i, j, read_data4[i][j].c);
@@ -1082,8 +1082,8 @@ test_attr_scalar_read(hid_t fapl)
 
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_FLT_ABS_EQUAL(rdata, attr_data5))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Aread",
-                 (double)attr_data5, (double)rdata, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Aread",
+               (double)attr_data5, (double)rdata, (int)__LINE__, __FILE__);
 
     /* Get the attribute's dataspace */
     sid = H5Aget_space(attr);
@@ -7160,8 +7160,8 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx
 
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for iterate aren't "
-                 "supported with this connector\n");
+        printf("    API functions for iterate aren't "
+               "supported with this connector\n");
         return 1;
     }
 
diff --git a/test/API/testhdf5.c b/test/API/testhdf5.c
index 58cbfdf..5e0409c 100644
--- a/test/API/testhdf5.c
+++ b/test/API/testhdf5.c
@@ -377,13 +377,13 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu
             MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
             if (mpi_rank == 0)
-                HDprintf("*** Hint ***\n"
-                         "You can use environment variable HDF5_PARAPREFIX to "
-                         "run parallel test files in a\n"
-                         "different directory or to add file type prefix. e.g.,\n"
-                         "   HDF5_PARAPREFIX=pfs:/PFS/user/me\n"
-                         "   export HDF5_PARAPREFIX\n"
-                         "*** End of Hint ***\n");
+                printf("*** Hint ***\n"
+                       "You can use environment variable HDF5_PARAPREFIX to "
+                       "run parallel test files in a\n"
+                       "different directory or to add file type prefix. e.g.,\n"
+                       "   HDF5_PARAPREFIX=pfs:/PFS/user/me\n"
+                       "   export HDF5_PARAPREFIX\n"
+                       "*** End of Hint ***\n");
 
             explained = TRUE;
 #ifdef HDF5_PARAPREFIX
@@ -560,25 +560,25 @@ main(int argc, char *argv[])
     (void)argv;
 #endif
 
-    HDprintf("===================================\n");
-    HDprintf("HDF5 TESTS START\n");
-    HDprintf("===================================\n");
+    printf("===================================\n");
+    printf("HDF5 TESTS START\n");
+    printf("===================================\n");
 
     /* Initialize testing framework */
     /* TestInit(argv[0], NULL, NULL); */
 
     /* Tests are generally arranged from least to most complexity... */
     /* AddTest("config", test_configure, cleanup_configure, "Configure definitions", NULL); */
-    HDprintf("** CONFIGURE DEFINITIONS **\n");
+    printf("** CONFIGURE DEFINITIONS **\n");
     test_configure();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("metadata", test_metadata, cleanup_metadata, "Encoding/decoding metadata", NULL); */
 
     /* AddTest("checksum", test_checksum, cleanup_checksum, "Checksum algorithm", NULL); */
-    HDprintf("** CHECKSUM ALGORITHM **\n");
+    printf("** CHECKSUM ALGORITHM **\n");
     test_checksum();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("tst", test_tst, NULL,  "Ternary Search Trees", NULL); */
 
@@ -589,89 +589,89 @@ main(int argc, char *argv[])
     /* AddTest("refstr", test_refstr, NULL,  "Reference Counted Strings", NULL); */
 
     /* AddTest("file", test_file, cleanup_file, "Low-Level File I/O", NULL); */
-    HDprintf("** LOW-LEVEL FILE I/O **\n");
+    printf("** LOW-LEVEL FILE I/O **\n");
     test_file();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("objects", test_h5o, cleanup_h5o, "Generic Object Functions", NULL); */
-    HDprintf("** GENERIC OBJECT FUNCTIONS **\n");
+    printf("** GENERIC OBJECT FUNCTIONS **\n");
     test_h5o();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("h5s",  test_h5s,  cleanup_h5s,  "Dataspaces", NULL); */
-    HDprintf("** DATASPACES **\n");
+    printf("** DATASPACES **\n");
     test_h5s();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("coords",  test_coords,  cleanup_coords,  "Dataspace coordinates", NULL); */
-    HDprintf("** DATASPACE COORDINATES **\n");
+    printf("** DATASPACE COORDINATES **\n");
     test_coords();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("sohm", test_sohm, cleanup_sohm,  "Shared Object Header Messages", NULL); */
 
     /* AddTest("attr", test_attr, cleanup_attr,  "Attributes", NULL); */
-    HDprintf("** ATTRIBUTES **\n");
+    printf("** ATTRIBUTES **\n");
     test_attr();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("select", test_select, cleanup_select,  "Selections", NULL); */
-    HDprintf("** SELECTIONS **\n");
+    printf("** SELECTIONS **\n");
     test_select();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("time", test_time, cleanup_time,  "Time Datatypes", NULL); */
-    HDprintf("** TIME DATATYPES**\n");
+    printf("** TIME DATATYPES**\n");
     test_time();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("ref_deprec", test_reference_deprec, cleanup_reference_deprec,  "Deprecated References", NULL);
      */
 
     /* AddTest("ref", test_reference, cleanup_reference,  "References", NULL); */
-    HDprintf("** REFERENCES **\n");
+    printf("** REFERENCES **\n");
     test_reference();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("vltypes", test_vltypes, cleanup_vltypes,  "Variable-Length Datatypes", NULL); */
-    HDprintf("** VARIABLE-LENGTH DATATYPES **\n");
+    printf("** VARIABLE-LENGTH DATATYPES **\n");
     test_vltypes();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("vlstrings", test_vlstrings, cleanup_vlstrings,  "Variable-Length Strings", NULL); */
-    HDprintf("** VARIABLE-LENGTH STRINGS **\n");
+    printf("** VARIABLE-LENGTH STRINGS **\n");
     test_vlstrings();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("iterate", test_iterate, cleanup_iterate,  "Group & Attribute Iteration", NULL); */
-    HDprintf("** GROUP & ATTRIBUTE ITERATION **\n");
+    printf("** GROUP & ATTRIBUTE ITERATION **\n");
     test_iterate();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("array", test_array, cleanup_array,  "Array Datatypes", NULL); */
-    HDprintf("** ARRAY DATATYPES **\n");
+    printf("** ARRAY DATATYPES **\n");
     test_array();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("genprop", test_genprop, cleanup_genprop,  "Generic Properties", NULL); */
-    HDprintf("** GENERIC PROPERTIES **\n");
+    printf("** GENERIC PROPERTIES **\n");
     test_genprop();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("unicode", test_unicode, cleanup_unicode,  "UTF-8 Encoding", NULL); */
-    HDprintf("** UTF-8 ENCODING **\n");
+    printf("** UTF-8 ENCODING **\n");
     test_unicode();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("id", test_ids, NULL,  "User-Created Identifiers", NULL); */
-    HDprintf("** USER-CREATED IDENTIFIERS **\n");
+    printf("** USER-CREATED IDENTIFIERS **\n");
     test_ids();
-    HDprintf("\n");
+    printf("\n");
 
     /* AddTest("misc", test_misc, cleanup_misc,  "Miscellaneous", NULL); */
-    HDprintf("** MISCELLANEOUS **\n");
+    printf("** MISCELLANEOUS **\n");
     test_misc();
-    HDprintf("\n");
+    printf("\n");
 
     /* Display testing information */
     /* TestInfo(argv[0]); */
@@ -690,7 +690,7 @@ main(int argc, char *argv[])
     if (/* GetTestCleanup() && */ !getenv("HDF5_NOCLEANUP")) {
         /* TestCleanup(); */
 
-        HDprintf("TEST CLEANUP\n");
+        printf("TEST CLEANUP\n");
 
         H5E_BEGIN_TRY
         cleanup_configure();
@@ -712,7 +712,7 @@ main(int argc, char *argv[])
         cleanup_misc();
         H5E_END_TRY;
 
-        HDprintf("\n");
+        printf("\n");
     }
 
     /* Release test infrastructure */
@@ -721,11 +721,11 @@ main(int argc, char *argv[])
     /* Exit failure if errors encountered; else exit success. */
     /* No need to print anything since PerformTests() already does. */
     if (nerrors /* GetTestNumErrs() */ > 0) {
-        HDprintf("** HDF5 tests failed with %d errors **\n", nerrors);
+        printf("** HDF5 tests failed with %d errors **\n", nerrors);
         HDexit(EXIT_FAILURE);
     }
     else {
-        HDprintf("** HDF5 tests ran successfully **\n");
+        printf("** HDF5 tests ran successfully **\n");
         HDexit(EXIT_SUCCESS);
     }
 } /* end main() */
diff --git a/test/API/testhdf5.h b/test/API/testhdf5.h
index 3d945f8..e4aaacd 100644
--- a/test/API/testhdf5.h
+++ b/test/API/testhdf5.h
@@ -207,15 +207,15 @@
 #define TEST_STR      "Test"
 #define CLEAN_STR     "Cleanup"
 
-#define AT() HDprintf("   at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);
+#define AT() printf("   at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);
 #define TESTING(WHAT)                                                                                        \
     {                                                                                                        \
-        HDprintf("Testing %-62s", WHAT);                                                                     \
+        printf("Testing %-62s", WHAT);                                                                       \
         HDfflush(stdout);                                                                                    \
     }
 #define TESTING_2(WHAT)                                                                                      \
     {                                                                                                        \
-        HDprintf("  Testing %-60s", WHAT);                                                                   \
+        printf("  Testing %-60s", WHAT);                                                                     \
         HDfflush(stdout);                                                                                    \
     }
 #define PASSED()                                                                                             \
diff --git a/test/API/tfile.c b/test/API/tfile.c
index 12c57e6..5462467 100644
--- a/test/API/tfile.c
+++ b/test/API/tfile.c
@@ -5742,7 +5742,7 @@ test_libver_bounds_copy(void)
     CHECK_I(ret, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
diff --git a/test/API/tgenprop.c b/test/API/tgenprop.c
index c1ee8af..b22409a 100644
--- a/test/API/tgenprop.c
+++ b/test/API/tgenprop.c
@@ -703,8 +703,8 @@ test_genprop_basic_list(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
-                 (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
+               (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
 
     /* Close list */
     ret = H5Pclose(lid1);
@@ -796,8 +796,8 @@ test_genprop_basic_list_prop(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
-                 (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
+               (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
 
     /* Check values of temporary properties (set with regular values) */
     ret = H5Pget(lid1, PROP3_NAME, &prop3_value);
@@ -808,8 +808,8 @@ test_genprop_basic_list_prop(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
-                 *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
+               *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
 
     /* Delete permanent property */
     ret = H5Premove(lid1, PROP2_NAME);
@@ -845,8 +845,8 @@ test_genprop_basic_list_prop(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
-                 *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
+               *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
 
     /* Close list */
     ret = H5Pclose(lid1);
@@ -1253,8 +1253,8 @@ test_genprop_list_callback(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
-                 (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
+               (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
 
     /* Check values of temporary properties (set with regular values) */
     ret = H5Pget(lid1, PROP3_NAME, &prop3_value);
@@ -1268,8 +1268,8 @@ test_genprop_list_callback(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
-                 *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
+               *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
 
     /* Verify get callback information for properties tracked */
     VERIFY(prop1_cb_info.get_count, 1, "H5Pget");
diff --git a/test/API/th5s.c b/test/API/th5s.c
index d27e57c..3e403e7 100644
--- a/test/API/th5s.c
+++ b/test/API/th5s.c
@@ -213,7 +213,7 @@ test_h5s_basic(void)
             CHECK_I(ret, "H5Fclose");
         }
         else
-            HDprintf("***cannot open the pre-created H5S_MAX_RANK test file (%s)\n", testfile);
+            printf("***cannot open the pre-created H5S_MAX_RANK test file (%s)\n", testfile);
     }
 #endif
     /* Verify that incorrect dimensions don't work */
@@ -723,7 +723,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
         }
@@ -744,7 +744,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata_short[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]);
                 }
             }
         }
@@ -821,7 +821,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
 
@@ -846,8 +846,8 @@ test_h5s_zero_dim(void)
                 for (k = 0; k < SPACE1_DIM3; k++) {
                     if (rdata_real[i][j][k] != wdata_real[i][j][k]) {
                         H5_FAILED();
-                        HDprintf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k,
-                                 rdata_real[i][j][k], wdata_real[i][j][k]);
+                        printf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k,
+                               rdata_real[i][j][k], wdata_real[i][j][k]);
                     }
                 }
             }
@@ -870,7 +870,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
         if ((vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) &&
@@ -919,7 +919,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
 
@@ -962,7 +962,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
         }
@@ -993,7 +993,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
         }
@@ -1014,7 +1014,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata_short[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]);
                 }
             }
         }
@@ -1074,8 +1074,8 @@ test_h5s_zero_dim(void)
                 for (k = 0; k < SPACE1_DIM3; k++) {
                     if (rdata_real[i][j][k] != wdata_real[i][j][k]) {
                         H5_FAILED();
-                        HDprintf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k,
-                                 rdata_real[i][j][k], wdata_real[i][j][k]);
+                        printf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k,
+                               rdata_real[i][j][k], wdata_real[i][j][k]);
                     }
                 }
             }
@@ -1161,7 +1161,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
         }
@@ -1198,7 +1198,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata_short[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]);
                 }
             }
         }
@@ -2479,10 +2479,10 @@ test_h5s_compound_scalar_read(void)
     ret = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
     CHECK(ret, FAIL, "H5Dread");
     if (HDmemcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) {
-        HDprintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c1);
-        HDprintf("scalar data different: space4_data.u=%u, read_data4.u=%u\n", space4_data.u, rdata.u);
-        HDprintf("scalar data different: space4_data.f=%f, read_data4.f=%f\n", (double)space4_data.f,
-                 (double)rdata.f);
+        printf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c1);
+        printf("scalar data different: space4_data.u=%u, read_data4.u=%u\n", space4_data.u, rdata.u);
+        printf("scalar data different: space4_data.f=%f, read_data4.f=%f\n", (double)space4_data.f,
+               (double)rdata.f);
         TestErrPrintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1,
                       rdata.c2);
     } /* end if */
diff --git a/test/API/titerate.c b/test/API/titerate.c
index e528803..343c601 100644
--- a/test/API/titerate.c
+++ b/test/API/titerate.c
@@ -92,8 +92,8 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR
 
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) {
         SKIPPED();
-        HDprintf("    API functions for iterate aren't "
-                 "supported with this connector\n");
+        printf("    API functions for iterate aren't "
+               "supported with this connector\n");
         return 1;
     }
 
@@ -115,7 +115,7 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR
             return (count2 > 10 ? 1 : 0);
 
         default:
-            HDprintf("invalid iteration command");
+            printf("invalid iteration command");
             return (-1);
     } /* end switch */
 } /* end liter_cb() */
@@ -415,7 +415,7 @@ aiter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5A_info_t H5_ATTR_
             return (count2 > 10 ? 1 : 0);
 
         default:
-            HDprintf("invalid iteration command");
+            printf("invalid iteration command");
             return (-1);
     } /* end switch */
 } /* end aiter_cb() */
@@ -619,8 +619,8 @@ liter_cb2(hid_t loc_id, const char *name, const H5L_info2_t H5_ATTR_UNUSED *link
 
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for iterate and basic links aren't "
-                 "supported with this connector\n");
+        printf("    API functions for iterate and basic links aren't "
+               "supported with this connector\n");
         return 1;
     }
 
@@ -1068,7 +1068,7 @@ test_corrupted_attnamelen(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
diff --git a/test/API/tmisc.c b/test/API/tmisc.c
index 6e323e1..4696bda 100644
--- a/test/API/tmisc.c
+++ b/test/API/tmisc.c
@@ -1044,16 +1044,16 @@ test_misc5(void)
 
     /* Verify the correct information was read in */
     for (i = 0; i < (buf.len); i++) {
-        /* HDprintf("[%d]=%d\n",i, ((misc5_struct1 *)(buf.p))[i].st1_el1); */
+        /* printf("[%d]=%d\n",i, ((misc5_struct1 *)(buf.p))[i].st1_el1); */
         VERIFY(((misc5_struct1 *)(buf.p))[i].st1_el1, MISC5_DBGELVAL1, "H5Dread");
         for (j = 0; j < (((misc5_struct1 *)(buf.p))[i].st1_el2.len); j++) {
-            /* HDprintf("   [%d]=%d\n",j, ((misc5_struct2 *)(((misc5_struct1 *)
+            /* printf("   [%d]=%d\n",j, ((misc5_struct2 *)(((misc5_struct1 *)
              * (buf.p))[i].st1_el2.p))[j].st2_el1); */
             VERIFY(((misc5_struct2 *)(((misc5_struct1 *)(buf.p))[i].st1_el2.p))[j].st2_el1, MISC5_DBGELVAL2,
                    "H5Dread");
             for (k = 0; k < (((misc5_struct2 *)(((misc5_struct1 *)(buf.p))[i].st1_el2.p))[j].st2_el2.len);
                  k++) {
-                /* HDprintf("      [%d]=%d\n",k, ((misc5_struct3 *)(((misc5_struct2 *) (((misc5_struct1
+                /* printf("      [%d]=%d\n",k, ((misc5_struct3 *)(((misc5_struct2 *) (((misc5_struct1
                  * *)(buf.p))[i].  st1_el2.p))[j].st2_el2.p))[k].st3_el1); */
                 VERIFY(((misc5_struct3 *)(((misc5_struct2 *)(((misc5_struct1 *)(buf.p))[i].st1_el2.p))[j]
                                               .st2_el2.p))[k]
@@ -1863,7 +1863,7 @@ test_misc10(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
@@ -3792,7 +3792,7 @@ test_misc20(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
@@ -5099,7 +5099,7 @@ test_misc25b(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
@@ -5362,7 +5362,7 @@ test_misc27(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
@@ -5590,7 +5590,7 @@ test_misc29(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
@@ -5889,7 +5889,7 @@ test_misc33(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
@@ -6192,7 +6192,7 @@ test_misc37(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
diff --git a/test/API/trefer.c b/test/API/trefer.c
index c09b586..ea8888c 100644
--- a/test/API/trefer.c
+++ b/test/API/trefer.c
@@ -3266,7 +3266,7 @@ test_reference_perf(void)
         CHECK(ret, FAIL, "H5Rdestroy");
     }
     if (VERBOSE_MED)
-        HDprintf("--- Object reference create time: %lfs\n", t / MAX_ITER_CREATE);
+        printf("--- Object reference create time: %lfs\n", t / MAX_ITER_CREATE);
 
     /* Create reference to dataset */
     ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, &wbuf[0]);
@@ -3285,7 +3285,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Object reference  write time: %lfs\n", t / MAX_ITER_WRITE);
+        printf("--- Object reference  write time: %lfs\n", t / MAX_ITER_WRITE);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -3304,7 +3304,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Deprecated object reference create time: %lfs\n", t / MAX_ITER_CREATE);
+        printf("--- Deprecated object reference create time: %lfs\n", t / MAX_ITER_CREATE);
 
     /* Create reference to dataset */
     ret = H5Rcreate(&wbuf_deprec[0], fid1, "/Group1/Dataset1", H5R_OBJECT1, H5I_INVALID_HID);
@@ -3320,7 +3320,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Deprecated object reference  write time: %lfs\n", t / MAX_ITER_WRITE);
+        printf("--- Deprecated object reference  write time: %lfs\n", t / MAX_ITER_WRITE);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -3342,7 +3342,7 @@ test_reference_perf(void)
         CHECK(ret, FAIL, "H5Rdestroy");
     }
     if (VERBOSE_MED)
-        HDprintf("--- Region reference create time: %lfs\n", t / MAX_ITER_CREATE);
+        printf("--- Region reference create time: %lfs\n", t / MAX_ITER_CREATE);
 
     /* Store first dataset region */
     ret = H5Rcreate_region(fid1, "/Group1/Dataset1", sid1, H5P_DEFAULT, &wbuf_reg[0]);
@@ -3358,7 +3358,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Region reference  write time: %lfs\n", t / MAX_ITER_WRITE);
+        printf("--- Region reference  write time: %lfs\n", t / MAX_ITER_WRITE);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -3378,7 +3378,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Deprecated region reference create time: %lfs\n", t / MAX_ITER_CREATE);
+        printf("--- Deprecated region reference create time: %lfs\n", t / MAX_ITER_CREATE);
 
     t = 0;
     for (i = 0; i < MAX_ITER_WRITE; i++) {
@@ -3390,7 +3390,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Deprecated region reference  write time: %lfs\n", t / MAX_ITER_WRITE);
+        printf("--- Deprecated region reference  write time: %lfs\n", t / MAX_ITER_WRITE);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -3424,7 +3424,7 @@ test_reference_perf(void)
         CHECK(ret, FAIL, "H5Rdestroy");
     }
     if (VERBOSE_MED)
-        HDprintf("--- Object reference read time: %lfs\n", t / MAX_ITER_READ);
+        printf("--- Object reference read time: %lfs\n", t / MAX_ITER_READ);
 
     /* Read selection from disk */
     ret = H5Dread(dataset, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf);
@@ -3470,7 +3470,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Deprecated object reference read time: %lfs\n", t / MAX_ITER_READ);
+        printf("--- Deprecated object reference read time: %lfs\n", t / MAX_ITER_READ);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -3492,7 +3492,7 @@ test_reference_perf(void)
         CHECK(ret, FAIL, "H5Rdestroy");
     }
     if (VERBOSE_MED)
-        HDprintf("--- Region reference read time: %lfs\n", t / MAX_ITER_READ);
+        printf("--- Region reference read time: %lfs\n", t / MAX_ITER_READ);
 
     /* Read selection from disk */
     ret = H5Dread(dataset, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf_reg);
@@ -3516,7 +3516,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Deprecated region reference read time: %lfs\n", t / MAX_ITER_READ);
+        printf("--- Deprecated region reference read time: %lfs\n", t / MAX_ITER_READ);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
diff --git a/test/API/tselect.c b/test/API/tselect.c
index 619df42..34c90c3 100644
--- a/test/API/tselect.c
+++ b/test/API/tselect.c
@@ -1390,10 +1390,10 @@ test_select_hyper_stride(hid_t xfer_plist)
         tbuf  = wbuf + loc1[i];
         tbuf2 = rbuf + loc2[i];
         if (*tbuf != *tbuf2) {
-            HDprintf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n", __LINE__, i,
-                     (int)loc1[i], i, (int)loc2[i]);
-            HDprintf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n", (void *)wbuf, (void *)tbuf, (void *)rbuf,
-                     (void *)tbuf2);
+            printf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n", __LINE__, i, (int)loc1[i],
+                   i, (int)loc2[i]);
+            printf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n", (void *)wbuf, (void *)tbuf, (void *)rbuf,
+                   (void *)tbuf2);
             TestErrPrintf("*tbuf=%u, *tbuf2=%u\n", (unsigned)*tbuf, (unsigned)*tbuf2);
         } /* end if */
     }     /* end for */
@@ -1835,14 +1835,14 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist)
                         (k >= start[2] && k < (start[2] + count[2])) &&
                         (l >= start[3] && l < (start[3] + count[3]))) {
                         if (*tbuf != *tbuf2) {
-                            HDprintf("Error: hyperslab values don't match!\n");
+                            printf("Error: hyperslab values don't match!\n");
                             TestErrPrintf("Line: %d, i=%u, j=%u, k=%u, l=%u, *tbuf=%u,*tbuf2=%u\n", __LINE__,
                                           i, j, k, l, (unsigned)*tbuf, (unsigned)*tbuf2);
                         } /* end if */
                     }     /* end if */
                     else {
                         if (*tbuf2 != 0) {
-                            HDprintf("Error: invalid data in read buffer!\n");
+                            printf("Error: invalid data in read buffer!\n");
                             TestErrPrintf("Line: %d, i=%u, j=%u, k=%u, l=%u, *tbuf=%u,*tbuf2=%u\n", __LINE__,
                                           i, j, k, l, (unsigned)*tbuf, (unsigned)*tbuf2);
                         } /* end if */
@@ -5316,10 +5316,10 @@ test_select_hyper_union_stagger(void)
     /* Verify input data */
     for (i = 0; i < 8; i++) {
         if (data[input_loc[i][0]][input_loc[i][1]] != data_out[output_loc[i][0]][output_loc[i][1]]) {
-            HDprintf("input data #%d is wrong!\n", i);
-            HDprintf("input_loc=[%d][%d]\n", input_loc[i][0], input_loc[i][1]);
-            HDprintf("output_loc=[%d][%d]\n", output_loc[i][0], output_loc[i][1]);
-            HDprintf("data=%d\n", data[input_loc[i][0]][input_loc[i][1]]);
+            printf("input data #%d is wrong!\n", i);
+            printf("input_loc=[%d][%d]\n", input_loc[i][0], input_loc[i][1]);
+            printf("output_loc=[%d][%d]\n", output_loc[i][0], output_loc[i][1]);
+            printf("data=%d\n", data[input_loc[i][0]][input_loc[i][1]]);
             TestErrPrintf("data_out=%d\n", data_out[output_loc[i][0]][output_loc[i][1]]);
         } /* end if */
     }     /* end for */
@@ -5795,14 +5795,14 @@ test_select_hyper_and_2d(void)
         for (j = 0; j < SPACE2_DIM2; j++, tbuf++) {
             if ((i >= 5 && i <= 9) && (j >= 5 && j <= 9)) {
                 if (*tbuf != *tbuf2)
-                    HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__,
-                             i, j, (int)*tbuf, (int)*tbuf2);
+                    printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__,
+                           i, j, (int)*tbuf, (int)*tbuf2);
                 tbuf2++;
             } /* end if */
             else {
                 if (*tbuf != 0)
-                    HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j,
-                             (int)*tbuf);
+                    printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j,
+                           (int)*tbuf);
             } /* end else */
         }     /* end for */
 
@@ -5936,14 +5936,14 @@ test_select_hyper_xor_2d(void)
                 ((i >= 5 && i <= 9) && ((j >= 0 && j <= 4) || (j >= 10 && j <= 14))) ||
                 ((i >= 10 && i <= 14) && (j >= 5 && j <= 14))) {
                 if (*tbuf != *tbuf2)
-                    HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__,
-                             i, j, (int)*tbuf, (int)*tbuf2);
+                    printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__,
+                           i, j, (int)*tbuf, (int)*tbuf2);
                 tbuf2++;
             } /* end if */
             else {
                 if (*tbuf != 0)
-                    HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j,
-                             (int)*tbuf);
+                    printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j,
+                           (int)*tbuf);
             } /* end else */
         }     /* end for */
 
@@ -6075,14 +6075,14 @@ test_select_hyper_notb_2d(void)
         for (j = 0; j < SPACE2_DIM2; j++, tbuf++) {
             if (((i >= 0 && i <= 4) && (j >= 0 && j <= 9)) || ((i >= 5 && i <= 9) && (j >= 0 && j <= 4))) {
                 if (*tbuf != *tbuf2)
-                    HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__,
-                             i, j, (int)*tbuf, (int)*tbuf2);
+                    printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__,
+                           i, j, (int)*tbuf, (int)*tbuf2);
                 tbuf2++;
             } /* end if */
             else {
                 if (*tbuf != 0)
-                    HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j,
-                             (int)*tbuf);
+                    printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j,
+                           (int)*tbuf);
             } /* end else */
         }     /* end for */
 
@@ -6262,14 +6262,14 @@ test_select_hyper_iter2(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned ndim
 
     if (*tbuf != **tbuf2) {
         TestErrPrintf("Error in hyperslab iteration!\n");
-        HDprintf("location: { ");
+        printf("location: { ");
         for (u = 0; u < ndim; u++) {
-            HDprintf("%2d", (int)point[u]);
+            printf("%2d", (int)point[u]);
             if (u < (ndim - 1))
-                HDprintf(", ");
+                printf(", ");
         } /* end for */
-        HDprintf("}\n");
-        HDprintf("*tbuf=%d, **tbuf2=%d\n", *tbuf, **tbuf2);
+        printf("}\n");
+        printf("*tbuf=%d, **tbuf2=%d\n", *tbuf, **tbuf2);
         return (-1);
     } /* end if */
     else {
@@ -16148,7 +16148,7 @@ test_select(void)
     test_select_hyper_contig_dr(H5T_STD_U16BE, H5P_DEFAULT);
     test_select_hyper_contig_dr(H5T_STD_U16BE, plist_id);
 #else
-    HDprintf("** SKIPPED a test due to file creation issues\n");
+    printf("** SKIPPED a test due to file creation issues\n");
 #endif
 #if 0
     test_select_hyper_checker_board_dr(H5T_STD_U16LE, H5P_DEFAULT);
@@ -16156,7 +16156,7 @@ test_select(void)
     test_select_hyper_checker_board_dr(H5T_STD_U16BE, H5P_DEFAULT);
     test_select_hyper_checker_board_dr(H5T_STD_U16BE, plist_id);
 #else
-    HDprintf("** SKIPPED a test due to assertion in HDF5\n");
+    printf("** SKIPPED a test due to assertion in HDF5\n");
 #endif
     test_select_hyper_copy();    /* Test hyperslab selection copying code */
     test_select_point_copy();    /* Test point selection copying code */
@@ -16261,7 +16261,7 @@ test_select(void)
     test_select_hyper_chunk_offset();
     test_select_hyper_chunk_offset2();
 #else
-    HDprintf("** SKIPPED a test due to assertion in HDF5\n");
+    printf("** SKIPPED a test due to assertion in HDF5\n");
 #endif
 
     /* Test selection bounds with & without offsets */
diff --git a/test/API/ttime.c b/test/API/ttime.c
index 74128fd..7735aad 100644
--- a/test/API/ttime.c
+++ b/test/API/ttime.c
@@ -176,13 +176,13 @@ test_time_io(void)
     tid = H5Dget_type(dsid);
     CHECK(tid, FAIL, "H5Dget_type");
     if (H5Tget_class(tid) == H5T_TIME)
-        HDfprintf(stderr, "datatype class is H5T_TIME\n");
+        fprintf(stderr, "datatype class is H5T_TIME\n");
     status = H5Tclose(tid);
     CHECK(status, FAIL, "H5Tclose");
 
     status = H5Dread(dsid, H5T_UNIX_D32LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &timethen);
     CHECK(status, FAIL, "H5Dread");
-    HDfprintf(stderr, "time written was: %s\n", HDctime(&timethen));
+    fprintf(stderr, "time written was: %s\n", HDctime(&timethen));
 
     status = H5Dclose(dsid);
     CHECK(status, FAIL, "H5Dclose");
diff --git a/test/API/tunicode.c b/test/API/tunicode.c
index 04d0d8b..326de86 100644
--- a/test/API/tunicode.c
+++ b/test/API/tunicode.c
@@ -783,15 +783,15 @@ dump_string(const char *string)
     size_t length;
     size_t x;
 
-    HDprintf("The string was:\n %s", string);
-    HDprintf("Or in hex:\n");
+    printf("The string was:\n %s", string);
+    printf("Or in hex:\n");
 
     length = HDstrlen(string);
 
     for (x = 0; x < length; x++)
-        HDprintf("%x ", string[x] & (0x000000FF));
+        printf("%x ", string[x] & (0x000000FF));
 
-    HDprintf("\n");
+    printf("\n");
 }
 
 /* Main test.
diff --git a/test/accum.c b/test/accum.c
index ebd7a90..85e6179 100644
--- a/test/accum.c
+++ b/test/accum.c
@@ -1965,7 +1965,7 @@ test_random_write(H5F_t *f)
     seed = (unsigned)HDtime(NULL);
 #if 0
 /* seed = (unsigned)1155438845; */
-HDfprintf(stderr, "Random # seed was: %u\n", seed);
+fprintf(stderr, "Random # seed was: %u\n", seed);
 #endif
     HDsrandom(seed);
 
@@ -2067,7 +2067,7 @@ error:
     HDfree(off);
     HDfree(len);
 
-    HDfprintf(stderr, "Random # seed was: %u\n", seed);
+    fprintf(stderr, "Random # seed was: %u\n", seed);
     return 1;
 } /* end test_random_write() */
 
@@ -2238,7 +2238,7 @@ test_swmr_write_big(hbool_t newest_format)
         ZeroMemory(&pi, sizeof(pi));
 
         if (0 == CreateProcess(NULL, SWMR_READER, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) {
-            HDprintf("CreateProcess failed (%d).\n", GetLastError());
+            printf("CreateProcess failed (%d).\n", GetLastError());
             FAIL_STACK_ERROR;
         }
 
@@ -2272,7 +2272,7 @@ test_swmr_write_big(hbool_t newest_format)
             char *const new_argv[]    = {swmr_reader, NULL};
             /* Run the reader */
             status = execv(SWMR_READER, new_argv);
-            HDprintf("errno from execv = %s\n", HDstrerror(errno));
+            printf("errno from execv = %s\n", HDstrerror(errno));
             FAIL_STACK_ERROR;
         } /* end if */
 
@@ -2355,31 +2355,31 @@ accum_printf(const H5F_t *f)
 {
     H5F_meta_accum_t *accum = &f->shared->accum;
 
-    HDprintf("\n");
-    HDprintf("Current contents of accumulator:\n");
+    printf("\n");
+    printf("Current contents of accumulator:\n");
     if (accum->alloc_size == 0) {
-        HDprintf("=====================================================\n");
-        HDprintf(" No accumulator allocated.\n");
-        HDprintf("=====================================================\n");
+        printf("=====================================================\n");
+        printf(" No accumulator allocated.\n");
+        printf("=====================================================\n");
     }
     else {
-        HDprintf("=====================================================\n");
-        HDprintf(" accumulator allocated size == %zu\n", accum->alloc_size);
-        HDprintf(" accumulated data size      == %zu\n", accum->size);
-        HDfprintf(stdout, " accumulator dirty?         == %s\n", accum->dirty ? "TRUE" : "FALSE");
-        HDprintf("=====================================================\n");
-        HDfprintf(stdout, " start of accumulated data, loc = %" PRIuHADDR "\n", accum->loc);
+        printf("=====================================================\n");
+        printf(" accumulator allocated size == %zu\n", accum->alloc_size);
+        printf(" accumulated data size      == %zu\n", accum->size);
+        fprintf(stdout, " accumulator dirty?         == %s\n", accum->dirty ? "TRUE" : "FALSE");
+        printf("=====================================================\n");
+        fprintf(stdout, " start of accumulated data, loc = %" PRIuHADDR "\n", accum->loc);
         if (accum->dirty) {
-            HDfprintf(stdout, " start of dirty region, loc = %" PRIuHADDR "\n",
-                      (haddr_t)(accum->loc + accum->dirty_off));
-            HDfprintf(stdout, " end of dirty region,   loc = %" PRIuHADDR "\n",
-                      (haddr_t)(accum->loc + accum->dirty_off + accum->dirty_len));
+            fprintf(stdout, " start of dirty region, loc = %" PRIuHADDR "\n",
+                    (haddr_t)(accum->loc + accum->dirty_off));
+            fprintf(stdout, " end of dirty region,   loc = %" PRIuHADDR "\n",
+                    (haddr_t)(accum->loc + accum->dirty_off + accum->dirty_len));
         } /* end if */
-        HDfprintf(stdout, " end of accumulated data,   loc = %" PRIuHADDR "\n",
-                  (haddr_t)(accum->loc + accum->size));
-        HDfprintf(stdout, " end of accumulator allocation,   loc = %" PRIuHADDR "\n",
-                  (haddr_t)(accum->loc + accum->alloc_size));
-        HDprintf("=====================================================\n");
+        fprintf(stdout, " end of accumulated data,   loc = %" PRIuHADDR "\n",
+                (haddr_t)(accum->loc + accum->size));
+        fprintf(stdout, " end of accumulator allocation,   loc = %" PRIuHADDR "\n",
+                (haddr_t)(accum->loc + accum->alloc_size));
+        printf("=====================================================\n");
     }
-    HDprintf("\n\n");
+    printf("\n\n");
 } /* accum_printf() */
diff --git a/test/app_ref.c b/test/app_ref.c
index 68b4e5b..af91749 100644
--- a/test/app_ref.c
+++ b/test/app_ref.c
@@ -72,9 +72,9 @@ Abrt_Handler(int H5_ATTR_UNUSED sig)
 
     const char *string = " ID reference count: ";
     for (i = 0; i < T_NUMCLASSES; i++) {
-        HDfprintf(stderr, "%s%s", IDNAME[i], string);
+        fprintf(stderr, "%s%s", IDNAME[i], string);
         n = (int)(strlen(IDNAME[i]) + strlen(string));
-        HDfprintf(stderr, "%*d\n", (n < ERR_WIDTH) ? (ERR_WIDTH - n) : 0, rc[i]);
+        fprintf(stderr, "%*d\n", (n < ERR_WIDTH) ? (ERR_WIDTH - n) : 0, rc[i]);
     }
 }
 
diff --git a/test/big.c b/test/big.c
index 0311a93..07f16fa 100644
--- a/test/big.c
+++ b/test/big.c
@@ -356,12 +356,12 @@ writer(char *filename, hid_t fapl, fsizes_t testsize, int wrt_n)
 
         case NO_FILE:
             /* what to do?? */
-            HDfprintf(stdout, "Unexpected file size of NO_FILE\n");
+            fprintf(stdout, "Unexpected file size of NO_FILE\n");
             goto error;
             break;
 
         default:
-            HDfprintf(stdout, "Unexpected file size(%d)\n", testsize);
+            fprintf(stdout, "Unexpected file size(%d)\n", testsize);
             goto error;
             break;
     }
@@ -404,7 +404,7 @@ writer(char *filename, hid_t fapl, fsizes_t testsize, int wrt_n)
     for (i = 0; i < wrt_n; i++) {
         /* start position must be at least hs_size from the end */
         hs_start[0] = randll(size2[0] - hs_size[0], i);
-        HDfprintf(out, "#%03d 0x%016" PRIxHSIZE "\n", i, hs_start[0]);
+        fprintf(out, "#%03d 0x%016" PRIxHSIZE "\n", i, hs_start[0]);
         if (H5Sselect_hyperslab(space2, H5S_SELECT_SET, hs_start, NULL, hs_size, NULL) < 0)
             goto error;
         for (j = 0; j < WRT_SIZE; j++) {
@@ -497,7 +497,7 @@ reader(char *filename, hid_t fapl)
             break;
         i            = (int)HDstrtol(ln + 1, &s, 10);
         hs_offset[0] = HDstrtoull(s, NULL, 0);
-        HDfprintf(stdout, "#%03d 0x%016" PRIxHSIZE "%47s", i, hs_offset[0], "");
+        fprintf(stdout, "#%03d 0x%016" PRIxHSIZE "%47s", i, hs_offset[0], "");
         HDfflush(stdout);
 
         if (H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL) < 0)
@@ -514,7 +514,7 @@ reader(char *filename, hid_t fapl)
         }
         if (zero) {
             H5_FAILED();
-            HDprintf("    %d zero%s\n", zero, 1 == zero ? "" : "s");
+            printf("    %d zero%s\n", zero, 1 == zero ? "" : "s");
         }
         else if (wrong) {
             SKIPPED();
@@ -570,18 +570,18 @@ error:
 static void
 usage(void)
 {
-    HDfprintf(stdout,
-              "Usage: big [-h] [-c] [-fsize <fsize>}\n"
-              "\t-h\tPrint the help page\n"
-              "\t-c\tFile system Checking skipped.  Caution: this test generates\n"
-              "\t\tmany big files and may fill up the file system.\n"
-              "\t-fsize\tChange family size default to <fsize> where <fsize> is\n"
-              "\t\ta positive float point number.  Default value is %" PRIuHSIZE ".\n"
-              "Examples:\n"
-              "\t big -fsize 2.1e9 \t# test with file size just under 2GB\n"
-              "\t big -fsize 2.2e9 \t# test with file size just above 2GB\n"
-              "\t Be sure the file system can support the file size requested\n",
-              (hsize_t)FAMILY_SIZE);
+    fprintf(stdout,
+            "Usage: big [-h] [-c] [-fsize <fsize>}\n"
+            "\t-h\tPrint the help page\n"
+            "\t-c\tFile system Checking skipped.  Caution: this test generates\n"
+            "\t\tmany big files and may fill up the file system.\n"
+            "\t-fsize\tChange family size default to <fsize> where <fsize> is\n"
+            "\t\ta positive float point number.  Default value is %" PRIuHSIZE ".\n"
+            "Examples:\n"
+            "\t big -fsize 2.1e9 \t# test with file size just under 2GB\n"
+            "\t big -fsize 2.2e9 \t# test with file size just above 2GB\n"
+            "\t Be sure the file system can support the file size requested\n",
+            (hsize_t)FAMILY_SIZE);
 }
 
 static int
@@ -592,7 +592,7 @@ test_sec2(hid_t fapl)
 
     testsize = supports_big();
     if (testsize == NO_FILE) {
-        HDfprintf(stdout, "Test for sec2 is skipped because file system does not support big files.\n");
+        fprintf(stdout, "Test for sec2 is skipped because file system does not support big files.\n");
         goto quit;
     }
     /* Test big file with the SEC2 driver */
@@ -627,7 +627,7 @@ test_stdio(hid_t fapl)
 
     testsize = supports_big();
     if (testsize == NO_FILE) {
-        HDfprintf(stdout, "Test for stdio is skipped because file system does not support big files.\n");
+        fprintf(stdout, "Test for stdio is skipped because file system does not support big files.\n");
         goto quit;
     }
     HDputs("\nTesting big file with the STDIO Driver ");
@@ -744,7 +744,7 @@ main(int ac, char **av)
                 family_size_def = (hsize_t)HDstrtoull(*av, NULL, 0);
             }
             else {
-                HDprintf("***Missing fsize value***\n");
+                printf("***Missing fsize value***\n");
                 usage();
                 return 1;
             }
@@ -777,7 +777,7 @@ main(int ac, char **av)
     seed = (unsigned long)HDtime(NULL);
 #if 0
     /* seed = (unsigned long)1155438845; */
-    HDfprintf(stderr, "Random # seed was: %lu\n", seed);
+    fprintf(stderr, "Random # seed was: %lu\n", seed);
 #endif
     HDsrandom((unsigned)seed);
 
diff --git a/test/bittests.c b/test/bittests.c
index 285f404..13ad749 100644
--- a/test/bittests.c
+++ b/test/bittests.c
@@ -85,13 +85,13 @@ test_find(void)
         n         = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, TRUE);
         if ((ssize_t)i != n) {
             H5_FAILED();
-            HDprintf("    Test for set bit %d failed (lsb)!\n", i);
+            printf("    Test for set bit %d failed (lsb)!\n", i);
             goto failed;
         }
         n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_MSB, TRUE);
         if ((ssize_t)i != n) {
             H5_FAILED();
-            HDprintf("    Test for set bit %d failed (msb)!\n", i);
+            printf("    Test for set bit %d failed (msb)!\n", i);
             goto failed;
         }
     }
@@ -118,13 +118,13 @@ test_find(void)
         n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, FALSE);
         if ((ssize_t)i != n) {
             H5_FAILED();
-            HDprintf("    Test for clear bit %d failed (lsb)!\n", i);
+            printf("    Test for clear bit %d failed (lsb)!\n", i);
             goto failed;
         }
         n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_MSB, FALSE);
         if ((ssize_t)i != n) {
             H5_FAILED();
-            HDprintf("    Test for clear bit %d failed (lsb)!\n", i);
+            printf("    Test for clear bit %d failed (lsb)!\n", i);
             goto failed;
         }
     }
@@ -133,10 +133,10 @@ test_find(void)
     return 0;
 
 failed:
-    HDprintf("    v = 0x");
+    printf("    v = 0x");
     for (i = 0; i < (int)sizeof(v1); i++)
-        HDprintf("%02x", v1[i]);
-    HDprintf("\n");
+        printf("%02x", v1[i]);
+    printf("\n");
     return -1;
 }
 
@@ -192,9 +192,9 @@ test_copy(void)
         n = H5T__bit_find(v2, (size_t)0, 8 * sizeof(v2), H5T_BIT_LSB, 1);
         if (size > 0 && n != (ssize_t)d_offset) {
             H5_FAILED();
-            HDprintf("    Unable to find first copied bit in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to find first copied bit in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (0 == size && n >= 0) {
@@ -205,9 +205,9 @@ test_copy(void)
         n = H5T__bit_find(v2, d_offset, 8 * sizeof(v2) - d_offset, H5T_BIT_LSB, 0);
         if (d_offset + size < 8 * sizeof(v2) && n != (ssize_t)size) {
             H5_FAILED();
-            HDprintf("    Unable to find last copied bit in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to find last copied bit in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (d_offset + size == 8 * sizeof(v2) && n >= 0) {
@@ -223,9 +223,9 @@ test_copy(void)
         n = H5T__bit_find(v2, (size_t)0, 8 * sizeof(v2), H5T_BIT_MSB, 1);
         if (size > 0 && (size_t)(n + 1) != d_offset + size) {
             H5_FAILED();
-            HDprintf("    Unable to find last copied bit in destination "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to find last copied bit in destination "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (0 == size && n >= 0) {
@@ -236,9 +236,9 @@ test_copy(void)
         n = H5T__bit_find(v2, (size_t)0, d_offset + size, H5T_BIT_MSB, 0);
         if (d_offset > 0 && n + 1 != (ssize_t)d_offset) {
             H5_FAILED();
-            HDprintf("    Unable to find beginning of copied data "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to find beginning of copied data "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (0 == d_offset && n >= 0) {
@@ -252,15 +252,15 @@ test_copy(void)
     return 0;
 
 failed:
-    HDprintf("    i=%d, s_offset=%lu, d_offset=%lu, size=%lu\n", i, (unsigned long)s_offset,
-             (unsigned long)d_offset, (unsigned long)size);
-    HDprintf("    s = 0x");
+    printf("    i=%d, s_offset=%lu, d_offset=%lu, size=%lu\n", i, (unsigned long)s_offset,
+           (unsigned long)d_offset, (unsigned long)size);
+    printf("    s = 0x");
     for (j = sizeof(v1) - 1; j >= 0; --j)
-        HDprintf("%02x", v1[j]);
-    HDprintf("\n    d = 0x");
+        printf("%02x", v1[j]);
+    printf("\n    d = 0x");
     for (j = sizeof(v2) - 1; j >= 0; --j)
-        HDprintf("%02x", v2[j]);
-    HDprintf("\n");
+        printf("%02x", v2[j]);
+    printf("\n");
     return -1;
 }
 
@@ -306,9 +306,9 @@ test_shift(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1);
         if (n != (ssize_t)offset + shift_dist) {
             H5_FAILED();
-            HDprintf("    Unable to find first bit in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to find first bit in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
 
@@ -319,9 +319,9 @@ test_shift(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1);
         if (n != (ssize_t)(offset + size - 1)) {
             H5_FAILED();
-            HDprintf("    Unable to find last bit in destination "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to find last bit in destination "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
 
@@ -335,9 +335,9 @@ test_shift(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1);
         if ((size_t)n != offset) {
             H5_FAILED();
-            HDprintf("    Unable to find first bit in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to find first bit in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
 
@@ -348,9 +348,9 @@ test_shift(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1);
         if (n != (ssize_t)(offset + size) - shift_dist - 1) {
             H5_FAILED();
-            HDprintf("    Unable to find last bit in destination "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to find last bit in destination "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
 
@@ -372,9 +372,9 @@ test_shift(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1);
         if (n >= 0) {
             H5_FAILED();
-            HDprintf("    Unable to verify all bits are zero in destination(LSB) "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to verify all bits are zero in destination(LSB) "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
 
@@ -382,9 +382,9 @@ test_shift(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1);
         if (n >= 0) {
             H5_FAILED();
-            HDprintf("    Unable to verify all bits are zero in destination(MSB) "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to verify all bits are zero in destination(MSB) "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
     }
@@ -393,11 +393,11 @@ test_shift(void)
     return 0;
 
 failed:
-    HDprintf("    i=%d, offset=%lu, size=%lu, shift_dist=%lu\n", i, (unsigned long)offset,
-             (unsigned long)size, (unsigned long)shift_dist);
+    printf("    i=%d, offset=%lu, size=%lu, shift_dist=%lu\n", i, (unsigned long)offset, (unsigned long)size,
+           (unsigned long)shift_dist);
     for (j = sizeof(vector) - 1; j >= 0; --j)
-        HDprintf("%02x", vector[j]);
-    HDprintf("\n");
+        printf("%02x", vector[j]);
+    printf("\n");
     return -1;
 }
 
@@ -445,16 +445,16 @@ test_increment(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1);
         if (size != 1 && (size_t)n != offset + size - 1) {
             H5_FAILED();
-            HDprintf("    Unable to find first bit in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to find first bit in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (size == 1 && n >= 0) {
             H5_FAILED();
-            HDprintf("    Unable to verify all-zero bit in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to verify all-zero bit in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
 
@@ -465,16 +465,16 @@ test_increment(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1);
         if (size != 1 && n != (ssize_t)(offset + size - 1)) {
             H5_FAILED();
-            HDprintf("    Unable to find last bit in destination "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to find last bit in destination "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (size == 1 && n >= 0) {
             H5_FAILED();
-            HDprintf("    Unable to verify all-zero bit in destination "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to verify all-zero bit in destination "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
     }
@@ -483,10 +483,10 @@ test_increment(void)
     return 0;
 
 failed:
-    HDprintf("    i=%d, offset=%lu, size=%lu\n", i, (unsigned long)offset, (unsigned long)size);
+    printf("    i=%d, offset=%lu, size=%lu\n", i, (unsigned long)offset, (unsigned long)size);
     for (j = sizeof(vector) - 1; j >= 0; --j)
-        HDprintf("%02x", vector[j]);
-    HDprintf("\n");
+        printf("%02x", vector[j]);
+    printf("\n");
     return -1;
 }
 
@@ -531,9 +531,9 @@ test_decrement(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1);
         if ((size_t)n != offset) {
             H5_FAILED();
-            HDprintf("    Unable to find first bit in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to find first bit in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
 
@@ -544,9 +544,9 @@ test_decrement(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1);
         if (n != (ssize_t)(offset + size - 1)) {
             H5_FAILED();
-            HDprintf("    Unable to find last bit in destination "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to find last bit in destination "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
     }
@@ -555,10 +555,10 @@ test_decrement(void)
     return 0;
 
 failed:
-    HDprintf("    i=%d, offset=%lu, size=%lu\n", i, (unsigned long)offset, (unsigned long)size);
+    printf("    i=%d, offset=%lu, size=%lu\n", i, (unsigned long)offset, (unsigned long)size);
     for (j = sizeof(vector) - 1; j >= 0; --j)
-        HDprintf("%02x", vector[j]);
-    HDprintf("\n");
+        printf("%02x", vector[j]);
+    printf("\n");
     return -1;
 }
 
@@ -603,9 +603,9 @@ test_negate(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1);
         if ((size_t)n != offset) {
             H5_FAILED();
-            HDprintf("    Unable to find first bit in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to find first bit in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
 
@@ -616,9 +616,9 @@ test_negate(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1);
         if (n != (ssize_t)(offset + size - 1)) {
             H5_FAILED();
-            HDprintf("    Unable to find last bit in destination "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to find last bit in destination "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
 
@@ -633,9 +633,9 @@ test_negate(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1);
         if (n >= 0) {
             H5_FAILED();
-            HDprintf("    Unable to verify all-zero bits in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to verify all-zero bits in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
 
@@ -646,9 +646,9 @@ test_negate(void)
         n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1);
         if (n >= 0) {
             H5_FAILED();
-            HDprintf("    Unable to verify all-zero bits in destination "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to verify all-zero bits in destination "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
     }
@@ -657,10 +657,10 @@ test_negate(void)
     return 0;
 
 failed:
-    HDprintf("    i=%d, offset=%lu, size=%lu\n", i, (unsigned long)offset, (unsigned long)size);
+    printf("    i=%d, offset=%lu, size=%lu\n", i, (unsigned long)offset, (unsigned long)size);
     for (j = sizeof(vector) - 1; j >= 0; --j)
-        HDprintf("%02x", vector[j]);
-    HDprintf("\n");
+        printf("%02x", vector[j]);
+    printf("\n");
     return -1;
 }
 
@@ -714,9 +714,9 @@ test_set(void)
         n = H5T__bit_find(v2, (size_t)0, 8 * sizeof(v2), H5T_BIT_LSB, 1);
         if (size > 0 && n != (ssize_t)d_offset) {
             H5_FAILED();
-            HDprintf("    Unable to find first set bit in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to find first set bit in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (0 == size && n >= 0) {
@@ -727,9 +727,9 @@ test_set(void)
         n = H5T__bit_find(v2, d_offset, 8 * sizeof(v2) - d_offset, H5T_BIT_LSB, 0);
         if (d_offset + size < 8 * sizeof(v2) && n != (ssize_t)size) {
             H5_FAILED();
-            HDprintf("    Unable to find last set bit in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to find last set bit in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (d_offset + size == 8 * sizeof(v2) && n >= 0) {
@@ -745,9 +745,9 @@ test_set(void)
         n = H5T__bit_find(v2, (size_t)0, 8 * sizeof(v2), H5T_BIT_MSB, 1);
         if (size > 0 && (size_t)(n + 1) != d_offset + size) {
             H5_FAILED();
-            HDprintf("    Unable to find last set bit in destination "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to find last set bit in destination "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (0 == size && n >= 0) {
@@ -758,9 +758,9 @@ test_set(void)
         n = H5T__bit_find(v2, (size_t)0, d_offset + size, H5T_BIT_MSB, 0);
         if (d_offset > 0 && n + 1 != (ssize_t)d_offset) {
             H5_FAILED();
-            HDprintf("    Unable to find beginning of set bit region "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to find beginning of set bit region "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (0 == d_offset && n >= 0) {
@@ -774,11 +774,11 @@ test_set(void)
     return 0;
 
 failed:
-    HDprintf("    i=%d, d_offset=%lu, size=%lu\n", i, (unsigned long)d_offset, (unsigned long)size);
-    HDprintf("    d = 0x");
+    printf("    i=%d, d_offset=%lu, size=%lu\n", i, (unsigned long)d_offset, (unsigned long)size);
+    printf("    d = 0x");
     for (j = sizeof(v2) - 1; j >= 0; --j)
-        HDprintf("%02x", v2[j]);
-    HDprintf("\n");
+        printf("%02x", v2[j]);
+    printf("\n");
     return -1;
 }
 
@@ -832,9 +832,9 @@ test_clear(void)
         n = H5T__bit_find(v2, (size_t)0, 8 * sizeof(v2), H5T_BIT_LSB, 0);
         if (size > 0 && n != (ssize_t)d_offset) {
             H5_FAILED();
-            HDprintf("    Unable to find first cleared bit in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to find first cleared bit in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (0 == size && n >= 0) {
@@ -845,9 +845,9 @@ test_clear(void)
         n = H5T__bit_find(v2, d_offset, 8 * sizeof(v2) - d_offset, H5T_BIT_LSB, 1);
         if (d_offset + size < 8 * sizeof(v2) && n != (ssize_t)size) {
             H5_FAILED();
-            HDprintf("    Unable to find last cleared bit in destination "
-                     "(n=%d)\n",
-                     (int)n);
+            printf("    Unable to find last cleared bit in destination "
+                   "(n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (d_offset + size == 8 * sizeof(v2) && n >= 0) {
@@ -863,9 +863,9 @@ test_clear(void)
         n = H5T__bit_find(v2, (size_t)0, 8 * sizeof(v2), H5T_BIT_MSB, 0);
         if (size > 0 && (size_t)(n + 1) != d_offset + size) {
             H5_FAILED();
-            HDprintf("    Unable to find last cleared bit in destination "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to find last cleared bit in destination "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (0 == size && n >= 0) {
@@ -876,9 +876,9 @@ test_clear(void)
         n = H5T__bit_find(v2, (size_t)0, d_offset + size, H5T_BIT_MSB, 1);
         if (d_offset > 0 && n + 1 != (ssize_t)d_offset) {
             H5_FAILED();
-            HDprintf("    Unable to find beginning of cleared bit region "
-                     "(reverse, n=%d)\n",
-                     (int)n);
+            printf("    Unable to find beginning of cleared bit region "
+                   "(reverse, n=%d)\n",
+                   (int)n);
             goto failed;
         }
         if (0 == d_offset && n >= 0) {
@@ -892,11 +892,11 @@ test_clear(void)
     return 0;
 
 failed:
-    HDprintf("    i=%d, d_offset=%lu, size=%lu\n", i, (unsigned long)d_offset, (unsigned long)size);
-    HDprintf("    d = 0x");
+    printf("    i=%d, d_offset=%lu, size=%lu\n", i, (unsigned long)d_offset, (unsigned long)size);
+    printf("    d = 0x");
     for (j = sizeof(v2) - 1; j >= 0; --j)
-        HDprintf("%02x", v2[j]);
-    HDprintf("\n");
+        printf("%02x", v2[j]);
+    printf("\n");
     return -1;
 }
 
@@ -932,10 +932,10 @@ main(void)
     nerrors += test_negate() < 0 ? 1 : 0;
 
     if (nerrors) {
-        HDprintf("***** %u FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
+        printf("***** %u FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
         HDexit(EXIT_FAILURE);
     }
-    HDprintf("All bit tests passed.\n");
+    printf("All bit tests passed.\n");
 
     H5close();
 
diff --git a/test/btree2.c b/test/btree2.c
index aebdebe..7169f3e 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -3008,7 +3008,7 @@ test_insert_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t
     curr_time = HDtime(NULL);
 #if 0
 curr_time=1109170019;
-HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
+fprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
 #endif
     HDsrandom((unsigned)curr_time);
 
@@ -5102,7 +5102,7 @@ test_update_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t
     curr_time = HDtime(NULL);
 #if 0
 curr_time = 1451342093;
-HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
+fprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
 #endif
     HDsrandom((unsigned)curr_time);
 
@@ -5305,7 +5305,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
     return 0;
 
 error:
-    HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
+    fprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
     H5E_BEGIN_TRY
     {
         if (bt2)
@@ -8814,7 +8814,7 @@ test_remove_lots(const char *env_h5_drvr, hid_t fapl, const H5B2_create_t *cpara
     curr_time = HDtime(NULL);
 #if 0
 curr_time = 1163537969;
-HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
+fprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
 #endif
     HDsrandom((unsigned)curr_time);
 
@@ -10139,7 +10139,7 @@ main(void)
         ExpressMode = 2;
 
     if (ExpressMode > 1)
-        HDprintf("***Express test mode on.  Some tests may be skipped\n");
+        printf("***Express test mode on.  Some tests may be skipped\n");
 
     /* Initialize v2 B-tree creation parameters */
     init_cparam(&cparam, &cparam2);
@@ -10152,11 +10152,11 @@ main(void)
     /* Loop over re-opening B-tree during tests */
     for (reopen = FALSE; reopen <= TRUE; reopen++) {
         if (reopen) {
-            HDfprintf(stdout, "Testing with reopening B-tree:\n");
+            fprintf(stdout, "Testing with reopening B-tree:\n");
             tparam.reopen_btree = TRUE;
         } /* end if */
         else {
-            HDfprintf(stdout, "Testing without reopening B-tree:\n");
+            fprintf(stdout, "Testing without reopening B-tree:\n");
             tparam.reopen_btree = FALSE;
         } /* end else */
 
@@ -10176,7 +10176,7 @@ main(void)
         nerrors += test_insert_level2_3internal_redistrib(fapl, &cparam, &tparam);
         nerrors += test_insert_level2_3internal_split(fapl, &cparam, &tparam);
         if (ExpressMode > 1)
-            HDprintf("***Express test mode on.  test_insert_lots skipped\n");
+            printf("***Express test mode on.  test_insert_lots skipped\n");
         else
             nerrors += test_insert_lots(fapl, &cparam, &tparam);
 
@@ -10190,7 +10190,7 @@ main(void)
         nerrors += test_update_level1_middle_split(fapl, &cparam2, &tparam);
         nerrors += test_update_make_level2(fapl, &cparam2, &tparam);
         if (ExpressMode > 1)
-            HDprintf("***Express test mode on.  test_update_lots skipped\n");
+            printf("***Express test mode on.  test_update_lots skipped\n");
         else
             nerrors += test_update_lots(fapl, &cparam2, &tparam);
 
@@ -10217,7 +10217,7 @@ main(void)
         nerrors += test_remove_level2_3internal_merge(fapl, &cparam, &tparam);
         nerrors += test_remove_level2_collapse_right(fapl, &cparam, &tparam);
         if (ExpressMode > 1)
-            HDprintf("***Express test mode on.  test_remove_lots skipped\n");
+            printf("***Express test mode on.  test_remove_lots skipped\n");
         else
             nerrors += test_remove_lots(envval, fapl, &cparam);
 
diff --git a/test/cache.c b/test/cache.c
index b1eb744..ecd6578 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -286,7 +286,7 @@ smoke_check_1(int express_test, unsigned paged)
 
         default:
             SKIPPED();
-            HDfprintf(stdout, "    Long tests disabled.\n");
+            fprintf(stdout, "    Long tests disabled.\n");
             return 0; /* <========== note return */
             break;
     }
@@ -294,17 +294,17 @@ smoke_check_1(int express_test, unsigned paged)
     pass = TRUE;
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     reset_entries();
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     file_ptr = setup_cache((size_t)(4 * 1024 * 1024), (size_t)(2 * 1024 * 1024), paged);
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
                            /* max_index              */ max_index,
@@ -322,7 +322,7 @@ smoke_check_1(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_backward(/* file_ptr               */ file_ptr,
                             /* max_index              */ max_index,
@@ -340,7 +340,7 @@ smoke_check_1(int express_test, unsigned paged)
                             /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
                            /* max_index              */ max_index,
@@ -358,7 +358,7 @@ smoke_check_1(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush and destroy all entries in the cache: */
 
@@ -368,7 +368,7 @@ smoke_check_1(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr               */ file_ptr,
                            /* max_index              */ max_index,
@@ -381,7 +381,7 @@ smoke_check_1(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush all entries in the cache: */
 
@@ -391,7 +391,7 @@ smoke_check_1(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_backward(/* file_ptr               */ file_ptr,
                             /* max_index              */ max_index,
@@ -404,12 +404,12 @@ smoke_check_1(int express_test, unsigned paged)
                             /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     takedown_cache(file_ptr, display_stats, TRUE);
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     verify_clean();
     verify_unprotected();
@@ -423,7 +423,7 @@ smoke_check_1(int express_test, unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -484,7 +484,7 @@ smoke_check_2(int express_test, unsigned paged)
 
         default:
             SKIPPED();
-            HDfprintf(stdout, "    Long tests disabled.\n");
+            fprintf(stdout, "    Long tests disabled.\n");
             return 0; /* <========== note return */
             break;
     }
@@ -492,17 +492,17 @@ smoke_check_2(int express_test, unsigned paged)
     pass = TRUE;
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     reset_entries();
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     file_ptr = setup_cache((size_t)(4 * 1024 * 1024), (size_t)(2 * 1024 * 1024), paged);
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
                            /* max_index              */ max_index,
@@ -520,7 +520,7 @@ smoke_check_2(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_backward(/* file_ptr               */ file_ptr,
                             /* max_index              */ max_index,
@@ -538,7 +538,7 @@ smoke_check_2(int express_test, unsigned paged)
                             /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
                            /* max_index              */ max_index,
@@ -556,7 +556,7 @@ smoke_check_2(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush and destroy all entries in the cache: */
 
@@ -566,7 +566,7 @@ smoke_check_2(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr               */ file_ptr,
                            /* max_index              */ max_index,
@@ -579,7 +579,7 @@ smoke_check_2(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush all entries in the cache: */
 
@@ -589,7 +589,7 @@ smoke_check_2(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_backward(/* file_ptr               */ file_ptr,
                             /* max_index              */ max_index,
@@ -602,12 +602,12 @@ smoke_check_2(int express_test, unsigned paged)
                             /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     takedown_cache(file_ptr, display_stats, TRUE);
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     verify_clean();
     verify_unprotected();
@@ -621,7 +621,7 @@ smoke_check_2(int express_test, unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -681,7 +681,7 @@ smoke_check_3(int express_test, unsigned paged)
 
         default:
             SKIPPED();
-            HDfprintf(stdout, "    Long tests disabled.\n");
+            fprintf(stdout, "    Long tests disabled.\n");
             return 0; /* <========== note return */
             break;
     }
@@ -689,17 +689,17 @@ smoke_check_3(int express_test, unsigned paged)
     pass = TRUE;
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     reset_entries();
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     file_ptr = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged);
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
                            /* max_index              */ max_index,
@@ -717,7 +717,7 @@ smoke_check_3(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_backward(/* file_ptr              */ file_ptr,
                             /* max_index              */ max_index,
@@ -735,7 +735,7 @@ smoke_check_3(int express_test, unsigned paged)
                             /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
                            /* max_index              */ max_index,
@@ -753,7 +753,7 @@ smoke_check_3(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush and destroy all entries in the cache: */
 
@@ -763,7 +763,7 @@ smoke_check_3(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr              */ file_ptr,
                            /* max_index              */ max_index,
@@ -776,7 +776,7 @@ smoke_check_3(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush all entries in the cache: */
 
@@ -786,7 +786,7 @@ smoke_check_3(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_backward(/* file_ptr              */ file_ptr,
                             /* max_index              */ max_index,
@@ -799,12 +799,12 @@ smoke_check_3(int express_test, unsigned paged)
                             /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     takedown_cache(file_ptr, display_stats, TRUE);
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     verify_clean();
     verify_unprotected();
@@ -818,7 +818,7 @@ smoke_check_3(int express_test, unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -879,7 +879,7 @@ smoke_check_4(int express_test, unsigned paged)
 
         default:
             SKIPPED();
-            HDfprintf(stdout, "    Long tests disabled.\n");
+            fprintf(stdout, "    Long tests disabled.\n");
             return 0; /* <========== note return */
             break;
     }
@@ -887,17 +887,17 @@ smoke_check_4(int express_test, unsigned paged)
     pass = TRUE;
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     reset_entries();
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     file_ptr = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged);
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
                            /* max_index              */ max_index,
@@ -915,7 +915,7 @@ smoke_check_4(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_backward(/* file_ptr               */ file_ptr,
                             /* max_index              */ max_index,
@@ -933,7 +933,7 @@ smoke_check_4(int express_test, unsigned paged)
                             /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr               */ file_ptr,
                            /* max_index              */ max_index,
@@ -951,7 +951,7 @@ smoke_check_4(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush and destroy all entries in the cache: */
 
@@ -961,7 +961,7 @@ smoke_check_4(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr               */ file_ptr,
                            /* max_index              */ max_index,
@@ -974,7 +974,7 @@ smoke_check_4(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush all entries in the cache: */
 
@@ -984,7 +984,7 @@ smoke_check_4(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_backward(/* file_ptr               */ file_ptr,
                             /* max_index              */ max_index,
@@ -997,12 +997,12 @@ smoke_check_4(int express_test, unsigned paged)
                             /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     takedown_cache(file_ptr, display_stats, TRUE);
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     verify_clean();
     verify_unprotected();
@@ -1016,7 +1016,7 @@ smoke_check_4(int express_test, unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -1117,7 +1117,7 @@ smoke_check_5(int express_test, unsigned paged)
 
         default:
             SKIPPED();
-            HDfprintf(stdout, "    Long tests disabled.\n");
+            fprintf(stdout, "    Long tests disabled.\n");
             return 0; /* <========== note return */
             break;
     }
@@ -1125,12 +1125,12 @@ smoke_check_5(int express_test, unsigned paged)
     pass = TRUE;
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     reset_entries();
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     file_ptr  = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged);
     cache_ptr = file_ptr->shared->cache;
@@ -1147,7 +1147,7 @@ smoke_check_5(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_row_major_scan_forward(/* file_ptr              */ file_ptr,
                               /* max_index              */ max_index,
@@ -1158,7 +1158,7 @@ smoke_check_5(int express_test, unsigned paged)
                               /* do_inserts             */ FALSE);
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_row_major_scan_backward(/* file_ptr              */ file_ptr,
                                /* max_index              */ max_index,
@@ -1169,7 +1169,7 @@ smoke_check_5(int express_test, unsigned paged)
                                /* do_inserts             */ FALSE);
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_row_major_scan_forward(/* file_ptr              */ file_ptr,
                               /* max_index              */ max_index,
@@ -1180,7 +1180,7 @@ smoke_check_5(int express_test, unsigned paged)
                               /* do_inserts             */ TRUE);
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush and destroy all entries in the cache: */
 
@@ -1190,7 +1190,7 @@ smoke_check_5(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_col_major_scan_forward(/* file_ptr              */ file_ptr,
                               /* max_index              */ max_index,
@@ -1202,7 +1202,7 @@ smoke_check_5(int express_test, unsigned paged)
                               /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush all entries in the cache: */
 
@@ -1212,7 +1212,7 @@ smoke_check_5(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_col_major_scan_backward(/* file_ptr              */ file_ptr,
                                /* max_index              */ max_index,
@@ -1224,12 +1224,12 @@ smoke_check_5(int express_test, unsigned paged)
                                /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     takedown_cache(file_ptr, display_stats, TRUE);
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     verify_clean();
     verify_unprotected();
@@ -1243,7 +1243,7 @@ smoke_check_5(int express_test, unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -1346,18 +1346,18 @@ smoke_check_6(int express_test, unsigned paged)
 
         default:
             SKIPPED();
-            HDfprintf(stdout, "    Long tests disabled.\n");
+            fprintf(stdout, "    Long tests disabled.\n");
             return 0; /* <========== note return */
             break;
     }
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     reset_entries();
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     file_ptr  = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged);
     cache_ptr = file_ptr->shared->cache;
@@ -1374,7 +1374,7 @@ smoke_check_6(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_row_major_scan_forward(/* file_ptr              */ file_ptr,
                               /* max_index              */ max_index,
@@ -1385,7 +1385,7 @@ smoke_check_6(int express_test, unsigned paged)
                               /* do_inserts             */ FALSE);
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_row_major_scan_backward(/* file_ptr              */ file_ptr,
                                /* max_index              */ max_index,
@@ -1396,7 +1396,7 @@ smoke_check_6(int express_test, unsigned paged)
                                /* do_inserts             */ FALSE);
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_row_major_scan_forward(/* file_ptr              */ file_ptr,
                               /* max_index              */ max_index,
@@ -1407,7 +1407,7 @@ smoke_check_6(int express_test, unsigned paged)
                               /* do_inserts             */ TRUE);
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush and destroy all entries in the cache: */
 
@@ -1417,7 +1417,7 @@ smoke_check_6(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_col_major_scan_forward(/* file_ptr              */ file_ptr,
                               /* max_index              */ max_index,
@@ -1429,7 +1429,7 @@ smoke_check_6(int express_test, unsigned paged)
                               /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush all entries in the cache: */
 
@@ -1439,7 +1439,7 @@ smoke_check_6(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_col_major_scan_backward(/* file_ptr              */ file_ptr,
                                /* max_index              */ max_index,
@@ -1451,12 +1451,12 @@ smoke_check_6(int express_test, unsigned paged)
                                /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     takedown_cache(file_ptr, display_stats, TRUE);
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     verify_clean();
     verify_unprotected();
@@ -1470,7 +1470,7 @@ smoke_check_6(int express_test, unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -1572,7 +1572,7 @@ smoke_check_7(int express_test, unsigned paged)
 
         default:
             SKIPPED();
-            HDfprintf(stdout, "    Long tests disabled.\n");
+            fprintf(stdout, "    Long tests disabled.\n");
             return 0; /* <========== note return */
             break;
     }
@@ -1580,12 +1580,12 @@ smoke_check_7(int express_test, unsigned paged)
     pass = TRUE;
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     reset_entries();
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     file_ptr  = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged);
     cache_ptr = file_ptr->shared->cache;
@@ -1602,7 +1602,7 @@ smoke_check_7(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_row_major_scan_forward(/* file_ptr              */ file_ptr,
                               /* max_index              */ max_index,
@@ -1613,7 +1613,7 @@ smoke_check_7(int express_test, unsigned paged)
                               /* do_inserts             */ FALSE);
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_row_major_scan_backward(/* file_ptr              */ file_ptr,
                                /* max_index              */ max_index,
@@ -1624,7 +1624,7 @@ smoke_check_7(int express_test, unsigned paged)
                                /* do_inserts             */ FALSE);
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_row_major_scan_forward(/* file_ptr              */ file_ptr,
                               /* max_index              */ max_index,
@@ -1635,7 +1635,7 @@ smoke_check_7(int express_test, unsigned paged)
                               /* do_inserts             */ TRUE);
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush and destroy all entries in the cache: */
 
@@ -1645,7 +1645,7 @@ smoke_check_7(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_col_major_scan_forward(/* file_ptr              */ file_ptr,
                               /* max_index              */ max_index,
@@ -1657,7 +1657,7 @@ smoke_check_7(int express_test, unsigned paged)
                               /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush all entries in the cache: */
 
@@ -1667,7 +1667,7 @@ smoke_check_7(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_col_major_scan_backward(/* file_ptr              */ file_ptr,
                                /* max_index              */ max_index,
@@ -1679,12 +1679,12 @@ smoke_check_7(int express_test, unsigned paged)
                                /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     takedown_cache(file_ptr, display_stats, TRUE);
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     verify_clean();
     verify_unprotected();
@@ -1698,7 +1698,7 @@ smoke_check_7(int express_test, unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -1800,7 +1800,7 @@ smoke_check_8(int express_test, unsigned paged)
 
         default:
             SKIPPED();
-            HDfprintf(stdout, "    Long tests disabled.\n");
+            fprintf(stdout, "    Long tests disabled.\n");
             return 0; /* <========== note return */
             break;
     }
@@ -1808,12 +1808,12 @@ smoke_check_8(int express_test, unsigned paged)
     pass = TRUE;
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     reset_entries();
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     file_ptr  = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged);
     cache_ptr = file_ptr->shared->cache;
@@ -1830,7 +1830,7 @@ smoke_check_8(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_row_major_scan_forward(/* file_ptr              */ file_ptr,
                               /* max_index              */ max_index,
@@ -1841,7 +1841,7 @@ smoke_check_8(int express_test, unsigned paged)
                               /* do_inserts             */ FALSE);
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_row_major_scan_backward(/* file_ptr              */ file_ptr,
                                /* max_index              */ max_index,
@@ -1852,7 +1852,7 @@ smoke_check_8(int express_test, unsigned paged)
                                /* do_inserts             */ FALSE);
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_row_major_scan_forward(/* file_ptr              */ file_ptr,
                               /* max_index              */ max_index,
@@ -1863,7 +1863,7 @@ smoke_check_8(int express_test, unsigned paged)
                               /* do_inserts             */ TRUE);
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush and destroy all entries in the cache: */
 
@@ -1873,7 +1873,7 @@ smoke_check_8(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_col_major_scan_forward(/* file_ptr              */ file_ptr,
                               /* max_index              */ max_index,
@@ -1885,7 +1885,7 @@ smoke_check_8(int express_test, unsigned paged)
                               /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush all entries in the cache: */
 
@@ -1895,7 +1895,7 @@ smoke_check_8(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     hl_col_major_scan_backward(/* file_ptr              */ file_ptr,
                                /* max_index              */ max_index,
@@ -1907,12 +1907,12 @@ smoke_check_8(int express_test, unsigned paged)
                                /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     takedown_cache(file_ptr, display_stats, TRUE);
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     verify_clean();
     verify_unprotected();
@@ -1926,7 +1926,7 @@ smoke_check_8(int express_test, unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -1993,7 +1993,7 @@ smoke_check_9(int express_test, unsigned paged)
 
         default:
             SKIPPED();
-            HDfprintf(stdout, "    Long tests disabled.\n");
+            fprintf(stdout, "    Long tests disabled.\n");
             return 0; /* <========== note return */
             break;
     }
@@ -2001,12 +2001,12 @@ smoke_check_9(int express_test, unsigned paged)
     pass = TRUE;
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     reset_entries();
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     file_ptr  = setup_cache((size_t)(4 * 1024 * 1024), (size_t)(2 * 1024 * 1024), paged);
     cache_ptr = file_ptr->shared->cache;
@@ -2014,7 +2014,7 @@ smoke_check_9(int express_test, unsigned paged)
     /* disable evictions */
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2028,8 +2028,7 @@ smoke_check_9(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
                            /* max_index              */ max_index,
@@ -2049,7 +2048,7 @@ smoke_check_9(int express_test, unsigned paged)
     /* enable evictions */
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2063,8 +2062,7 @@ smoke_check_9(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_backward(/* file_ptr              */ file_ptr,
                             /* max_index              */ max_index,
@@ -2082,7 +2080,7 @@ smoke_check_9(int express_test, unsigned paged)
                             /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2096,8 +2094,8 @@ smoke_check_9(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled \n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled \n", __func__, mile_stone++,
+                (int)pass);
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
                            /* max_index              */ max_index,
@@ -2115,7 +2113,7 @@ smoke_check_9(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2129,8 +2127,7 @@ smoke_check_9(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n", __func__, mile_stone++, (int)pass);
 
     /* flush and destroy all entries in the cache: */
 
@@ -2140,7 +2137,7 @@ smoke_check_9(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2154,8 +2151,7 @@ smoke_check_9(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 12 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr              */ file_ptr,
                            /* max_index              */ max_index,
@@ -2168,7 +2164,7 @@ smoke_check_9(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 13 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush all entries in the cache: */
 
@@ -2178,7 +2174,7 @@ smoke_check_9(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 14 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2192,8 +2188,7 @@ smoke_check_9(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 15 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_backward(/* file_ptr              */ file_ptr,
                             /* max_index              */ max_index,
@@ -2206,7 +2201,7 @@ smoke_check_9(int express_test, unsigned paged)
                             /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 16 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2220,13 +2215,12 @@ smoke_check_9(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 17 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass);
 
     takedown_cache(file_ptr, display_stats, TRUE);
 
     if (show_progress) /* 18 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     verify_clean();
     verify_unprotected();
@@ -2240,7 +2234,7 @@ smoke_check_9(int express_test, unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -2307,7 +2301,7 @@ smoke_check_10(int express_test, unsigned paged)
 
         default:
             SKIPPED();
-            HDfprintf(stdout, "    Long tests disabled.\n");
+            fprintf(stdout, "    Long tests disabled.\n");
             return 0; /* <========== note return */
             break;
     }
@@ -2315,19 +2309,18 @@ smoke_check_10(int express_test, unsigned paged)
     pass = TRUE;
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     reset_entries();
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     file_ptr  = setup_cache((size_t)(4 * 1024 * 1024), (size_t)(2 * 1024 * 1024), paged);
     cache_ptr = file_ptr->shared->cache;
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
                            /* max_index              */ max_index,
@@ -2345,7 +2338,7 @@ smoke_check_10(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2359,8 +2352,7 @@ smoke_check_10(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_backward(/* file_ptr              */ file_ptr,
                             /* max_index              */ max_index,
@@ -2378,7 +2370,7 @@ smoke_check_10(int express_test, unsigned paged)
                             /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2392,8 +2384,7 @@ smoke_check_10(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
                            /* max_index              */ max_index,
@@ -2411,7 +2402,7 @@ smoke_check_10(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2425,8 +2416,7 @@ smoke_check_10(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass);
 
     /* flush and destroy all entries in the cache: */
 
@@ -2436,7 +2426,7 @@ smoke_check_10(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2450,8 +2440,7 @@ smoke_check_10(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr              */ file_ptr,
                            /* max_index              */ max_index,
@@ -2464,7 +2453,7 @@ smoke_check_10(int express_test, unsigned paged)
                            /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 12 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2478,8 +2467,7 @@ smoke_check_10(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 13 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass);
 
     /* flush all entries in the cache: */
 
@@ -2489,7 +2477,7 @@ smoke_check_10(int express_test, unsigned paged)
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 14 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2503,8 +2491,7 @@ smoke_check_10(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 15 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_backward(/* file_ptr              */ file_ptr,
                             /* max_index              */ max_index,
@@ -2517,7 +2504,7 @@ smoke_check_10(int express_test, unsigned paged)
                             /* dirty_unprotects       */ dirty_unprotects);
 
     if (show_progress) /* 16 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -2531,13 +2518,12 @@ smoke_check_10(int express_test, unsigned paged)
     }
 
     if (show_progress) /* 17 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++,
-                  (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass);
 
     takedown_cache(file_ptr, display_stats, TRUE);
 
     if (show_progress) /* 18 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     verify_clean();
     verify_unprotected();
@@ -2551,7 +2537,7 @@ smoke_check_10(int express_test, unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -2616,7 +2602,7 @@ write_permitted_check(int
 
         default:
             SKIPPED();
-            HDfprintf(stdout, "    Long tests disabled.\n");
+            fprintf(stdout, "    Long tests disabled.\n");
             return 0; /* <========== note return */
             break;
     }
@@ -2624,17 +2610,17 @@ write_permitted_check(int
     pass = TRUE;
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     reset_entries();
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     file_ptr = setup_cache((size_t)(1 * 1024 * 1024), (size_t)0, paged);
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     row_major_scan_forward(/* file_ptr              */ file_ptr,
                            /* max_index              */ max_index,
@@ -2652,7 +2638,7 @@ write_permitted_check(int
                            /* dirty_unprotects       */ TRUE);
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     write_permitted = FALSE;
 
@@ -2672,7 +2658,7 @@ write_permitted_check(int
                             /* dirty_unprotects       */ NO_CHANGE);
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     write_permitted = TRUE;
 
@@ -2692,7 +2678,7 @@ write_permitted_check(int
                            /* dirty_unprotects       */ TRUE);
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* flush and destroy all entries in the cache: */
 
@@ -2702,7 +2688,7 @@ write_permitted_check(int
                 /* dump_detailed_stats */ FALSE);
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     col_major_scan_forward(/* file_ptr              */ file_ptr,
                            /* max_index              */ max_index,
@@ -2715,7 +2701,7 @@ write_permitted_check(int
                            /* dirty_unprotects       */ TRUE);
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     write_permitted = FALSE;
 
@@ -2732,12 +2718,12 @@ write_permitted_check(int
     write_permitted = TRUE;
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     takedown_cache(file_ptr, display_stats, TRUE);
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     verify_clean();
     verify_unprotected();
@@ -2751,14 +2737,14 @@ write_permitted_check(int
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
 #else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
     SKIPPED();
 
-    HDfprintf(stdout, "    Clean and dirty LRU lists disabled.\n");
+    fprintf(stdout, "    Clean and dirty LRU lists disabled.\n");
 
 #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
@@ -3039,7 +3025,7 @@ check_insert_entry(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -3126,7 +3112,7 @@ check_flush_cache(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -11258,7 +11244,7 @@ check_get_entry_status(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -11536,7 +11522,7 @@ check_expunge_entry(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -11923,7 +11909,7 @@ check_multiple_read_protect(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -12023,7 +12009,7 @@ check_move_entry(unsigned paged)
         H5_FAILED();
 
     if (!pass)
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return (unsigned)!pass;
 } /* check_move_entry() */
@@ -12275,7 +12261,7 @@ check_pin_protected_entry(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -13137,7 +13123,7 @@ check_resize_entry(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -13216,7 +13202,7 @@ check_evictions_enabled(unsigned paged)
     pass = TRUE;
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* create the cache */
     if (pass) {
@@ -13238,7 +13224,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* verify that it is empty */
     if (pass) {
@@ -13254,7 +13240,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* verify that H5C_get_evictions_enabled() returns the expected value */
     if (pass) {
@@ -13270,7 +13256,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13282,7 +13268,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* verify that the cache is full */
     if (pass) {
@@ -13298,7 +13284,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13308,7 +13294,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* verify that an entry has been evicted */
     if (pass) {
@@ -13324,7 +13310,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13354,7 +13340,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13363,7 +13349,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* verify that another entry has been evicted */
     if (pass) {
@@ -13380,7 +13366,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13410,7 +13396,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 12 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* disable evictions */
     if (pass) {
@@ -13426,7 +13412,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 13 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* verify that evictions are disabled */
     if (pass) {
@@ -13443,7 +13429,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 14 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13453,7 +13439,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 15 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* verify that no entry has been evicted */
     if (pass) {
@@ -13470,7 +13456,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 16 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13479,7 +13465,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 17 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* verify that no entry has been evicted */
     if (pass) {
@@ -13496,7 +13482,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 18 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* re-enable evictions */
     if (pass) {
@@ -13512,7 +13498,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 19 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13522,7 +13508,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 20 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* verify that no entries have been evicted */
     if (pass) {
@@ -13539,7 +13525,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 21 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13549,7 +13535,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 22 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* verify that the entries have been evicted to bring the
      * cache back down to its normal size.
@@ -13569,7 +13555,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 23 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13599,7 +13585,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 24 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13629,7 +13615,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 25 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* disable evictions again */
     if (pass) {
@@ -13645,7 +13631,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 26 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13657,7 +13643,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 27 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* verify that the cache has grown */
     if (pass) {
@@ -13674,7 +13660,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 28 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* re-enable evictions again */
     if (pass) {
@@ -13690,7 +13676,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 29 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13699,7 +13685,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 30 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* verify that the cache has returned to its maximum size */
     if (pass) {
@@ -13716,7 +13702,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 31 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13746,7 +13732,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 32 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* disable evictions one last time before we shut down */
     if (pass) {
@@ -13762,7 +13748,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 33 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -13770,7 +13756,7 @@ check_evictions_enabled(unsigned paged)
     }
 
     if (show_progress) /* 34 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
         PASSED();
@@ -13781,7 +13767,7 @@ check_evictions_enabled(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -13872,7 +13858,7 @@ check_flush_protected_err(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -13958,7 +13944,7 @@ check_destroy_pinned_err(unsigned paged)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return (unsigned)!pass;
 
@@ -14052,7 +14038,7 @@ check_destroy_protected_err(unsigned paged)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return (unsigned)!pass;
 
@@ -14131,7 +14117,7 @@ check_duplicate_insert_err(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -14216,7 +14202,7 @@ check_double_pin_err(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -14310,7 +14296,7 @@ check_double_unpin_err(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -14418,7 +14404,7 @@ check_pin_entry_errs(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -14500,7 +14486,7 @@ check_double_protect_err(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -14578,7 +14564,7 @@ check_double_unprotect_err(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -14660,7 +14646,7 @@ check_mark_entry_dirty_errs(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -14773,7 +14759,7 @@ check_expunge_entry_errs(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -14890,7 +14876,7 @@ check_move_entry_errs(unsigned paged)
     else {
         H5_FAILED();
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     } /* end else */
 
     return (unsigned)!pass;
@@ -14990,7 +14976,7 @@ check_resize_entry_errs(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -15111,7 +15097,7 @@ check_unprotect_ro_dirty_err(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -15194,7 +15180,7 @@ check_protect_ro_rw_err(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -15323,7 +15309,7 @@ check_protect_retries(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_msg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_msg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -15459,7 +15445,7 @@ check_check_evictions_enabled_err(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -15554,7 +15540,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* allocate a cache, enable automatic cache resizing, and then force
      * the cache through all its operational modes.  Verify that all
@@ -15585,7 +15571,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache not full -- should result in not
      * full status.
@@ -15610,7 +15596,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache full -- should result in increase
      * of cache size from .5 to 1 meg.
@@ -15636,7 +15622,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache not full -- should result in not
      * full status.
@@ -15662,7 +15648,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache full again -- should result in increase
      * of cache size from 1 to 2 meg.
@@ -15689,7 +15675,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache full again -- should result in increase
      * of cache size from 2 to 4 meg.
@@ -15716,7 +15702,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache full again -- should result in increase
      * of cache size from 4 to 8 meg.
@@ -15743,7 +15729,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache full again -- should result in increase
      * of cache size from 8 to 12 meg.  Note that max increase reduced the
@@ -15771,7 +15757,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache full again -- should result in increase
      * of cache size from 12 to 14 meg.
@@ -15798,7 +15784,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache full and at maximum size -- should
      * in no change in size and a result of at_max_size.
@@ -15825,7 +15811,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate with cache full and at maximum size -- should
      * result in a decrease from 14 to 13 Meg -- note that max decrease
@@ -15853,7 +15839,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* the current cache configuration is inconvenient for testing cache
      * size reduction, so lets change it some something easier to work
@@ -15920,7 +15906,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate  -- should result in a decrease from ~4 to ~3
      * M -- note that max decrease reduces the size of the reduction
@@ -15947,7 +15933,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate again  -- should result in a decrease from ~3
      * to ~2 M -- again note that max decrease reduces the size of the
@@ -15975,7 +15961,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate again  -- should result in a decrease from ~2
      * to ~1 M -- again note that max decrease reduces the size of the
@@ -16003,7 +15989,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate again  -- should result in a decrease from ~1
      * to ~0.5 M -- max decrease is no longer a factor.  New size is five
@@ -16030,7 +16016,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate again  -- should result in a decrease of five
      * bytes to the minimum cache size.
@@ -16056,7 +16042,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate again -- Already at minimum size so no change in
      * cache size and result should be at_min_size.
@@ -16082,7 +16068,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force in range hit rate  -- should be no change in cache size,
      * and result should be in_spec.
@@ -16116,7 +16102,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache full -- should
      * increase cache size from .5 to 1 M.
@@ -16142,7 +16128,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- should result in a decrease to the
      * minimum cache size.
@@ -16168,7 +16154,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /******************************************************************
      * now do some tests with the maximum increase and decrease sizes
@@ -16235,7 +16221,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- should result in a decrease to the
      * minimum cache size.
@@ -16261,7 +16247,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache full -- should increase cache size
      * from 1 to 4 Meg.
@@ -16288,7 +16274,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate again with cache full -- should increase cache
      * size from 4 to 16 Meg.
@@ -16315,7 +16301,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- should result in a decrease cache size from
      * 16 to 4 Meg.
@@ -16342,7 +16328,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /******************************************************************
      * We have tested the threshold increment and decrement modes.
@@ -16411,7 +16397,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (cork_ageout)
         cork_entry_type(file_ptr, MEDIUM_ENTRY_TYPE);
@@ -16444,7 +16430,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* second epoch */
         rpt_fcn_called = FALSE;
@@ -16467,7 +16453,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* third epoch */
         rpt_fcn_called = FALSE;
@@ -16490,7 +16476,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fourth epoch -- If the hit rate were above the lower threshold,
      * we would see cache size reduction now.  However, nothing will
@@ -16517,7 +16503,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fifth epoch -- force the hit rate to 100%.  We should see cache size
      * reduction now.
@@ -16542,7 +16528,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* sixth epoch -- force the hit rate to 100% again.
      */
@@ -16566,7 +16552,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* seventh epoch -- force the hit rate to 100% again.
      */
@@ -16590,7 +16576,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* eighth epoch -- force the hit rate to 100% again -- should be steady
      * state.
@@ -16615,7 +16601,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* now just bang on one entry -- after three epochs, this should
      * get all entries other than the one evicted, and the cache size
@@ -16641,7 +16627,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* tenth epoch */
         rpt_fcn_called = FALSE;
@@ -16663,7 +16649,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* eleventh epoch -- cache size reduction */
         rpt_fcn_called = FALSE;
@@ -16686,7 +16672,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* twelfth epoch -- at minimum size so no more ageouts */
         rpt_fcn_called = FALSE;
@@ -16709,7 +16695,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (cork_ageout)
         uncork_entry_type(file_ptr, MEDIUM_ENTRY_TYPE);
@@ -16781,7 +16767,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fill the cache with 1024 byte entries -- nothing should happen
      * for three epochs while the markers are inserted into the cache
@@ -16812,7 +16798,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* second epoch */
 
@@ -16836,7 +16822,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* third epoch */
 
@@ -16860,7 +16846,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fourth epoch -- If the hit rate were above the lower threshold,
      * we would see cache size reduction now.  However, nothing will
@@ -16888,7 +16874,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fifth epoch -- force the hit rate to 100%.  We should see cache size
      * reduction now.
@@ -16915,7 +16901,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* sixth epoch -- force the hit rate to 100% again.
      */
@@ -16941,7 +16927,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* seventh epoch -- keep hit rate at 100%, and keep 2K entries active.
      */
@@ -16967,7 +16953,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* eighth epoch -- still 100% hit rate
      */
@@ -16993,7 +16979,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* ninth epoch --hit rate at 100%.
      */
@@ -17019,7 +17005,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* tenth epoch -- still 100% hit rate
      */
@@ -17045,7 +17031,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* eleventh epoch -- hit rate at 100% -- starting to stableize
      */
@@ -17070,7 +17056,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* twelfth epoch -- force the hit rate to 100% again -- should be steady
      * state.
@@ -17096,7 +17082,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* now just bang on one entry -- after three epochs, this should
      * get all entries other than the one evicted, and the cache size
@@ -17123,7 +17109,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* fourteenth epoch */
 
@@ -17147,7 +17133,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* fifteenth epoch -- cache size reduction */
 
@@ -17171,7 +17157,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* sixteenth epoch -- at minimum size so no more ageouts */
 
@@ -17195,7 +17181,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* repeat the test yet again, this time with empty reserve enabled.
      * Again, some structural changes in the test are necessary.
@@ -17263,7 +17249,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fill the cache with 1024 byte entries -- nothing should happen
      * for three epochs while the markers are inserted into the cache
@@ -17294,7 +17280,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* second epoch */
 
@@ -17318,7 +17304,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* third epoch */
 
@@ -17342,7 +17328,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fourth epoch -- If the hit rate were above the lower threshold,
      * we would see cache size reduction now.  However, nothing will
@@ -17370,7 +17356,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fifth epoch -- force the hit rate to 100%.  We should see cache size
      * reduction now.
@@ -17396,7 +17382,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* sixth epoch -- force the hit rate to 100% again.
      */
@@ -17421,7 +17407,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* seventh epoch -- force the hit rate to 100% again.
      */
@@ -17446,7 +17432,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* eighth epoch -- force the hit rate to 100% again -- should be steady
      * state.
@@ -17472,7 +17458,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* now just bang on one entry -- after three epochs, this should
      * get all entries other than the one evicted, and the cache size
@@ -17499,7 +17485,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* tenth epoch */
 
@@ -17522,7 +17508,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* eleventh epoch -- cache size reduction */
 
@@ -17546,7 +17532,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* twelfth epoch -- at minimum size so no more ageouts */
 
@@ -17570,7 +17556,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Repeat the test again, this time using the age out with threshold
      * mode.  To simplify the testing, set epochs to eviction to 1.
@@ -17641,7 +17627,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fill the cache with 4K byte entries -- increment mode is off,
      * so cache size reduction should kick in as soon as we get the
@@ -17669,7 +17655,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* second epoch -- hit rate 0 */
 
@@ -17693,7 +17679,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* third epoch -- hit rate 1.0 -- should see decrease */
 
@@ -17717,7 +17703,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fourth epoch -- load up the cache again -- hit rate 0 */
     if (pass) {
@@ -17742,7 +17728,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fifth epoch -- still loading up the cache -- hit rate 0 */
     if (pass) {
@@ -17767,7 +17753,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* sixth epoch -- force hit rate to .998 -- should be no reduction */
     if (pass) {
@@ -17792,7 +17778,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* seventh epoch -- force hit rate to .999 -- should see reduction
      */
@@ -17818,7 +17804,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* We have now tested all the major ageout modes individually.
      * Lets try them all together to look for unexpected interactions
@@ -17885,7 +17871,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fill the cache with 4K byte entries -- increment mode is threshold,
      * so the decrease code will not be executed until the hit rate exceeds
@@ -17913,7 +17899,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) { /* second epoch -- hit rate 0 */
 
@@ -17937,7 +17923,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* third epoch -- force the hit rate to 1.0.  Should be no change
      * in the cache size due to the combination of the empty reserve
@@ -17970,7 +17956,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fourth epoch -- hit rate still 1.0.  Index size should decrease,
      * but otherwise no change expected.
@@ -17998,7 +17984,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fifth epoch -- hit rate still 1.0.  Index size should decrease,
      * but otherwise no change expected.
@@ -18026,7 +18012,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* sixth epoch -- hit rate still 1.0.  Index size should decrease,
      * but otherwise no change expected.  Note that the cache size is
@@ -18055,7 +18041,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* seventh epoch -- hit rate still 1.0.  No change in index size expected.
      */
@@ -18082,7 +18068,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* eighth epoch -- start loading 1 KB entries.  Hit rate 0 so
      * decrease code shouldn't be called.
@@ -18110,7 +18096,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* ninth epoch -- access the 1 KB entries again, driving the hit rate
      * to 1.0.  Decrease code should be triggered, but the max decrease
@@ -18139,7 +18125,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* tenth epoch -- access the 1 KB entries yet again, forcing hit rate
      * to 1.0.  Decrease code should be triggered, and the empty reserve
@@ -18168,7 +18154,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* eleventh epoch -- access the 1 KB entries yet again, forcing hit rate
      * to 1.0.  Decrease code should be triggered, and the empty reserve
@@ -18197,7 +18183,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* twelfth  epoch -- hit rate 1.0 -- decrease as before.
      */
@@ -18224,7 +18210,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* thirteenth  epoch -- hit rate 1.0 -- decrease as before.
      */
@@ -18251,7 +18237,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fourteenth  epoch -- hit rate 1.0 -- decrease as before.
      */
@@ -18278,7 +18264,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* fifteenth  epoch -- hit rate 1.0 -- decrease as before.
      */
@@ -18305,7 +18291,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* sixteenth  epoch -- hit rate 1.0 -- should be stable now
      */
@@ -18332,7 +18318,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* now test the flash cache size increment code.  At least at present,
      * there should be no interaction between the regular auto-resize
@@ -18346,7 +18332,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
      */
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Place the cache in a known state via a flush-destroy on the cache
      * to clear out all entries, and then a reset on all the entries.
@@ -18361,7 +18347,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* now repeat the above tests using the add space flash cache size
      * increment algorithm.
@@ -18427,7 +18413,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Load a huge entry into the cache */
     if (pass) {
@@ -18447,7 +18433,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now load a monster entry.  Since a monster entry is larger than
      * half the size of the cache, and there is not sufficient space
@@ -18472,7 +18458,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Load a second monster entry.  Since the monster entry is larger
      * than half the size of the cache yet again, and there is not
@@ -18496,7 +18482,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Load a third moster entry.  Should be no cache size increase this
      * time.
@@ -18518,7 +18504,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* delete existing entries to prepare for next test, and reset
      * the size of the cache.
@@ -18551,7 +18537,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
      */
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* insert a huge entry into the cache */
     if (pass) {
@@ -18574,7 +18560,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now insert a monster entry.  Since a monster entry is larger than
      * half the size of the cache, and there is not sufficient space
@@ -18596,7 +18582,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Insert a second monster entry.  Cache size should increase again.
      */
@@ -18615,7 +18601,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Insert a third monster entry.  Should be no cache size increase this
      * time.
@@ -18637,7 +18623,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* delete existing entries to prepare for next test, and reset
      * the size of the cache.  We must also change the size of the needed
@@ -18689,7 +18675,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now load the variable entries into the cache */
     if (pass) {
@@ -18716,7 +18702,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* protect a variable entry, and re-size it to 3K.  Should be
      * no effect on the size of the cache.
@@ -18737,7 +18723,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* protect the variable entry again, and re-size it to 10K.  Should
      * resize the cache to 13 KB.  Note that cache_accesses will be 0
@@ -18759,7 +18745,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* protect a second variable entry, and re-size it to 10K.  Should
      * resize to 22 KB.
@@ -18780,7 +18766,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* protect a third variable entry, and re-size it to 10K.  Should
      * be no change in cache size.
@@ -18801,7 +18787,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* re-size the variable entries back down to their initial size, and
      * restore the cache to its initial size as well, in preparation
@@ -18843,7 +18829,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now test flash cache resizes with pinned entries...
      */
@@ -18863,7 +18849,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -18879,7 +18865,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -18897,7 +18883,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -18915,7 +18901,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Unpin the entries.  Note that no entries are evicted as we don't
      * load any entries.
@@ -18941,7 +18927,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* re-size the variable entries back down to their initial size, and
      * restore the cache to its initial size as well, in preparation
@@ -18998,7 +18984,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -19014,7 +19000,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -19032,7 +19018,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -19050,7 +19036,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Unpin the entries.  Note that no entries are evicted as we don't
      * load any entries.
@@ -19095,7 +19081,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* ...and then reconfigure.   Note that we change the flash_multiple
      * and flash_threshold just to make sure that such changed perform
@@ -19151,7 +19137,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -19164,7 +19150,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* protect and unprotect a large entry -- no change in cache size since
      * a large entry will just fill the available space in the cache.
@@ -19186,7 +19172,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* protect and unprotect another a large entry -- should trigger a
      * flash cache size increase to 12 KB (remember that flash_multiple is
@@ -19210,7 +19196,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* protect and unprotect two more large entries -- shouldn't trigger a
      * flash cache size increase.
@@ -19235,7 +19221,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* do many accesses of a single entry to talk the cache into reducing
      * its size to the minimum.
@@ -19261,7 +19247,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Force another flash increase */
     if (pass) {
@@ -19283,7 +19269,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force regular size increase up to maximum */
     if (pass) {
@@ -19307,7 +19293,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -19315,7 +19301,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
         PASSED();
@@ -19325,7 +19311,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
     } /* end else */
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return (unsigned)!pass;
 } /* check_auto_cache_resize() */
@@ -19403,7 +19389,7 @@ check_auto_cache_resize_disable(unsigned paged)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* allocate a cache, enable automatic cache resizing, and then force
      * the cache through all its operational modes.  Verify that all
@@ -19448,7 +19434,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /******************************************************************
      * So far, we have forced the auto cache resize through all modes
@@ -19519,7 +19505,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache full -- increase disabled so should
      * be no change in cache size, and result should be increase_disabled.
@@ -19547,7 +19533,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- make sure that we haven't disabled decreases.
      * should result in a decrease cache size from 4 to 2 Meg.
@@ -19575,7 +19561,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate again -- increase disabled so should
      * be no change in cache size, and result should be increase_disabled.
@@ -19603,7 +19589,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Repeat the above tests, disabling increase through the lower
      * threshold instead of the increment.
@@ -19670,7 +19656,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache full -- increase disabled so should
      * be no change in cache size, and result should be in_spec.
@@ -19698,7 +19684,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- make sure that we haven't disabled decreases.
      * should result in a decrease cache size from 4 to 2 Meg.
@@ -19726,7 +19712,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate again -- increase disabled so should
      * be no change in cache size, and result should be increase_disabled.
@@ -19754,7 +19740,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Repeat the above tests yet again, disabling increase through the
      * incr_mode.
@@ -19822,7 +19808,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate with cache full -- increase disabled so should
      * be no change in cache size, and result should be in_spec.
@@ -19850,7 +19836,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- make sure that we haven't disabled decreases.
      * should result in a decrease cache size from 4 to 2 Meg.
@@ -19878,7 +19864,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate again -- increase disabled so should
      * be no change in cache size, and result should be increase_disabled.
@@ -19906,7 +19892,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now, disable size decreases, and repeat the above tests.
      */
@@ -19963,7 +19949,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -19976,7 +19962,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- should be no change in cache size,
      * and result should be decrease_disabled.
@@ -20004,7 +19990,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate -- cache size should increase from 4 to 6 Meg.
      */
@@ -20031,7 +20017,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate again -- should be no change in cache size,
      * and result should be decrease_disabled.
@@ -20059,7 +20045,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Repeat the above tests, disabling decrease through the upper
      * threshold instead of the decrement.
@@ -20127,7 +20113,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- should be no change in cache size,
      * and result should be in_spec.
@@ -20155,7 +20141,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate -- cache size should increase from 4 to 6 Meg.
      */
@@ -20182,7 +20168,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate again -- should be no change in cache size,
      * and result should be in_spec.
@@ -20210,7 +20196,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Repeat the above tests, disabling decrease through the decr_mode.
      */
@@ -20277,7 +20263,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- should be no change in cache size,
      * and result should be in_spec.
@@ -20305,7 +20291,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate -- cache size should increase from 4 to 6 Meg.
      */
@@ -20332,7 +20318,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate again -- should be no change in cache size,
      * and result should be in_spec.
@@ -20360,7 +20346,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now do tests disabling size decrement in age out mode.
      *
@@ -20429,7 +20415,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -20438,7 +20424,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* load up the cache with small entries.  Note that it will take an
      * epoch for the ageout code to initialize itself if it is enabled.
@@ -20466,7 +20452,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Load up some more small entries.
      */
@@ -20493,7 +20479,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now force a high hit rate so that the size increase code is
      * is satisfied.  We would see a decrease here if decrease were
@@ -20522,7 +20508,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate -- cache size should increase from 4 to 6 Meg.
      */
@@ -20549,7 +20535,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* just bang on a single entry.  This will see to it that there are
      * many entries that could be aged out were decreases enabled.
@@ -20579,7 +20565,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now disable size decrement in age out mode via the empty reserve.
      */
@@ -20646,7 +20632,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -20655,7 +20641,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* load up the cache with small entries.  Note that it will take an
      * epoch for the ageout code to initialize itself if it is enabled.
@@ -20683,7 +20669,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Load up some more small entries.
      */
@@ -20710,7 +20696,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now force a high hit rate so that the size increase code is
      * is satisfied.  We would see a decrease here if decrease were
@@ -20739,7 +20725,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate -- cache size should increase from 4 to 6 Meg.
      */
@@ -20766,7 +20752,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* just bang on a single entry.  This will see to it that there are
      * many entries that could be aged out were decreases enabled.
@@ -20796,7 +20782,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now work with age out with threshold.  One can argue that we should
      * repeat the above age out tests with age out with threshold, but the
@@ -20870,7 +20856,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -20879,7 +20865,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* load up the cache with small entries.  Note that it will take an
      * epoch for the ageout code to initialize itself if it is enabled.
@@ -20907,7 +20893,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Load up some more small entries.
      */
@@ -20934,7 +20920,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now force a high hit rate so that the size increase code is
      * is satisfied.  We would see a decrease here if decrease were
@@ -20966,7 +20952,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate -- cache size should increase from 4 to 6 Meg.
      */
@@ -20993,7 +20979,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* just bang on a single entry.  This keeps the hit rate high, and sees
      * to it that there are many entries that could be aged out were
@@ -21025,7 +21011,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /*********************************************************************
      * Finally, use the auto cache resize code to set the size of the
@@ -21096,7 +21082,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate -- should be no response as the auto-resize
      * code should be disabled.
@@ -21124,7 +21110,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- should be no response as the auto-resize
      * code should be disabled.
@@ -21152,7 +21138,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -21216,7 +21202,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate -- should be no response as the auto-resize
      * code should be disabled.
@@ -21244,7 +21230,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- should be no response as the auto-resize
      * code should be disabled.
@@ -21272,7 +21258,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -21336,7 +21322,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate -- should be no response as the auto-resize
      * code should be disabled.
@@ -21364,7 +21350,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- should be no response as the auto-resize
      * code should be disabled.
@@ -21392,7 +21378,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -21456,7 +21442,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate -- should be no response as the auto-resize
      * code should be disabled.
@@ -21484,7 +21470,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- should be no response as the auto-resize
      * code should be disabled.
@@ -21512,7 +21498,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -21576,7 +21562,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate -- should be no response as the auto-resize
      * code should be disabled.
@@ -21604,7 +21590,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- should be no response as the auto-resize
      * code should be disabled.
@@ -21632,7 +21618,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -21696,7 +21682,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force low hit rate -- should be no response as the auto-resize
      * code should be disabled.
@@ -21724,7 +21710,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* force high hit rate -- should be no response as the auto-resize
      * code should be disabled.
@@ -21752,7 +21738,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now test the flash cache size increment code to verify that it
      * is disabled when it should be.
@@ -21856,11 +21842,11 @@ check_auto_cache_resize_disable(unsigned paged)
                       (cache_ptr->min_clean_size != (32 * 1024)) || (cache_ptr->index_len != 1) ||
                       (cache_ptr->index_size != LARGE_ENTRY_SIZE) || (rpt_fcn_called != FALSE)))) {
 
-            HDfprintf(stdout, "\nmax_cache_size = %ld.\n", (long)(cache_ptr->max_cache_size));
-            HDfprintf(stdout, "min_clean_size = %ld.\n", (long)(cache_ptr->min_clean_size));
-            HDfprintf(stdout, "index_len = %ld.\n", (long)(cache_ptr->index_len));
-            HDfprintf(stdout, "index_size = %ld.\n", (long)(cache_ptr->index_size));
-            HDfprintf(stdout, "rpt_fcn_called = %ld.\n", (long)(rpt_fcn_called));
+            fprintf(stdout, "\nmax_cache_size = %ld.\n", (long)(cache_ptr->max_cache_size));
+            fprintf(stdout, "min_clean_size = %ld.\n", (long)(cache_ptr->min_clean_size));
+            fprintf(stdout, "index_len = %ld.\n", (long)(cache_ptr->index_len));
+            fprintf(stdout, "index_size = %ld.\n", (long)(cache_ptr->index_size));
+            fprintf(stdout, "rpt_fcn_called = %ld.\n", (long)(rpt_fcn_called));
 
             pass         = FALSE;
             failure_mssg = "Unexpected cache size change results 46.\n";
@@ -21868,7 +21854,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now protect and unprotect a monster entry.  If the flash cache
      * size increment code was active, this would trigger an increase.
@@ -21888,11 +21874,11 @@ check_auto_cache_resize_disable(unsigned paged)
                       (cache_ptr->min_clean_size != (32 * 1024)) || (cache_ptr->index_len != 1) ||
                       (cache_ptr->index_size != MONSTER_ENTRY_SIZE) || (rpt_fcn_called != FALSE)))) {
 
-            HDfprintf(stdout, "\nmax_cache_size = %ld.\n", (long)(cache_ptr->max_cache_size));
-            HDfprintf(stdout, "min_clean_size = %ld.\n", (long)(cache_ptr->min_clean_size));
-            HDfprintf(stdout, "index_len = %ld.\n", (long)(cache_ptr->index_len));
-            HDfprintf(stdout, "index_size = %ld.\n", (long)(cache_ptr->index_size));
-            HDfprintf(stdout, "rpt_fcn_called = %ld.\n", (long)(rpt_fcn_called));
+            fprintf(stdout, "\nmax_cache_size = %ld.\n", (long)(cache_ptr->max_cache_size));
+            fprintf(stdout, "min_clean_size = %ld.\n", (long)(cache_ptr->min_clean_size));
+            fprintf(stdout, "index_len = %ld.\n", (long)(cache_ptr->index_len));
+            fprintf(stdout, "index_size = %ld.\n", (long)(cache_ptr->index_size));
+            fprintf(stdout, "rpt_fcn_called = %ld.\n", (long)(rpt_fcn_called));
 
             pass         = FALSE;
             failure_mssg = "Unexpected cache size change results 47.\n";
@@ -21900,7 +21886,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -21908,7 +21894,7 @@ check_auto_cache_resize_disable(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
         PASSED();
@@ -21919,7 +21905,7 @@ check_auto_cache_resize_disable(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -22000,7 +21986,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -22031,7 +22017,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now make sure that we are managing the epoch markers correctly.
      */
@@ -22098,7 +22084,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Since we just created the cache, there should be no epoch markers
      * active.  Verify that this is true.
@@ -22137,7 +22123,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -22166,7 +22152,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* we now have a full complement of epoch markers -- see if
      * we get the expected reduction.
@@ -22195,7 +22181,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* now reduce the epochs before eviction, and see if the cache
      * deletes the extra markers
@@ -22262,7 +22248,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* There should be exactly one active epoch marker at present.
      */
@@ -22302,7 +22288,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* There should be exactly one active epoch marker at present...
      */
@@ -22391,7 +22377,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* shift the decrement mode to age out with threshold.  Set epochs
      * before eviction to 10 again.
@@ -22459,7 +22445,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* build up a full set of epoch markers. */
     if (pass) {
@@ -22489,7 +22475,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Verify that there are now 10 active epoch markers.
      */
@@ -22568,7 +22554,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     /* verify that we still have the expected number of entries in the cache,
      * and that the cache is of the expected size.
@@ -22585,7 +22571,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
 
@@ -22593,7 +22579,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
     }
 
     if (show_progress)
-        HDfprintf(stderr, "check point %d\n", checkpoint++);
+        fprintf(stderr, "check point %d\n", checkpoint++);
 
     if (pass) {
         PASSED();
@@ -22604,7 +22590,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -24818,7 +24804,7 @@ check_auto_cache_resize_input_errs(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -25307,7 +25293,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -25410,7 +25396,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     } /* end else */
 
     if (show_progress) /* 0 */
-        HDfprintf(stdout, "\n%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "\n%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     if (pass) {
 
@@ -25431,7 +25417,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     /* ========================================================================
      * ========================================================================
@@ -25494,7 +25480,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     /* ========================================================================
      * ========================================================================
@@ -25564,7 +25550,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     if (pass) {
 
@@ -25618,7 +25604,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     if (pass) {
 
@@ -25671,7 +25657,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     /* ========================================================================
      * ========================================================================
@@ -25746,7 +25732,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     if (pass) {
 
@@ -25817,7 +25803,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     /* ========================================================================
      * ========================================================================
@@ -25876,7 +25862,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     if (pass) {
 
@@ -25924,7 +25910,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     if (pass) {
 
@@ -25975,7 +25961,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     if (pass) {
 
@@ -26021,7 +26007,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     if (cache_ptr) {
 
@@ -26031,7 +26017,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 12 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass);
 
     HDfree(expected);
 
@@ -27963,7 +27949,7 @@ done:
         PASSED();
     else {
         H5_FAILED();
-        HDfprintf(stdout, "%s.\n", failure_mssg);
+        fprintf(stdout, "%s.\n", failure_mssg);
     } /* end else */
 
     return (unsigned)!pass;
@@ -28229,7 +28215,7 @@ done:
         PASSED();
     else {
         H5_FAILED();
-        HDfprintf(stdout, "%s.\n", failure_mssg);
+        fprintf(stdout, "%s.\n", failure_mssg);
     } /* end else */
 
     return (unsigned)!pass;
@@ -30959,7 +30945,7 @@ done:
         PASSED();
     else {
         H5_FAILED();
-        HDfprintf(stdout, "%s.\n", failure_mssg);
+        fprintf(stdout, "%s.\n", failure_mssg);
     } /* end else */
 
     return (unsigned)!pass;
@@ -31175,7 +31161,7 @@ done:
         PASSED();
     else {
         H5_FAILED();
-        HDfprintf(stdout, "%s.\n", failure_mssg);
+        fprintf(stdout, "%s.\n", failure_mssg);
     } /* end else */
 
     return (unsigned)!pass;
@@ -31259,7 +31245,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
         TESTING("to ensure cork/uncork metadata on protect/unprotect");
 
     if (show_progress) /* 0 */
-        HDfprintf(stdout, "\n%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "\n%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     if (pass) {
 
@@ -31283,7 +31269,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     cork_entry_type(file_ptr, entry_type);
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     /* ========================================================================
      * ========================================================================
@@ -31336,7 +31322,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     /* ========================================================================
      * ========================================================================
@@ -31392,7 +31378,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     if (pass) {
 
@@ -31433,7 +31419,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     if (pass) {
 
@@ -31482,7 +31468,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     /* ========================================================================
      * ========================================================================
@@ -31495,7 +31481,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
      */
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     if (pass) {
 
@@ -31534,7 +31520,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     /* ========================================================================
      * ========================================================================
@@ -31578,7 +31564,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     if (pass) {
 
@@ -31621,7 +31607,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     if (pass) {
 
@@ -31665,7 +31651,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     if (pass) {
 
@@ -31705,7 +31691,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     if (pass) {
 
@@ -31749,14 +31735,14 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     }
 
     if (show_progress) /* 12 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     /* We're done with testing. We can take down the cache. */
     takedown_cache(file_ptr, FALSE, FALSE);
     reset_entries();
 
     if (show_progress) /* 13 */
-        HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
+        fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass);
 
     HDfree(expected);
 
@@ -31858,7 +31844,7 @@ check_entry_deletions_during_scans(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return (unsigned)!pass;
@@ -33270,14 +33256,14 @@ check_stats(unsigned paged)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
 #else /* H5C_COLLECT_CACHE_STATS */
 
     SKIPPED();
 
-    HDfprintf(stdout, "    Statistics collection disabled.\n");
+    fprintf(stdout, "    Statistics collection disabled.\n");
 
 #endif /* H5C_COLLECT_CACHE_STATS */
 
@@ -33738,7 +33724,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
     hid_t   fcpl_id = H5P_DEFAULT;
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     saved_fid = -1;
 
@@ -33781,7 +33767,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
     }
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass && try_core_file_driver) {
         if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) == FAIL) {
@@ -33798,7 +33784,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
             core_file_driver_failed = TRUE;
 
             if (verbose)
-                HDfprintf(stdout, "%s: H5Fcreate() with CFD failed.\n", __func__);
+                fprintf(stdout, "%s: H5Fcreate() with CFD failed.\n", __func__);
         }
         else {
             saved_fapl_id = fapl_id;
@@ -33806,7 +33792,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
     }
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     /* if we either aren't using the core file driver, or a create
      * with the core file driver failed, try again with a regular file.
@@ -33821,7 +33807,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
             failure_mssg = "H5Fcreate() failed.";
 
             if (verbose)
-                HDfprintf(stdout, "%s: H5Fcreate() failed.\n", __func__);
+                fprintf(stdout, "%s: H5Fcreate() failed.\n", __func__);
         } /* end if */
     }     /* end if */
 
@@ -33829,7 +33815,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
     H5CX_push();
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
         assert(fid >= 0);
@@ -33839,7 +33825,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
             failure_mssg = "H5Fflush() failed.";
 
             if (verbose)
-                HDfprintf(stdout, "%s: H5Fflush() failed.\n", __func__);
+                fprintf(stdout, "%s: H5Fflush() failed.\n", __func__);
         }
         else {
             file_ptr = (H5F_t *)H5VL_object_verify(fid, H5I_FILE);
@@ -33848,13 +33834,13 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
                 failure_mssg = "Can't get file_ptr.";
 
                 if (verbose)
-                    HDfprintf(stdout, "%s: H5Fflush() failed.\n", __func__);
+                    fprintf(stdout, "%s: H5Fflush() failed.\n", __func__);
             }
         }
     }
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
 
@@ -33897,7 +33883,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
     }
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
         if (cache_ptr == NULL) {
@@ -33905,12 +33891,12 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
             failure_mssg = "H5C_create() failed.";
 
             if (verbose)
-                HDfprintf(stdout, "%s: H5C_create() failed.\n", __func__);
+                fprintf(stdout, "%s: H5C_create() failed.\n", __func__);
         }
     }
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) { /* allocate space for test entries */
         actual_base_addr = H5MF_alloc(file_ptr, H5FD_MEM_DEFAULT, (hsize_t)(ADDR_SPACE_SIZE + BASE_ADDR));
@@ -33920,7 +33906,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
             failure_mssg = "H5MF_alloc() failed.";
 
             if (verbose)
-                HDfprintf(stdout, "%s: H5MF_alloc() failed.\n", __func__);
+                fprintf(stdout, "%s: H5MF_alloc() failed.\n", __func__);
         }
         else if (actual_base_addr > BASE_ADDR) {
             /* If this happens, must increase BASE_ADDR so that the
@@ -33931,14 +33917,14 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
             failure_mssg = "actual_base_addr > BASE_ADDR";
 
             if (verbose)
-                HDfprintf(stdout, "%s: actual_base_addr > BASE_ADDR.\n", __func__);
+                fprintf(stdout, "%s: actual_base_addr > BASE_ADDR.\n", __func__);
         }
 
         saved_actual_base_addr = actual_base_addr;
     }
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     if (pass) {
         /* Need to set this else all cache tests will fail */
@@ -33949,7 +33935,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged)
     }
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
+        fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass);
 
     return (ret_val);
 } /* setup_cache() */
@@ -34079,10 +34065,10 @@ main(void)
 
     express_test = GetTestExpress();
 
-    HDprintf("=========================================\n");
-    HDprintf("Internal cache tests\n");
-    HDprintf("        express_test = %d\n", express_test);
-    HDprintf("=========================================\n");
+    printf("=========================================\n");
+    printf("Internal cache tests\n");
+    printf("        express_test = %d\n", express_test);
+    printf("=========================================\n");
 
     if (!h5_using_default_driver(NULL)) {
         HDputs(" -- SKIPPED for incompatible VFD --");
@@ -34091,7 +34077,7 @@ main(void)
 
     if (create_entry_arrays() < 0) {
 
-        HDprintf("ERROR: Unable to create entries arrays. Aborting.\n");
+        printf("ERROR: Unable to create entries arrays. Aborting.\n");
         return EXIT_FAILURE;
     } /* end if */
 
@@ -34101,12 +34087,12 @@ main(void)
 
         if (paged) {
 
-            HDfprintf(stdout, "\n\nRe-running tests with paged aggregation:\n");
+            fprintf(stdout, "\n\nRe-running tests with paged aggregation:\n");
 
             if (express_test > 0)
-                HDfprintf(stdout, "    Skipping smoke checks.\n");
+                fprintf(stdout, "    Skipping smoke checks.\n");
 
-            HDfprintf(stdout, "\n");
+            fprintf(stdout, "\n");
         }
 
         nerrs += smoke_check_1(express_test, paged);
diff --git a/test/cache_api.c b/test/cache_api.c
index 9e09b86..413232e 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -475,7 +475,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return pass;
@@ -800,7 +800,7 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return pass;
@@ -964,7 +964,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
 
         SKIPPED();
 
-        HDfprintf(stdout, "     Long tests disabled.\n");
+        fprintf(stdout, "     Long tests disabled.\n");
 
         return pass;
     }
@@ -1418,7 +1418,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return pass;
@@ -1796,7 +1796,7 @@ check_fapl_mdc_api_errs(void)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return pass;
@@ -1849,7 +1849,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: calling h5_fixname().\n", __func__);
+            fprintf(stdout, "%s: calling h5_fixname().\n", __func__);
         }
 
         if (h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) {
@@ -1863,7 +1863,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: calling H5Fcreate().\n", __func__);
+            fprintf(stdout, "%s: calling H5Fcreate().\n", __func__);
         }
 
         file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT);
@@ -1884,7 +1884,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 1.\n", __func__);
+            fprintf(stdout, "%s: testing H5Fget_mdc_config() 1.\n", __func__);
         }
 
         H5E_BEGIN_TRY
@@ -1904,7 +1904,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 2.\n", __func__);
+            fprintf(stdout, "%s: testing H5Fget_mdc_config() 2.\n", __func__);
         }
 
         H5E_BEGIN_TRY
@@ -1925,7 +1925,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 3.\n", __func__);
+            fprintf(stdout, "%s: testing H5Fget_mdc_config() 3.\n", __func__);
         }
 
         H5E_BEGIN_TRY
@@ -1948,7 +1948,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 1.\n", __func__);
+            fprintf(stdout, "%s: testing H5Fset_mdc_config() 1.\n", __func__);
         }
 
         H5E_BEGIN_TRY
@@ -1968,7 +1968,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 2.\n", __func__);
+            fprintf(stdout, "%s: testing H5Fset_mdc_config() 2.\n", __func__);
         }
 
         H5E_BEGIN_TRY
@@ -1988,7 +1988,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
     while ((pass) && (i < NUM_INVALID_CONFIGS)) {
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: testing H5Fset_mdc_config() with invalid config %d.\n", __func__, i);
+            fprintf(stdout, "%s: testing H5Fset_mdc_config() with invalid config %d.\n", __func__, i);
         }
 
         H5E_BEGIN_TRY
@@ -2016,7 +2016,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 1.\n", __func__);
+            fprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 1.\n", __func__);
         }
 
         H5E_BEGIN_TRY
@@ -2036,7 +2036,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 2.\n", __func__);
+            fprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 2.\n", __func__);
         }
 
         H5E_BEGIN_TRY
@@ -2057,7 +2057,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: testing H5Freset_mdc_hit_rate_stats().\n", __func__);
+            fprintf(stdout, "%s: testing H5Freset_mdc_hit_rate_stats().\n", __func__);
         }
 
         H5E_BEGIN_TRY
@@ -2078,7 +2078,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: testing H5Fget_mdc_size() 1.\n", __func__);
+            fprintf(stdout, "%s: testing H5Fget_mdc_size() 1.\n", __func__);
         }
 
         H5E_BEGIN_TRY
@@ -2098,7 +2098,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: testing H5Fget_mdc_size() 2.\n", __func__);
+            fprintf(stdout, "%s: testing H5Fget_mdc_size() 2.\n", __func__);
         }
 
         if ((H5Fget_mdc_size(file_id, &max_size, NULL, NULL, NULL) < 0) ||
@@ -2117,7 +2117,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
         if (show_progress) {
 
-            HDfprintf(stdout, "%s: cleaning up from tests.\n", __func__);
+            fprintf(stdout, "%s: cleaning up from tests.\n", __func__);
         }
 
         if (H5Fclose(file_id) < 0) {
@@ -2143,7 +2143,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id)
 
     if (!pass) {
 
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
     }
 
     return pass;
@@ -2175,36 +2175,36 @@ main(void)
 
     express_test = GetTestExpress();
 
-    HDprintf("===================================\n");
-    HDprintf("Cache API tests\n");
-    HDprintf("        express_test = %d\n", express_test);
-    HDprintf("===================================\n");
+    printf("===================================\n");
+    printf("Cache API tests\n");
+    printf("        express_test = %d\n", express_test);
+    printf("===================================\n");
 
     /* Initialize invalid configurations.
      */
     invalid_configs = init_invalid_configs();
     if (NULL == invalid_configs) {
         failure_mssg = "Unable to allocate memory for invalid configs.";
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
         return EXIT_FAILURE;
     } /* end if */
 
     if ((fcpl_id = H5Pcreate(H5P_FILE_CREATE)) < 0) {
         failure_mssg = "H5Pcreate(H5P_FILE_CREATE) failed.\n";
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
         return EXIT_FAILURE;
     } /* end if */
 
     /* Set file space strategy to default or paged aggregation strategy */
     if ((fcpl2_id = H5Pcopy(fcpl_id)) < 0) {
         failure_mssg = "H5Pcreate(H5P_FILE_CREATE) failed.\n";
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
         return EXIT_FAILURE;
     } /* end if */
 
     if (H5Pset_file_space_strategy(fcpl2_id, H5F_FSPACE_STRATEGY_PAGE, 1, (hsize_t)1) < 0) {
         failure_mssg = "H5Pset_file_space_strategy() failed.\n";
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
         return EXIT_FAILURE;
     } /* end if */
 
@@ -2242,7 +2242,7 @@ main(void)
 
     if (H5Pclose(fcpl_id) < 0) {
         failure_mssg = "H5Pclose() failed.\n";
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
         return EXIT_FAILURE;
     } /* end if */
 
diff --git a/test/cache_common.c b/test/cache_common.c
index e4135b0..454d194 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -710,20 +710,20 @@ deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *udata, hb
         (!entry->at_main_addr && entry->written_to_alt_addr)) {
         if ((type == PICO_ENTRY_TYPE) || (type == VARIABLE_ENTRY_TYPE) || (type == NOTIFY_ENTRY_TYPE)) {
             if ((*((const char *)image)) != (char)(idx & 0xFF)) {
-                HDfprintf(stdout, "type = %d, idx = %d, addr = 0x%lx.\n", type, idx, (long)addr);
-                HDfprintf(stdout, "*image = 0x%x\n", (int)(*((const char *)image)));
-                HDfprintf(stdout, "expected *image = 0x%x\n", (int)(idx & 0xFF));
+                fprintf(stdout, "type = %d, idx = %d, addr = 0x%lx.\n", type, idx, (long)addr);
+                fprintf(stdout, "*image = 0x%x\n", (int)(*((const char *)image)));
+                fprintf(stdout, "expected *image = 0x%x\n", (int)(idx & 0xFF));
             } /* end if */
             assert((*((const char *)image)) == (char)(idx & 0xFF));
         } /* end if */
         else {
             if ((*(((const char *)image) + 2)) != (char)(idx & 0xFF)) {
-                HDfprintf(stdout, "type = %d, idx = %d, addr = 0x%lx.\n", type, idx, (long)addr);
-                HDfprintf(stdout, "*image = 0x%" PRIx8 " 0x%" PRIx8 " 0x%" PRIx8 "\n",
-                          (*((const uint8_t *)image)), (*(((const uint8_t *)image) + 1)),
-                          (*(((const uint8_t *)image) + 2)));
-                HDfprintf(stdout, "expected *image = 0x%02" PRIx32 "%02" PRIx32 "\n", (uint32_t)idx & 0xFF,
-                          (((uint32_t)idx & 0xFF00) >> 8));
+                fprintf(stdout, "type = %d, idx = %d, addr = 0x%lx.\n", type, idx, (long)addr);
+                fprintf(stdout, "*image = 0x%" PRIx8 " 0x%" PRIx8 " 0x%" PRIx8 "\n",
+                        (*((const uint8_t *)image)), (*(((const uint8_t *)image) + 1)),
+                        (*(((const uint8_t *)image) + 2)));
+                fprintf(stdout, "expected *image = 0x%02" PRIx32 "%02" PRIx32 "\n", (uint32_t)idx & 0xFF,
+                        (((uint32_t)idx & 0xFF00) >> 8));
             } /* end if */
             assert((*((const char *)image)) == (char)(type & 0xFF));
             assert((*(((const char *)image) + 1)) == (char)((idx & 0xFF00) >> 8));
@@ -2769,9 +2769,9 @@ flush_cache(H5F_t *file_ptr, hbool_t destroy_entries, hbool_t dump_stats, hbool_
 
             if (verbose) {
 
-                HDfprintf(stdout, "%s: unexpected il/is/cis/dis = %lld/%lld/%lld/%lld.\n", __func__,
-                          (long long)(cache_ptr->index_len), (long long)(cache_ptr->index_size),
-                          (long long)(cache_ptr->clean_index_size), (long long)(cache_ptr->dirty_index_size));
+                fprintf(stdout, "%s: unexpected il/is/cis/dis = %lld/%lld/%lld/%lld.\n", __func__,
+                        (long long)(cache_ptr->index_len), (long long)(cache_ptr->index_size),
+                        (long long)(cache_ptr->clean_index_size), (long long)(cache_ptr->dirty_index_size));
             }
             pass         = FALSE;
             failure_mssg = "non zero index len/sizes after H5C_flush_cache() with invalidate.";
@@ -2912,16 +2912,16 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags)
 
 #if 0 /* This is useful debugging code.  Lets keep it around. */
 
-            HDfprintf(stdout, "result = %d\n", (int)result);
-            HDfprintf(stdout, "entry_ptr->header.is_protected = %d\n",
+            fprintf(stdout, "result = %d\n", (int)result);
+            fprintf(stdout, "entry_ptr->header.is_protected = %d\n",
                       (int)(entry_ptr->header.is_protected));
-            HDfprintf(stdout,
+            fprintf(stdout,
             "entry_ptr->header.type != types[type] = %d\n",
                       (int)(entry_ptr->header.type != types[type]));
-            HDfprintf(stdout,
+            fprintf(stdout,
                       "entry_ptr->size != entry_ptr->header.size = %d\n",
                       (int)(entry_ptr->size != entry_ptr->header.size));
-            HDfprintf(stdout,
+            fprintf(stdout,
                       "entry_ptr->addr != entry_ptr->header.addr = %d\n",
                        (int)(entry_ptr->addr != entry_ptr->header.addr));
 #endif
@@ -3160,22 +3160,22 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx)
              * again.
              *                              - JRM
              */
-            HDfprintf(stdout, "( cache_entry_ptr != (void *)entry_ptr ) = %d\n",
+            fprintf(stdout, "( cache_entry_ptr != (void *)entry_ptr ) = %d\n",
                       (int)( cache_entry_ptr != (void *)entry_ptr ));
-            HDfprintf(stdout, "cache_entry_ptr = 0x%lx, entry_ptr = 0x%lx\n",
+            fprintf(stdout, "cache_entry_ptr = 0x%lx, entry_ptr = 0x%lx\n",
                       (long)cache_entry_ptr, (long)entry_ptr);
-            HDfprintf(stdout, "entry_ptr->header.is_protected = %d\n",
+            fprintf(stdout, "entry_ptr->header.is_protected = %d\n",
                       (int)(entry_ptr->header.is_protected));
-            HDfprintf(stdout,
+            fprintf(stdout,
                       "( entry_ptr->header.type != types[type] ) = %d\n",
                       (int)( entry_ptr->header.type != types[type] ));
-            HDfprintf(stdout,
+            fprintf(stdout,
                       "entry_ptr->size = %d, entry_ptr->header.size = %d\n",
                       (int)(entry_ptr->size), (int)(entry_ptr->header.size));
-            HDfprintf(stdout,
+            fprintf(stdout,
                       "entry_ptr->addr = %d, entry_ptr->header.addr = %d\n",
                       (int)(entry_ptr->addr), (int)(entry_ptr->header.addr));
-            HDfprintf(stdout,
+            fprintf(stdout,
                     "entry_ptr->verify_ct = %d, entry_ptr->max_verify_ct = %d\n",
                     entry_ptr->verify_ct, entry_ptr->max_verify_ct);
             H5Eprint2(H5E_DEFAULT, stdout);
@@ -3517,7 +3517,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
     int32_t local_max_index;
 
     if (verbose)
-        HDfprintf(stdout, "%s(): entering.\n", __func__);
+        fprintf(stdout, "%s(): entering.\n", __func__);
 
     if (pass) {
         cache_ptr = file_ptr->shared->cache;
@@ -3536,14 +3536,14 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             int32_t tmp_idx;
 
             if (verbose)
-                HDfprintf(stdout, "%d:%d: ", type, idx);
+                fprintf(stdout, "%d:%d: ", type, idx);
 
             tmp_idx = idx + lag;
             if (pass && do_inserts && (tmp_idx >= 0) && (tmp_idx <= local_max_index) &&
                 ((tmp_idx % 2) == 0) && !entry_in_cache(cache_ptr, type, tmp_idx)) {
 
                 if (verbose)
-                    HDfprintf(stdout, "1(i, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "1(i, %d, %d) ", type, tmp_idx);
 
                 insert_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
 
@@ -3554,7 +3554,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 3) == 0) {
 
                 if (verbose)
-                    HDfprintf(stdout, "2(p, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "2(p, %d, %d) ", type, tmp_idx);
 
                 protect_entry(file_ptr, type, tmp_idx);
 
@@ -3565,7 +3565,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 3) == 0) {
 
                 if (verbose)
-                    HDfprintf(stdout, "3(u, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "3(u, %d, %d) ", type, tmp_idx);
 
                 unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
 
@@ -3576,7 +3576,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if (pass && do_moves && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 3) == 0) {
 
                 if (verbose)
-                    HDfprintf(stdout, "4(r, %d, %d, %d) ", type, tmp_idx, (int)move_to_main_addr);
+                    fprintf(stdout, "4(r, %d, %d, %d) ", type, tmp_idx, (int)move_to_main_addr);
 
                 move_entry(cache_ptr, type, tmp_idx, move_to_main_addr);
 
@@ -3587,7 +3587,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 5) == 0) {
 
                 if (verbose)
-                    HDfprintf(stdout, "5(p, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "5(p, %d, %d) ", type, tmp_idx);
 
                 protect_entry(file_ptr, type, tmp_idx);
 
@@ -3598,7 +3598,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 5) == 0) {
 
                 if (verbose)
-                    HDfprintf(stdout, "6(u, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "6(u, %d, %d) ", type, tmp_idx);
 
                 unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
 
@@ -3610,7 +3610,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if (pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 9) == 0) {
 
                     if (verbose)
-                        HDfprintf(stdout, "7(p-ro, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "7(p-ro, %d, %d) ", type, tmp_idx);
 
                     protect_entry_ro(file_ptr, type, tmp_idx);
 
@@ -3622,7 +3622,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if (pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 11) == 0) {
 
                     if (verbose)
-                        HDfprintf(stdout, "8(p-ro, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "8(p-ro, %d, %d) ", type, tmp_idx);
 
                     protect_entry_ro(file_ptr, type, tmp_idx);
 
@@ -3634,7 +3634,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if (pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 13) == 0) {
 
                     if (verbose)
-                        HDfprintf(stdout, "9(p-ro, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "9(p-ro, %d, %d) ", type, tmp_idx);
 
                     protect_entry_ro(file_ptr, type, tmp_idx);
 
@@ -3646,7 +3646,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if (pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 9) == 0) {
 
                     if (verbose)
-                        HDfprintf(stdout, "10(u-ro, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "10(u-ro, %d, %d) ", type, tmp_idx);
 
                     unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
 
@@ -3658,7 +3658,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if (pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 11) == 0) {
 
                     if (verbose)
-                        HDfprintf(stdout, "11(u-ro, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "11(u-ro, %d, %d) ", type, tmp_idx);
 
                     unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
 
@@ -3670,7 +3670,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if (pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 13) == 0) {
 
                     if (verbose)
-                        HDfprintf(stdout, "12(u-ro, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "12(u-ro, %d, %d) ", type, tmp_idx);
 
                     unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
 
@@ -3681,7 +3681,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
 
             if (pass && (idx >= 0) && (idx <= local_max_index)) {
                 if (verbose)
-                    HDfprintf(stdout, "13(p, %d, %d) ", type, idx);
+                    fprintf(stdout, "13(p, %d, %d) ", type, idx);
 
                 protect_entry(file_ptr, type, idx);
 
@@ -3692,7 +3692,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 7) == 0) {
 
                 if (verbose)
-                    HDfprintf(stdout, "14(u, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "14(u, %d, %d) ", type, tmp_idx);
 
                 unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
 
@@ -3703,7 +3703,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 7) == 0) {
 
                 if (verbose)
-                    HDfprintf(stdout, "15(p, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "15(p, %d, %d) ", type, tmp_idx);
 
                 protect_entry(file_ptr, type, tmp_idx);
 
@@ -3716,7 +3716,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                     switch (tmp_idx % 4) {
                         case 0: /* we just did an insert */
                             if (verbose)
-                                HDfprintf(stdout, "16(u, %d, %d) ", type, tmp_idx);
+                                fprintf(stdout, "16(u, %d, %d) ", type, tmp_idx);
 
                             unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
 
@@ -3727,7 +3727,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                         case 1:
                             if ((entries[type])[tmp_idx].is_dirty) {
                                 if (verbose)
-                                    HDfprintf(stdout, "17(u, %d, %d) ", type, tmp_idx);
+                                    fprintf(stdout, "17(u, %d, %d) ", type, tmp_idx);
 
                                 unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
 
@@ -3736,7 +3736,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                             } /* end if */
                             else {
                                 if (verbose)
-                                    HDfprintf(stdout, "18(u, %d, %d) ", type, tmp_idx);
+                                    fprintf(stdout, "18(u, %d, %d) ", type, tmp_idx);
 
                                 unprotect_entry(file_ptr, type, tmp_idx,
                                                 (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET));
@@ -3748,7 +3748,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
 
                         case 2: /* we just did an insert */
                             if (verbose)
-                                HDfprintf(stdout, "19(u-del, %d, %d) ", type, tmp_idx);
+                                fprintf(stdout, "19(u-del, %d, %d) ", type, tmp_idx);
 
                             unprotect_entry(file_ptr, type, tmp_idx, H5C__DELETED_FLAG);
 
@@ -3759,7 +3759,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                         case 3:
                             if ((entries[type])[tmp_idx].is_dirty) {
                                 if (verbose)
-                                    HDfprintf(stdout, "20(u-del, %d, %d) ", type, tmp_idx);
+                                    fprintf(stdout, "20(u-del, %d, %d) ", type, tmp_idx);
 
                                 unprotect_entry(file_ptr, type, tmp_idx, H5C__DELETED_FLAG);
 
@@ -3768,7 +3768,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                             } /* end if */
                             else {
                                 if (verbose)
-                                    HDfprintf(stdout, "21(u-del, %d, %d) ", type, tmp_idx);
+                                    fprintf(stdout, "21(u-del, %d, %d) ", type, tmp_idx);
 
                                 unprotect_entry(file_ptr, type, tmp_idx,
                                                 (dirty_destroys ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET) |
@@ -3789,7 +3789,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 tmp_idx = idx - lag;
                 if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index)) {
                     if (verbose)
-                        HDfprintf(stdout, "22(u, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "22(u, %d, %d) ", type, tmp_idx);
 
                     unprotect_entry(file_ptr, type, tmp_idx,
                                     (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET));
@@ -3800,7 +3800,7 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             }     /* end elseif */
 
             if (verbose)
-                HDfprintf(stdout, "\n");
+                fprintf(stdout, "\n");
 
             idx++;
         } /* end while */
@@ -3840,7 +3840,7 @@ hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h
     int32_t local_max_index;
 
     if (verbose)
-        HDfprintf(stdout, "%s(): entering.\n", __func__);
+        fprintf(stdout, "%s(): entering.\n", __func__);
 
     if (pass) {
 
@@ -3867,7 +3867,7 @@ hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h
                 (((idx + lag) % 2) == 0) && (!entry_in_cache(cache_ptr, type, (idx + lag)))) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(i, %d, %d) ", type, (idx + lag));
+                    fprintf(stdout, "(i, %d, %d) ", type, (idx + lag));
 
                 insert_entry(file_ptr, type, (idx + lag), H5C__NO_FLAGS_SET);
             }
@@ -3878,12 +3878,12 @@ hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h
                 if ((pass) && (i >= 0) && (i <= local_max_index)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(p, %d, %d) ", type, i);
+                        fprintf(stdout, "(p, %d, %d) ", type, i);
 
                     protect_entry(file_ptr, type, i);
 
                     if (verbose)
-                        HDfprintf(stdout, "(u, %d, %d) ", type, i);
+                        fprintf(stdout, "(u, %d, %d) ", type, i);
 
                     unprotect_entry(file_ptr, type, i, H5C__NO_FLAGS_SET);
                 }
@@ -3891,7 +3891,7 @@ hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h
             }
 
             if (verbose)
-                HDfprintf(stdout, "\n");
+                fprintf(stdout, "\n");
 
             idx++;
         }
@@ -3932,7 +3932,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
     int32_t local_max_index;
 
     if (verbose)
-        HDfprintf(stdout, "%s(): Entering.\n", __func__);
+        fprintf(stdout, "%s(): Entering.\n", __func__);
 
     if (pass) {
 
@@ -3960,7 +3960,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 ((tmp_idx % 2) == 1) && (!entry_in_cache(cache_ptr, type, tmp_idx))) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(i, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "(i, %d, %d) ", type, tmp_idx);
 
                 insert_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
             }
@@ -3969,7 +3969,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if ((pass) && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 3) == 0)) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(p, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "(p, %d, %d) ", type, tmp_idx);
 
                 protect_entry(file_ptr, type, tmp_idx);
             }
@@ -3978,7 +3978,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if ((pass) && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 3) == 0)) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(u, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "(u, %d, %d) ", type, tmp_idx);
 
                 unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
             }
@@ -3988,7 +3988,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 ((tmp_idx % 3) == 0)) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(r, %d, %d, %d) ", type, tmp_idx, (int)move_to_main_addr);
+                    fprintf(stdout, "(r, %d, %d, %d) ", type, tmp_idx, (int)move_to_main_addr);
 
                 move_entry(cache_ptr, type, tmp_idx, move_to_main_addr);
             }
@@ -3997,7 +3997,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if ((pass) && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 5) == 0)) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(p, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "(p, %d, %d) ", type, tmp_idx);
 
                 protect_entry(file_ptr, type, (idx - lag + 3));
             }
@@ -4006,7 +4006,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if ((pass) && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 5) == 0)) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(u, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "(u, %d, %d) ", type, tmp_idx);
 
                 unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
             }
@@ -4016,7 +4016,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if ((pass) && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 9 == 0)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx);
 
                     protect_entry_ro(file_ptr, type, tmp_idx);
                 }
@@ -4025,7 +4025,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if ((pass) && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 11 == 0)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx);
 
                     protect_entry_ro(file_ptr, type, tmp_idx);
                 }
@@ -4034,7 +4034,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if ((pass) && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 13 == 0)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx);
 
                     protect_entry_ro(file_ptr, type, tmp_idx);
                 }
@@ -4043,7 +4043,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if ((pass) && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 9 == 0)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx);
 
                     unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
                 }
@@ -4052,7 +4052,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if ((pass) && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 11 == 0)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx);
 
                     unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
                 }
@@ -4061,7 +4061,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if ((pass) && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 13 == 0)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx);
+                        fprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx);
 
                     unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
                 }
@@ -4070,7 +4070,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if ((pass) && (idx >= 0) && (idx <= local_max_index)) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(p, %d, %d) ", type, idx);
+                    fprintf(stdout, "(p, %d, %d) ", type, idx);
 
                 protect_entry(file_ptr, type, idx);
             }
@@ -4079,7 +4079,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if ((pass) && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 7) == 0)) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(u, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "(u, %d, %d) ", type, tmp_idx);
 
                 unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET);
             }
@@ -4088,7 +4088,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if ((pass) && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 7) == 0)) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(p, %d, %d) ", type, tmp_idx);
+                    fprintf(stdout, "(p, %d, %d) ", type, tmp_idx);
 
                 protect_entry(file_ptr, type, tmp_idx);
             }
@@ -4143,7 +4143,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 if ((pass) && ((idx + lag) >= 0) && ((idx + lag) <= local_max_index)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(u, %d, %d) ", type, (idx + lag));
+                        fprintf(stdout, "(u, %d, %d) ", type, (idx + lag));
 
                     unprotect_entry(file_ptr, type, idx + lag,
                                     (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET));
@@ -4151,7 +4151,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             }
 
             if (verbose)
-                HDfprintf(stdout, "\n");
+                fprintf(stdout, "\n");
 
             idx--;
         }
@@ -4192,7 +4192,7 @@ hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose,
     int32_t local_max_index;
 
     if (verbose)
-        HDfprintf(stdout, "%s(): entering.\n", __func__);
+        fprintf(stdout, "%s(): entering.\n", __func__);
 
     if (pass) {
 
@@ -4219,7 +4219,7 @@ hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose,
                 (((idx + lag) % 2) == 0) && (!entry_in_cache(cache_ptr, type, (idx + lag)))) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(i, %d, %d) ", type, (idx + lag));
+                    fprintf(stdout, "(i, %d, %d) ", type, (idx + lag));
 
                 insert_entry(file_ptr, type, (idx + lag), H5C__NO_FLAGS_SET);
             }
@@ -4230,12 +4230,12 @@ hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose,
                 if ((pass) && (i >= 0) && (i <= local_max_index)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(p, %d, %d) ", type, i);
+                        fprintf(stdout, "(p, %d, %d) ", type, i);
 
                     protect_entry(file_ptr, type, i);
 
                     if (verbose)
-                        HDfprintf(stdout, "(u, %d, %d) ", type, i);
+                        fprintf(stdout, "(u, %d, %d) ", type, i);
 
                     unprotect_entry(file_ptr, type, i, H5C__NO_FLAGS_SET);
                 }
@@ -4243,7 +4243,7 @@ hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose,
             }
 
             if (verbose)
-                HDfprintf(stdout, "\n");
+                fprintf(stdout, "\n");
 
             idx--;
         }
@@ -4283,7 +4283,7 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
     int32_t local_max_index[NUMBER_OF_ENTRY_TYPES];
 
     if (verbose)
-        HDfprintf(stdout, "%s: entering.\n", __func__);
+        fprintf(stdout, "%s: entering.\n", __func__);
 
     if (pass) {
         int i;
@@ -4311,7 +4311,7 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 (((idx + lag) % 3) == 0) && (!entry_in_cache(cache_ptr, type, (idx + lag)))) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(i, %d, %d) ", type, (idx + lag));
+                    fprintf(stdout, "(i, %d, %d) ", type, (idx + lag));
 
                 insert_entry(file_ptr, type, (idx + lag), H5C__NO_FLAGS_SET);
             }
@@ -4319,7 +4319,7 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if ((pass) && (idx >= 0) && (idx <= local_max_index[type])) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(p, %d, %d) ", type, idx);
+                    fprintf(stdout, "(p, %d, %d) ", type, idx);
 
                 protect_entry(file_ptr, type, idx);
             }
@@ -4327,14 +4327,14 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if ((pass) && ((idx - lag) >= 0) && ((idx - lag) <= local_max_index[type])) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(u, %d, %d) ", type, (idx - lag));
+                    fprintf(stdout, "(u, %d, %d) ", type, (idx - lag));
 
                 unprotect_entry(file_ptr, type, idx - lag,
                                 (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET));
             }
 
             if (verbose)
-                HDfprintf(stdout, "\n");
+                fprintf(stdout, "\n");
 
             type++;
         }
@@ -4377,7 +4377,7 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h
     int32_t local_max_index;
 
     if (verbose)
-        HDfprintf(stdout, "%s: entering.\n", __func__);
+        fprintf(stdout, "%s: entering.\n", __func__);
 
     if (pass) {
 
@@ -4411,7 +4411,7 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h
                     (!entry_in_cache(cache_ptr, type, i))) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(i, %d, %d) ", type, i);
+                        fprintf(stdout, "(i, %d, %d) ", type, i);
 
                     insert_entry(file_ptr, type, i, H5C__NO_FLAGS_SET);
                 }
@@ -4419,7 +4419,7 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h
                 if ((pass) && (i >= 0) && (i <= local_max_index)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(p, %d, %d) ", type, i);
+                        fprintf(stdout, "(p, %d, %d) ", type, i);
 
                     protect_entry(file_ptr, type, i);
                 }
@@ -4427,14 +4427,14 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h
                 if ((pass) && (i >= 0) && (i <= local_max_index)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(u, %d, %d) ", type, i);
+                        fprintf(stdout, "(u, %d, %d) ", type, i);
 
                     unprotect_entry(file_ptr, type, i,
                                     (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET));
                 }
 
                 if (verbose)
-                    HDfprintf(stdout, "\n");
+                    fprintf(stdout, "\n");
 
                 type++;
             }
@@ -4479,7 +4479,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
     int32_t local_max_index[NUMBER_OF_ENTRY_TYPES] = {0};
 
     if (verbose)
-        HDfprintf(stdout, "%s: entering.\n", __func__);
+        fprintf(stdout, "%s: entering.\n", __func__);
 
     if (pass) {
         int i;
@@ -4502,7 +4502,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
     idx = local_max_index[NUMBER_OF_ENTRY_TYPES - 1] + lag;
 
     if (verbose) /* 1 */
-        HDfprintf(stdout, "%s: point %d.\n", __func__, mile_stone++);
+        fprintf(stdout, "%s: point %d.\n", __func__, mile_stone++);
 
     while ((pass) && ((idx + lag) >= 0)) {
         type = NUMBER_OF_ENTRY_TYPES - 1;
@@ -4512,7 +4512,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
                 (((idx - lag) % 3) == 0) && (!entry_in_cache(cache_ptr, type, (idx - lag)))) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(i, %d, %d) ", type, (idx - lag));
+                    fprintf(stdout, "(i, %d, %d) ", type, (idx - lag));
 
                 insert_entry(file_ptr, type, (idx - lag), H5C__NO_FLAGS_SET);
             }
@@ -4520,7 +4520,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if ((pass) && (idx >= 0) && (idx <= local_max_index[type])) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(p, %d, %d) ", type, idx);
+                    fprintf(stdout, "(p, %d, %d) ", type, idx);
 
                 protect_entry(file_ptr, type, idx);
             }
@@ -4528,14 +4528,14 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
             if ((pass) && ((idx + lag) >= 0) && ((idx + lag) <= local_max_index[type])) {
 
                 if (verbose)
-                    HDfprintf(stdout, "(u, %d, %d) ", type, (idx + lag));
+                    fprintf(stdout, "(u, %d, %d) ", type, (idx + lag));
 
                 unprotect_entry(file_ptr, type, idx + lag,
                                 (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET));
             }
 
             if (verbose)
-                HDfprintf(stdout, "\n");
+                fprintf(stdout, "\n");
 
             type--;
         }
@@ -4544,7 +4544,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
     }
 
     if (verbose) /* 2 */
-        HDfprintf(stdout, "%s: point %d.\n", __func__, mile_stone++);
+        fprintf(stdout, "%s: point %d.\n", __func__, mile_stone++);
 
     if ((pass) && (display_stats)) {
 
@@ -4552,7 +4552,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
     }
 
     if (verbose)
-        HDfprintf(stdout, "%s: exiting.\n", __func__);
+        fprintf(stdout, "%s: exiting.\n", __func__);
 
 } /* col_major_scan_backward() */
 
@@ -4584,7 +4584,7 @@ hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose,
     int32_t local_max_index = -1;
 
     if (verbose)
-        HDfprintf(stdout, "%s: entering.\n", __func__);
+        fprintf(stdout, "%s: entering.\n", __func__);
 
     if (pass) {
 
@@ -4618,7 +4618,7 @@ hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose,
                     (!entry_in_cache(cache_ptr, type, i))) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(i, %d, %d) ", type, i);
+                        fprintf(stdout, "(i, %d, %d) ", type, i);
 
                     insert_entry(file_ptr, type, i, H5C__NO_FLAGS_SET);
                 }
@@ -4626,7 +4626,7 @@ hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose,
                 if ((pass) && (i >= 0) && (i <= local_max_index)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(p, %d, %d) ", type, i);
+                        fprintf(stdout, "(p, %d, %d) ", type, i);
 
                     protect_entry(file_ptr, type, i);
                 }
@@ -4634,14 +4634,14 @@ hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose,
                 if ((pass) && (i >= 0) && (i <= local_max_index)) {
 
                     if (verbose)
-                        HDfprintf(stdout, "(u, %d, %d) ", type, i);
+                        fprintf(stdout, "(u, %d, %d) ", type, i);
 
                     unprotect_entry(file_ptr, type, i,
                                     (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET));
                 }
 
                 if (verbose)
-                    HDfprintf(stdout, "\n");
+                    fprintf(stdout, "\n");
 
                 type++;
             }
@@ -5009,8 +5009,8 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d
     /* dump data to stdout if requested */
     if ((pass) && (dump_data)) {
 
-        HDfprintf(stdout, "cache_hits: %ld, cache_accesses: %ld, hit_rate: %lf\n", (long)cache_hits,
-                  (long)cache_accesses, hit_rate);
+        fprintf(stdout, "cache_hits: %ld, cache_accesses: %ld, hit_rate: %lf\n", (long)cache_hits,
+                (long)cache_accesses, hit_rate);
     }
 
     if ((pass) && (cache_accesses > min_accesses) && (hit_rate < min_hit_rate)) {
@@ -5126,8 +5126,8 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c
     /* dump data to stdout if requested */
     if ((pass) && (dump_data)) {
 
-        HDfprintf(stdout, "max_sz: %ld, min_clean_sz: %ld, cur_sz: %ld, cur_ent: %ld\n", (long)max_size,
-                  (long)min_clean_size, (long)cur_size, (long)cur_num_entries);
+        fprintf(stdout, "max_sz: %ld, min_clean_sz: %ld, cur_sz: %ld, cur_ent: %ld\n", (long)max_size,
+                (long)min_clean_size, (long)cur_size, (long)cur_num_entries);
     }
 
 } /* check_and_validate_cache_size() */
@@ -5321,22 +5321,22 @@ dump_LRU(H5F_t * file_ptr)
 
     entry_ptr = cache_ptr->LRU_head_ptr;
 
-    HDfprintf(stdout,
+    fprintf(stdout,
               "\n\nIndex len/size/clean size/dirty size = %u/%lld/%lld/%lld\n",
               cache_ptr->index_len, (long long)(cache_ptr->index_size),
               (long long)(cache_ptr->clean_index_size),
               (long long)(cache_ptr->dirty_index_size));
-    HDfprintf(stdout, "\nLRU len/size = %d/%lld.\n\n",
+    fprintf(stdout, "\nLRU len/size = %d/%lld.\n\n",
               cache_ptr->LRU_list_len, (long long)(cache_ptr->LRU_list_size));
 
     if ( entry_ptr != NULL )
     {
-        HDfprintf(stdout, "%s%s%s", hdr_0, hdr_1, hdr_2);
+        fprintf(stdout, "%s%s%s", hdr_0, hdr_1, hdr_2);
     }
 
     while ( entry_ptr != NULL )
     {
-        HDfprintf(stdout,
+        fprintf(stdout,
                   "  %3d     %d     %10lld  0x%010llx  %s(%d)\n",
                   i,
                   (int)(entry_ptr->is_dirty),
@@ -5350,7 +5350,7 @@ dump_LRU(H5F_t * file_ptr)
 
     if ( cache_ptr->LRU_list_len > 0 )
     {
-        HDfprintf(stdout, "%s\n", hdr_2);
+        fprintf(stdout, "%s\n", hdr_2);
     }
 
     return;
diff --git a/test/cache_common.h b/test/cache_common.h
index b49601b..f1bbf92 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -404,17 +404,17 @@ typedef struct test_entry_t {
 
 #define H5C_TEST__PRE_HT_SEARCH_SC(cache_ptr, Addr)                                                          \
     if (H5C__PRE_HT_SEARCH_SC_CMP(cache_ptr, Addr)) {                                                        \
-        HDfprintf(stdout, "Pre HT search SC failed.\n");                                                     \
+        fprintf(stdout, "Pre HT search SC failed.\n");                                                       \
     }
 
 #define H5C_TEST__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, k)                                             \
     if (H5C__POST_SUC_HT_SEARCH_SC_CMP(cache_ptr, entry_ptr, k)) {                                           \
-        HDfprintf(stdout, "Post successful HT search SC failed.\n");                                         \
+        fprintf(stdout, "Post successful HT search SC failed.\n");                                           \
     }
 
 #define H5C_TEST__POST_HT_SHIFT_TO_FRONT_SC(cache_ptr, entry_ptr, k)                                         \
     if (H5C__POST_HT_SHIFT_TO_FRONT_SC_CMP(cache_ptr, entry_ptr, k)) {                                       \
-        HDfprintf(stdout, "Post HT shift to front failed.\n");                                               \
+        fprintf(stdout, "Post HT shift to front failed.\n");                                                 \
     }
 
 #define H5C_TEST__SEARCH_INDEX(cache_ptr, Addr, entry_ptr)                                                   \
diff --git a/test/cache_image.c b/test/cache_image.c
index fc76ed6..5624080 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -110,7 +110,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset)
     hsize_t     chunk_size[2];
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     assert(0 <= min_dset);
     assert(min_dset <= max_dset);
@@ -191,7 +191,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* create the mem space to be used to read and write chunks */
     if (pass) {
@@ -208,7 +208,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* select in memory hyperslab */
     if (pass) {
@@ -227,7 +227,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* initialize all datasets on a round robin basis */
     i = 0;
@@ -274,7 +274,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* read data from datasets and validate it */
     i = 0;
@@ -323,11 +323,11 @@ create_datasets(hid_t file_id, int min_dset, int max_dset)
 
                                 if (verbose) {
 
-                                    HDfprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l,
-                                              data_chunk[k][l],
-                                              ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l));
-                                    HDfprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k,
-                                              l);
+                                    fprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l,
+                                            data_chunk[k][l],
+                                            ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l));
+                                    fprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k,
+                                            l);
                                 }
                             }
                         }
@@ -340,7 +340,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset)
 
                         if (verbose) {
 
-                            HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m);
+                            fprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m);
                         }
                     }
                 }
@@ -352,7 +352,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* close the file spaces */
     i = min_dset;
@@ -421,20 +421,20 @@ delete_datasets(hid_t file_id, int min_dset, int max_dset)
     int         i;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     assert(0 <= min_dset);
     assert(min_dset <= max_dset);
     assert(max_dset < MAX_NUM_DSETS);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* first, verify the contents of the target dataset(s) */
     verify_datasets(file_id, min_dset, max_dset);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* now delete the target datasets */
     if (pass) {
@@ -455,7 +455,7 @@ delete_datasets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
 } /* delete_datasets() */
 
@@ -536,12 +536,12 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
         }
         else if (verbose) {
 
-            HDfprintf(stdout, "%s: HDF file name = \"%s\".\n", fcn_name, hdf_file_name);
+            fprintf(stdout, "%s: HDF file name = \"%s\".\n", fcn_name, hdf_file_name);
         }
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* create a file access property list. */
     if (pass) {
@@ -556,7 +556,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* call H5Pset_libver_bounds() on the fapl_id */
     if (pass) {
@@ -569,7 +569,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* get metadata cache image config -- verify that it is the default */
     if (pass) {
@@ -593,7 +593,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* set metadata cache image fapl entry if indicated */
     if ((pass) && (set_mdci_fapl)) {
@@ -613,7 +613,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* setup the persistent free space manager if indicated */
     if ((pass) && (config_fsm)) {
@@ -635,7 +635,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* set evict on close if indicated */
     if ((pass) && (set_eoc)) {
@@ -648,7 +648,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* open the file */
     if (pass) {
@@ -691,14 +691,14 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
                 failure_mssg = "Can't get file_ptr.";
 
                 if (verbose) {
-                    HDfprintf(stdout, "%s: Can't get file_ptr.\n", fcn_name);
+                    fprintf(stdout, "%s: Can't get file_ptr.\n", fcn_name);
                 }
             }
         }
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* get a pointer to the files internal data structure and then
      * to the cache structure
@@ -717,7 +717,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* verify expected metadata cache status */
 
@@ -736,7 +736,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     if (pass) {
 
@@ -779,7 +779,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     if ((pass) && (set_mdci_fapl)) {
 
@@ -793,7 +793,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     if (pass) {
 
@@ -833,7 +833,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     if (pass) {
 
@@ -843,7 +843,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d -- exiting.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d -- exiting.\n", fcn_name, cp++);
 
 } /* open_hdf5_file() */
 
@@ -891,7 +891,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* call H5Pset_libver_bounds() on the fapl_id */
     if (pass) {
@@ -904,7 +904,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* set metadata cache image fapl entry if indicated */
     if ((pass) && (set_mdci_fapl)) {
@@ -924,7 +924,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* open the file */
     if (pass) {
@@ -954,7 +954,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
 } /* attempt_swmr_open_hdf5_file() */
 
@@ -1002,7 +1002,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset)
     hsize_t     offset[2];
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     assert(0 <= min_dset);
     assert(min_dset <= max_dset);
@@ -1045,7 +1045,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* create the mem space to be used to read and write chunks */
     if (pass) {
@@ -1062,7 +1062,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* select in memory hyperslab */
     if (pass) {
@@ -1081,7 +1081,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* read data from datasets and validate it */
     i = 0;
@@ -1130,11 +1130,11 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset)
 
                                 if (verbose) {
 
-                                    HDfprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l,
-                                              data_chunk[k][l],
-                                              ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l));
-                                    HDfprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k,
-                                              l);
+                                    fprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l,
+                                            data_chunk[k][l],
+                                            ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l));
+                                    fprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k,
+                                            l);
                                 }
                             }
                         }
@@ -1147,7 +1147,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset)
 
                         if (verbose) {
 
-                            HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m);
+                            fprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m);
                         }
                     }
                 }
@@ -1159,7 +1159,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* close the file spaces */
     i = min_dset;
@@ -1289,7 +1289,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -1302,7 +1302,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with the cache image FAPL entry.
      *
@@ -1328,7 +1328,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create some datasets in the file. */
 
@@ -1338,7 +1338,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -1352,7 +1352,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Open the file.
      *
@@ -1378,7 +1378,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Open and close a dataset.
      *
@@ -1399,7 +1399,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Close the file. */
 
@@ -1413,7 +1413,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Open the file.
      *
@@ -1437,7 +1437,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Close the file. */
 
@@ -1451,7 +1451,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Delete the file */
 
@@ -1472,7 +1472,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -1566,7 +1566,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -1579,7 +1579,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with the cache image FAPL entry.
      *
@@ -1605,7 +1605,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Close the file. */
 
@@ -1619,7 +1619,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Open the file.
      *
@@ -1645,7 +1645,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Close the file. */
 
@@ -1659,7 +1659,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Open the file.
      *
@@ -1683,7 +1683,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Close the file. */
 
@@ -1697,7 +1697,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Delete the file */
 
@@ -1718,7 +1718,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -1830,7 +1830,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress) /* 0 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -1843,7 +1843,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file WITHOUT the cache image FAPL entry.
      *
@@ -1867,7 +1867,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Close the file. */
 
@@ -1881,7 +1881,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Open the file WITH the cache image FAPL entry.
      *
@@ -1907,7 +1907,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Create some datasets. */
 
@@ -1917,7 +1917,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Close the file. */
 
@@ -1931,7 +1931,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Open the file READ ONLY.
      *
@@ -1958,7 +1958,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Verify the contents of the datasets. */
 
@@ -1968,7 +1968,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Close the file. */
 
@@ -1982,7 +1982,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Open the file READ/WRITE.
      *
@@ -2009,7 +2009,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Verify the contents of the datasets. */
 
@@ -2019,7 +2019,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 11) Close the file. */
 
@@ -2033,7 +2033,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 12 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 12) Open the file
      *
@@ -2057,7 +2057,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 13 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 13) Close the file. */
 
@@ -2071,7 +2071,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 14 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 14) Delete the file. */
 
@@ -2092,7 +2092,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -2196,7 +2196,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress) /* 0 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -2209,7 +2209,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file WITHOUT the cache image FAPL entry.
      *
@@ -2233,7 +2233,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Close the file. */
 
@@ -2247,7 +2247,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Open the file WITH the cache image FAPL entry.
      *
@@ -2273,7 +2273,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Close the file. */
 
@@ -2287,7 +2287,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Open the file READ ONLY.
      *
@@ -2314,7 +2314,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Close the file. */
 
@@ -2328,7 +2328,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Open the file READ/WRITE.
      *
@@ -2355,7 +2355,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Close the file. */
 
@@ -2369,7 +2369,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Open the file
      *
@@ -2393,7 +2393,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Close the file. */
 
@@ -2407,7 +2407,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 11 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 11) Delete the file. */
 
@@ -2428,7 +2428,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -2525,7 +2525,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress) /* 0 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -2538,7 +2538,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with the cache image FAPL entry.
      *
@@ -2564,7 +2564,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create some datasets. */
 
@@ -2574,7 +2574,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -2588,7 +2588,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Open the file WITH the cache image FAPL entry.
      *
@@ -2621,7 +2621,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Verify the contents of the datasets. */
 
@@ -2631,7 +2631,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Close the file. */
 
@@ -2645,7 +2645,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Open the file.
      *
@@ -2672,7 +2672,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 8 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Verify the contents of the datasets. */
 
@@ -2682,7 +2682,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 9 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Close the file. */
 
@@ -2696,7 +2696,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 10 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Delete the file. */
 
@@ -2717,7 +2717,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -2806,7 +2806,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress) /* 0 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -2819,7 +2819,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 1 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with the cache image FAPL entry.
      *
@@ -2845,7 +2845,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 2 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Close the file. */
 
@@ -2859,7 +2859,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 3 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Open the file WITH the cache image FAPL entry.
      *
@@ -2892,7 +2892,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 4 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Close the file. */
 
@@ -2906,7 +2906,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 5 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Open the file.
      *
@@ -2933,7 +2933,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 6 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Close the file. */
 
@@ -2947,7 +2947,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd)
     }
 
     if (show_progress) /* 7 */
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Delete the file. */
 
@@ -2968,7 +2968,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -3092,7 +3092,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -3105,7 +3105,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with the cache image FAPL entry.
      *
@@ -3130,7 +3130,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create some datasets in the file. */
 
@@ -3151,7 +3151,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -3165,7 +3165,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Open the file.
      *
@@ -3191,7 +3191,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Open and close a dataset.
      *
@@ -3216,7 +3216,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Close the file. */
 
@@ -3230,7 +3230,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Open the file.
      *
@@ -3254,7 +3254,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Open and close a dataset.
      *
@@ -3279,7 +3279,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Close the file. */
 
@@ -3293,7 +3293,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Open the file with the cache image FAPL entry.
      *
@@ -3317,7 +3317,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 11) Close the file.  Since there has been no access to
      *       any entries that would be included in the cache image,
@@ -3334,7 +3334,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 12) Open the file.
      *
@@ -3358,7 +3358,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 13) Open a dataset.
      *
@@ -3382,7 +3382,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 14) Close the file. */
 
@@ -3396,7 +3396,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 15) Delete the file */
 
@@ -3417,7 +3417,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -3503,7 +3503,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -3516,7 +3516,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with the cache image FAPL entry.
      *
@@ -3541,7 +3541,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create some datasets in the file. */
 
@@ -3562,7 +3562,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -3576,7 +3576,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Open the file.
      *
@@ -3606,7 +3606,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd)
      */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Close the file. */
 
@@ -3620,7 +3620,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Open the file.
      *
@@ -3644,7 +3644,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Open and close a dataset.
      *
@@ -3658,7 +3658,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Close the file. */
 
@@ -3672,7 +3672,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Delete the file */
 
@@ -3693,7 +3693,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -3801,7 +3801,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -3814,7 +3814,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with the cache image FAPL entry.
      *
@@ -3839,7 +3839,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create some datasets in the file. */
 
@@ -3860,7 +3860,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -3874,7 +3874,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Open the file read only.
      *
@@ -3898,7 +3898,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Open and close a dataset.
      *
@@ -3923,7 +3923,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Close the file. */
 
@@ -3937,7 +3937,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Open the file.
      *
@@ -3961,7 +3961,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Open and close a dataset.
      *
@@ -3986,7 +3986,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Close the file. */
 
@@ -4021,7 +4021,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 11) Open and close a dataset.
      *
@@ -4046,7 +4046,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 12) Close the file. */
 
@@ -4060,7 +4060,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 13) Delete the file */
 
@@ -4081,7 +4081,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -4180,7 +4180,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -4193,7 +4193,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with the cache image FAPL entry.
      *
@@ -4218,7 +4218,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create a dataset in the file. */
 
@@ -4239,7 +4239,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -4253,7 +4253,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     while ((pass) && (max_dset < MAX_NUM_DSETS)) {
 
@@ -4279,7 +4279,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
         }
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L1 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp, max_dset, pass);
+            fprintf(stdout, "%s:L1 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp, max_dset, pass);
 
         /* 5) Create a dataset in the file. */
 
@@ -4300,7 +4300,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L2 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 1, max_dset, pass);
+            fprintf(stdout, "%s:L2 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 1, max_dset, pass);
 
         /* 6) Close the file. */
 
@@ -4314,7 +4314,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
         }
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L3 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 2, max_dset, pass);
+            fprintf(stdout, "%s:L3 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 2, max_dset, pass);
     } /* end while */
     cp += 3;
 
@@ -4340,7 +4340,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Open and close all datasets.
      *
@@ -4365,7 +4365,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Close the file. */
 
@@ -4400,7 +4400,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 11) Open and close all datasets.
      *
@@ -4425,7 +4425,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 12) Close the file. */
 
@@ -4439,7 +4439,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 13) Delete the file */
 
@@ -4460,7 +4460,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 } /* cache_image_smoke_check_4() */
@@ -4576,7 +4576,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -4593,7 +4593,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with the cache image FAPL entry.
      *
@@ -4618,7 +4618,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create a process specific group. */
     if (pass) {
@@ -4635,7 +4635,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Construct a "zoo" in the above group, and validate it. */
     if (pass)
@@ -4653,7 +4653,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Close the file. */
 
@@ -4676,7 +4676,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     while ((pass) && (max_group < MAX_NUM_GROUPS)) {
 
@@ -4702,7 +4702,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
         }
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L1 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp, max_group, pass);
+            fprintf(stdout, "%s:L1 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp, max_group, pass);
 
         /* 6) Validate the "zoo" created in the previous file open. */
         if (pass)
@@ -4720,8 +4720,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L2 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 1, max_group,
-                      pass);
+            fprintf(stdout, "%s:L2 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 1, max_group, pass);
 
         /* 7) Create a process specific group for this file open */
         if (pass) {
@@ -4739,16 +4738,14 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
         }
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L3 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 2, max_group,
-                      pass);
+            fprintf(stdout, "%s:L3 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 2, max_group, pass);
 
         /* 8) Construct a "zoo" in the above group, and validate it. */
         if (pass)
             create_zoo(file_id, process_group_name, max_group);
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L4 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 3, max_group,
-                      pass);
+            fprintf(stdout, "%s:L4 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 3, max_group, pass);
 
         /* 9) Close the file. */
 
@@ -4771,8 +4768,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
         }
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L5 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 4, max_group,
-                      pass);
+            fprintf(stdout, "%s:L5 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 4, max_group, pass);
     } /* end while */
     cp += 5;
 
@@ -4796,7 +4792,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 11) Validate all the zoos. */
     i = min_group;
@@ -4815,7 +4811,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 12) Close the file. */
     if (pass) {
@@ -4847,7 +4843,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 14) Validate all the zoos. */
     i = min_group;
@@ -4869,7 +4865,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 15) Close the file. */
 
@@ -4904,7 +4900,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 17) Validate all the zoos.
      *
@@ -4929,7 +4925,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 18) Close the file. */
 
@@ -4943,7 +4939,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 19) Delete the file */
 
@@ -4964,7 +4960,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -5076,7 +5072,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -5089,7 +5085,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with the cache image FAPL entry.
      *
@@ -5114,7 +5110,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create a dataset in the file. */
 
@@ -5135,7 +5131,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -5149,7 +5145,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     while ((pass) && (max_dset < MAX_NUM_DSETS)) {
 
@@ -5175,7 +5171,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
         }
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L1 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp, max_dset, pass);
+            fprintf(stdout, "%s:L1 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp, max_dset, pass);
 
         /* 5) Create a dataset in the file. */
 
@@ -5196,7 +5192,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L2 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 1, max_dset, pass);
+            fprintf(stdout, "%s:L2 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 1, max_dset, pass);
 
         /* 6) Verify and delete the old dataset. */
         if (pass) {
@@ -5205,7 +5201,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
         }
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L3 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 2, max_dset, pass);
+            fprintf(stdout, "%s:L3 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 2, max_dset, pass);
 
         /* 7) Close the file. */
 
@@ -5219,7 +5215,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
         }
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L4 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 3, max_dset, pass);
+            fprintf(stdout, "%s:L4 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 3, max_dset, pass);
     } /* end while */
     cp += 4;
 
@@ -5245,7 +5241,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Verify the last dataset created. */
 
@@ -5266,7 +5262,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Close the file. */
 
@@ -5301,7 +5297,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 12) Verify and delete the last dataset.
      *
@@ -5336,7 +5332,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 14) Get the size of the file.  Verify that it is less
      *     than 20 KB.  Without deletions and persistent free
@@ -5361,7 +5357,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 15) Delete the file */
     if (pass) {
@@ -5381,7 +5377,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -5468,7 +5464,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -5481,7 +5477,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file. */
 
@@ -5501,7 +5497,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create some datasets in the file. */
 
@@ -5522,7 +5518,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -5536,7 +5532,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Open the file read only with a cache image FAPL entry requested. */
 
@@ -5556,7 +5552,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Open and close a dataset.
      *
@@ -5582,7 +5578,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Close the file. */
 
@@ -5596,7 +5592,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Open the file read only. */
 
@@ -5616,7 +5612,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Open and close a dataset.
      *
@@ -5642,7 +5638,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Close the file. */
 
@@ -5656,7 +5652,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Open the file read / write. */
 
@@ -5676,7 +5672,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 11) Open and close a dataset.
      *
@@ -5702,7 +5698,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 12) Close the file.  */
 
@@ -5716,7 +5712,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 13) Delete the file */
 
@@ -5737,7 +5733,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -5836,7 +5832,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -5849,7 +5845,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with a cache image requested. */
 
@@ -5869,7 +5865,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create some datasets in the file. */
 
@@ -5890,7 +5886,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -5904,7 +5900,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Open the file read only with a cache image FAPL entry requested. */
 
@@ -5924,7 +5920,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Open and close a dataset.
      *
@@ -5950,7 +5946,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Close the file. */
 
@@ -5964,7 +5960,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Open the file read only. */
 
@@ -5984,7 +5980,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Open and close a dataset.
      *
@@ -6010,7 +6006,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Close the file. */
 
@@ -6024,7 +6020,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Open the file read / write. */
 
@@ -6044,7 +6040,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 11) Open and close a dataset.
      *
@@ -6070,7 +6066,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 12) Close the file.  */
 
@@ -6084,7 +6080,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 13) Open the file read / write. */
 
@@ -6104,7 +6100,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 14) Open and close a dataset.
      *
@@ -6130,7 +6126,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 15) Close the file.  */
 
@@ -6144,7 +6140,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 13) Delete the file */
 
@@ -6165,7 +6161,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -6237,7 +6233,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -6250,7 +6246,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with a cache image requested. */
 
@@ -6270,7 +6266,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Try to start SWMR write -- should fail. */
 
@@ -6288,7 +6284,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Discard the file if necessary */
 
@@ -6308,7 +6304,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Attempt to create a HDF5 file with SWMR write
      *    access and cache image requested -- should fail.
@@ -6319,7 +6315,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
                                 /* hdf_file_name */ filename);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Discard the file if necessary */
 
@@ -6332,7 +6328,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Create a HDF5 file with a cache image requested. */
 
@@ -6352,7 +6348,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Create some datasets in the file. */
 
@@ -6373,7 +6369,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Close the file. */
 
@@ -6387,7 +6383,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Attempt to open the file with SWMR write access -- should fail. */
 
@@ -6396,7 +6392,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
                                 /* hdf_file_name */ filename);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Discard the file if necessary. */
 
@@ -6410,7 +6406,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
         PASSED();
@@ -6420,7 +6416,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -6520,7 +6516,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -6533,7 +6529,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /*    1) Create a FAPL requesting  a cache image, but WITHOUT
      *           specifying the latest file format.
@@ -6550,7 +6546,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -6568,7 +6564,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create a HDF5 file using the above FAPL. */
 
@@ -6594,7 +6590,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* get a pointer to the files internal data structure and then
      * to the cache structure
@@ -6613,7 +6609,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Create some datasets in the file. */
 
@@ -6636,7 +6632,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Close the file. */
 
@@ -6650,7 +6646,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Open the file read only. */
 
@@ -6670,7 +6666,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Verify that the datasets exist and contain the
      *    expected data
@@ -6693,7 +6689,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Close the file. */
 
@@ -6707,7 +6703,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Open the file R/W using the FAPL defined in 1) above.
      *
@@ -6736,7 +6732,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* get a pointer to the files internal data structure and then
      * to the cache structure
@@ -6755,7 +6751,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -6767,7 +6763,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Close the file. */
 
@@ -6781,7 +6777,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Open the file R/W using the FAPL defined in 1) above.
      *     Verify that the file does not contain a cache image.
@@ -6809,7 +6805,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* get a pointer to the files internal data structure and then
      * to the cache structure
@@ -6828,7 +6824,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -6840,7 +6836,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 11) Verify that the data sets contain the expected data
      *
@@ -6864,7 +6860,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 12) Create several more data sets. */
 
@@ -6874,7 +6870,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 13) Close the file. */
 
@@ -6888,7 +6884,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 14) Open the file read write.
      *
@@ -6911,7 +6907,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 15) Verify the data sets exist and contain the expected  data.
      *
@@ -6935,7 +6931,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 16) Close the file. */
 
@@ -6949,7 +6945,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 17) Delete the file */
 
@@ -6963,7 +6959,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* tidy up */
     if (fapl_id != -1)
@@ -6977,7 +6973,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -7091,7 +7087,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -7104,7 +7100,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with a cache image requested
      *    and persistent free space managers enabled.
@@ -7126,7 +7122,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create some data sets, and then delete some of
      *    of those near the beginning of the file.
@@ -7138,7 +7134,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -7146,7 +7142,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -7154,7 +7150,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -7168,7 +7164,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Open the file read only. */
 
@@ -7188,7 +7184,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Verify that a cache image exists, and has not been loaded. */
 
@@ -7202,7 +7198,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Verify that one or more self referential FSMs
      *    have been stored at the end of the file just
@@ -7224,7 +7220,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Call H5Fget_free_sections(). */
 
@@ -7238,7 +7234,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Verify that the cache image has been loaded and
      *    that the self referential FSMs have been floated.
@@ -7253,7 +7249,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Verify that the remaining data sets contain the expected data. */
 
@@ -7263,7 +7259,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Close the file. */
 
@@ -7277,7 +7273,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 11) Open the file R/W. */
 
@@ -7297,7 +7293,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 12) Verify that a cache image exists, and has not been loaded. */
 
@@ -7311,7 +7307,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 13) Verify that one or more self referential FSMs
      *     have been stored at the end of the file just
@@ -7329,7 +7325,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 14) Call H5Fget_free_sections(). */
 
@@ -7343,7 +7339,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 15) Verify that the cache image has been loaded and
      *     that the self referential FSMs have been floated.
@@ -7358,7 +7354,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 16) Verify that the remaining data sets contain the expected data. */
 
@@ -7368,7 +7364,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 17) Delete the remaining data sets. */
 
@@ -7378,7 +7374,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 18) Close the file. */
 
@@ -7392,7 +7388,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 19) Verify that file space has been reclaimed. */
 
@@ -7411,7 +7407,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 20) Discard the file. */
 
@@ -7425,7 +7421,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
         PASSED();
@@ -7435,7 +7431,7 @@ get_free_sections_test(hbool_t single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 
@@ -7540,7 +7536,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -7553,7 +7549,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file without a cache image requested
      *    and persistent free space managers enabled.
@@ -7574,7 +7570,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create some data sets and verify them.  */
 
@@ -7584,7 +7580,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -7592,7 +7588,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -7606,7 +7602,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Open the file R/W, and with cache image requested. */
 
@@ -7626,7 +7622,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Verify the datasets created in 2) above.  This will
      *    force their (clean) metadata into the metadata cache,
@@ -7639,7 +7635,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Create some more datasets and verify them */
 
@@ -7649,7 +7645,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -7660,12 +7656,12 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
 
         assert(cache_ptr);
 
-        HDfprintf(stdout, "index size / index dirty size = %lld / %lld\n", (long long)(cache_ptr->index_size),
-                  (long long)(cache_ptr->dirty_index_size));
+        fprintf(stdout, "index size / index dirty size = %lld / %lld\n", (long long)(cache_ptr->index_size),
+                (long long)(cache_ptr->dirty_index_size));
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Close the file. */
 
@@ -7679,7 +7675,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Open the file R/O and with evict on close enabled. */
 
@@ -7699,7 +7695,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s*: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s*: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Verify all datasets twice */
 
@@ -7709,7 +7705,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -7717,7 +7713,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Close the file. */
 
@@ -7731,7 +7727,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 11) Open the file R/w and with evict on close enabled. */
 
@@ -7751,7 +7747,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s*: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s*: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 12) Verify all datasets twice */
 
@@ -7761,7 +7757,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -7769,7 +7765,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 13) Close the file. */
 
@@ -7783,7 +7779,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 14) Discard the file. */
 
@@ -7797,7 +7793,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
         PASSED();
@@ -7807,7 +7803,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd)
     }
 
     if (!pass)
-        HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
+        fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg);
 
     return !pass;
 #endif /* H5_HAVE_PARALLEL */
@@ -7845,10 +7841,10 @@ main(void)
 
     express_test = GetTestExpress();
 
-    HDprintf("=========================================\n");
-    HDprintf("Cache image tests\n");
-    HDprintf("        express_test = %d\n", express_test);
-    HDprintf("=========================================\n");
+    printf("=========================================\n");
+    printf("Cache image tests\n");
+    printf("        express_test = %d\n", express_test);
+    printf("=========================================\n");
 
     /* Check for VFD which stores data in multiple files */
     single_file_vfd = !h5_driver_uses_multiple_files(env_h5_drvr, H5_EXCLUDE_NON_MULTIPART_DRIVERS);
diff --git a/test/cache_logging.c b/test/cache_logging.c
index 42427c7..67cf13d 100644
--- a/test/cache_logging.c
+++ b/test/cache_logging.c
@@ -165,16 +165,16 @@ main(void)
     /* Reset library */
     h5_reset();
 
-    HDprintf("Testing basic metadata cache logging functionality.\n");
+    printf("Testing basic metadata cache logging functionality.\n");
 
     nerrors += test_logging_api();
 
     if (nerrors) {
-        HDprintf("***** %d Metadata cache logging TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+        printf("***** %d Metadata cache logging TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
         HDexit(EXIT_FAILURE);
     }
 
-    HDprintf("All Metadata Cache Logging tests passed.\n");
+    printf("All Metadata Cache Logging tests passed.\n");
 
     HDexit(EXIT_SUCCESS);
 }
diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index e1656a2..b1110bc 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -4532,7 +4532,7 @@ check_invalid_tag_application(void)
     PASSED();
 #else
     SKIPPED();
-    HDprintf("    test skipped because sanity checking on tag value is disabled.\n");
+    printf("    test skipped because sanity checking on tag value is disabled.\n");
 #endif /* H5C_DO_TAGGING_SANITY_CHECKS */
 
     return 0;
@@ -4601,13 +4601,13 @@ main(void)
         if (test_type == TEST_DEFAULT) {
 
             if (!nerrs)
-                HDprintf("Testing standard tag application cases w/ default fcpl:\n");
+                printf("Testing standard tag application cases w/ default fcpl:\n");
             fcpl = fcpl_default;
         }
         else if (test_type == TEST_SHMESG) {
 
             if (!nerrs)
-                HDprintf("Testing standard tag application cases w/ shared messages:\n");
+                printf("Testing standard tag application cases w/ shared messages:\n");
             fcpl = fcpl_shmesg_all;
         }
         else {
@@ -4638,7 +4638,7 @@ main(void)
     } /* end for */
 
     if (!nerrs)
-        HDprintf("Testing other specific tag application cases:\n");
+        printf("Testing other specific tag application cases:\n");
     if (!nerrs)
         nerrs += check_group_creation_tags();
     if (!nerrs)
diff --git a/test/chunk_info.c b/test/chunk_info.c
index 1018132..def35e9 100644
--- a/test/chunk_info.c
+++ b/test/chunk_info.c
@@ -355,9 +355,9 @@ verify_selected_chunks(hid_t dset, hid_t plist, const hsize_t *start, const hsiz
 
             /* Verify that read chunk is the same as the corresponding written one */
             if (HDmemcmp(expected_buf[chk_index], read_buf, CHUNK_NX * CHUNK_NY) != 0) {
-                HDfprintf(stderr,
-                          "Read chunk differs from written chunk at offset (%" PRIuHSIZE ",%" PRIuHSIZE ")\n",
-                          offset[0], offset[1]);
+                fprintf(stderr,
+                        "Read chunk differs from written chunk at offset (%" PRIuHSIZE ",%" PRIuHSIZE ")\n",
+                        offset[0], offset[1]);
                 return FAIL;
             }
         }
@@ -577,15 +577,15 @@ test_get_chunk_info_highest_v18(hid_t fapl)
 
     /* Check for various zlib errors */
     if (Z_BUF_ERROR == ret) {
-        HDfprintf(stderr, "overflow");
+        fprintf(stderr, "overflow");
         TEST_ERROR;
     }
     else if (Z_MEM_ERROR == ret) {
-        HDfprintf(stderr, "deflate memory error");
+        fprintf(stderr, "deflate memory error");
         TEST_ERROR;
     }
     else if (Z_OK != ret) {
-        HDfprintf(stderr, "other deflate error");
+        fprintf(stderr, "other deflate error");
         TEST_ERROR;
     }
 #else
@@ -1932,7 +1932,7 @@ test_get_chunk_info_v110(hid_t fapl)
     H5F_libver_t low, high;                   /* File format bounds */
 
     TESTING("getting chunk information in file with versions 1.10 and later");
-    HDprintf("\n"); /* to list sub-tests */
+    printf("\n"); /* to list sub-tests */
 
     /* Set high bound to the current latest version */
     high = H5F_LIBVER_LATEST;
@@ -2108,9 +2108,9 @@ test_flt_msk_with_skip_compress(hid_t fapl)
     for (ii = 0; ii < CHUNK_NX; ii++)
         for (jj = 0; jj < CHUNK_NY; jj++)
             if (direct_buf[ii][jj] != check_chunk[ii][jj]) {
-                HDprintf("    1. Read different values than written.");
-                HDprintf("    At index %d,%d\n", ii, jj);
-                HDprintf("    direct_buf=%d, check_chunk=%d\n", direct_buf[ii][jj], check_chunk[ii][jj]);
+                printf("    1. Read different values than written.");
+                printf("    At index %d,%d\n", ii, jj);
+                printf("    direct_buf=%d, check_chunk=%d\n", direct_buf[ii][jj], check_chunk[ii][jj]);
                 TEST_ERROR;
             }
 
@@ -2131,10 +2131,10 @@ test_flt_msk_with_skip_compress(hid_t fapl)
     for (ii = 0; ii < CHUNK_NX; ii++)
         for (jj = 0; jj < CHUNK_NY; jj++)
             if (direct_buf[ii][jj] != read_direct_buf[ii][jj]) {
-                HDprintf("    1. Read different values than written.");
-                HDprintf("    At index %d,%d\n", ii, jj);
-                HDprintf("    direct_buf=%d, read_direct_buf=%d\n", direct_buf[ii][jj],
-                         read_direct_buf[ii][jj]);
+                printf("    1. Read different values than written.");
+                printf("    At index %d,%d\n", ii, jj);
+                printf("    direct_buf=%d, read_direct_buf=%d\n", direct_buf[ii][jj],
+                       read_direct_buf[ii][jj]);
                 TEST_ERROR;
             }
 
@@ -2230,7 +2230,7 @@ main(void)
     if (nerrors)
         goto error;
 
-    HDprintf("All chunk query tests passed.\n");
+    printf("All chunk query tests passed.\n");
 
     h5_cleanup(FILENAME, fapl);
 
@@ -2238,7 +2238,7 @@ main(void)
 
 error:
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d QUERY CHUNK INFO TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    printf("***** %d QUERY CHUNK INFO TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     return EXIT_FAILURE;
 }
 
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index 1155110..8d1f877 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -209,17 +209,17 @@ test_compound(char *filename, hid_t fapl)
     if ((PRESERVE = H5Pcreate(H5P_DATASET_XFER)) < 0)
         goto error;
     if ((ret_code = H5Pget_preserve(PRESERVE)) != 0) {
-        HDprintf("Preserve status of dataset transfer property list should be"
-                 " 0 (FALSE), got %d\n",
-                 ret_code);
+        printf("Preserve status of dataset transfer property list should be"
+               " 0 (FALSE), got %d\n",
+               ret_code);
         goto error;
     }
     if (H5Pset_preserve(PRESERVE, 1) < 0)
         goto error;
     if ((ret_code = H5Pget_preserve(PRESERVE)) != 1) {
-        HDprintf("Preserve status of dataset transfer property list should be"
-                 " 1 (TRUE), got %d\n",
-                 ret_code);
+        printf("Preserve status of dataset transfer property list should be"
+               " 1 (TRUE), got %d\n",
+               ret_code);
         goto error;
     }
 
@@ -520,11 +520,11 @@ test_compound(char *filename, hid_t fapl)
             s1[i].c[1] != 8 * i + 3 || s1[i].c[2] != 8 * i + 4 || s1[i].c[3] != 8 * i + 5 ||
             s1[i].d != 8 * i + 6 || s1[i].e != 8 * i + 7) {
             H5_FAILED();
-            HDprintf("    i==%u, row=%u, col=%u\n", i, i / NY, i % NY);
-            HDprintf("    got: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n", s1[i].a, s1[i].b, s1[i].c[0],
-                     s1[i].c[1], s1[i].c[2], s1[i].c[3], s1[i].d, s1[i].e);
-            HDprintf("    ans: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n", 8 * i + 0, 8 * i + 1, 8 * i + 2,
-                     8 * i + 3, 8 * i + 4, 8 * i + 5, 8 * i + 6, 8 * i + 7);
+            printf("    i==%u, row=%u, col=%u\n", i, i / NY, i % NY);
+            printf("    got: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n", s1[i].a, s1[i].b, s1[i].c[0], s1[i].c[1],
+                   s1[i].c[2], s1[i].c[3], s1[i].d, s1[i].e);
+            printf("    ans: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n", 8 * i + 0, 8 * i + 1, 8 * i + 2,
+                   8 * i + 3, 8 * i + 4, 8 * i + 5, 8 * i + 6, 8 * i + 7);
             goto error;
         }
     }
@@ -1220,8 +1220,8 @@ compare_data(void *src_data, void *dst_data, hbool_t src_subset)
             !H5_DBL_ABS_EQUAL(s_ptr->n, d_ptr->n)) {
 
             H5_FAILED();
-            HDprintf("    i=%d\n", i);
-            HDprintf(
+            printf("    i=%d\n", i);
+            printf(
                 "    src={a=%d, b=%d, c=[%d,%d,%d,%d,%d,%d,%d,%d], d=%d, e=%d, f=%f, g=%f, "
                 "h=[%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f], i=%f, j=%f, k=%f, l=%f, m=%f, n=%f}\n",
                 s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->c[4],
@@ -1231,7 +1231,7 @@ compare_data(void *src_data, void *dst_data, hbool_t src_subset)
                 (double)s_ptr->h[8], (double)s_ptr->h[9], (double)s_ptr->h[10], (double)s_ptr->h[11],
                 (double)s_ptr->h[12], (double)s_ptr->h[13], (double)s_ptr->h[14], (double)s_ptr->h[15],
                 (double)s_ptr->i, (double)s_ptr->j, s_ptr->k, s_ptr->l, s_ptr->m, s_ptr->n);
-            HDprintf(
+            printf(
                 "    dst={a=%d, b=%d, c=[%d,%d,%d,%d,%d,%d,%d,%d], d=%d, e=%d, f=%f, g=%f, "
                 "h=[%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f], i=%f, j=%f, k=%f, l=%f, m=%f, n=%f}\n",
                 d_ptr->a, d_ptr->b, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->c[4],
@@ -1665,10 +1665,10 @@ error:
         int _i;                                                                                              \
         H5_FAILED();                                                                                         \
         AT();                                                                                                \
-        HDprintf("    Insertion order =");                                                                   \
+        printf("    Insertion order =");                                                                     \
         for (_i = 0; _i < PACK_NMEMBS; _i++)                                                                 \
-            HDprintf(" %d", order[_i]);                                                                      \
-        HDprintf("\n    Inner compound order = %d, location = %d\n", sub_cmpd_order, order[sub_cmpd_order]); \
+            printf(" %d", order[_i]);                                                                        \
+        printf("\n    Inner compound order = %d, location = %d\n", sub_cmpd_order, order[sub_cmpd_order]);   \
         HDfflush(stdout);                                                                                    \
         goto error;                                                                                          \
     }
@@ -2216,7 +2216,7 @@ main(int argc, char *argv[])
     /* Turn off optimized compound converter? */
     if (argc > 1) {
         if (argc > 2 || HDstrcmp("--noopt", argv[1]) != 0) {
-            HDfprintf(stderr, "usage: %s [--noopt]\n", argv[0]);
+            fprintf(stderr, "usage: %s [--noopt]\n", argv[0]);
             HDexit(EXIT_FAILURE);
         }
         H5Tunregister(H5T_PERS_DONTCARE, NULL, (hid_t)-1, (hid_t)-1,
@@ -2249,7 +2249,7 @@ main(int argc, char *argv[])
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl_id) < 0 ? 1 : 0);
 
     if (nerrors) {
-        HDprintf("***** %u FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
+        printf("***** %u FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
         HDexit(EXIT_FAILURE);
     }
 
diff --git a/test/cmpd_dtransform.c b/test/cmpd_dtransform.c
index 6e38ec9..c62eea6 100644
--- a/test/cmpd_dtransform.c
+++ b/test/cmpd_dtransform.c
@@ -92,7 +92,7 @@ main(void)
     if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
         FAIL_STACK_ERROR;
     if (H5Pset_data_transform(dxpl_id, expr) < 0) {
-        HDprintf("**** ERROR: H5Pset_data_transform (expression: %s) ****\n", expr);
+        printf("**** ERROR: H5Pset_data_transform (expression: %s) ****\n", expr);
         FAIL_STACK_ERROR;
     }
 
diff --git a/test/cross_read.c b/test/cross_read.c
index 8e9bff0..e52bea1 100644
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -104,8 +104,8 @@ check_data_i(const char *dsetname, hid_t fid)
             if (data_out[i][j] != data_in[i][j])
                 if (!nerrors++) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %lld but should have been %lld\n", (int)i, (int)j,
-                             data_out[i][j], data_in[i][j]);
+                    printf("element [%d][%d] is %lld but should have been %lld\n", (int)i, (int)j,
+                           data_out[i][j], data_in[i][j]);
                 } /* end if */
 
     /* Close/release resources. */
@@ -114,7 +114,7 @@ check_data_i(const char *dsetname, hid_t fid)
 
     /* Failure */
     if (nerrors) {
-        HDprintf("total of %d errors out of %d elements\n", nerrors, (int)(NX * NY));
+        printf("total of %d errors out of %d elements\n", nerrors, (int)(NX * NY));
         return 1;
     } /* end if */
 
@@ -178,8 +178,8 @@ check_data_f(const char *dsetname, hid_t fid)
             if (!H5_DBL_REL_EQUAL(data_out[i][j], data_in[i][j], 0.001))
                 if (!nerrors++) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %g but should have been %g\n", (int)i, (int)j,
-                             data_out[i][j], data_in[i][j]);
+                    printf("element [%d][%d] is %g but should have been %g\n", (int)i, (int)j, data_out[i][j],
+                           data_in[i][j]);
                 } /* end if */
 
     /* Close/release resources. */
@@ -188,7 +188,7 @@ check_data_f(const char *dsetname, hid_t fid)
 
     /* Failure */
     if (nerrors) {
-        HDprintf("total of %d errors out of %d elements\n", nerrors, (int)(NX * NY));
+        printf("total of %d errors out of %d elements\n", nerrors, (int)(NX * NY));
         return 1;
     } /* end if */
 
@@ -382,10 +382,10 @@ main(void)
     nerrors += check_file(filename);
 
     if (nerrors) {
-        HDprintf("***** %d FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
+        printf("***** %d FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
         return EXIT_FAILURE;
     } /* end if */
 
-    HDprintf("All data type tests passed.\n");
+    printf("All data type tests passed.\n");
     return EXIT_SUCCESS;
 } /* end main() */
diff --git a/test/direct_chunk.c b/test/direct_chunk.c
index 58e76a3..84ba71e 100644
--- a/test/direct_chunk.c
+++ b/test/direct_chunk.c
@@ -212,15 +212,15 @@ test_direct_chunk_write(hid_t file)
 
     /* Check for various zlib errors */
     if (Z_BUF_ERROR == ret) {
-        HDfprintf(stderr, "overflow");
+        fprintf(stderr, "overflow");
         goto error;
     }
     else if (Z_MEM_ERROR == ret) {
-        HDfprintf(stderr, "deflate memory error");
+        fprintf(stderr, "deflate memory error");
         goto error;
     }
     else if (Z_OK != ret) {
-        HDfprintf(stderr, "other deflate error");
+        fprintf(stderr, "other deflate error");
         goto error;
     }
 
@@ -269,9 +269,9 @@ test_direct_chunk_write(hid_t file)
     for (i = 0; i < CHUNK_NX; i++) {
         for (j = 0; j < CHUNK_NY; j++) {
             if (direct_buf[i][j] != check_chunk[i][j]) {
-                HDprintf("    1. Read different values than written.");
-                HDprintf("    At index %d,%d\n", i, j);
-                HDprintf("    direct_buf=%d, check_chunk=%d\n", direct_buf[i][j], check_chunk[i][j]);
+                printf("    1. Read different values than written.");
+                printf("    At index %d,%d\n", i, j);
+                printf("    direct_buf=%d, check_chunk=%d\n", direct_buf[i][j], check_chunk[i][j]);
                 goto error;
             }
         }
@@ -291,15 +291,15 @@ test_direct_chunk_write(hid_t file)
 
     /* Check for various zlib errors */
     if (Z_BUF_ERROR == ret) {
-        HDfprintf(stderr, "overflow");
+        fprintf(stderr, "overflow");
         goto error;
     }
     else if (Z_MEM_ERROR == ret) {
-        HDfprintf(stderr, "deflate memory error");
+        fprintf(stderr, "deflate memory error");
         goto error;
     }
     else if (Z_OK != ret) {
-        HDfprintf(stderr, "other deflate error");
+        fprintf(stderr, "other deflate error");
         goto error;
     }
 
@@ -335,9 +335,9 @@ test_direct_chunk_write(hid_t file)
     for (i = 0; i < CHUNK_NX; i++) {
         for (j = 0; j < CHUNK_NY; j++) {
             if (direct_buf[i][j] != check_chunk[i][j]) {
-                HDprintf("    2. Read different values than written.");
-                HDprintf("    At index %d,%d\n", i, j);
-                HDprintf("    direct_buf=%d, check_chunk=%d\n", direct_buf[i][j], check_chunk[i][j]);
+                printf("    2. Read different values than written.");
+                printf("    At index %d,%d\n", i, j);
+                printf("    direct_buf=%d, check_chunk=%d\n", direct_buf[i][j], check_chunk[i][j]);
                 goto error;
             }
         }
@@ -605,9 +605,9 @@ test_skip_compress_write1(hid_t file)
     for (i = 0; i < CHUNK_NX; i++) {
         for (j = 0; j < CHUNK_NY; j++) {
             if (direct_buf[i][j] != check_chunk[i][j]) {
-                HDprintf("    1. Read different values than written.");
-                HDprintf("    At index %d,%d\n", i, j);
-                HDprintf("    direct_buf=%d, check_chunk=%d\n", direct_buf[i][j], check_chunk[i][j]);
+                printf("    1. Read different values than written.");
+                printf("    At index %d,%d\n", i, j);
+                printf("    direct_buf=%d, check_chunk=%d\n", direct_buf[i][j], check_chunk[i][j]);
                 goto error;
             }
         }
@@ -630,9 +630,9 @@ test_skip_compress_write1(hid_t file)
     for (i = 0; i < CHUNK_NX; i++) {
         for (j = 0; j < CHUNK_NY; j++) {
             if (direct_buf[i][j] != read_direct_buf[i][j]) {
-                HDprintf("    1. Read different values than written.");
-                HDprintf("    At index %d,%d\n", i, j);
-                HDprintf("    direct_buf=%d, read_direct_buf=%d\n", direct_buf[i][j], read_direct_buf[i][j]);
+                printf("    1. Read different values than written.");
+                printf("    At index %d,%d\n", i, j);
+                printf("    direct_buf=%d, read_direct_buf=%d\n", direct_buf[i][j], read_direct_buf[i][j]);
                 goto error;
             }
         }
@@ -880,10 +880,10 @@ test_skip_compress_write2(hid_t file)
     for (i = 0; i < CHUNK_NX; i++) {
         for (j = 0; j < CHUNK_NY; j++) {
             if (origin_direct_buf[i][j] != check_chunk[i][j]) {
-                HDprintf("    1. Read different values than written.");
-                HDprintf("    At index %d,%d\n", i, j);
-                HDprintf("    origin_direct_buf=%d, check_chunk=%d\n", origin_direct_buf[i][j],
-                         check_chunk[i][j]);
+                printf("    1. Read different values than written.");
+                printf("    At index %d,%d\n", i, j);
+                printf("    origin_direct_buf=%d, check_chunk=%d\n", origin_direct_buf[i][j],
+                       check_chunk[i][j]);
                 goto error;
             }
         }
@@ -906,9 +906,9 @@ test_skip_compress_write2(hid_t file)
     for (i = 0; i < CHUNK_NX; i++) {
         for (j = 0; j < CHUNK_NY; j++) {
             if (direct_buf[i][j] != read_direct_buf[i][j]) {
-                HDprintf("    1. Read different values than written.");
-                HDprintf("    At index %d,%d\n", i, j);
-                HDprintf("    direct_buf=%d, read_direct_buf=%d\n", direct_buf[i][j], read_direct_buf[i][j]);
+                printf("    1. Read different values than written.");
+                printf("    At index %d,%d\n", i, j);
+                printf("    direct_buf=%d, read_direct_buf=%d\n", direct_buf[i][j], read_direct_buf[i][j]);
                 goto error;
             }
         }
@@ -1088,16 +1088,16 @@ test_data_conv(hid_t file)
                 (direct_buf[i][j]).c[3] != (read_chunk[i][j]).c[3] ||
                 (direct_buf[i][j]).d != (read_chunk[i][j]).d ||
                 (direct_buf[i][j]).e != (read_chunk[i][j]).e) {
-                HDprintf("    1. Read different values than written.");
-                HDprintf("    At index %d,%d\n", i, j);
-                HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (direct_buf[i][j]).a,
-                         (direct_buf[i][j]).b, (direct_buf[i][j]).c[0], (direct_buf[i][j]).c[1],
-                         (direct_buf[i][j]).c[2], (direct_buf[i][j]).c[3], (direct_buf[i][j]).d,
-                         (direct_buf[i][j]).e);
-                HDprintf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (read_chunk[i][j]).a,
-                         (read_chunk[i][j]).b, (read_chunk[i][j]).c[0], (read_chunk[i][j]).c[1],
-                         (read_chunk[i][j]).c[2], (read_chunk[i][j]).c[3], (read_chunk[i][j]).d,
-                         (read_chunk[i][j]).e);
+                printf("    1. Read different values than written.");
+                printf("    At index %d,%d\n", i, j);
+                printf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (direct_buf[i][j]).a,
+                       (direct_buf[i][j]).b, (direct_buf[i][j]).c[0], (direct_buf[i][j]).c[1],
+                       (direct_buf[i][j]).c[2], (direct_buf[i][j]).c[3], (direct_buf[i][j]).d,
+                       (direct_buf[i][j]).e);
+                printf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (read_chunk[i][j]).a,
+                       (read_chunk[i][j]).b, (read_chunk[i][j]).c[0], (read_chunk[i][j]).c[1],
+                       (read_chunk[i][j]).c[2], (read_chunk[i][j]).c[3], (read_chunk[i][j]).d,
+                       (read_chunk[i][j]).e);
 
                 goto error;
             }
@@ -1131,15 +1131,15 @@ test_data_conv(hid_t file)
                 (direct_buf[i][j]).c[2] != (check_chunk[i][j]).c[2] ||
                 (direct_buf[i][j]).c[3] != (check_chunk[i][j]).c[3] ||
                 (direct_buf[i][j]).e != (check_chunk[i][j]).e) {
-                HDprintf("    1. Read different values than written.");
-                HDprintf("    At index %d,%d\n", i, j);
-                HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (direct_buf[i][j]).a,
-                         (direct_buf[i][j]).b, (direct_buf[i][j]).c[0], (direct_buf[i][j]).c[1],
-                         (direct_buf[i][j]).c[2], (direct_buf[i][j]).c[3], (direct_buf[i][j]).d,
-                         (direct_buf[i][j]).e);
-                HDprintf("    dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", (check_chunk[i][j]).a,
-                         (check_chunk[i][j]).c[0], (check_chunk[i][j]).c[1], (check_chunk[i][j]).c[2],
-                         (check_chunk[i][j]).c[3], (check_chunk[i][j]).e);
+                printf("    1. Read different values than written.");
+                printf("    At index %d,%d\n", i, j);
+                printf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (direct_buf[i][j]).a,
+                       (direct_buf[i][j]).b, (direct_buf[i][j]).c[0], (direct_buf[i][j]).c[1],
+                       (direct_buf[i][j]).c[2], (direct_buf[i][j]).c[3], (direct_buf[i][j]).d,
+                       (direct_buf[i][j]).e);
+                printf("    dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", (check_chunk[i][j]).a,
+                       (check_chunk[i][j]).c[0], (check_chunk[i][j]).c[1], (check_chunk[i][j]).c[2],
+                       (check_chunk[i][j]).c[3], (check_chunk[i][j]).e);
 
                 goto error;
             }
@@ -1550,19 +1550,19 @@ test_direct_chunk_read_no_cache(hid_t file)
 
             /* Check for various zlib errors */
             if (Z_BUF_ERROR == ret) {
-                HDfprintf(stderr, "overflow\n");
+                fprintf(stderr, "overflow\n");
                 goto error;
             }
             else if (Z_MEM_ERROR == ret) {
-                HDfprintf(stderr, "deflate memory error\n");
+                fprintf(stderr, "deflate memory error\n");
                 goto error;
             }
             else if (Z_DATA_ERROR == ret) {
-                HDfprintf(stderr, "corrupted data\n");
+                fprintf(stderr, "corrupted data\n");
                 goto error;
             }
             else if (Z_OK != ret) {
-                HDfprintf(stderr, "other deflate error\n");
+                fprintf(stderr, "other deflate error\n");
                 goto error;
             }
 
@@ -1570,9 +1570,9 @@ test_direct_chunk_read_no_cache(hid_t file)
             for (k = 0; k < CHUNK_NX; k++) {
                 for (l = 0; l < CHUNK_NY; l++) {
                     if (direct_buf[k][l] != check_chunk[k][l]) {
-                        HDprintf("\n    1. Read different values than written.");
-                        HDprintf("    At index %d,%d\n", k, l);
-                        HDprintf("    direct_buf=%d, check_chunk=%d\n", direct_buf[k][l], check_chunk[k][l]);
+                        printf("\n    1. Read different values than written.");
+                        printf("    At index %d,%d\n", k, l);
+                        printf("    direct_buf=%d, check_chunk=%d\n", direct_buf[k][l], check_chunk[k][l]);
                         goto error;
                     }
                 }
@@ -1741,19 +1741,19 @@ test_direct_chunk_read_cache(hid_t file, hbool_t flush)
 
             /* Check for various zlib errors */
             if (Z_BUF_ERROR == ret) {
-                HDfprintf(stderr, "overflow\n");
+                fprintf(stderr, "overflow\n");
                 goto error;
             }
             else if (Z_MEM_ERROR == ret) {
-                HDfprintf(stderr, "deflate memory error\n");
+                fprintf(stderr, "deflate memory error\n");
                 goto error;
             }
             else if (Z_DATA_ERROR == ret) {
-                HDfprintf(stderr, "corrupted data\n");
+                fprintf(stderr, "corrupted data\n");
                 goto error;
             }
             else if (Z_OK != ret) {
-                HDfprintf(stderr, "other deflate error\n");
+                fprintf(stderr, "other deflate error\n");
                 goto error;
             }
 
@@ -1761,9 +1761,9 @@ test_direct_chunk_read_cache(hid_t file, hbool_t flush)
             for (k = 0; k < CHUNK_NX; k++) {
                 for (l = 0; l < CHUNK_NY; l++) {
                     if (direct_buf[k][l] != check_chunk[k][l]) {
-                        HDprintf("\n    1. Read different values than written.");
-                        HDprintf("    At index %d,%d\n", k, l);
-                        HDprintf("    direct_buf=%d, check_chunk=%d\n", direct_buf[k][l], check_chunk[k][l]);
+                        printf("\n    1. Read different values than written.");
+                        printf("    At index %d,%d\n", k, l);
+                        printf("    direct_buf=%d, check_chunk=%d\n", direct_buf[k][l], check_chunk[k][l]);
                         goto error;
                     }
                 }
@@ -1923,9 +1923,9 @@ test_read_unfiltered_dset(hid_t file)
             for (k = 0; k < CHUNK_NX; k++) {
                 for (l = 0; l < CHUNK_NY; l++) {
                     if (direct_buf[k][l] != check_chunk[k][l]) {
-                        HDprintf("\n    1. Read different values than written.");
-                        HDprintf("    At index %d,%d\n", k, l);
-                        HDprintf("    direct_buf=%d, check_chunk=%d\n", direct_buf[k][l], check_chunk[k][l]);
+                        printf("\n    1. Read different values than written.");
+                        printf("    At index %d,%d\n", k, l);
+                        printf("    direct_buf=%d, check_chunk=%d\n", direct_buf[k][l], check_chunk[k][l]);
                         goto error;
                     }
                 }
@@ -2299,40 +2299,40 @@ main(void)
             continue;
 
         /* Print configuration */
-        HDprintf("Configuration: ");
+        printf("Configuration: ");
         if (config == 0)
-            HDprintf("<empty>");
+            printf("<empty>");
         if (config & CONFIG_LATEST) {
             if (need_comma)
-                HDprintf(", ");
-            HDprintf("latest format");
+                printf(", ");
+            printf("latest format");
             need_comma = TRUE;
         } /* end if */
         if (config & CONFIG_REOPEN_FILE) {
             if (need_comma)
-                HDprintf(", ");
-            HDprintf("reopen file");
+                printf(", ");
+            printf("reopen file");
             need_comma = TRUE;
         } /* end if */
         else if (config & CONFIG_REOPEN_DSET) {
             if (need_comma)
-                HDprintf(", ");
-            HDprintf("reopen dataset");
+                printf(", ");
+            printf("reopen dataset");
             need_comma = TRUE;
         } /* end if */
         if (config & CONFIG_DIRECT_WRITE) {
             if (need_comma)
-                HDprintf(", ");
-            HDprintf("direct write");
+                printf(", ");
+            printf("direct write");
             need_comma = TRUE;
         } /* end if */
         if (config & CONFIG_DIRECT_READ) {
             if (need_comma)
-                HDprintf(", ");
-            HDprintf("direct read");
+                printf(", ");
+            printf("direct read");
             need_comma = TRUE;
         } /* end if */
-        HDprintf(":\n");
+        printf(":\n");
         HDfflush(stdout);
 
         nerrors += test_single_chunk(config);
diff --git a/test/dsets.c b/test/dsets.c
index d44a7ad..d0dfdf6 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -611,8 +611,8 @@ test_simple_io(const char *env_h5_drvr, hid_t fapl)
             for (j = 0; j < DSET_DIM2; j++) {
                 if (points[i][j] != check[i][j]) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    At index %d,%d\n", i, j);
+                    printf("    Read different values than written.\n");
+                    printf("    At index %d,%d\n", i, j);
                     goto error;
                 }
             }
@@ -638,8 +638,8 @@ test_simple_io(const char *env_h5_drvr, hid_t fapl)
             for (j = 0; j < DSET_DIM2; j++) {
                 if (points[i][j] != rdata[i][j]) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    At index %d,%d\n", i, j);
+                    printf("    Read different values than written.\n");
+                    printf("    At index %d,%d\n", i, j);
                     goto error;
                 }
             }
@@ -775,8 +775,8 @@ test_userblock_offset(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
             for (j = 0; j < DSET_DIM2; j++) {
                 if (points[i][j] != rdata[i][j]) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    At index %d,%d\n", i, j);
+                    printf("    Read different values than written.\n");
+                    printf("    At index %d,%d\n", i, j);
                     goto error;
                 }
             }
@@ -913,10 +913,10 @@ test_compact_io(hid_t fapl)
         for (j = 0; j < 8; j++)
             if (rbuf[i][j] != wbuf[i][j]) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %d,%d\n", i, j);
-                HDprintf("    wbuf[%d][%d]=%d\n", i, j, wbuf[i][j]);
-                HDprintf("    rbuf[%d][%d]=%d\n", i, j, rbuf[i][j]);
+                printf("    Read different values than written.\n");
+                printf("    At index %d,%d\n", i, j);
+                printf("    wbuf[%d][%d]=%d\n", i, j, wbuf[i][j]);
+                printf("    rbuf[%d][%d]=%d\n", i, j, rbuf[i][j]);
                 goto error;
             } /* end  */
 
@@ -979,10 +979,10 @@ test_compact_io(hid_t fapl)
                 for (j = 0; j < 8; j++)
                     if (rbuf[i][j] != wbuf[i][j]) {
                         H5_FAILED();
-                        HDprintf("    Read different values than written.\n");
-                        HDprintf("    At index %d,%d\n", i, j);
-                        HDprintf("    wbuf[%d][%d]=%d\n", i, j, wbuf[i][j]);
-                        HDprintf("    rbuf[%d][%d]=%d\n", i, j, rbuf[i][j]);
+                        printf("    Read different values than written.\n");
+                        printf("    At index %d,%d\n", i, j);
+                        printf("    wbuf[%d][%d]=%d\n", i, j, wbuf[i][j]);
+                        printf("    rbuf[%d][%d]=%d\n", i, j, rbuf[i][j]);
                         goto error;
                     } /* end  */
 
@@ -1132,8 +1132,8 @@ test_max_compact(hid_t fapl)
     for (u = 0; u < compact_size; u++)
         if (rbuf[u] != wbuf[u]) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %u\n", (unsigned)u);
+            printf("    Read different values than written.\n");
+            printf("    At index %u\n", (unsigned)u);
             goto error;
         } /* end if */
 
@@ -1940,7 +1940,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
     /* Check if all the filters are available */
     if (H5Pall_filters_avail(dcpl) != TRUE) {
         H5_FAILED();
-        HDprintf("    Line %d: Incorrect filter availability\n", __LINE__);
+        printf("    Line %d: Incorrect filter availability\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -1963,8 +1963,8 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
         for (j = 0; j < (size_t)size[1]; j++) {
             if (0 != check[i][j]) {
                 H5_FAILED();
-                HDprintf("    Read a non-zero value.\n");
-                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                printf("    Read a non-zero value.\n");
+                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 goto error;
             }
         }
@@ -2037,10 +2037,10 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
             for (j = 0; j < size[1]; j++) {
                 if (points[i][j] != check[i][j]) {
                     H5_FAILED();
-                    HDfprintf(stderr, "    Read different values than written.\n");
-                    HDfprintf(stderr, "    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
-                    HDfprintf(stderr, "    At original: %d\n", (int)points[i][j]);
-                    HDfprintf(stderr, "    At returned: %d\n", (int)check[i][j]);
+                    fprintf(stderr, "    Read different values than written.\n");
+                    fprintf(stderr, "    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                    fprintf(stderr, "    At original: %d\n", (int)points[i][j]);
+                    fprintf(stderr, "    At returned: %d\n", (int)check[i][j]);
                     goto error;
                 }
             }
@@ -2105,8 +2105,8 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
             for (j = 0; j < size[1]; j++) {
                 if (points[i][j] != check[i][j]) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                    printf("    Read different values than written.\n");
+                    printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                     goto error;
                 }
             }
@@ -2169,8 +2169,8 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
             for (j = 0; j < size[1]; j++)
                 if (points[i][j] != check[i][j]) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                    printf("    Read different values than written.\n");
+                    printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                     goto error;
                 } /* end if */
     }             /* end else */
@@ -2236,13 +2236,13 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
                 if (points[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j] !=
                     check[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]) {
                     H5_FAILED();
-                    HDfprintf(stderr, "    Read different values than written.\n");
-                    HDfprintf(stderr, "    At index %lu,%lu\n", (unsigned long)((size_t)hs_offset[0] + i),
-                              (unsigned long)((size_t)hs_offset[1] + j));
-                    HDfprintf(stderr, "    At original: %d\n",
-                              (int)points[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]);
-                    HDfprintf(stderr, "    At returned: %d\n",
-                              (int)check[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]);
+                    fprintf(stderr, "    Read different values than written.\n");
+                    fprintf(stderr, "    At index %lu,%lu\n", (unsigned long)((size_t)hs_offset[0] + i),
+                            (unsigned long)((size_t)hs_offset[1] + j));
+                    fprintf(stderr, "    At original: %d\n",
+                            (int)points[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]);
+                    fprintf(stderr, "    At returned: %d\n",
+                            (int)check[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]);
                     goto error;
                 }
             }
@@ -2857,7 +2857,7 @@ test_missing_filter(hid_t file)
     /* Verify deflate filter is registered currently */
     if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != TRUE) {
         H5_FAILED();
-        HDprintf("    Line %d: Deflate filter not available\n", __LINE__);
+        printf("    Line %d: Deflate filter not available\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -2870,31 +2870,31 @@ test_missing_filter(hid_t file)
     /* (Use private routine, to avoid range checking on filter ID) */
     if (H5Z__unregister(H5Z_FILTER_DEFLATE) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't unregister deflate filter\n", __LINE__);
+        printf("    Line %d: Can't unregister deflate filter\n", __LINE__);
         goto error;
     }  /* end if */
 #endif /* H5_HAVE_FILTER_DEFLATE */
     /* Verify deflate filter is not registered currently */
     if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != FALSE) {
         H5_FAILED();
-        HDprintf("    Line %d: Deflate filter available\n", __LINE__);
+        printf("    Line %d: Deflate filter available\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Create dcpl with deflate filter */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't create dcpl\n", __LINE__);
+        printf("    Line %d: Can't create dcpl\n", __LINE__);
         goto error;
     } /* end if */
     if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't set chunk sizes\n", __LINE__);
+        printf("    Line %d: Can't set chunk sizes\n", __LINE__);
         goto error;
     } /* end if */
     if (H5Pset_deflate(dcpl, 9) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't set deflate filter\n", __LINE__);
+        printf("    Line %d: Can't set deflate filter\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -2902,19 +2902,19 @@ test_missing_filter(hid_t file)
     ret = H5Pall_filters_avail(dcpl);
     if (ret < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't check filter availability\n", __LINE__);
+        printf("    Line %d: Can't check filter availability\n", __LINE__);
         goto error;
     } /* end if */
     if (ret != FALSE) {
         H5_FAILED();
-        HDprintf("    Line %d: Filter shouldn't be available\n", __LINE__);
+        printf("    Line %d: Filter shouldn't be available\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Create the data space */
     if ((sid = H5Screate_simple(2, dims, NULL)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't open dataspace\n", __LINE__);
+        printf("    Line %d: Can't open dataspace\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -2922,29 +2922,29 @@ test_missing_filter(hid_t file)
     if ((dsid = H5Dcreate2(file, DSET_MISSING_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't create dataset\n", __LINE__);
+        printf("    Line %d: Can't create dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Write data */
     if (H5Dwrite(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, points_data) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error writing dataset data\n", __LINE__);
+        printf("    Line %d: Error writing dataset data\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Flush the file (to clear the cache) */
     if (H5Fflush(file, H5F_SCOPE_GLOBAL) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error flushing file\n", __LINE__);
+        printf("    Line %d: Error flushing file\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Query the dataset's size on disk */
     if (0 == (dset_size = H5Dget_storage_size(dsid))) {
         H5_FAILED();
-        HDprintf("    Line %d: Error querying dataset size, dset_size=%lu\n", __LINE__,
-                 (unsigned long)dset_size);
+        printf("    Line %d: Error querying dataset size, dset_size=%lu\n", __LINE__,
+               (unsigned long)dset_size);
         goto error;
     } /* end if */
 
@@ -2952,14 +2952,14 @@ test_missing_filter(hid_t file)
     /* (i.e. the deflation filter we asked for was silently ignored) */
     if ((H5Tget_size(H5T_NATIVE_INT) * DSET_DIM1 * DSET_DIM2) != dset_size) {
         H5_FAILED();
-        HDprintf("    Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size);
+        printf("    Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size);
         goto error;
     } /* end if */
 
     /* Read data */
     if (H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_data) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error reading dataset data\n", __LINE__);
+        printf("    Line %d: Error reading dataset data\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -2969,10 +2969,10 @@ test_missing_filter(hid_t file)
         for (j = 0; j < (size_t)dims[1]; j++) {
             if (points[i][j] != check[i][j]) {
                 H5_FAILED();
-                HDprintf("    Line %d: Read different values than written.\n", __LINE__);
-                HDprintf("    At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j));
-                HDprintf("    At original: %d\n", points[i][j]);
-                HDprintf("    At returned: %d\n", check[i][j]);
+                printf("    Line %d: Read different values than written.\n", __LINE__);
+                printf("    At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j));
+                printf("    At original: %d\n", points[i][j]);
+                printf("    At returned: %d\n", check[i][j]);
                 goto error;
             } /* end if */
         }     /* end for */
@@ -2981,21 +2981,21 @@ test_missing_filter(hid_t file)
     /* Close dataset */
     if (H5Dclose(dsid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dataset\n", __LINE__);
+        printf("    Line %d: Can't close dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close dataspace */
     if (H5Sclose(sid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dataspace\n", __LINE__);
+        printf("    Line %d: Can't close dataspace\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close dataset creation property list */
     if (H5Pclose(dcpl) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dcpl\n", __LINE__);
+        printf("    Line %d: Can't close dcpl\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -3004,14 +3004,14 @@ test_missing_filter(hid_t file)
     /* Open existing file */
     if ((fid = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't open existing deflated file\n", __LINE__);
+        printf("    Line %d: Can't open existing deflated file\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Open dataset */
     if ((dsid = H5Dopen2(fid, "Dataset1", H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't open dataset\n", __LINE__);
+        printf("    Line %d: Can't open dataset\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -3023,21 +3023,21 @@ test_missing_filter(hid_t file)
     H5E_END_TRY
     if (ret >= 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Should not be able to read dataset data\n", __LINE__);
+        printf("    Line %d: Should not be able to read dataset data\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close dataset */
     if (H5Dclose(dsid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dataset\n", __LINE__);
+        printf("    Line %d: Can't close dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close existing file */
     if (H5Fclose(fid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close file\n", __LINE__);
+        printf("    Line %d: Can't close file\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -3045,21 +3045,21 @@ test_missing_filter(hid_t file)
     /* Verify deflate filter is not registered currently */
     if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != FALSE) {
         H5_FAILED();
-        HDprintf("    Line %d: Deflate filter available\n", __LINE__);
+        printf("    Line %d: Deflate filter available\n", __LINE__);
         goto error;
     } /* end if */
 #ifdef H5_HAVE_FILTER_DEFLATE
     /* Register deflate filter (use internal function to avoid range checks) */
     if (H5Z_register(H5Z_DEFLATE) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't unregister deflate filter\n", __LINE__);
+        printf("    Line %d: Can't unregister deflate filter\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Verify deflate filter is registered currently */
     if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != TRUE) {
         H5_FAILED();
-        HDprintf("    Line %d: Deflate filter not available\n", __LINE__);
+        printf("    Line %d: Deflate filter not available\n", __LINE__);
         goto error;
     }  /* end if */
 #endif /* H5_HAVE_FILTER_DEFLATE */
@@ -3152,8 +3152,8 @@ test_onebyte_shuffle(hid_t file)
         for (j = 0; j < (size_t)size[1]; j++) {
             if (new_data[i][j] != orig_data[i][j]) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                printf("    Read different values than written.\n");
+                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 goto error;
             }
         }
@@ -3275,8 +3275,8 @@ test_nbit_int(hid_t file)
         for (j = 0; j < (size_t)size[1]; j++) {
             if (((unsigned)new_data[i][j] & mask) != ((unsigned)orig_data[i][j] & mask)) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                printf("    Read different values than written.\n");
+                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 goto error;
             }
         }
@@ -3394,8 +3394,8 @@ test_nbit_float(hid_t file)
                 continue; /* skip if value is NaN */
             if (!H5_FLT_ABS_EQUAL(new_data[i][j], orig_data[i][j])) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                printf("    Read different values than written.\n");
+                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 goto error;
             }
         }
@@ -3516,8 +3516,8 @@ test_nbit_double(hid_t file)
                 continue; /* skip if value is NaN */
             if (!H5_DBL_ABS_EQUAL(new_data[i][j], orig_data[i][j])) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                printf("    Read different values than written.\n");
+                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 goto error;
             }
         }
@@ -3649,9 +3649,9 @@ test_nbit_array(hid_t file)
                 for (n = 0; n < (size_t)adims[1]; n++) {
                     if (new_data[i][j][m][n] != orig_data[i][j][m][n]) {
                         H5_FAILED();
-                        HDprintf("    Read different values than written.\n");
-                        HDprintf("    At index %lu,%lu,%lu,%lu\n", (unsigned long)i, (unsigned long)j,
-                                 (unsigned long)m, (unsigned long)n);
+                        printf("    Read different values than written.\n");
+                        printf("    At index %lu,%lu,%lu,%lu\n", (unsigned long)i, (unsigned long)j,
+                               (unsigned long)m, (unsigned long)n);
                         goto error;
                     }
                 }
@@ -3860,8 +3860,8 @@ test_nbit_compound(hid_t file)
                 ((unsigned)new_data[i][j].s & s_mask) != ((unsigned)orig_data[i][j].s & s_mask) ||
                 (!HDisnan(orig_data[i][j].f) && !H5_FLT_ABS_EQUAL(new_data[i][j].f, orig_data[i][j].f))) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                printf("    Read different values than written.\n");
+                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 goto error;
             }
         }
@@ -4198,8 +4198,8 @@ out:
                 (!HDisnan(new_data[i][j].a.f) && !H5_FLT_ABS_EQUAL(new_data[i][j].a.f, new_data[i][j].a.f)) ||
                 new_data[i][j].v != orig_data[i][j].v || b_failed || d_failed) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                printf("    Read different values than written.\n");
+                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 goto error;
             }
         }
@@ -4395,24 +4395,24 @@ test_nbit_compound_3(hid_t file)
             HDstrcmp(new_data[i].vl_str, orig_data[i].vl_str) != 0 ||
             new_data[i].v.len != orig_data[i].v.len || new_data[i].r != orig_data[i].r) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %lu\n", (unsigned long)i);
+            printf("    Read different values than written.\n");
+            printf("    At index %lu\n", (unsigned long)i);
             goto error;
         }
 
         for (k = 0; k < i + 1; k++)
             if (((unsigned int *)orig_data[i].v.p)[k] != ((unsigned int *)new_data[i].v.p)[k]) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %lu\n", (unsigned long)i);
+                printf("    Read different values than written.\n");
+                printf("    At index %lu\n", (unsigned long)i);
                 goto error;
             }
 
         for (j = 0; j < 5; j++)
             if (orig_data[i].o[j] != new_data[i].o[j]) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %lu\n", (unsigned long)i);
+                printf("    Read different values than written.\n");
+                printf("    At index %lu\n", (unsigned long)i);
                 goto error;
             }
     }
@@ -4493,41 +4493,41 @@ test_nbit_int_size(hid_t file)
     /* Define dataset datatype (integer), and set precision, offset */
     if ((datatype = H5Tcopy(H5T_NATIVE_INT)) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Tcopy failed\n", __LINE__);
+        printf("    line %d: H5Tcopy failed\n", __LINE__);
         goto error;
     }
 
     precision = 16; /* precision includes sign bit */
     if (H5Tset_precision(datatype, precision) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pset_precision failed\n", __LINE__);
+        printf("    line %d: H5Pset_precision failed\n", __LINE__);
         goto error;
     }
 
     offset = 8;
     if (H5Tset_offset(datatype, offset) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Tset_offset failed\n", __LINE__);
+        printf("    line %d: H5Tset_offset failed\n", __LINE__);
         goto error;
     }
 
     /* Copy to memory datatype */
     if ((mem_datatype = H5Tcopy(datatype)) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Tcopy failed\n", __LINE__);
+        printf("    line %d: H5Tcopy failed\n", __LINE__);
         goto error;
     }
 
     /* Set order of dataset datatype */
     if (H5Tset_order(datatype, H5T_ORDER_BE) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pset_order failed\n", __LINE__);
+        printf("    line %d: H5Pset_order failed\n", __LINE__);
         goto error;
     }
 
     if (H5Tset_size(datatype, 4) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pset_size failed\n", __LINE__);
+        printf("    line %d: H5Pset_size failed\n", __LINE__);
         goto error;
     }
 
@@ -4545,7 +4545,7 @@ test_nbit_int_size(hid_t file)
     dims[1] = DSET_DIM2;
     if ((dataspace = H5Screate_simple(2, dims, NULL)) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pcreate failed\n", __LINE__);
+        printf("    line %d: H5Pcreate failed\n", __LINE__);
         goto error;
     }
 
@@ -4556,13 +4556,13 @@ test_nbit_int_size(hid_t file)
     chunk_size[1] = DSET_DIM2 / 10;
     if ((dset_create_props = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pcreate failed\n", __LINE__);
+        printf("    line %d: H5Pcreate failed\n", __LINE__);
         goto error;
     }
 
     if (H5Pset_chunk(dset_create_props, 2, chunk_size) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pset_chunk failed\n", __LINE__);
+        printf("    line %d: H5Pset_chunk failed\n", __LINE__);
         goto error;
     }
 
@@ -4571,7 +4571,7 @@ test_nbit_int_size(hid_t file)
      */
     if (H5Pset_nbit(dset_create_props) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pset_nbit failed\n", __LINE__);
+        printf("    line %d: H5Pset_nbit failed\n", __LINE__);
         goto error;
     }
 
@@ -4581,7 +4581,7 @@ test_nbit_int_size(hid_t file)
     if ((dataset = H5Dcreate2(file, DSET_NBIT_INT_SIZE_NAME, datatype, dataspace, H5P_DEFAULT,
                               dset_create_props, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5dwrite failed\n", __LINE__);
+        printf("    line %d: H5dwrite failed\n", __LINE__);
         goto error;
     }
 
@@ -4590,7 +4590,7 @@ test_nbit_int_size(hid_t file)
      */
     if (H5Dwrite(dataset, mem_datatype, H5S_ALL, H5S_ALL, H5P_DEFAULT, orig_data) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: H5Dwrite failed\n", __LINE__);
+        printf("    Line %d: H5Dwrite failed\n", __LINE__);
         goto error;
     }
 
@@ -4599,7 +4599,7 @@ test_nbit_int_size(hid_t file)
      */
     if ((precision = H5Tget_precision(datatype)) == 0) {
         H5_FAILED();
-        HDprintf("    Line %d: wrong precision size: %zu\n", __LINE__, precision);
+        printf("    Line %d: wrong precision size: %zu\n", __LINE__, precision);
         goto error;
     }
 
@@ -4609,7 +4609,7 @@ test_nbit_int_size(hid_t file)
     if ((dset_size = H5Dget_storage_size(dataset)) < DSET_DIM1 * DSET_DIM2 * (precision / 8) ||
         dset_size > DSET_DIM1 * DSET_DIM2 * (precision / 8) + 1 * KB) {
         H5_FAILED();
-        HDfprintf(stdout, "    Line %d: wrong dataset size: %" PRIuHSIZE "\n", __LINE__, dset_size);
+        fprintf(stdout, "    Line %d: wrong dataset size: %" PRIuHSIZE "\n", __LINE__, dset_size);
         goto error;
     }
 
@@ -4694,7 +4694,7 @@ test_nbit_flt_size(hid_t file)
      *-------------------------------------------------------------------*/
     if ((datatype = H5Tcopy(H5T_IEEE_F32LE)) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Tcopy failed\n", __LINE__);
+        printf("    line %d: H5Tcopy failed\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -4708,38 +4708,38 @@ test_nbit_flt_size(hid_t file)
 
     if (H5Tset_fields(datatype, spos, epos, esize, mpos, msize) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Tset_fields failed\n", __LINE__);
+        printf("    line %d: H5Tset_fields failed\n", __LINE__);
         goto error;
     } /* end if */
 
     if (H5Tset_offset(datatype, offset) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Tset_offset failed\n", __LINE__);
+        printf("    line %d: H5Tset_offset failed\n", __LINE__);
         goto error;
     } /* end if */
 
     if (H5Tset_precision(datatype, precision) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Tset_precision failed\n", __LINE__);
+        printf("    line %d: H5Tset_precision failed\n", __LINE__);
         goto error;
     } /* end if */
 
     if (H5Tset_size(datatype, 4) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pset_size failed\n", __LINE__);
+        printf("    line %d: H5Pset_size failed\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Set order of dataset datatype */
     if (H5Tset_order(datatype, H5T_ORDER_BE) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pset_order failed\n", __LINE__);
+        printf("    line %d: H5Pset_order failed\n", __LINE__);
         goto error;
     } /* end if */
 
     if (H5Tset_ebias(datatype, 31) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pset_size failed\n", __LINE__);
+        printf("    line %d: H5Pset_size failed\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -4755,7 +4755,7 @@ test_nbit_flt_size(hid_t file)
     dims[1] = DSET_DIM2;
     if ((dataspace = H5Screate_simple(2, dims, NULL)) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pcreate failed\n", __LINE__);
+        printf("    line %d: H5Pcreate failed\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -4766,13 +4766,13 @@ test_nbit_flt_size(hid_t file)
     chunk_size[1] = DSET_DIM2 / 10;
     if ((dset_create_props = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pcreate failed\n", __LINE__);
+        printf("    line %d: H5Pcreate failed\n", __LINE__);
         goto error;
     } /* end if */
 
     if (H5Pset_chunk(dset_create_props, 2, chunk_size) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pset_chunk failed\n", __LINE__);
+        printf("    line %d: H5Pset_chunk failed\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -4781,7 +4781,7 @@ test_nbit_flt_size(hid_t file)
      */
     if (H5Pset_nbit(dset_create_props) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5Pset_nbit failed\n", __LINE__);
+        printf("    line %d: H5Pset_nbit failed\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -4791,7 +4791,7 @@ test_nbit_flt_size(hid_t file)
     if ((dataset = H5Dcreate2(file, DSET_NBIT_FLT_SIZE_NAME, datatype, dataspace, H5P_DEFAULT,
                               dset_create_props, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    line %d: H5dwrite failed\n", __LINE__);
+        printf("    line %d: H5dwrite failed\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -4800,7 +4800,7 @@ test_nbit_flt_size(hid_t file)
      */
     if (H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, orig_data) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: H5Dwrite failed\n", __LINE__);
+        printf("    Line %d: H5Dwrite failed\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -4809,7 +4809,7 @@ test_nbit_flt_size(hid_t file)
      */
     if ((precision = H5Tget_precision(datatype)) == 0) {
         H5_FAILED();
-        HDprintf("    Line %d: wrong precision size: %zu\n", __LINE__, precision);
+        printf("    Line %d: wrong precision size: %zu\n", __LINE__, precision);
         goto error;
     } /* end if */
 
@@ -4819,7 +4819,7 @@ test_nbit_flt_size(hid_t file)
     if ((dset_size = H5Dget_storage_size(dataset)) < DSET_DIM1 * DSET_DIM2 * (precision / 8) ||
         dset_size > DSET_DIM1 * DSET_DIM2 * (precision / 8) + 1 * KB) {
         H5_FAILED();
-        HDfprintf(stdout, "    Line %d: wrong dataset size: %" PRIuHSIZE "\n", __LINE__, dset_size);
+        fprintf(stdout, "    Line %d: wrong dataset size: %" PRIuHSIZE "\n", __LINE__, dset_size);
         goto error;
     } /* end if */
 
@@ -4936,8 +4936,8 @@ test_scaleoffset_int(hid_t file)
         for (j = 0; j < (size_t)size[1]; j++) {
             if (new_data[i][j] != orig_data[i][j]) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                printf("    Read different values than written.\n");
+                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 goto error;
             }
         }
@@ -5080,8 +5080,8 @@ test_scaleoffset_int_2(hid_t file)
     for (j = 0; j < (size_t)size[1]; j++) {
         if (new_data[0][j] != orig_data[0][j]) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %lu,%lu\n", (unsigned long)0, (unsigned long)j);
+            printf("    Read different values than written.\n");
+            printf("    At index %lu,%lu\n", (unsigned long)0, (unsigned long)j);
             goto error;
         }
     }
@@ -5202,8 +5202,8 @@ test_scaleoffset_float(hid_t file)
         for (j = 0; j < (size_t)size[1]; j++) {
             if (HDfabs((double)(new_data[i][j] - orig_data[i][j])) > HDpow(10.0, -3.0)) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                printf("    Read different values than written.\n");
+                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 goto error;
             }
         }
@@ -5348,8 +5348,8 @@ test_scaleoffset_float_2(hid_t file)
     for (j = 0; j < (size_t)size[1]; j++) {
         if (HDfabs((double)(new_data[0][j] - orig_data[0][j])) > HDpow(10.0, -3.0)) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %lu,%lu\n", (unsigned long)0, (unsigned long)j);
+            printf("    Read different values than written.\n");
+            printf("    At index %lu,%lu\n", (unsigned long)0, (unsigned long)j);
             goto error;
         }
     }
@@ -5469,8 +5469,8 @@ test_scaleoffset_double(hid_t file)
         for (j = 0; j < (size_t)size[1]; j++) {
             if (HDfabs(new_data[i][j] - orig_data[i][j]) > HDpow(10.0, -7.0)) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
+                printf("    Read different values than written.\n");
+                printf("    At index %lu,%lu\n", (unsigned long)i, (unsigned long)j);
                 goto error;
             }
         }
@@ -5615,8 +5615,8 @@ test_scaleoffset_double_2(hid_t file)
     for (j = 0; j < (size_t)size[1]; j++) {
         if (HDfabs((double)(new_data[0][j] - orig_data[0][j])) > HDpow(10.0, -7.0)) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %lu,%lu\n", (unsigned long)0, (unsigned long)j);
+            printf("    Read different values than written.\n");
+            printf("    At index %lu,%lu\n", (unsigned long)0, (unsigned long)j);
             goto error;
         }
     }
@@ -5694,7 +5694,7 @@ test_multiopen(hid_t file)
         goto error;
     if (cur_size[0] != tmp_size[0]) {
         H5_FAILED();
-        HDprintf("    Got %d instead of %d!\n", (int)tmp_size[0], (int)cur_size[0]);
+        printf("    Got %d instead of %d!\n", (int)tmp_size[0], (int)cur_size[0]);
         goto error;
     } /* end if */
 
@@ -5874,30 +5874,30 @@ test_can_apply(hid_t file)
     /* Create dcpl with special filter */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't create dcpl\n", __LINE__);
+        printf("    Line %d: Can't create dcpl\n", __LINE__);
         goto error;
     } /* end if */
     if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't set chunk sizes\n", __LINE__);
+        printf("    Line %d: Can't set chunk sizes\n", __LINE__);
         goto error;
     } /* end if */
     if (H5Zregister(H5Z_CAN_APPLY_TEST) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't register 'can apply' filter\n", __LINE__);
+        printf("    Line %d: Can't register 'can apply' filter\n", __LINE__);
         goto error;
     }
     /* The filter is mandate. */
     if (H5Pset_filter(dcpl, H5Z_FILTER_CAN_APPLY_TEST, 0, (size_t)0, NULL) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't set bogus filter\n", __LINE__);
+        printf("    Line %d: Can't set bogus filter\n", __LINE__);
         goto error;
     }
 
     /* Create the data space */
     if ((sid = H5Screate_simple(2, dims, NULL)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't open dataspace\n", __LINE__);
+        printf("    Line %d: Can't open dataspace\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -5911,7 +5911,7 @@ test_can_apply(hid_t file)
     H5E_END_TRY
     if (dsid >= 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Shouldn't have created dataset!\n", __LINE__);
+        printf("    Line %d: Shouldn't have created dataset!\n", __LINE__);
         H5Dclose(dsid);
         goto error;
     } /* end if */
@@ -5924,7 +5924,7 @@ test_can_apply(hid_t file)
     H5E_END_TRY
     if (dsid >= 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Shouldn't have created dataset!\n", __LINE__);
+        printf("    Line %d: Shouldn't have created dataset!\n", __LINE__);
         H5Dclose(dsid);
         goto error;
     } /* end if */
@@ -5933,42 +5933,42 @@ test_can_apply(hid_t file)
     if ((dsid = H5Dcreate2(file, DSET_CAN_APPLY_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't create dataset\n", __LINE__);
+        printf("    Line %d: Can't create dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Write data */
     if (H5Dwrite(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, points_data) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error writing dataset data\n", __LINE__);
+        printf("    Line %d: Error writing dataset data\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Flush the file (to clear the cache) */
     if (H5Fflush(file, H5F_SCOPE_GLOBAL) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error flushing file\n", __LINE__);
+        printf("    Line %d: Error flushing file\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Query the dataset's size on disk */
     if ((dset_size = H5Dget_storage_size(dsid)) == 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error querying dataset size\n", __LINE__);
+        printf("    Line %d: Error querying dataset size\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Verify that the size indicates data is uncompressed */
     if ((H5Tget_size(H5T_NATIVE_INT) * dims[0] * dims[1]) != dset_size) {
         H5_FAILED();
-        HDprintf("    Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size);
+        printf("    Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size);
         goto error;
     } /* end if */
 
     /* Read data */
     if (H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_data) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error reading dataset data\n", __LINE__);
+        printf("    Line %d: Error reading dataset data\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -5978,10 +5978,10 @@ test_can_apply(hid_t file)
         for (j = 0; j < (size_t)dims[1]; j++) {
             if (points[i][j] != check[i][j]) {
                 H5_FAILED();
-                HDprintf("    Line %d: Read different values than written.\n", __LINE__);
-                HDprintf("    At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j));
-                HDprintf("    At original: %d\n", points[i][j]);
-                HDprintf("    At returned: %d\n", check[i][j]);
+                printf("    Line %d: Read different values than written.\n", __LINE__);
+                printf("    At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j));
+                printf("    At original: %d\n", points[i][j]);
+                printf("    At returned: %d\n", check[i][j]);
                 goto error;
             } /* end if */
         }     /* end for */
@@ -5990,21 +5990,21 @@ test_can_apply(hid_t file)
     /* Close dataset */
     if (H5Dclose(dsid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dataset\n", __LINE__);
+        printf("    Line %d: Can't close dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close dataspace */
     if (H5Sclose(sid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dataspace\n", __LINE__);
+        printf("    Line %d: Can't close dataspace\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close dataset creation property list */
     if (H5Pclose(dcpl) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dcpl\n", __LINE__);
+        printf("    Line %d: Can't close dcpl\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -6058,30 +6058,30 @@ test_can_apply2(hid_t file)
     /* Create dcpl with special filter */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't create dcpl\n", __LINE__);
+        printf("    Line %d: Can't create dcpl\n", __LINE__);
         goto error;
     } /* end if */
     if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't set chunk sizes\n", __LINE__);
+        printf("    Line %d: Can't set chunk sizes\n", __LINE__);
         goto error;
     } /* end if */
     if (H5Zregister(H5Z_CAN_APPLY_TEST2) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't register 'can apply' filter\n", __LINE__);
+        printf("    Line %d: Can't register 'can apply' filter\n", __LINE__);
         goto error;
     }
     /* The filter is optional. */
     if (H5Pset_filter(dcpl, H5Z_FILTER_CAN_APPLY_TEST2, H5Z_FLAG_OPTIONAL, (size_t)0, NULL) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't set bogus filter\n", __LINE__);
+        printf("    Line %d: Can't set bogus filter\n", __LINE__);
         goto error;
     }
 
     /* Create the data space */
     if ((sid = H5Screate_simple(2, dims, NULL)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't open dataspace\n", __LINE__);
+        printf("    Line %d: Can't open dataspace\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -6089,42 +6089,42 @@ test_can_apply2(hid_t file)
     if ((dsid = H5Dcreate2(file, DSET_CAN_APPLY_NAME2, H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, dcpl,
                            H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't create dataset\n", __LINE__);
+        printf("    Line %d: Can't create dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Write data */
     if (H5Dwrite(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, points_data) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error writing dataset data\n", __LINE__);
+        printf("    Line %d: Error writing dataset data\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Flush the file (to clear the cache) */
     if (H5Fflush(file, H5F_SCOPE_GLOBAL) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error flushing file\n", __LINE__);
+        printf("    Line %d: Error flushing file\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Query the dataset's size on disk */
     if ((dset_size = H5Dget_storage_size(dsid)) == 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error querying dataset size\n", __LINE__);
+        printf("    Line %d: Error querying dataset size\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Verify that the size indicates data is uncompressed */
     if ((H5Tget_size(H5T_NATIVE_DOUBLE) * dims[0] * dims[1]) != dset_size) {
         H5_FAILED();
-        HDprintf("    Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size);
+        printf("    Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size);
         goto error;
     } /* end if */
 
     /* Read data */
     if (H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_data) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error reading dataset data\n", __LINE__);
+        printf("    Line %d: Error reading dataset data\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -6134,10 +6134,10 @@ test_can_apply2(hid_t file)
         for (j = 0; j < (size_t)dims[1]; j++) {
             if (points[i][j] != check[i][j]) {
                 H5_FAILED();
-                HDprintf("    Line %d: Read different values than written.\n", __LINE__);
-                HDprintf("    At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j));
-                HDprintf("    At original: %d\n", points[i][j]);
-                HDprintf("    At returned: %d\n", check[i][j]);
+                printf("    Line %d: Read different values than written.\n", __LINE__);
+                printf("    At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j));
+                printf("    At original: %d\n", points[i][j]);
+                printf("    At returned: %d\n", check[i][j]);
                 goto error;
             } /* end if */
         }     /* end for */
@@ -6146,21 +6146,21 @@ test_can_apply2(hid_t file)
     /* Close dataset */
     if (H5Dclose(dsid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dataset\n", __LINE__);
+        printf("    Line %d: Can't close dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close dataspace */
     if (H5Sclose(sid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dataspace\n", __LINE__);
+        printf("    Line %d: Can't close dataspace\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close dataset creation property list */
     if (H5Pclose(dcpl) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dcpl\n", __LINE__);
+        printf("    Line %d: Can't close dcpl\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -6322,19 +6322,19 @@ test_can_apply_szip(hid_t
         /* Create the data space */
         if ((sid = H5Screate_simple(2, dims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't open dataspace\n", __LINE__);
+            printf("    Line %d: Can't open dataspace\n", __LINE__);
             goto error;
         } /* end if */
 
         /* Create dcpl with special filter */
         if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't create dcpl\n", __LINE__);
+            printf("    Line %d: Can't create dcpl\n", __LINE__);
             goto error;
         } /* end if */
         if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't set chunk sizes\n", __LINE__);
+            printf("    Line %d: Can't set chunk sizes\n", __LINE__);
             goto error;
         } /* end if */
 
@@ -6347,7 +6347,7 @@ test_can_apply_szip(hid_t
         H5E_END_TRY
         if (ret >= 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Shouldn't be able to set szip filter\n", __LINE__);
+            printf("    Line %d: Shouldn't be able to set szip filter\n", __LINE__);
             goto error;
         }
 
@@ -6360,7 +6360,7 @@ test_can_apply_szip(hid_t
         H5E_END_TRY
         if (ret >= 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Shouldn't be able to set szip filter\n", __LINE__);
+            printf("    Line %d: Shouldn't be able to set szip filter\n", __LINE__);
             goto error;
         }
 
@@ -6368,7 +6368,7 @@ test_can_apply_szip(hid_t
         szip_pixels_per_block = 2;
         if (H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't set szip filter\n", __LINE__);
+            printf("    Line %d: Can't set szip filter\n", __LINE__);
             goto error;
         }
 
@@ -6383,47 +6383,47 @@ test_can_apply_szip(hid_t
         H5E_END_TRY
         if (dsid <= 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Should have created dataset!\n", __LINE__);
+            printf("    Line %d: Should have created dataset!\n", __LINE__);
             goto error;
         } /* end if */
 
         /* Close dataset */
         if (H5Dclose(dsid) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't close dataset\n", __LINE__);
+            printf("    Line %d: Can't close dataset\n", __LINE__);
             goto error;
         } /* end if */
 
         /* Close dataspace */
         if (H5Sclose(sid) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't close dataspace\n", __LINE__);
+            printf("    Line %d: Can't close dataspace\n", __LINE__);
             goto error;
         } /* end if */
 
         /* Close dataset creation property list */
         if (H5Pclose(dcpl) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't close dcpl\n", __LINE__);
+            printf("    Line %d: Can't close dcpl\n", __LINE__);
             goto error;
         } /* end if */
 
         /* Create another data space */
         if ((sid = H5Screate_simple(2, dims2, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't open dataspace\n", __LINE__);
+            printf("    Line %d: Can't open dataspace\n", __LINE__);
             goto error;
         } /* end if */
 
         /* Create dcpl with special filter */
         if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't create dcpl\n", __LINE__);
+            printf("    Line %d: Can't create dcpl\n", __LINE__);
             goto error;
         } /* end if */
         if (H5Pset_chunk(dcpl, 2, chunk_dims2) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't set chunk sizes\n", __LINE__);
+            printf("    Line %d: Can't set chunk sizes\n", __LINE__);
             goto error;
         } /* end if */
 
@@ -6431,7 +6431,7 @@ test_can_apply_szip(hid_t
         szip_pixels_per_block = 32;
         if (H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't set szip filter\n", __LINE__);
+            printf("    Line %d: Can't set szip filter\n", __LINE__);
             goto error;
         }
 
@@ -6445,7 +6445,7 @@ test_can_apply_szip(hid_t
         H5E_END_TRY
         if (dsid >= 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Shouldn't have created dataset!\n", __LINE__);
+            printf("    Line %d: Shouldn't have created dataset!\n", __LINE__);
             H5Dclose(dsid);
             goto error;
         } /* end if */
@@ -6453,14 +6453,14 @@ test_can_apply_szip(hid_t
         /* Close dataspace */
         if (H5Sclose(sid) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't close dataspace\n", __LINE__);
+            printf("    Line %d: Can't close dataspace\n", __LINE__);
             goto error;
         } /* end if */
 
         /* Close dataset creation property list */
         if (H5Pclose(dcpl) < 0) {
             H5_FAILED();
-            HDprintf("    Line %d: Can't close dcpl\n", __LINE__);
+            printf("    Line %d: Can't close dcpl\n", __LINE__);
             goto error;
         } /* end if */
 
@@ -6534,36 +6534,36 @@ test_set_local(hid_t fapl)
     /* Open file */
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't open file\n", __LINE__);
+        printf("    Line %d: Can't open file\n", __LINE__);
         goto error;
     }
 
     /* Create dcpl with special filter */
     if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't create dcpl\n", __LINE__);
+        printf("    Line %d: Can't create dcpl\n", __LINE__);
         goto error;
     } /* end if */
     if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't set chunk sizes\n", __LINE__);
+        printf("    Line %d: Can't set chunk sizes\n", __LINE__);
         goto error;
     } /* end if */
     if (H5Zregister(H5Z_SET_LOCAL_TEST) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't register 'set local' filter\n", __LINE__);
+        printf("    Line %d: Can't register 'set local' filter\n", __LINE__);
         goto error;
     }
     if (H5Pset_filter(dcpl, H5Z_FILTER_SET_LOCAL_TEST, 0, (size_t)BOGUS2_PERM_NPARMS, cd_values) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't set bogus2 filter\n", __LINE__);
+        printf("    Line %d: Can't set bogus2 filter\n", __LINE__);
         goto error;
     }
 
     /* Create the data space */
     if ((sid = H5Screate_simple(2, dims, NULL)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't open dataspace\n", __LINE__);
+        printf("    Line %d: Can't open dataspace\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -6571,21 +6571,21 @@ test_set_local(hid_t fapl)
     if ((dsid = H5Dcreate2(file, DSET_SET_LOCAL_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't create dataset\n", __LINE__);
+        printf("    Line %d: Can't create dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Write data */
     if (H5Dwrite(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, points_data) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error writing dataset data\n", __LINE__);
+        printf("    Line %d: Error writing dataset data\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close dataset */
     if (H5Dclose(dsid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dataset\n", __LINE__);
+        printf("    Line %d: Can't close dataset\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -6594,77 +6594,77 @@ test_set_local(hid_t fapl)
     if ((dsid = H5Dcreate2(file, DSET_SET_LOCAL_NAME_2, H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, dcpl,
                            H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't create dataset\n", __LINE__);
+        printf("    Line %d: Can't create dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Write data */
     if (H5Dwrite(dsid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, points_dbl_data) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error writing dataset data\n", __LINE__);
+        printf("    Line %d: Error writing dataset data\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close dataset */
     if (H5Dclose(dsid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dataset\n", __LINE__);
+        printf("    Line %d: Can't close dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close dataspace */
     if (H5Sclose(sid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dataspace\n", __LINE__);
+        printf("    Line %d: Can't close dataspace\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close dataset creation property list */
     if (H5Pclose(dcpl) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dcpl\n", __LINE__);
+        printf("    Line %d: Can't close dcpl\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close file (flushes & empties cache) */
     if (H5Fclose(file) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close file\n", __LINE__);
+        printf("    Line %d: Can't close file\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Open file */
     if ((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't open file\n", __LINE__);
+        printf("    Line %d: Can't open file\n", __LINE__);
         goto error;
     }
 
     /* Re-open dataset */
     if ((dsid = H5Dopen2(file, DSET_SET_LOCAL_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't open dataset\n", __LINE__);
+        printf("    Line %d: Can't open dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Query the dataset's size on disk */
     if ((dset_size = H5Dget_storage_size(dsid)) == 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error querying dataset size\n", __LINE__);
+        printf("    Line %d: Error querying dataset size\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Verify that the size indicates data is uncompressed */
     if ((H5Tget_size(H5T_NATIVE_INT) * dims[0] * dims[1]) != dset_size) {
         H5_FAILED();
-        HDprintf("    Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size);
+        printf("    Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size);
         goto error;
     } /* end if */
 
     /* Read data */
     if (H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_data) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error reading dataset data\n", __LINE__);
+        printf("    Line %d: Error reading dataset data\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -6674,10 +6674,10 @@ test_set_local(hid_t fapl)
         for (j = 0; j < dims[1]; j++) {
             if ((points[i][j] + (int)sizeof(int)) != check[i][j]) {
                 H5_FAILED();
-                HDprintf("    Line %d: Read different values than written.\n", __LINE__);
-                HDprintf("    At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j));
-                HDprintf("    At original: %d\n", points[i][j]);
-                HDprintf("    At returned: %d\n", check[i][j]);
+                printf("    Line %d: Read different values than written.\n", __LINE__);
+                printf("    At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j));
+                printf("    At original: %d\n", points[i][j]);
+                printf("    At returned: %d\n", check[i][j]);
                 goto error;
             } /* end if */
         }     /* end for */
@@ -6686,35 +6686,35 @@ test_set_local(hid_t fapl)
     /* Close dataset */
     if (H5Dclose(dsid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dataset\n", __LINE__);
+        printf("    Line %d: Can't close dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Re-open second dataset */
     if ((dsid = H5Dopen2(file, DSET_SET_LOCAL_NAME_2, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't open dataset\n", __LINE__);
+        printf("    Line %d: Can't open dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Query the dataset's size on disk */
     if ((dset_size = H5Dget_storage_size(dsid)) == 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error querying dataset size\n", __LINE__);
+        printf("    Line %d: Error querying dataset size\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Verify that the size indicates data is uncompressed */
     if ((H5Tget_size(H5T_NATIVE_DOUBLE) * dims[0] * dims[1]) != dset_size) {
         H5_FAILED();
-        HDprintf("    Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size);
+        printf("    Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size);
         goto error;
     } /* end if */
 
     /* Read data */
     if (H5Dread(dsid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_dbl_data) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Error reading dataset data\n", __LINE__);
+        printf("    Line %d: Error reading dataset data\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -6726,10 +6726,10 @@ test_set_local(hid_t fapl)
              * considered not equal. */
             if (!H5_DBL_REL_EQUAL(points_dbl[i][j], check_dbl[i][j], 0.00001)) {
                 H5_FAILED();
-                HDprintf("    Line %d: Read different values than written.\n", __LINE__);
-                HDprintf("    At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j));
-                HDprintf("    At original: %f\n", points_dbl[i][j]);
-                HDprintf("    At returned: %f\n", check_dbl[i][j]);
+                printf("    Line %d: Read different values than written.\n", __LINE__);
+                printf("    At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j));
+                printf("    At original: %f\n", points_dbl[i][j]);
+                printf("    At returned: %f\n", check_dbl[i][j]);
                 goto error;
             } /* end if */
         }     /* end for */
@@ -6738,14 +6738,14 @@ test_set_local(hid_t fapl)
     /* Close dataset */
     if (H5Dclose(dsid) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close dataset\n", __LINE__);
+        printf("    Line %d: Can't close dataset\n", __LINE__);
         goto error;
     } /* end if */
 
     /* Close file */
     if (H5Fclose(file) < 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Can't close file\n", __LINE__);
+        printf("    Line %d: Can't close file\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -7106,7 +7106,7 @@ test_filter_delete(hid_t file)
     H5E_END_TRY
     if (ret >= 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Shouldn't have deleted filter!\n", __LINE__);
+        printf("    Line %d: Shouldn't have deleted filter!\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -7118,7 +7118,7 @@ test_filter_delete(hid_t file)
     H5E_END_TRY
     if (ret >= 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Shouldn't have deleted filter!\n", __LINE__);
+        printf("    Line %d: Shouldn't have deleted filter!\n", __LINE__);
         goto error;
     } /* end if */
 
@@ -7226,7 +7226,7 @@ auxread_fdata(hid_t fid, const char *name)
     if (nelmts) {
         buf = (void *)HDmalloc((size_t)(nelmts * msize));
         if (buf == NULL) {
-            HDprintf("cannot read into memory\n");
+            printf("cannot read into memory\n");
             goto error;
         }
         if (H5Dread(dset_id, mtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
@@ -7721,14 +7721,14 @@ test_missing_chunk(hid_t file)
     for (u = 0; u < MISSING_CHUNK_DIM; u++) {
         if ((u % 10) >= 5) {
             if (rdata[u] != 911) {
-                HDprintf("    Line %d: Incorrect value, rdata[%u]=%d\n", __LINE__, (unsigned)u, rdata[u]);
+                printf("    Line %d: Incorrect value, rdata[%u]=%d\n", __LINE__, (unsigned)u, rdata[u]);
                 TEST_ERROR;
             } /* end if */
         }     /* end if */
         else {
             if (rdata[u] != wdata[u]) {
-                HDprintf("    Line %d: Incorrect value, wdata[%u]=%d, rdata[%u]=%d\n", __LINE__, (unsigned)u,
-                         wdata[u], (unsigned)u, rdata[u]);
+                printf("    Line %d: Incorrect value, wdata[%u]=%d, rdata[%u]=%d\n", __LINE__, (unsigned)u,
+                       wdata[u], (unsigned)u, rdata[u]);
                 TEST_ERROR;
             } /* end if */
         }     /* end else */
@@ -7740,16 +7740,16 @@ test_missing_chunk(hid_t file)
 
             if ((i % 10) >= 5 || (j % 10) >= 5) {
                 if (rdata2[i][j] != 911) {
-                    HDprintf("    Line %d: Incorrect value, rdata2[%u][%u] = %d\n", __LINE__, (unsigned)i,
-                             (unsigned)j, rdata2[i][j]);
+                    printf("    Line %d: Incorrect value, rdata2[%u][%u] = %d\n", __LINE__, (unsigned)i,
+                           (unsigned)j, rdata2[i][j]);
                     TEST_ERROR;
                 } /* end if */
             }     /* end if */
             else {
                 if (rdata2[i][j] != wdata2[i][j]) {
-                    HDprintf("    Line %d: Incorrect value, wdata2[%u][%u] = %d, rdata2[%u][%u] = %d\n",
-                             __LINE__, (unsigned)i, (unsigned)j, wdata2[i][j], (unsigned)i, (unsigned)j,
-                             rdata2[i][j]);
+                    printf("    Line %d: Incorrect value, wdata2[%u][%u] = %d, rdata2[%u][%u] = %d\n",
+                           __LINE__, (unsigned)i, (unsigned)j, wdata2[i][j], (unsigned)i, (unsigned)j,
+                           rdata2[i][j]);
                     TEST_ERROR;
                 } /* end if */
             }     /* end else */
@@ -8029,10 +8029,10 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl)
     /* Verify that written and read data are the same */
     for (i = 0; i < NPOINTS; i++)
         if (rbuf[i] != wbuf[i]) {
-            HDprintf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i,
-                     wbuf[i], (unsigned)i, rbuf[i]);
-            HDprintf("             coord[%u] = {%lu, %lu}\n", (unsigned)i, (unsigned long)coord[i][0],
-                     (unsigned long)coord[i][1]);
+            printf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, wbuf[i],
+                   (unsigned)i, rbuf[i]);
+            printf("             coord[%u] = {%lu, %lu}\n", (unsigned)i, (unsigned long)coord[i][0],
+                   (unsigned long)coord[i][1]);
             TEST_ERROR;
         } /* end if */
 
@@ -8171,8 +8171,8 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl)
     /* Verify that written and read data are the same */
     for (i = 0; i < NPOINTS; i++)
         if (rbuf[i] != wbuf[i]) {
-            HDprintf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i,
-                     wbuf[i], (unsigned)i, rbuf[i]);
+            printf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, wbuf[i],
+                   (unsigned)i, rbuf[i]);
             TEST_ERROR;
         } /* end if */
 
@@ -8309,8 +8309,8 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl)
     /* Verify that written and read data are the same */
     for (i = 0; i < NPOINTS; i++)
         if (rbuf[i] != wbuf[i]) {
-            HDprintf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i,
-                     wbuf[i], (unsigned)i, rbuf[i]);
+            printf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, wbuf[i],
+                   (unsigned)i, rbuf[i]);
             TEST_ERROR;
         } /* end if */
 
@@ -9236,17 +9236,16 @@ test_big_chunks_bypass_cache(hid_t fapl)
     /* Verify data for the first 1-D dataset */
     for (i = 0; i < BYPASS_CHUNK_DIM / 2; i++)
         if (rdata1[i] != i) {
-            HDprintf("    Read different values than written in the 1st chunk.\n");
-            HDprintf("    At line %d and index %d, rdata1 = %d. It should be %d.\n", __LINE__, i, rdata1[i],
-                     i);
+            printf("    Read different values than written in the 1st chunk.\n");
+            printf("    At line %d and index %d, rdata1 = %d. It should be %d.\n", __LINE__, i, rdata1[i], i);
             TEST_ERROR;
         } /* end if */
 
     for (j = BYPASS_CHUNK_DIM / 2; j < BYPASS_DIM; j++)
         if (rdata1[j] != fvalue) {
-            HDprintf("    Read different values than written in the 2nd chunk.\n");
-            HDprintf("    At line %d and index %d, rdata1 = %d. It should be %d.\n", __LINE__, i, rdata1[i],
-                     fvalue);
+            printf("    Read different values than written in the 2nd chunk.\n");
+            printf("    At line %d and index %d, rdata1 = %d. It should be %d.\n", __LINE__, i, rdata1[i],
+                   fvalue);
             TEST_ERROR;
         } /* end if */
 
@@ -9254,18 +9253,18 @@ test_big_chunks_bypass_cache(hid_t fapl)
     for (i = 0; i < BYPASS_CHUNK_DIM / 2; i++)
         for (j = 0; j < BYPASS_CHUNK_DIM / 2; j++)
             if (t_rdata1[i][j] != j) {
-                HDprintf("    Read different values than written in the 1st chunk.\n");
-                HDprintf("    At line %d and index (%d, %d), t_rdata1 = %d. It should be %d.\n", __LINE__, i,
-                         j, t_rdata1[i][j], j);
+                printf("    Read different values than written in the 1st chunk.\n");
+                printf("    At line %d and index (%d, %d), t_rdata1 = %d. It should be %d.\n", __LINE__, i, j,
+                       t_rdata1[i][j], j);
                 TEST_ERROR;
             } /* end if */
 
     for (i = BYPASS_CHUNK_DIM / 2; i < BYPASS_DIM; i++)
         for (j = BYPASS_CHUNK_DIM / 2; j < BYPASS_DIM; j++)
             if (t_rdata1[i][j] != fvalue) {
-                HDprintf("    Read different values than written in the 2nd chunk.\n");
-                HDprintf("    At line %d and index (%d, %d), t_rdata1 = %d. It should be %d.\n", __LINE__, i,
-                         j, t_rdata1[i][j], fvalue);
+                printf("    Read different values than written in the 2nd chunk.\n");
+                printf("    At line %d and index (%d, %d), t_rdata1 = %d. It should be %d.\n", __LINE__, i, j,
+                       t_rdata1[i][j], fvalue);
                 TEST_ERROR;
             } /* end if */
 
@@ -9319,9 +9318,8 @@ test_big_chunks_bypass_cache(hid_t fapl)
     /* Verify data for the second 1-D dataset */
     for (i = 0; i < BYPASS_CHUNK_DIM / 2; i++)
         if (rdata2[i] != i) {
-            HDprintf("    Read different values than written in the chunk.\n");
-            HDprintf("    At line %d and index %d, rdata2 = %d. It should be %d.\n", __LINE__, i, rdata2[i],
-                     i);
+            printf("    Read different values than written in the chunk.\n");
+            printf("    At line %d and index %d, rdata2 = %d. It should be %d.\n", __LINE__, i, rdata2[i], i);
             TEST_ERROR;
         } /* end if */
 
@@ -9329,9 +9327,9 @@ test_big_chunks_bypass_cache(hid_t fapl)
     for (i = 0; i < BYPASS_CHUNK_DIM / 2; i++)
         for (j = 0; j < BYPASS_CHUNK_DIM / 2; j++)
             if (t_rdata2[i][j] != j) {
-                HDprintf("    Read different values than written in the chunk.\n");
-                HDprintf("    At line %d and index (%d, %d), t_rdata2 = %d. It should be %d.\n", __LINE__, i,
-                         j, t_rdata2[i][j], j);
+                printf("    Read different values than written in the chunk.\n");
+                printf("    At line %d and index (%d, %d), t_rdata2 = %d. It should be %d.\n", __LINE__, i, j,
+                       t_rdata2[i][j], j);
                 TEST_ERROR;
             } /* end if */
 
@@ -11083,8 +11081,8 @@ test_fixed_array(hid_t fapl)
             /* Verify that written and read data are the same */
             for (i = 0; i < POINTS; i++)
                 if (rbuf[i] != wbuf[i]) {
-                    HDprintf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__,
-                             (unsigned)i, wbuf[i], (unsigned)i, rbuf[i]);
+                    printf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i,
+                           wbuf[i], (unsigned)i, rbuf[i]);
                     TEST_ERROR;
                 } /* end if */
 
@@ -11119,8 +11117,8 @@ test_fixed_array(hid_t fapl)
             /* Verify that written and read data are the same */
             for (i = 0; i < POINTS; i++)
                 if (rbuf[i] != wbuf[i]) {
-                    HDprintf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__,
-                             (unsigned)i, wbuf[i], (unsigned)i, rbuf[i]);
+                    printf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i,
+                           wbuf[i], (unsigned)i, rbuf[i]);
                     TEST_ERROR;
                 } /* end if */
 
@@ -11153,8 +11151,8 @@ test_fixed_array(hid_t fapl)
             /* Verify that written and read data are the same */
             for (i = 0; i < POINTS_BIG; i++)
                 if (rbuf_big[i] != wbuf_big[i]) {
-                    HDprintf("    Line %d: Incorrect value, wbuf_bif[%u]=%d, rbuf_big[%u]=%d\n", __LINE__,
-                             (unsigned)i, wbuf_big[i], (unsigned)i, rbuf_big[i]);
+                    printf("    Line %d: Incorrect value, wbuf_bif[%u]=%d, rbuf_big[%u]=%d\n", __LINE__,
+                           (unsigned)i, wbuf_big[i], (unsigned)i, rbuf_big[i]);
                     TEST_ERROR;
                 } /* end if */
 
@@ -11441,8 +11439,8 @@ test_single_chunk(hid_t fapl)
             /* Verify that written and read data are the same */
             for (i = 0; i < (DSET_DIM1 * DSET_DIM2); i++)
                 if (rbuf[i] != wbuf[i]) {
-                    HDprintf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__,
-                             (unsigned)i, wbuf[i], (unsigned)i, rbuf[i]);
+                    printf("    Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i,
+                           wbuf[i], (unsigned)i, rbuf[i]);
                     TEST_ERROR;
                 } /* end if */
 
@@ -11463,8 +11461,8 @@ test_single_chunk(hid_t fapl)
             /* Verify that written and read data are the same */
             for (i = 0; i < (DSET_TMP_DIM1 * DSET_TMP_DIM2); i++)
                 if (t_rbuf[i] != t_wbuf[i]) {
-                    HDprintf("    Line %d: Incorrect value, t_wbuf[%u]=%d, t_rbuf[%u]=%d\n", __LINE__,
-                             (unsigned)i, t_wbuf[i], (unsigned)i, t_rbuf[i]);
+                    printf("    Line %d: Incorrect value, t_wbuf[%u]=%d, t_rbuf[%u]=%d\n", __LINE__,
+                           (unsigned)i, t_wbuf[i], (unsigned)i, t_rbuf[i]);
                     TEST_ERROR;
                 } /* end if */
 
@@ -13241,8 +13239,8 @@ typedef struct scatter_info_t {
                 if (ARR[i][j][k] != EXP[i][j][k]) {                                                          \
                     H5_FAILED();                                                                             \
                     AT();                                                                                    \
-                    HDprintf("  " #ARR "[%d][%d][%d] == %d, " #EXP "[%d][%d][%d] == %d\n", i, j, k,          \
-                             ARR[i][j][k], i, j, k, EXP[i][j][k]);                                           \
+                    printf("  " #ARR "[%d][%d][%d] == %d, " #EXP "[%d][%d][%d] == %d\n", i, j, k,            \
+                           ARR[i][j][k], i, j, k, EXP[i][j][k]);                                             \
                     goto error;                                                                              \
                 }
 
@@ -15834,7 +15832,7 @@ main(void)
 
     if (nerrors)
         goto error;
-    HDprintf("All dataset tests passed.\n");
+    printf("All dataset tests passed.\n");
 #ifdef H5_HAVE_FILTER_SZIP
     if (GetTestCleanup())
         HDremove(NOENCODER_COPY_FILENAME);
@@ -15865,6 +15863,6 @@ error:
     HDfree(check_dbl_data);
 
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    printf("***** %d DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     HDexit(EXIT_FAILURE);
 } /* end main() */
diff --git a/test/dt_arith.c b/test/dt_arith.c
index af4078e..9f83fe8 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -522,7 +522,7 @@ test_hard_query(void)
     /* Verify the conversion from int to float is a hard conversion. */
     if (H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT) != TRUE) {
         H5_FAILED();
-        HDprintf("Can't query conversion function\n");
+        printf("Can't query conversion function\n");
         goto error;
     }
 
@@ -532,7 +532,7 @@ test_hard_query(void)
                   (H5T_conv_t)((void (*)(void))H5T__conv_int_float));
     if (H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT) != FALSE) {
         H5_FAILED();
-        HDprintf("Can't query conversion function\n");
+        printf("Can't query conversion function\n");
         goto error;
     }
 
@@ -542,7 +542,7 @@ test_hard_query(void)
                 (H5T_conv_t)((void (*)(void))H5T__conv_int_float));
     if (H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT) != TRUE) {
         H5_FAILED();
-        HDprintf("Can't query conversion function\n");
+        printf("Can't query conversion function\n");
         goto error;
     }
 
@@ -637,7 +637,7 @@ test_particular_fp_integer(void)
 
     if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) {
         H5_FAILED();
-        HDprintf("Can't create data transfer property list\n");
+        printf("Can't create data transfer property list\n");
         goto error;
     }
 
@@ -655,14 +655,14 @@ test_particular_fp_integer(void)
     flag = 1;
     if (H5Pset_type_conv_cb(dxpl_id, expt_handle, &flag) < 0) {
         H5_FAILED();
-        HDprintf("Can't register conversion callback\n");
+        printf("Can't register conversion callback\n");
         goto error;
     }
 
     /* Do conversion */
     if (H5Tconvert(H5T_NATIVE_DOUBLE, H5T_NATIVE_SCHAR, (size_t)1, buf1, NULL, dxpl_id) < 0) {
         H5_FAILED();
-        HDprintf("Can't convert data\n");
+        printf("Can't convert data\n");
         goto error;
     }
 
@@ -676,20 +676,20 @@ test_particular_fp_integer(void)
         if (0 == fails_this_test++)
             H5_FAILED();
 
-        HDprintf("    test double to signed char:\n");
-        HDprintf("        src = ");
+        printf("    test double to signed char:\n");
+        printf("        src = ");
         for (j = 0; j < src_size1; j++)
-            HDprintf(" %02x", saved_buf1[ENDIAN(src_size1, j, endian)]);
+            printf(" %02x", saved_buf1[ENDIAN(src_size1, j, endian)]);
 
         HDmemcpy(&x, saved_buf1, src_size1);
-        HDprintf(" %29.20e\n", x);
+        printf(" %29.20e\n", x);
 
-        HDprintf("        dst = ");
+        printf("        dst = ");
         for (j = 0; j < dst_size1; j++)
-            HDprintf(" %02x", buf1[ENDIAN(dst_size1, j, endian)]);
+            printf(" %02x", buf1[ENDIAN(dst_size1, j, endian)]);
 
         HDmemcpy(&y, buf1, dst_size1);
-        HDprintf(" %29d\n", y);
+        printf(" %29d\n", y);
     }
 
     /* Test conversion from float (the value is INT_MAX) to int. */
@@ -706,7 +706,7 @@ test_particular_fp_integer(void)
     /* Do conversion */
     if (H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)1, buf2, NULL, dxpl_id) < 0) {
         H5_FAILED();
-        HDprintf("Can't convert data\n");
+        printf("Can't convert data\n");
         goto error;
     }
 
@@ -720,20 +720,20 @@ test_particular_fp_integer(void)
         if (0 == fails_this_test++)
             H5_FAILED();
 
-        HDprintf("    test float to int:\n");
-        HDprintf("        src = ");
+        printf("    test float to int:\n");
+        printf("        src = ");
         for (j = 0; j < src_size2; j++)
-            HDprintf(" %02x", saved_buf2[ENDIAN(src_size2, j, endian)]);
+            printf(" %02x", saved_buf2[ENDIAN(src_size2, j, endian)]);
 
         HDmemcpy(&x, saved_buf2, src_size2);
-        HDprintf(" %29.20e\n", (double)x);
+        printf(" %29.20e\n", (double)x);
 
-        HDprintf("        dst = ");
+        printf("        dst = ");
         for (j = 0; j < dst_size2; j++)
-            HDprintf(" %02x", buf2[ENDIAN(dst_size2, j, endian)]);
+            printf(" %02x", buf2[ENDIAN(dst_size2, j, endian)]);
 
         HDmemcpy(&y, buf2, dst_size2);
-        HDprintf(" %29d\n", y);
+        printf(" %29d\n", y);
     }
 
     if (fails_this_test)
@@ -741,7 +741,7 @@ test_particular_fp_integer(void)
 
     if (H5Pclose(dxpl_id) < 0) {
         H5_FAILED();
-        HDprintf("Can't close property list\n");
+        printf("Can't close property list\n");
         goto error;
     }
 
@@ -818,25 +818,25 @@ test_derived_flt(void)
     h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof filename);
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("Can't create file\n");
+        printf("Can't create file\n");
         goto error;
     }
 
     if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) {
         H5_FAILED();
-        HDprintf("Can't create data transfer property list\n");
+        printf("Can't create data transfer property list\n");
         goto error;
     }
 
     if ((tid1 = H5Tcopy(H5T_IEEE_F64LE)) < 0) {
         H5_FAILED();
-        HDprintf("Can't copy data type\n");
+        printf("Can't copy data type\n");
         goto error;
     }
 
     if ((tid2 = H5Tcopy(H5T_IEEE_F32LE)) < 0) {
         H5_FAILED();
-        HDprintf("Can't copy data type\n");
+        printf("Can't copy data type\n");
         goto error;
     }
 
@@ -860,44 +860,44 @@ test_derived_flt(void)
      *-----------------------------------------------------------------------*/
     if (H5Tset_fields(tid1, (size_t)44, (size_t)34, (size_t)10, (size_t)3, (size_t)31) < 0) {
         H5_FAILED();
-        HDprintf("Can't set fields\n");
+        printf("Can't set fields\n");
         goto error;
     }
     if (H5Tset_offset(tid1, (size_t)3) < 0) {
         H5_FAILED();
-        HDprintf("Can't set offset\n");
+        printf("Can't set offset\n");
         goto error;
     }
     if (H5Tset_precision(tid1, (size_t)42) < 0) {
         H5_FAILED();
-        HDprintf("Can't set precision 1\n");
+        printf("Can't set precision 1\n");
         goto error;
     }
     if (H5Tset_size(tid1, (size_t)7) < 0) {
         H5_FAILED();
-        HDprintf("Can't set size\n");
+        printf("Can't set size\n");
         goto error;
     }
 
     if (H5Tset_ebias(tid1, (size_t)511) < 0) {
         H5_FAILED();
-        HDprintf("Can't set exponent bias\n");
+        printf("Can't set exponent bias\n");
         goto error;
     }
     if (H5Tset_pad(tid1, H5T_PAD_ZERO, H5T_PAD_ZERO) < 0) {
         H5_FAILED();
-        HDprintf("Can't set padding\n");
+        printf("Can't set padding\n");
         goto error;
     }
 
     if (H5Tcommit2(file, "new float type 1", tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("Can't set inpad\n");
+        printf("Can't set inpad\n");
         goto error;
     }
     if (H5Tclose(tid1) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
 
@@ -905,33 +905,33 @@ test_derived_flt(void)
         FAIL_PUTS_ERROR("Can't open datatype");
     if (H5Tget_fields(tid1, &spos, &epos, &esize, &mpos, &msize) < 0) {
         H5_FAILED();
-        HDprintf("Can't get fields\n");
+        printf("Can't get fields\n");
         goto error;
     }
     if (spos != 44 || epos != 34 || esize != 10 || mpos != 3 || msize != 31) {
         H5_FAILED();
-        HDprintf("Wrong field values\n");
+        printf("Wrong field values\n");
         goto error;
     }
 
     if (H5Tget_precision(tid1) != 42) {
         H5_FAILED();
-        HDprintf("Can't get precision or wrong precision\n");
+        printf("Can't get precision or wrong precision\n");
         goto error;
     }
     if (H5Tget_offset(tid1) != 3) {
         H5_FAILED();
-        HDprintf("Can't get offset or wrong offset\n");
+        printf("Can't get offset or wrong offset\n");
         goto error;
     }
     if ((size = H5Tget_size(tid1)) != 7) {
         H5_FAILED();
-        HDprintf("Can't get size or wrong size\n");
+        printf("Can't get size or wrong size\n");
         goto error;
     }
     if (H5Tget_ebias(tid1) != 511) {
         H5_FAILED();
-        HDprintf("Can't get exponent bias or wrong bias\n");
+        printf("Can't get exponent bias or wrong bias\n");
         goto error;
     }
 
@@ -954,13 +954,13 @@ test_derived_flt(void)
      * The mantissa is big enough to retain the integer's precision. */
     if (H5Tconvert(H5T_NATIVE_INT, tid1, nelmts, buf, NULL, dxpl_id) < 0) {
         H5_FAILED();
-        HDprintf("Can't convert data\n");
+        printf("Can't convert data\n");
         goto error;
     }
     /* Convert data from the derived floating-point type back to native integer. */
     if (H5Tconvert(tid1, H5T_NATIVE_INT, nelmts, buf, NULL, dxpl_id) < 0) {
         H5_FAILED();
-        HDprintf("Can't convert data\n");
+        printf("Can't convert data\n");
         goto error;
     }
 
@@ -976,25 +976,25 @@ test_derived_flt(void)
         if (0 == fails_this_test++) {
             HDsnprintf(str, sizeof(str),
                        "\nTesting random sw derived floating-point -> derived floating-point conversions");
-            HDprintf("%-70s", str);
+            printf("%-70s", str);
             HDfflush(stdout);
             H5_FAILED();
         }
-        HDprintf("    test %u elmt %u: \n", 1, (unsigned)i);
+        printf("    test %u elmt %u: \n", 1, (unsigned)i);
 
-        HDprintf("        src = ");
+        printf("        src = ");
         for (j = 0; j < src_size; j++)
-            HDprintf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]);
+            printf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]);
 
         HDmemcpy(aligned, saved_buf + i * sizeof(int), sizeof(int));
-        HDprintf(" %29d\n", *aligned);
+        printf(" %29d\n", *aligned);
 
-        HDprintf("        dst = ");
+        printf("        dst = ");
         for (j = 0; j < src_size; j++)
-            HDprintf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]);
+            printf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]);
 
         HDmemcpy(aligned, buf + i * sizeof(int), sizeof(int));
-        HDprintf(" %29d\n", *aligned);
+        printf(" %29d\n", *aligned);
 
         if (fails_this_test >= max_fails) {
             HDputs("    maximum failures reached, aborting test...");
@@ -1021,43 +1021,43 @@ test_derived_flt(void)
      *--------------------------------------------------------------------------*/
     if (H5Tset_fields(tid2, (size_t)23, (size_t)16, (size_t)7, (size_t)0, (size_t)16) < 0) {
         H5_FAILED();
-        HDprintf("Can't set fields\n");
+        printf("Can't set fields\n");
         goto error;
     }
     if (H5Tset_offset(tid2, (size_t)0) < 0) {
         H5_FAILED();
-        HDprintf("Can't set offset\n");
+        printf("Can't set offset\n");
         goto error;
     }
     if (H5Tset_precision(tid2, (size_t)24) < 0) {
         H5_FAILED();
-        HDprintf("Can't set precision 2\n");
+        printf("Can't set precision 2\n");
         goto error;
     }
     if (H5Tset_size(tid2, (size_t)3) < 0) {
         H5_FAILED();
-        HDprintf("Can't set size\n");
+        printf("Can't set size\n");
         goto error;
     }
     if (H5Tset_ebias(tid2, (size_t)63) < 0) {
         H5_FAILED();
-        HDprintf("Can't set size\n");
+        printf("Can't set size\n");
         goto error;
     }
     if (H5Tset_pad(tid2, H5T_PAD_ZERO, H5T_PAD_ZERO) < 0) {
         H5_FAILED();
-        HDprintf("Can't set padding\n");
+        printf("Can't set padding\n");
         goto error;
     }
 
     if (H5Tcommit2(file, "new float type 2", tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("Can't set inpad\n");
+        printf("Can't set inpad\n");
         goto error;
     }
     if (H5Tclose(tid2) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
 
@@ -1065,33 +1065,33 @@ test_derived_flt(void)
         FAIL_PUTS_ERROR("Can't open datatype");
     if (H5Tget_fields(tid2, &spos, &epos, &esize, &mpos, &msize) < 0) {
         H5_FAILED();
-        HDprintf("Can't get fields\n");
+        printf("Can't get fields\n");
         goto error;
     }
     if (spos != 23 || epos != 16 || esize != 7 || mpos != 0 || msize != 16) {
         H5_FAILED();
-        HDprintf("Wrong field values\n");
+        printf("Wrong field values\n");
         goto error;
     }
 
     if (H5Tget_precision(tid2) != 24) {
         H5_FAILED();
-        HDprintf("Can't get precision or wrong precision\n");
+        printf("Can't get precision or wrong precision\n");
         goto error;
     }
     if (H5Tget_offset(tid2) != 0) {
         H5_FAILED();
-        HDprintf("Can't get offset or wrong offset\n");
+        printf("Can't get offset or wrong offset\n");
         goto error;
     }
     if ((size = H5Tget_size(tid2)) != 3) {
         H5_FAILED();
-        HDprintf("Can't get size or wrong size\n");
+        printf("Can't get size or wrong size\n");
         goto error;
     }
     if (H5Tget_ebias(tid2) != 63) {
         H5_FAILED();
-        HDprintf("Can't get exponent bias or wrong bias\n");
+        printf("Can't get exponent bias or wrong bias\n");
         goto error;
     }
 
@@ -1115,13 +1115,13 @@ test_derived_flt(void)
      * the precision and exponent power. */
     if (H5Tconvert(tid2, tid1, nelmts, buf, NULL, dxpl_id) < 0) {
         H5_FAILED();
-        HDprintf("Can't convert data\n");
+        printf("Can't convert data\n");
         goto error;
     }
     /* Convert data from the 1st back to the 2nd derived floating-point type. */
     if (H5Tconvert(tid1, tid2, nelmts, buf, NULL, dxpl_id) < 0) {
         H5_FAILED();
-        HDprintf("Can't convert data\n");
+        printf("Can't convert data\n");
         goto error;
     }
 
@@ -1145,21 +1145,21 @@ test_derived_flt(void)
         if (0 == fails_this_test++) {
             HDsnprintf(str, sizeof(str),
                        "\nTesting random sw derived floating-point -> derived floating-point conversions");
-            HDprintf("%-70s", str);
+            printf("%-70s", str);
             HDfflush(stdout);
             H5_FAILED();
         }
-        HDprintf("    test %u elmt %u: \n", 1, (unsigned)i);
+        printf("    test %u elmt %u: \n", 1, (unsigned)i);
 
-        HDprintf("        src = ");
+        printf("        src = ");
         for (j = 0; j < src_size; j++)
-            HDprintf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]);
-        HDprintf("\n");
+            printf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]);
+        printf("\n");
 
-        HDprintf("        dst = ");
+        printf("        dst = ");
         for (j = 0; j < src_size; j++)
-            HDprintf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]);
-        HDprintf("\n");
+            printf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]);
+        printf("\n");
 
         if (fails_this_test >= max_fails) {
             HDputs("    maximum failures reached, aborting test...");
@@ -1174,25 +1174,25 @@ test_derived_flt(void)
 
     if (H5Tclose(tid1) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
 
     if (H5Tclose(tid2) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
 
     if (H5Pclose(dxpl_id) < 0) {
         H5_FAILED();
-        HDprintf("Can't close property list\n");
+        printf("Can't close property list\n");
         goto error;
     }
 
     if (H5Fclose(file) < 0) {
         H5_FAILED();
-        HDprintf("Can't close file\n");
+        printf("Can't close file\n");
         goto error;
     } /* end if */
 
@@ -1265,25 +1265,25 @@ test_derived_integer(void)
     h5_fixname(FILENAME[1], H5P_DEFAULT, filename, sizeof filename);
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("Can't create file\n");
+        printf("Can't create file\n");
         goto error;
     }
 
     if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) {
         H5_FAILED();
-        HDprintf("Can't create data transfer property list\n");
+        printf("Can't create data transfer property list\n");
         goto error;
     }
 
     if ((tid1 = H5Tcopy(H5T_STD_I32LE)) < 0) {
         H5_FAILED();
-        HDprintf("Can't copy data type\n");
+        printf("Can't copy data type\n");
         goto error;
     }
 
     if ((tid2 = H5Tcopy(H5T_STD_U64LE)) < 0) {
         H5_FAILED();
-        HDprintf("Can't copy data type\n");
+        printf("Can't copy data type\n");
         goto error;
     }
 
@@ -1301,37 +1301,37 @@ test_derived_integer(void)
      *--------------------------------------------------------------------------*/
     if (H5Tset_offset(tid1, (size_t)0) < 0) {
         H5_FAILED();
-        HDprintf("Can't set offset\n");
+        printf("Can't set offset\n");
         goto error;
     }
 
     if (H5Tset_size(tid1, (size_t)3) < 0) {
         H5_FAILED();
-        HDprintf("Can't set size\n");
+        printf("Can't set size\n");
         goto error;
     }
 
     if (H5Tset_precision(tid1, (size_t)24) < 0) {
         H5_FAILED();
-        HDprintf("Can't set precision\n");
+        printf("Can't set precision\n");
         goto error;
     }
 
     if (H5Tset_order(tid1, H5T_ORDER_BE) < 0) {
         H5_FAILED();
-        HDprintf("Can't set order\n");
+        printf("Can't set order\n");
         goto error;
     }
 
     if (H5Tcommit2(file, "new integer type 1", tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("Can't commit data type\n");
+        printf("Can't commit data type\n");
         goto error;
     }
 
     if (H5Tclose(tid1) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
 
@@ -1339,22 +1339,22 @@ test_derived_integer(void)
         FAIL_PUTS_ERROR("Can't open datatype");
     if (H5Tget_precision(tid1) != 24) {
         H5_FAILED();
-        HDprintf("Can't get precision or wrong precision\n");
+        printf("Can't get precision or wrong precision\n");
         goto error;
     }
     if (H5Tget_offset(tid1) != 0) {
         H5_FAILED();
-        HDprintf("Can't get offset or wrong offset\n");
+        printf("Can't get offset or wrong offset\n");
         goto error;
     }
     if (H5Tget_size(tid1) != 3) {
         H5_FAILED();
-        HDprintf("Can't get size or wrong size\n");
+        printf("Can't get size or wrong size\n");
         goto error;
     }
     if (H5Tget_order(tid1) != H5T_ORDER_BE) {
         H5_FAILED();
-        HDprintf("Can't get order or wrong order\n");
+        printf("Can't get order or wrong order\n");
         goto error;
     }
 
@@ -1368,31 +1368,31 @@ test_derived_integer(void)
      *--------------------------------------------------------------------------*/
     if (H5Tset_precision(tid2, (size_t)48) < 0) {
         H5_FAILED();
-        HDprintf("Can't set precision\n");
+        printf("Can't set precision\n");
         goto error;
     }
 
     if (H5Tset_offset(tid2, (size_t)10) < 0) {
         H5_FAILED();
-        HDprintf("Can't set offset\n");
+        printf("Can't set offset\n");
         goto error;
     }
 
     if (H5Tset_sign(tid2, H5T_SGN_2) < 0) {
         H5_FAILED();
-        HDprintf("Can't set offset\n");
+        printf("Can't set offset\n");
         goto error;
     }
 
     if (H5Tcommit2(file, "new integer type 2", tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("Can't commit data type\n");
+        printf("Can't commit data type\n");
         goto error;
     }
 
     if (H5Tclose(tid2) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
 
@@ -1400,22 +1400,22 @@ test_derived_integer(void)
         FAIL_PUTS_ERROR("Can't open datatype");
     if (H5Tget_precision(tid2) != 48) {
         H5_FAILED();
-        HDprintf("Can't get precision or wrong precision\n");
+        printf("Can't get precision or wrong precision\n");
         goto error;
     }
     if (H5Tget_offset(tid2) != 10) {
         H5_FAILED();
-        HDprintf("Can't get offset or wrong offset\n");
+        printf("Can't get offset or wrong offset\n");
         goto error;
     }
     if (H5Tget_size(tid2) != 8) {
         H5_FAILED();
-        HDprintf("Can't get size or wrong size\n");
+        printf("Can't get size or wrong size\n");
         goto error;
     }
     if (H5Tget_sign(tid2) != H5T_SGN_2) {
         H5_FAILED();
-        HDprintf("Can't get sign or wrong sign\n");
+        printf("Can't get sign or wrong sign\n");
         goto error;
     }
 
@@ -1439,13 +1439,13 @@ test_derived_integer(void)
      * the 1st type's precision. */
     if (H5Tconvert(tid1, tid2, nelmts, buf, NULL, dxpl_id) < 0) {
         H5_FAILED();
-        HDprintf("Can't convert data\n");
+        printf("Can't convert data\n");
         goto error;
     }
     /* Convert data from the 2nd back to the 1st derived integer type. */
     if (H5Tconvert(tid2, tid1, nelmts, buf, NULL, dxpl_id) < 0) {
         H5_FAILED();
-        HDprintf("Can't convert data\n");
+        printf("Can't convert data\n");
         goto error;
     }
 
@@ -1461,21 +1461,21 @@ test_derived_integer(void)
         if (0 == fails_this_test++) {
             HDsnprintf(str, sizeof(str),
                        "\nTesting random sw derived integer -> derived integer conversions");
-            HDprintf("%-70s", str);
+            printf("%-70s", str);
             HDfflush(stdout);
             H5_FAILED();
         }
-        HDprintf("    test %u elmt %u: \n", 1, (unsigned)i);
+        printf("    test %u elmt %u: \n", 1, (unsigned)i);
 
-        HDprintf("        src = ");
+        printf("        src = ");
         for (j = 0; j < src_size; j++)
-            HDprintf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]);
-        HDprintf("\n");
+            printf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]);
+        printf("\n");
 
-        HDprintf("        dst = ");
+        printf("        dst = ");
         for (j = 0; j < src_size; j++)
-            HDprintf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]);
-        HDprintf("\n");
+            printf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]);
+        printf("\n");
 
         if (fails_this_test >= max_fails) {
             HDputs("    maximum failures reached, aborting test...");
@@ -1485,25 +1485,25 @@ test_derived_integer(void)
 
     if (H5Tclose(tid1) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
 
     if (H5Tclose(tid2) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
 
     if (H5Pclose(dxpl_id) < 0) {
         H5_FAILED();
-        HDprintf("Can't close property list\n");
+        printf("Can't close property list\n");
         goto error;
     }
 
     if (H5Fclose(file) < 0) {
         H5_FAILED();
-        HDprintf("Can't close file\n");
+        printf("Can't close file\n");
         goto error;
     } /* end if */
 
@@ -1692,14 +1692,14 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
     /* Sanity checks */
     if (OTHER == src_type || OTHER == dst_type) {
         HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name);
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         H5_FAILED();
         HDputs("    Unknown data type.");
         goto error;
     }
     else {
         HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name);
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         HDfflush(stdout);
         fails_this_test = 0;
     }
@@ -2404,52 +2404,52 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
         /* Print errors */
         if (0 == fails_this_test++)
             H5_FAILED();
-        HDprintf("    elmt %u\n", (unsigned)j);
+        printf("    elmt %u\n", (unsigned)j);
 
-        HDprintf("        src = ");
+        printf("        src = ");
         for (k = 0; k < src_size; k++)
-            HDprintf(" %02x", saved[j * src_size + ENDIAN(src_size, k, endian)]);
-        HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), "");
+            printf(" %02x", saved[j * src_size + ENDIAN(src_size, k, endian)]);
+        printf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), "");
         switch (src_type) {
             case INT_SCHAR:
                 HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char));
-                HDprintf(" %29d\n", (int)*((signed char *)aligned));
+                printf(" %29d\n", (int)*((signed char *)aligned));
                 break;
             case INT_UCHAR:
                 HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char));
-                HDprintf(" %29u\n", (unsigned)*((unsigned char *)aligned));
+                printf(" %29u\n", (unsigned)*((unsigned char *)aligned));
                 break;
             case INT_SHORT:
                 HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short));
-                HDprintf(" %29hd\n", *((short *)aligned));
+                printf(" %29hd\n", *((short *)aligned));
                 break;
             case INT_USHORT:
                 HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short));
-                HDprintf(" %29hu\n", *((unsigned short *)aligned));
+                printf(" %29hu\n", *((unsigned short *)aligned));
                 break;
             case INT_INT:
                 HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int));
-                HDprintf(" %29d\n", *((int *)aligned));
+                printf(" %29d\n", *((int *)aligned));
                 break;
             case INT_UINT:
                 HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned));
-                HDprintf(" %29u\n", *((unsigned *)aligned));
+                printf(" %29u\n", *((unsigned *)aligned));
                 break;
             case INT_LONG:
                 HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long));
-                HDprintf(" %29ld\n", *((long *)aligned));
+                printf(" %29ld\n", *((long *)aligned));
                 break;
             case INT_ULONG:
                 HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long));
-                HDprintf(" %29lu\n", *((unsigned long *)aligned));
+                printf(" %29lu\n", *((unsigned long *)aligned));
                 break;
             case INT_LLONG:
                 HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long));
-                HDfprintf(stdout, " %29lld\n", *((long long *)aligned));
+                fprintf(stdout, " %29lld\n", *((long long *)aligned));
                 break;
             case INT_ULLONG:
                 HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long));
-                HDfprintf(stdout, " %29llu\n", *((unsigned long long *)aligned));
+                fprintf(stdout, " %29llu\n", *((unsigned long long *)aligned));
                 break;
             case FLT_FLOAT:
             case FLT_DOUBLE:
@@ -2460,50 +2460,50 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 break;
         }
 
-        HDprintf("        dst = ");
+        printf("        dst = ");
         for (k = 0; k < dst_size; k++)
-            HDprintf(" %02x", buf[j * dst_size + ENDIAN(dst_size, k, endian)]);
-        HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), "");
+            printf(" %02x", buf[j * dst_size + ENDIAN(dst_size, k, endian)]);
+        printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), "");
         switch (dst_type) {
             case INT_SCHAR:
                 HDmemcpy(aligned, buf + j * sizeof(signed char), sizeof(signed char));
-                HDprintf(" %29d\n", (int)*((signed char *)aligned));
+                printf(" %29d\n", (int)*((signed char *)aligned));
                 break;
             case INT_UCHAR:
                 HDmemcpy(aligned, buf + j * sizeof(unsigned char), sizeof(unsigned char));
-                HDprintf(" %29u\n", (unsigned)*((unsigned char *)aligned));
+                printf(" %29u\n", (unsigned)*((unsigned char *)aligned));
                 break;
             case INT_SHORT:
                 HDmemcpy(aligned, buf + j * sizeof(short), sizeof(short));
-                HDprintf(" %29hd\n", *((short *)aligned));
+                printf(" %29hd\n", *((short *)aligned));
                 break;
             case INT_USHORT:
                 HDmemcpy(aligned, buf + j * sizeof(unsigned short), sizeof(unsigned short));
-                HDprintf(" %29hu\n", *((unsigned short *)aligned));
+                printf(" %29hu\n", *((unsigned short *)aligned));
                 break;
             case INT_INT:
                 HDmemcpy(aligned, buf + j * sizeof(int), sizeof(int));
-                HDprintf(" %29d\n", *((int *)aligned));
+                printf(" %29d\n", *((int *)aligned));
                 break;
             case INT_UINT:
                 HDmemcpy(aligned, buf + j * sizeof(unsigned), sizeof(unsigned));
-                HDprintf(" %29u\n", *((unsigned *)aligned));
+                printf(" %29u\n", *((unsigned *)aligned));
                 break;
             case INT_LONG:
                 HDmemcpy(aligned, buf + j * sizeof(long), sizeof(long));
-                HDprintf(" %29ld\n", *((long *)aligned));
+                printf(" %29ld\n", *((long *)aligned));
                 break;
             case INT_ULONG:
                 HDmemcpy(aligned, buf + j * sizeof(unsigned long), sizeof(unsigned long));
-                HDprintf(" %29lu\n", *((unsigned long *)aligned));
+                printf(" %29lu\n", *((unsigned long *)aligned));
                 break;
             case INT_LLONG:
                 HDmemcpy(aligned, buf + j * sizeof(long long), sizeof(long long));
-                HDfprintf(stdout, " %29lld\n", *((long long *)aligned));
+                fprintf(stdout, " %29lld\n", *((long long *)aligned));
                 break;
             case INT_ULLONG:
                 HDmemcpy(aligned, buf + j * sizeof(long long), sizeof(unsigned long long));
-                HDfprintf(stdout, " %29llu\n", *((unsigned long long *)aligned));
+                fprintf(stdout, " %29llu\n", *((unsigned long long *)aligned));
                 break;
             case FLT_FLOAT:
             case FLT_DOUBLE:
@@ -2514,40 +2514,40 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
                 break;
         }
 
-        HDprintf("        ans = ");
+        printf("        ans = ");
         for (k = 0; k < dst_size; k++)
-            HDprintf(" %02x", hw[ENDIAN(dst_size, k, endian)]);
-        HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), "");
+            printf(" %02x", hw[ENDIAN(dst_size, k, endian)]);
+        printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), "");
         switch (dst_type) {
             case INT_SCHAR:
-                HDprintf(" %29d\n", (int)*((signed char *)((void *)hw)));
+                printf(" %29d\n", (int)*((signed char *)((void *)hw)));
                 break;
             case INT_UCHAR:
-                HDprintf(" %29u\n", (unsigned)*((unsigned char *)((void *)hw)));
+                printf(" %29u\n", (unsigned)*((unsigned char *)((void *)hw)));
                 break;
             case INT_SHORT:
-                HDprintf(" %29hd\n", *((short *)((void *)hw)));
+                printf(" %29hd\n", *((short *)((void *)hw)));
                 break;
             case INT_USHORT:
-                HDprintf(" %29hu\n", *((unsigned short *)((void *)hw)));
+                printf(" %29hu\n", *((unsigned short *)((void *)hw)));
                 break;
             case INT_INT:
-                HDprintf(" %29d\n", *((int *)((void *)hw)));
+                printf(" %29d\n", *((int *)((void *)hw)));
                 break;
             case INT_UINT:
-                HDprintf(" %29u\n", *((unsigned *)((void *)hw)));
+                printf(" %29u\n", *((unsigned *)((void *)hw)));
                 break;
             case INT_LONG:
-                HDprintf(" %29ld\n", *((long *)((void *)hw)));
+                printf(" %29ld\n", *((long *)((void *)hw)));
                 break;
             case INT_ULONG:
-                HDprintf(" %29lu\n", *((unsigned long *)((void *)hw)));
+                printf(" %29lu\n", *((unsigned long *)((void *)hw)));
                 break;
             case INT_LLONG:
-                HDfprintf(stdout, " %29lld\n", *((long long *)((void *)hw)));
+                fprintf(stdout, " %29lld\n", *((long long *)((void *)hw)));
                 break;
             case INT_ULLONG:
-                HDfprintf(stdout, " %29llu\n", *((unsigned long long *)((void *)hw)));
+                fprintf(stdout, " %29llu\n", *((unsigned long long *)((void *)hw)));
                 break;
             case FLT_FLOAT:
             case FLT_DOUBLE:
@@ -2621,7 +2621,7 @@ test_conv_int_2(void)
     hid_t src_type, dst_type;
     char *buf;
 
-    HDprintf("%-70s", "Testing overlap calculations");
+    printf("%-70s", "Testing overlap calculations");
     HDfflush(stdout);
 
     buf = (char *)HDcalloc(TMP_BUF_DIM1, TMP_BUF_DIM2);
@@ -2911,7 +2911,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
             HDsnprintf(str, sizeof(str), "Testing %s denormalized %s -> %s conversions", name, src_type_name,
                        dst_type_name);
 
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         H5_FAILED();
         HDputs("    Unknown data type.");
         goto error;
@@ -2930,7 +2930,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
             HDsnprintf(str, sizeof(str), "Testing %s denormalized %s -> %s conversions", name, src_type_name,
                        dst_type_name);
 
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         HDfflush(stdout);
         fails_this_test = 0;
     }
@@ -3220,63 +3220,63 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst)
                 H5_WARNING();
             }
         }
-        HDprintf("    elmt %u\n", (unsigned)j);
+        printf("    elmt %u\n", (unsigned)j);
 
-        HDprintf("        src =");
+        printf("        src =");
         for (k = 0; k < src_size; k++)
-            HDprintf(" %02x", saved[j * src_size + ENDIAN(src_size, k, sendian)]);
-        HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), "");
+            printf(" %02x", saved[j * src_size + ENDIAN(src_size, k, sendian)]);
+        printf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), "");
         if (FLT_FLOAT == src_type) {
             float x = 0.0;
             HDmemcpy(&x, &saved[j * src_size], sizeof(float));
-            HDprintf(" %29.20e\n", (double)x);
+            printf(" %29.20e\n", (double)x);
         }
         else if (FLT_DOUBLE == src_type) {
             double x = 0.0;
             HDmemcpy(&x, &saved[j * src_size], sizeof(double));
-            HDprintf(" %29.20e\n", x);
+            printf(" %29.20e\n", x);
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
         }
         else {
             long double x = 0.0L;
             HDmemcpy(&x, &saved[j * src_size], sizeof(long double));
-            HDfprintf(stdout, " %29.20Le\n", x);
+            fprintf(stdout, " %29.20Le\n", x);
 #endif
         }
 
-        HDprintf("        dst =");
+        printf("        dst =");
         for (k = 0; k < dst_size; k++)
-            HDprintf(" %02x", buf[j * dst_size + ENDIAN(dst_size, k, dendian)]);
-        HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), "");
+            printf(" %02x", buf[j * dst_size + ENDIAN(dst_size, k, dendian)]);
+        printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), "");
         if (FLT_FLOAT == dst_type) {
             float x = 0.0;
             HDmemcpy(&x, &buf[j * dst_size], sizeof(float));
-            HDprintf(" %29.20e\n", (double)x);
+            printf(" %29.20e\n", (double)x);
         }
         else if (FLT_DOUBLE == dst_type) {
             double x = 0.0;
             HDmemcpy(&x, &buf[j * dst_size], sizeof(double));
-            HDprintf(" %29.20e\n", x);
+            printf(" %29.20e\n", x);
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
         }
         else {
             long double x = 0.0L;
             HDmemcpy(&x, &buf[j * dst_size], sizeof(long double));
-            HDfprintf(stdout, " %29.20Le\n", x);
+            fprintf(stdout, " %29.20Le\n", x);
 #endif
         }
 
-        HDprintf("        ans =");
+        printf("        ans =");
         for (k = 0; k < dst_size; k++)
-            HDprintf(" %02x", hw[ENDIAN(dst_size, k, dendian)]);
-        HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), "");
+            printf(" %02x", hw[ENDIAN(dst_size, k, dendian)]);
+        printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), "");
         if (FLT_FLOAT == dst_type)
-            HDprintf(" %29.20e\n", (double)hw_f);
+            printf(" %29.20e\n", (double)hw_f);
         else if (FLT_DOUBLE == dst_type)
-            HDprintf(" %29.20e\n", hw_d);
+            printf(" %29.20e\n", hw_d);
 #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
         else
-            HDfprintf(stdout, " %29.20Le\n", hw_ld);
+            fprintf(stdout, " %29.20Le\n", hw_ld);
 #endif
 
         /* If the source is normalized values, print out error message; if it is
@@ -3539,7 +3539,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
     /* Sanity checks */
     if (OTHER == src_type || OTHER == dst_type) {
         HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name);
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         H5_FAILED();
         HDputs("    Unknown data type.");
         goto error;
@@ -3550,7 +3550,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
          INT_LLONG == src_type || INT_ULLONG == src_type) &&
         (FLT_FLOAT != dst_type && FLT_DOUBLE != dst_type && FLT_LDOUBLE != dst_type)) {
         HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name);
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         H5_FAILED();
         HDputs("    1. Not an integer-float conversion.");
         goto error;
@@ -3561,7 +3561,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
          INT_INT != dst_type && INT_UINT != dst_type && INT_LONG != dst_type && INT_ULONG != dst_type &&
          INT_LLONG != dst_type && INT_ULLONG != dst_type)) {
         HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name);
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         H5_FAILED();
         HDputs("    2. Not a float-integer conversion.");
         goto error;
@@ -3571,7 +3571,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
         INT_INT == src_type || INT_UINT == src_type || INT_LONG == src_type || INT_ULONG == src_type ||
         INT_LLONG == src_type || INT_ULLONG == src_type) {
         HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name);
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         HDfflush(stdout);
         fails_this_test = 0;
     }
@@ -3585,7 +3585,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
         else
             HDsnprintf(str, sizeof(str), "Testing %s special %s -> %s conversions", name, src_type_name,
                        dst_type_name);
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         HDfflush(stdout);
         fails_this_test = 0;
     }
@@ -4321,64 +4321,64 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                 H5_WARNING();
             }
         }
-        HDprintf("    elmt %u: \n", (unsigned)j);
+        printf("    elmt %u: \n", (unsigned)j);
 
-        HDprintf("        src = ");
+        printf("        src = ");
         for (k = 0; k < src_size; k++)
-            HDprintf(" %02x", saved[j * src_size + ENDIAN(src_size, k, sendian)]);
-        HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), "");
+            printf(" %02x", saved[j * src_size + ENDIAN(src_size, k, sendian)]);
+        printf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), "");
         switch (src_type) {
             case INT_SCHAR:
                 HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char));
-                HDprintf(" %29d\n", (int)*((signed char *)aligned));
+                printf(" %29d\n", (int)*((signed char *)aligned));
                 break;
             case INT_UCHAR:
                 HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char));
-                HDprintf(" %29u\n", (unsigned)*((unsigned char *)aligned));
+                printf(" %29u\n", (unsigned)*((unsigned char *)aligned));
                 break;
             case INT_SHORT:
                 HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short));
-                HDprintf(" %29hd\n", *((short *)aligned));
+                printf(" %29hd\n", *((short *)aligned));
                 break;
             case INT_USHORT:
                 HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short));
-                HDprintf(" %29hu\n", *((unsigned short *)aligned));
+                printf(" %29hu\n", *((unsigned short *)aligned));
                 break;
             case INT_INT:
                 HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int));
-                HDprintf(" %29d\n", *((int *)aligned));
+                printf(" %29d\n", *((int *)aligned));
                 break;
             case INT_UINT:
                 HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned));
-                HDprintf(" %29u\n", *((unsigned *)aligned));
+                printf(" %29u\n", *((unsigned *)aligned));
                 break;
             case INT_LONG:
                 HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long));
-                HDprintf(" %29ld\n", *((long *)aligned));
+                printf(" %29ld\n", *((long *)aligned));
                 break;
             case INT_ULONG:
                 HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long));
-                HDprintf(" %29lu\n", *((unsigned long *)aligned));
+                printf(" %29lu\n", *((unsigned long *)aligned));
                 break;
             case INT_LLONG:
                 HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long));
-                HDfprintf(stdout, " %29lld\n", *((long long *)aligned));
+                fprintf(stdout, " %29lld\n", *((long long *)aligned));
                 break;
             case INT_ULLONG:
                 HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long));
-                HDfprintf(stdout, " %29llu\n", *((unsigned long long *)aligned));
+                fprintf(stdout, " %29llu\n", *((unsigned long long *)aligned));
                 break;
             case FLT_FLOAT:
                 HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float));
-                HDprintf(" %29f\n", (double)*((float *)aligned));
+                printf(" %29f\n", (double)*((float *)aligned));
                 break;
             case FLT_DOUBLE:
                 HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double));
-                HDprintf(" %29f\n", *((double *)aligned));
+                printf(" %29f\n", *((double *)aligned));
                 break;
             case FLT_LDOUBLE:
                 HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double));
-                HDprintf(" %29Lf\n", *((long double *)aligned));
+                printf(" %29Lf\n", *((long double *)aligned));
                 break;
             case OTHER:
             default:
@@ -4386,62 +4386,62 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                 break;
         }
 
-        HDprintf("        dst = ");
+        printf("        dst = ");
         for (k = 0; k < dst_size; k++)
-            HDprintf(" %02x", buf[j * dst_size + ENDIAN(dst_size, k, dendian)]);
-        HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), "");
+            printf(" %02x", buf[j * dst_size + ENDIAN(dst_size, k, dendian)]);
+        printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), "");
         switch (dst_type) {
             case INT_SCHAR:
                 HDmemcpy(aligned, buf + j * sizeof(signed char), sizeof(signed char));
-                HDprintf(" %29d\n", (int)*((signed char *)aligned));
+                printf(" %29d\n", (int)*((signed char *)aligned));
                 break;
             case INT_UCHAR:
                 HDmemcpy(aligned, buf + j * sizeof(unsigned char), sizeof(unsigned char));
-                HDprintf(" %29u\n", (unsigned)*((unsigned char *)aligned));
+                printf(" %29u\n", (unsigned)*((unsigned char *)aligned));
                 break;
             case INT_SHORT:
                 HDmemcpy(aligned, buf + j * sizeof(short), sizeof(short));
-                HDprintf(" %29hd\n", *((short *)aligned));
+                printf(" %29hd\n", *((short *)aligned));
                 break;
             case INT_USHORT:
                 HDmemcpy(aligned, buf + j * sizeof(unsigned short), sizeof(unsigned short));
-                HDprintf(" %29hu\n", *((unsigned short *)aligned));
+                printf(" %29hu\n", *((unsigned short *)aligned));
                 break;
             case INT_INT:
                 HDmemcpy(aligned, buf + j * sizeof(int), sizeof(int));
-                HDprintf(" %29d\n", *((int *)aligned));
+                printf(" %29d\n", *((int *)aligned));
                 break;
             case INT_UINT:
                 HDmemcpy(aligned, buf + j * sizeof(unsigned), sizeof(unsigned));
-                HDprintf(" %29u\n", *((unsigned *)aligned));
+                printf(" %29u\n", *((unsigned *)aligned));
                 break;
             case INT_LONG:
                 HDmemcpy(aligned, buf + j * sizeof(long), sizeof(long));
-                HDprintf(" %29ld\n", *((long *)aligned));
+                printf(" %29ld\n", *((long *)aligned));
                 break;
             case INT_ULONG:
                 HDmemcpy(aligned, buf + j * sizeof(unsigned long), sizeof(unsigned long));
-                HDprintf(" %29lu\n", *((unsigned long *)aligned));
+                printf(" %29lu\n", *((unsigned long *)aligned));
                 break;
             case INT_LLONG:
                 HDmemcpy(aligned, buf + j * sizeof(long long), sizeof(long long));
-                HDfprintf(stdout, " %29lld\n", *((long long *)aligned));
+                fprintf(stdout, " %29lld\n", *((long long *)aligned));
                 break;
             case INT_ULLONG:
                 HDmemcpy(aligned, buf + j * sizeof(unsigned long long), sizeof(unsigned long long));
-                HDfprintf(stdout, " %29llu\n", *((unsigned long long *)aligned));
+                fprintf(stdout, " %29llu\n", *((unsigned long long *)aligned));
                 break;
             case FLT_FLOAT:
                 HDmemcpy(aligned, buf + j * sizeof(float), sizeof(float));
-                HDprintf(" %29f\n", (double)*((float *)aligned));
+                printf(" %29f\n", (double)*((float *)aligned));
                 break;
             case FLT_DOUBLE:
                 HDmemcpy(aligned, buf + j * sizeof(double), sizeof(double));
-                HDprintf(" %29f\n", *((double *)aligned));
+                printf(" %29f\n", *((double *)aligned));
                 break;
             case FLT_LDOUBLE:
                 HDmemcpy(aligned, buf + j * sizeof(long double), sizeof(long double));
-                HDprintf(" %29Lf\n", *((long double *)aligned));
+                printf(" %29Lf\n", *((long double *)aligned));
                 break;
             case OTHER:
             default:
@@ -4449,49 +4449,49 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
                 break;
         }
 
-        HDprintf("        and = ");
+        printf("        and = ");
         for (k = 0; k < dst_size; k++)
-            HDprintf(" %02x", hw[ENDIAN(dst_size, k, dendian)]);
-        HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), "");
+            printf(" %02x", hw[ENDIAN(dst_size, k, dendian)]);
+        printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), "");
         switch (dst_type) {
             case INT_SCHAR:
-                HDprintf(" %29d\n", (int)*((signed char *)((void *)hw)));
+                printf(" %29d\n", (int)*((signed char *)((void *)hw)));
                 break;
             case INT_UCHAR:
-                HDprintf(" %29u\n", (unsigned)*((unsigned char *)((void *)hw)));
+                printf(" %29u\n", (unsigned)*((unsigned char *)((void *)hw)));
                 break;
             case INT_SHORT:
-                HDprintf(" %29hd\n", *((short *)((void *)hw)));
+                printf(" %29hd\n", *((short *)((void *)hw)));
                 break;
             case INT_USHORT:
-                HDprintf(" %29hu\n", *((unsigned short *)((void *)hw)));
+                printf(" %29hu\n", *((unsigned short *)((void *)hw)));
                 break;
             case INT_INT:
-                HDprintf(" %29d\n", *((int *)((void *)hw)));
+                printf(" %29d\n", *((int *)((void *)hw)));
                 break;
             case INT_UINT:
-                HDprintf(" %29u\n", *((unsigned int *)((void *)hw)));
+                printf(" %29u\n", *((unsigned int *)((void *)hw)));
                 break;
             case INT_LONG:
-                HDprintf(" %29ld\n", *((long *)((void *)hw)));
+                printf(" %29ld\n", *((long *)((void *)hw)));
                 break;
             case INT_ULONG:
-                HDprintf(" %29lu\n", *((unsigned long *)((void *)hw)));
+                printf(" %29lu\n", *((unsigned long *)((void *)hw)));
                 break;
             case INT_LLONG:
-                HDfprintf(stdout, " %29lld\n", *((long long *)((void *)hw)));
+                fprintf(stdout, " %29lld\n", *((long long *)((void *)hw)));
                 break;
             case INT_ULLONG:
-                HDfprintf(stdout, " %29llu\n", *((unsigned long long *)((void *)hw)));
+                fprintf(stdout, " %29llu\n", *((unsigned long long *)((void *)hw)));
                 break;
             case FLT_FLOAT:
-                HDprintf(" %29f\n", (double)*((float *)((void *)hw)));
+                printf(" %29f\n", (double)*((float *)((void *)hw)));
                 break;
             case FLT_DOUBLE:
-                HDprintf(" %29f\n", *((double *)((void *)hw)));
+                printf(" %29f\n", *((double *)((void *)hw)));
                 break;
             case FLT_LDOUBLE:
-                HDprintf(" %29Lf\n", *((long double *)((void *)hw)));
+                printf(" %29Lf\n", *((long double *)((void *)hw)));
                 break;
             case OTHER:
             default:
@@ -4853,7 +4853,7 @@ run_fp_tests(const char *name)
 
         HDsnprintf(str, sizeof(str), "Testing %s denormalized %s -> %s conversions", name, "long double",
                    "float");
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         SKIPPED();
         HDputs("    Test skipped due to the conversion problem on IBM ppc64le cpu.");
     }
@@ -4877,7 +4877,7 @@ run_fp_tests(const char *name)
 
         HDsnprintf(str, sizeof(str), "Testing %s special %s -> %s conversions", name, "long double",
                    "float or double");
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         SKIPPED();
         HDputs("    Test skipped due to the conversion problem on IBM ppc64le cpu.");
     }
@@ -4956,7 +4956,7 @@ run_int_fp_conv(const char *name)
 
         HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "(unsigned) long",
                    "long double");
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         SKIPPED();
         HDputs("    Test skipped due to the special algorithm of hardware conversion.");
     }
@@ -4970,7 +4970,7 @@ run_int_fp_conv(const char *name)
         char str[256]; /*hello string        */
 
         HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "long long", "long double");
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         SKIPPED();
         HDputs("    Test skipped due to compiler error in handling conversion.");
     }
@@ -4983,7 +4983,7 @@ run_int_fp_conv(const char *name)
 
         HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "unsigned long long",
                    "long double");
-        HDprintf("%-70s", str);
+        printf("%-70s", str);
         SKIPPED();
         HDputs("    Test skipped due to compiler not handling conversion.");
     }
@@ -5075,7 +5075,7 @@ run_fp_int_conv(const char *name)
 
             HDsnprintf(str, sizeof(str), "Testing %s special %s -> %s conversions", name, "long double",
                        "signed and unsigned char, short, int, long");
-            HDprintf("%-70s", str);
+            printf("%-70s", str);
             SKIPPED();
             HDputs("    Test skipped due to the conversion problem on IBM ppc64le cpu.");
 #endif
@@ -5098,7 +5098,7 @@ run_fp_int_conv(const char *name)
 
             HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "long double",
                        "(unsigned) long");
-            HDprintf("%-70s", str);
+            printf("%-70s", str);
             SKIPPED();
             HDputs("    Test skipped due to the special algorithm of hardware conversion.");
         }
@@ -5113,7 +5113,7 @@ run_fp_int_conv(const char *name)
             char str[256]; /*string        */
 
             HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "long double", "long long");
-            HDprintf("%-70s", str);
+            printf("%-70s", str);
             SKIPPED();
             HDputs("    Test skipped due to hardware conversion error.");
         }
@@ -5126,7 +5126,7 @@ run_fp_int_conv(const char *name)
 
             HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "long double",
                        "unsigned long long");
-            HDprintf("%-70s", str);
+            printf("%-70s", str);
             SKIPPED();
             HDputs("    Test skipped due to hardware conversion error.");
         }
@@ -5163,7 +5163,7 @@ main(void)
     reset_hdf5();
 
     if (ALIGNMENT)
-        HDprintf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT);
+        printf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT);
 
     /* Do the tests */
 
@@ -5229,9 +5229,9 @@ main(void)
     h5_restore_err();
 
     if (nerrors) {
-        HDprintf("***** %lu FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
+        printf("***** %lu FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
         HDexit(EXIT_FAILURE);
     }
-    HDprintf("All data type tests passed.\n");
+    printf("All data type tests passed.\n");
     return 0;
 }
diff --git a/test/dtransform.c b/test/dtransform.c
index 9bbac8f..d435b1f 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -80,7 +80,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22,
                       (((VAR1)[i][j] <= (TYPE)((VAR2)[i][j])) &&                                             \
                        (((VAR1)[i][j] + (TOL)) > (TYPE)((VAR2)[i][j]))))) {                                  \
                     H5_FAILED();                                                                             \
-                    HDfprintf(stderr, "    ERROR: Conversion failed to match computed data\n");              \
+                    fprintf(stderr, "    ERROR: Conversion failed to match computed data\n");                \
                     goto error;                                                                              \
                 }                                                                                            \
             }                                                                                                \
@@ -96,7 +96,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22,
                 if (!(((VAR1)[i][j] <= ((TYPE)(VAR2)[i][j] + (TOL))) &&                                      \
                       ((VAR1)[i][j] >= ((TYPE)(VAR2)[i][j] - (TOL))))) {                                     \
                     H5_FAILED();                                                                             \
-                    HDfprintf(stderr, "    ERROR: Conversion failed to match computed data\n");              \
+                    fprintf(stderr, "    ERROR: Conversion failed to match computed data\n");                \
                     goto error;                                                                              \
                 }                                                                                            \
             }                                                                                                \
@@ -111,7 +111,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22,
             for (j = 0; j < COLS; j++) {                                                                     \
                 if ((VAR1)[i][j] != (VAR2)[i][j]) {                                                          \
                     H5_FAILED();                                                                             \
-                    HDfprintf(stderr, "    ERROR: data  failed to match computed data\n");                   \
+                    fprintf(stderr, "    ERROR: data  failed to match computed data\n");                     \
                     goto error;                                                                              \
                 }                                                                                            \
             }                                                                                                \
@@ -307,7 +307,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22,
         }                                                                                                    \
         else {                                                                                               \
             H5_FAILED();                                                                                     \
-            HDfprintf(stderr, "    ERROR: Data transform allowed invalid TRANSFORM transform to be set\n");  \
+            fprintf(stderr, "    ERROR: Data transform allowed invalid TRANSFORM transform to be set\n");    \
             goto error;                                                                                      \
         }                                                                                                    \
     } while (0)
diff --git a/test/dtypes.c b/test/dtypes.c
index f6f99da..4de3117 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -70,8 +70,8 @@
             FAIL_STACK_ERROR;                                                                                \
         if ((NMEMBS) != H5I_nmembers(H5I_DATATYPE)) {                                                        \
             H5_FAILED();                                                                                     \
-            HDprintf("    #dtype ids expected: %lld; found: %lld\n", (long long)(NMEMBS),                    \
-                     (long long)H5I_nmembers(H5I_DATATYPE));                                                 \
+            printf("    #dtype ids expected: %lld; found: %lld\n", (long long)(NMEMBS),                      \
+                   (long long)H5I_nmembers(H5I_DATATYPE));                                                   \
             goto error;                                                                                      \
         }                                                                                                    \
     } while (0)
@@ -829,11 +829,11 @@ test_compound_2(void)
             s_ptr->c[1] != d_ptr->c[1] || s_ptr->c[2] != d_ptr->c[2] || s_ptr->c[3] != d_ptr->c[3] ||
             s_ptr->d != d_ptr->d || s_ptr->e != d_ptr->e) {
             H5_FAILED();
-            HDprintf("    i=%d\n", i);
-            HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0],
-                     s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e);
-            HDprintf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", d_ptr->a, d_ptr->b, d_ptr->c[0],
-                     d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e);
+            printf("    i=%d\n", i);
+            printf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0],
+                   s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e);
+            printf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", d_ptr->a, d_ptr->b, d_ptr->c[0],
+                   d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e);
             goto error;
         }
     }
@@ -953,11 +953,11 @@ test_compound_3(void)
         if (s_ptr->a != d_ptr->a || s_ptr->c[0] != d_ptr->c[0] || s_ptr->c[1] != d_ptr->c[1] ||
             s_ptr->c[2] != d_ptr->c[2] || s_ptr->c[3] != d_ptr->c[3] || s_ptr->e != d_ptr->e) {
             H5_FAILED();
-            HDprintf("    i=%d\n", i);
-            HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0],
-                     s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e);
-            HDprintf("    dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", d_ptr->a, d_ptr->c[0], d_ptr->c[1],
-                     d_ptr->c[2], d_ptr->c[3], d_ptr->e);
+            printf("    i=%d\n", i);
+            printf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0],
+                   s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e);
+            printf("    dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", d_ptr->a, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2],
+                   d_ptr->c[3], d_ptr->e);
             goto error;
         }
     }
@@ -1083,11 +1083,11 @@ test_compound_4(void)
             s_ptr->c[1] != d_ptr->c[1] || s_ptr->c[2] != d_ptr->c[2] || s_ptr->c[3] != d_ptr->c[3] ||
             s_ptr->d != d_ptr->d || s_ptr->e != d_ptr->e) {
             H5_FAILED();
-            HDprintf("    i=%d\n", i);
-            HDprintf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0],
-                     s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e);
-            HDprintf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", d_ptr->a, d_ptr->b, d_ptr->c[0],
-                     d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e);
+            printf("    i=%d\n", i);
+            printf("    src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0],
+                   s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e);
+            printf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", d_ptr->a, d_ptr->b, d_ptr->c[0],
+                   d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e);
             goto error;
         }
     }
@@ -1299,9 +1299,9 @@ test_compound_6(void)
         d_ptr = ((struct dt *)((void *)buf)) + i;
         if (s_ptr->b != d_ptr->b || s_ptr->d != d_ptr->d) {
             H5_FAILED();
-            HDprintf("    i=%d\n", i);
-            HDprintf("    src={b=%d, d=%d\n", (int)s_ptr->b, (int)s_ptr->d);
-            HDprintf("    dst={b=%ld, d=%ld\n", d_ptr->b, d_ptr->d);
+            printf("    i=%d\n", i);
+            printf("    src={b=%d, d=%d\n", (int)s_ptr->b, (int)s_ptr->d);
+            printf("    dst={b=%ld, d=%ld\n", d_ptr->b, d_ptr->d);
             goto error;
         }
     }
@@ -1367,43 +1367,43 @@ test_compound_7(void)
 
     if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) {
         H5_FAILED();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field 'a'\n");
+        printf("Can't insert field 'a'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field 'b'\n");
+        printf("Can't insert field 'b'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field 'c'\n");
+        printf("Can't insert field 'c'\n");
         goto error;
     } /* end if */
 
     if (H5Tget_size(tid1) != sizeof(struct s1)) {
         H5_FAILED();
-        HDprintf("Incorrect size for struct 1\n");
+        printf("Incorrect size for struct 1\n");
         goto error;
     } /* end if */
 
     if ((tid2 = H5Tcopy(tid1)) < 0) {
         H5_FAILED();
-        HDprintf("Can't copy datatype\n");
+        printf("Can't copy datatype\n");
         goto error;
     } /* end if */
 
     if (H5Tget_size(tid2) == sizeof(struct s2)) {
         H5_FAILED();
-        HDprintf("Incorrect size for struct 2\n");
+        printf("Incorrect size for struct 2\n");
         goto error;
     } /* end if */
 
@@ -1415,7 +1415,7 @@ test_compound_7(void)
     H5E_END_TRY
     if (ret >= 0) {
         H5_FAILED();
-        HDprintf("Inserted field 'd'?\n");
+        printf("Inserted field 'd'?\n");
         goto error;
     } /* end if */
 
@@ -1427,33 +1427,33 @@ test_compound_7(void)
     H5E_END_TRY
     if (ret >= 0) {
         H5_FAILED();
-        HDprintf("Shrunk compound type?\n");
+        printf("Shrunk compound type?\n");
         goto error;
     } /* end if */
 
     /* Increase compound type size and try inserting field again */
     if (H5Tset_size(tid2, sizeof(struct s2)) < 0) {
         H5_FAILED();
-        HDprintf("Can't increase size for compound type\n");
+        printf("Can't increase size for compound type\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(tid2, "d", HOFFSET(struct s2, d), H5T_NATIVE_DOUBLE) < 0) {
         H5_FAILED();
-        HDprintf("Can't expand compound datatype\n");
+        printf("Can't expand compound datatype\n");
         goto error;
     } /* end if */
 
     if (H5Tget_size(tid2) != sizeof(struct s2)) {
         H5_FAILED();
-        HDprintf("Incorrect size for struct 2\n");
+        printf("Incorrect size for struct 2\n");
         goto error;
     } /* end if */
 
     /* Release resources */
     if (H5Tclose(tid1) < 0 || H5Tclose(tid2) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatypes\n");
+        printf("Can't close datatypes\n");
         goto error;
     } /* end if */
 
@@ -1514,21 +1514,21 @@ test_compound_8(void)
     if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_CHAR) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'a'\n");
+        printf("Can't insert field 'a'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_INT) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'b'\n");
+        printf("Can't insert field 'b'\n");
         goto error;
     } /* end if */
 
@@ -1536,7 +1536,7 @@ test_compound_8(void)
     if ((tid1_copy = H5Tcopy(tid1)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't copy type #1\n");
+        printf("Can't copy type #1\n");
         goto error;
     } /* end if */
 
@@ -1544,14 +1544,14 @@ test_compound_8(void)
     if (H5Tpack(tid1) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't pack the compound datatype\n");
+        printf("Can't pack the compound datatype\n");
         goto error;
     } /* end if */
 
     if (H5Tlock(tid1) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't lock the compound datatype\n");
+        printf("Can't lock the compound datatype\n");
         goto error;
     } /* end if */
 
@@ -1559,7 +1559,7 @@ test_compound_8(void)
     if (H5Tpack(tid1) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't pack the compound datatype for second time\n");
+        printf("Can't pack the compound datatype for second time\n");
         goto error;
     } /* end if */
 
@@ -1567,14 +1567,14 @@ test_compound_8(void)
     if ((tsize = H5Tget_size(tid1)) == 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't get size of the compound datatype\n");
+        printf("Can't get size of the compound datatype\n");
         goto error;
     } /* end if */
 
     if (tsize != (sizeof(char) + sizeof(int))) {
         H5_FAILED();
         AT();
-        HDprintf("The size of the packed compound datatype is incorrect\n");
+        printf("The size of the packed compound datatype is incorrect\n");
         goto error;
     } /* end if */
 
@@ -1585,14 +1585,14 @@ test_compound_8(void)
     if ((tid2 = H5Tcreate(H5T_COMPOUND, sizeof(struct s2))) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(tid2, "c", HOFFSET(struct s2, c), H5T_NATIVE_CHAR) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'c'\n");
+        printf("Can't insert field 'c'\n");
         goto error;
     } /* end if */
 
@@ -1600,7 +1600,7 @@ test_compound_8(void)
     if (H5Tinsert(tid2, "d", HOFFSET(struct s2, d), tid1_copy) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'd'\n");
+        printf("Can't insert field 'd'\n");
         goto error;
     } /* end if */
 
@@ -1608,7 +1608,7 @@ test_compound_8(void)
     if ((tid3 = H5Tcopy(tid2)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't copy type #2\n");
+        printf("Can't copy type #2\n");
         goto error;
     } /* end if */
 
@@ -1616,7 +1616,7 @@ test_compound_8(void)
     if ((tid2_copy = H5Tcopy(tid2)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't copy type #2\n");
+        printf("Can't copy type #2\n");
         goto error;
     } /* end if */
 
@@ -1624,14 +1624,14 @@ test_compound_8(void)
     if (H5Tpack(tid2) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't pack the compound datatype\n");
+        printf("Can't pack the compound datatype\n");
         goto error;
     } /* end if */
 
     if (H5Tlock(tid2) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't lock the compound datatype\n");
+        printf("Can't lock the compound datatype\n");
         goto error;
     } /* end if */
 
@@ -1639,7 +1639,7 @@ test_compound_8(void)
     if (H5Tpack(tid2) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't pack the compound datatype for second time\n");
+        printf("Can't pack the compound datatype for second time\n");
         goto error;
     } /* end if */
 
@@ -1647,7 +1647,7 @@ test_compound_8(void)
     if (H5Tlock(tid3) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't lock the compound datatype\n");
+        printf("Can't lock the compound datatype\n");
         goto error;
     } /* end if */
 
@@ -1660,7 +1660,7 @@ test_compound_8(void)
     if (ret >= 0) {
         H5_FAILED();
         AT();
-        HDprintf("Packing locked datatype worked?\n");
+        printf("Packing locked datatype worked?\n");
         goto error;
     } /* end if */
 
@@ -1668,14 +1668,14 @@ test_compound_8(void)
     if ((tsize = H5Tget_size(tid2)) == 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't get size of the compound datatype\n");
+        printf("Can't get size of the compound datatype\n");
         goto error;
     } /* end if */
 
     if (tsize != (sizeof(char) + sizeof(char) + sizeof(int))) {
         H5_FAILED();
         AT();
-        HDprintf("The size of the packed compound datatype is incorrect: tsize = %zu\n", tsize);
+        printf("The size of the packed compound datatype is incorrect: tsize = %zu\n", tsize);
         goto error;
     } /* end if */
 
@@ -1686,7 +1686,7 @@ test_compound_8(void)
     if ((arr_tid = H5Tarray_create2(tid2_copy, 1, dims)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create an array datatype\n");
+        printf("Can't create an array datatype\n");
         goto error;
     } /* end if */
 
@@ -1694,7 +1694,7 @@ test_compound_8(void)
     if (H5Tpack(arr_tid) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't pack the array datatype\n");
+        printf("Can't pack the array datatype\n");
         goto error;
     } /* end if */
 
@@ -1702,35 +1702,35 @@ test_compound_8(void)
     if ((tsize = H5Tget_size(arr_tid)) == 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't get size of the array datatype\n");
+        printf("Can't get size of the array datatype\n");
         goto error;
     } /* end if */
 
     if (tsize != ARRAY_DIM * (sizeof(char) + sizeof(char) + sizeof(int))) {
         H5_FAILED();
         AT();
-        HDprintf("The size of the packed array datatype is incorrect\n");
+        printf("The size of the packed array datatype is incorrect\n");
         goto error;
     } /* end if */
 
     if (H5Tclose(tid1_copy) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't close the compound datatype\n");
+        printf("Can't close the compound datatype\n");
         goto error;
     } /* end if */
 
     if (H5Tclose(tid2_copy) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't close the compound datatype\n");
+        printf("Can't close the compound datatype\n");
         goto error;
     } /* end if */
 
     if (H5Tclose(arr_tid) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't close the array datatype\n");
+        printf("Can't close the array datatype\n");
         goto error;
     } /* end if */
 
@@ -1787,7 +1787,7 @@ test_compound_9(void)
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create file!\n");
+        printf("Can't create file!\n");
         goto error;
     } /* end if */
 
@@ -1795,14 +1795,14 @@ test_compound_9(void)
     if ((cmpd_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct_w))) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_tid, "i1", HOFFSET(struct cmpd_struct_w, i1), H5T_NATIVE_INT) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'i1'\n");
+        printf("Can't insert field 'i1'\n");
         goto error;
     } /* end if */
 
@@ -1810,35 +1810,35 @@ test_compound_9(void)
     if (H5Tset_size(str_id, H5T_VARIABLE) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't set size for VL string\n");
+        printf("Can't set size for VL string\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_tid, "vl_string", HOFFSET(cmpd_struct_w, str), str_id) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'i1'\n");
+        printf("Can't insert field 'i1'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_tid, "i2", HOFFSET(struct cmpd_struct_w, i2), H5T_NATIVE_INT) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'i2'\n");
+        printf("Can't insert field 'i2'\n");
         goto error;
     } /* end if */
 
     if (H5Tcommit2(file, "compound", cmpd_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't commit datatype\n");
+        printf("Can't commit datatype\n");
         goto error;
     } /* end if */
 
     if (H5Tclose(cmpd_tid) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     } /* end if */
 
@@ -1848,7 +1848,7 @@ test_compound_9(void)
     if ((dup_tid = H5Tcopy(cmpd_tid)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't copy datatype\n");
+        printf("Can't copy datatype\n");
         goto error;
     } /* end if */
 
@@ -1856,7 +1856,7 @@ test_compound_9(void)
     if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create space\n");
+        printf("Can't create space\n");
         goto error;
     } /* end if */
 
@@ -1864,35 +1864,35 @@ test_compound_9(void)
         0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create dataset\n");
+        printf("Can't create dataset\n");
         goto error;
     } /* end if */
 
     if (H5Dwrite(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't write data\n");
+        printf("Can't write data\n");
         goto error;
     } /* end if */
 
     if (H5Dread(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't read data\n");
+        printf("Can't read data\n");
         goto error;
     } /* end if */
 
     if (rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || HDstrcmp(rdata.str, wdata.str) != 0) {
         H5_FAILED();
         AT();
-        HDprintf("incorrect read data\n");
+        printf("incorrect read data\n");
         goto error;
     } /* end if */
 
     if (H5Treclaim(dup_tid, space_id, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't reclaim read data\n");
+        printf("Can't reclaim read data\n");
         goto error;
     } /* end if */
     rdata.str = NULL;
@@ -1913,35 +1913,35 @@ test_compound_9(void)
     if ((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("cannot open file\n");
+        printf("cannot open file\n");
         goto error;
     } /* end if */
 
     if ((dset_id = H5Dopen2(file, "Dataset", H5P_DEFAULT)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("cannot open dataset\n");
+        printf("cannot open dataset\n");
         goto error;
     } /* end if */
 
     if ((space_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't get space\n");
+        printf("Can't get space\n");
         goto error;
     } /* end if */
 
     if ((cmpd_tid = H5Dget_type(dset_id)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("cannot open dataset\n");
+        printf("cannot open dataset\n");
         goto error;
     } /* end if */
 
     if ((dup_tid = H5Tcopy(cmpd_tid)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't copy datatype\n");
+        printf("Can't copy datatype\n");
         goto error;
     } /* end if */
 
@@ -1952,21 +1952,21 @@ test_compound_9(void)
     if (H5Dread(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't read data\n");
+        printf("Can't read data\n");
         goto error;
     } /* end if */
 
     if (rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || HDstrcmp(rdata.str, wdata.str) != 0) {
         H5_FAILED();
         AT();
-        HDprintf("incorrect read data\n");
+        printf("incorrect read data\n");
         goto error;
     } /* end if */
 
     if (H5Treclaim(dup_tid, space_id, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't read data\n");
+        printf("Can't read data\n");
         goto error;
     } /* end if */
     rdata.str = NULL;
@@ -2048,7 +2048,7 @@ test_compound_10(void)
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create file!\n");
+        printf("Can't create file!\n");
         goto error;
     } /* end if */
 
@@ -2056,14 +2056,14 @@ test_compound_10(void)
     if ((cmpd_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_tid, "i1", HOFFSET(struct cmpd_struct, i1), H5T_NATIVE_INT) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'i1'\n");
+        printf("Can't insert field 'i1'\n");
         goto error;
     } /* end if */
 
@@ -2071,14 +2071,14 @@ test_compound_10(void)
     if (H5Tset_size(cstr_id, H5T_VARIABLE) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't set size for C string\n");
+        printf("Can't set size for C string\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_tid, "c_string", HOFFSET(cmpd_struct, str), cstr_id) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'str'\n");
+        printf("Can't insert field 'str'\n");
         goto error;
     } /* end if */
 
@@ -2086,21 +2086,21 @@ test_compound_10(void)
     if ((vlstr_id = H5Tvlen_create(H5T_NATIVE_CHAR)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create VL string\n");
+        printf("Can't create VL string\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_tid, "vl_string", HOFFSET(cmpd_struct, text), vlstr_id) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'text'\n");
+        printf("Can't insert field 'text'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_tid, "i2", HOFFSET(struct cmpd_struct, i2), H5T_NATIVE_INT) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'i2'\n");
+        printf("Can't insert field 'i2'\n");
         goto error;
     } /* end if */
 
@@ -2108,7 +2108,7 @@ test_compound_10(void)
     if ((arr_tid = H5Tarray_create2(cmpd_tid, 1, arr_dim)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create array type\n");
+        printf("Can't create array type\n");
         goto error;
     } /* end if */
 
@@ -2116,7 +2116,7 @@ test_compound_10(void)
     if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create space\n");
+        printf("Can't create space\n");
         goto error;
     } /* end if */
 
@@ -2124,21 +2124,21 @@ test_compound_10(void)
         0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create dataset\n");
+        printf("Can't create dataset\n");
         goto error;
     } /* end if */
 
     if (H5Dwrite(dset_id, arr_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't write data\n");
+        printf("Can't write data\n");
         goto error;
     } /* end if */
 
     if (H5Dread(dset_id, arr_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't read data\n");
+        printf("Can't read data\n");
         goto error;
     } /* end if */
 
@@ -2147,14 +2147,14 @@ test_compound_10(void)
             HDstrcmp(rdata[i].str, wdata[i].str) != 0) {
             H5_FAILED();
             AT();
-            HDprintf("incorrect read data\n");
+            printf("incorrect read data\n");
             goto error;
         } /* end if */
 
         if (rdata[i].text.len != wdata[i].text.len) {
             H5_FAILED();
             AT();
-            HDprintf("incorrect VL length\n");
+            printf("incorrect VL length\n");
             goto error;
         } /* end if */
 
@@ -2163,20 +2163,20 @@ test_compound_10(void)
         if (HDstrcmp((char *)t1, (char *)t2) != 0) {
             H5_FAILED();
             AT();
-            HDprintf("incorrect VL read data\n");
+            printf("incorrect VL read data\n");
             goto error;
         }
     } /* end for */
     if (H5Treclaim(arr_tid, space_id, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't reclaim read data\n");
+        printf("Can't reclaim read data\n");
         goto error;
     } /* end if */
     if (H5Treclaim(arr_tid, space_id, H5P_DEFAULT, &wdata) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't reclaim read data\n");
+        printf("Can't reclaim read data\n");
         goto error;
     } /* end if */
 
@@ -2312,7 +2312,7 @@ test_compound_11(void)
     if ((space_id = H5Screate_simple(1, dim, NULL)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create space\n");
+        printf("Can't create space\n");
         goto error;
     } /* end if */
 
@@ -2331,30 +2331,30 @@ test_compound_11(void)
     /* Verify converted buffer is correct */
     for (u = 0; u < NTESTELEM; u++) {
         if (!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) {
-            HDprintf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u,
-                     ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1);
+            printf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u,
+                   ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1);
             TEST_ERROR;
         } /* end if */
         if (((big_t *)buf_orig)[u].i1 != ((little_t *)buf)[u].i1) {
-            HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u,
-                     ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1);
+            printf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u,
+                   ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1);
             TEST_ERROR;
         } /* end if */
         if (((big_t *)buf_orig)[u].s1 == NULL || ((little_t *)buf)[u].s1 == NULL) {
-            HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u,
-                     ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1);
+            printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u,
+                   ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1);
             TEST_ERROR;
         } /* end if */
         else if (HDstrcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) {
-            HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u,
-                     ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1);
+            printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u,
+                   ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1);
             TEST_ERROR;
         } /* end if */
     }     /* end for */
     if (H5Treclaim(little_tid2, space_id, H5P_DEFAULT, buf) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't reclaim data\n");
+        printf("Can't reclaim data\n");
         goto error;
     } /* end if */
 
@@ -2382,30 +2382,30 @@ test_compound_11(void)
     /* Verify converted buffer is correct */
     for (u = 0; u < NTESTELEM; u++) {
         if (!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) {
-            HDprintf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u,
-                     ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1);
+            printf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u,
+                   ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1);
             TEST_ERROR;
         } /* end if */
         if (((big_t *)buf_orig)[u].i1 != ((little_t *)buf)[u].i1) {
-            HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u,
-                     ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1);
+            printf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u,
+                   ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1);
             TEST_ERROR;
         } /* end if */
         if (((big_t *)buf_orig)[u].s1 == NULL || ((little_t *)buf)[u].s1 == NULL) {
-            HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u,
-                     ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1);
+            printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u,
+                   ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1);
             TEST_ERROR;
         } /* end if */
         else if (HDstrcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) {
-            HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u,
-                     ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1);
+            printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u,
+                   ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1);
             TEST_ERROR;
         } /* end if */
     }     /* end for */
     if (H5Treclaim(little_tid, space_id, H5P_DEFAULT, buf) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't reclaim data\n");
+        printf("Can't reclaim data\n");
         goto error;
     } /* end if */
 
@@ -2423,30 +2423,30 @@ test_compound_11(void)
     /* Verify converted buffer is correct */
     for (u = 0; u < NTESTELEM; u++) {
         if (!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) {
-            HDprintf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u,
-                     ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1);
+            printf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u,
+                   ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1);
             TEST_ERROR;
         } /* end if */
         if (((big_t *)buf_orig)[u].i1 != ((little_t *)buf)[u].i1) {
-            HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u,
-                     ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1);
+            printf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u,
+                   ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1);
             TEST_ERROR;
         } /* end if */
         if (((big_t *)buf_orig)[u].s1 == NULL || ((little_t *)buf)[u].s1 == NULL) {
-            HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u,
-                     ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1);
+            printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u,
+                   ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1);
             TEST_ERROR;
         } /* end if */
         else if (HDstrcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) {
-            HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u,
-                     ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1);
+            printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u,
+                   ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1);
             TEST_ERROR;
         } /* end if */
     }     /* end for */
     if (H5Treclaim(little_tid, space_id, H5P_DEFAULT, buf) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't reclaim data\n");
+        printf("Can't reclaim data\n");
         goto error;
     } /* end if */
 
@@ -2782,7 +2782,7 @@ test_compound_14(void)
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create file!\n");
+        printf("Can't create file!\n");
         goto error;
     } /* end if */
 
@@ -2790,21 +2790,21 @@ test_compound_14(void)
     if ((cmpd_m1_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct_1_w))) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_m1_tid, "c1", HOFFSET(struct cmpd_struct_1_w, c1), H5T_NATIVE_CHAR) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'c1'\n");
+        printf("Can't insert field 'c1'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_m1_tid, "c2", HOFFSET(struct cmpd_struct_1_w, c2), H5T_NATIVE_CHAR) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'c2'\n");
+        printf("Can't insert field 'c2'\n");
         goto error;
     } /* end if */
 
@@ -2812,14 +2812,14 @@ test_compound_14(void)
     if (H5Tset_size(str_id, H5T_VARIABLE) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't set size for VL string\n");
+        printf("Can't set size for VL string\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_m1_tid, "vl_string", HOFFSET(cmpd_struct_1_w, str), str_id) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'vl_string'\n");
+        printf("Can't insert field 'vl_string'\n");
         goto error;
     } /* end if */
 
@@ -2827,28 +2827,28 @@ test_compound_14(void)
     if ((cmpd_f1_tid = H5Tcreate(H5T_COMPOUND, 8 + 1 + sizeof(hvl_t))) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_f1_tid, "c1", (size_t)0, H5T_STD_I64BE) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'c1'\n");
+        printf("Can't insert field 'c1'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_f1_tid, "c2", (size_t)8, H5T_NATIVE_CHAR) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'c2'\n");
+        printf("Can't insert field 'c2'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_f1_tid, "vl_string", (size_t)(8 + 1), str_id) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'vl_string'\n");
+        printf("Can't insert field 'vl_string'\n");
         goto error;
     } /* end if */
 
@@ -2856,56 +2856,56 @@ test_compound_14(void)
     if ((cmpd_m2_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct_2_w))) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_m2_tid, "c1", HOFFSET(struct cmpd_struct_2_w, c1), H5T_NATIVE_CHAR) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'c1'\n");
+        printf("Can't insert field 'c1'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_m2_tid, "c2", HOFFSET(struct cmpd_struct_2_w, c2), H5T_NATIVE_CHAR) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'c2'\n");
+        printf("Can't insert field 'c2'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_m2_tid, "vl_string", HOFFSET(cmpd_struct_2_w, str), str_id) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'vl_string'\n");
+        printf("Can't insert field 'vl_string'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_m2_tid, "l1", HOFFSET(struct cmpd_struct_2_w, l1), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'l1'\n");
+        printf("Can't insert field 'l1'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_m2_tid, "l2", HOFFSET(struct cmpd_struct_2_w, l2), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'l2'\n");
+        printf("Can't insert field 'l2'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_m2_tid, "l3", HOFFSET(struct cmpd_struct_2_w, l3), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'l3'\n");
+        printf("Can't insert field 'l3'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_m2_tid, "l4", HOFFSET(struct cmpd_struct_2_w, l4), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'l4'\n");
+        printf("Can't insert field 'l4'\n");
         goto error;
     } /* end if */
 
@@ -2913,56 +2913,56 @@ test_compound_14(void)
     if ((cmpd_f2_tid = H5Tcreate(H5T_COMPOUND, 8 + 1 + sizeof(hvl_t) + 4 * sizeof(long))) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_f2_tid, "c1", (size_t)0, H5T_STD_I64BE) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'c1'\n");
+        printf("Can't insert field 'c1'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_f2_tid, "c2", (size_t)8, H5T_NATIVE_CHAR) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'c2'\n");
+        printf("Can't insert field 'c2'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_f2_tid, "vl_string", (size_t)(8 + 1), str_id) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'vl_string'\n");
+        printf("Can't insert field 'vl_string'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_f2_tid, "l1", 8 + 1 + sizeof(hvl_t), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'l1'\n");
+        printf("Can't insert field 'l1'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_f2_tid, "l2", 8 + 1 + sizeof(hvl_t) + sizeof(long), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'l2'\n");
+        printf("Can't insert field 'l2'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_f2_tid, "l3", 8 + 1 + sizeof(hvl_t) + 2 * sizeof(long), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'l3'\n");
+        printf("Can't insert field 'l3'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_f2_tid, "l4", 8 + 1 + sizeof(hvl_t) + 3 * sizeof(long), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'l4'\n");
+        printf("Can't insert field 'l4'\n");
         goto error;
     } /* end if */
 
@@ -2970,7 +2970,7 @@ test_compound_14(void)
     if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create space\n");
+        printf("Can't create space\n");
         goto error;
     } /* end if */
 
@@ -2978,7 +2978,7 @@ test_compound_14(void)
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create dataset\n");
+        printf("Can't create dataset\n");
         goto error;
     } /* end if */
 
@@ -2986,42 +2986,42 @@ test_compound_14(void)
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create dataset\n");
+        printf("Can't create dataset\n");
         goto error;
     } /* end if */
 
     if (H5Dwrite(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't write data\n");
+        printf("Can't write data\n");
         goto error;
     } /* end if */
 
     if (H5Dwrite(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't write data\n");
+        printf("Can't write data\n");
         goto error;
     } /* end if */
 
     if (H5Dread(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata1) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't read data\n");
+        printf("Can't read data\n");
         goto error;
     } /* end if */
 
     if (H5Dread(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata2) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't read data\n");
+        printf("Can't read data\n");
         goto error;
     } /* end if */
 
     if (rdata1.c1 != wdata1.c1 || rdata1.c2 != wdata1.c2 || HDstrcmp(rdata1.str, wdata1.str) != 0) {
         H5_FAILED();
         AT();
-        HDprintf("incorrect read data\n");
+        printf("incorrect read data\n");
         goto error;
     } /* end if */
 
@@ -3030,21 +3030,21 @@ test_compound_14(void)
         rdata2.l4 != wdata2.l4) {
         H5_FAILED();
         AT();
-        HDprintf("incorrect read data\n");
+        printf("incorrect read data\n");
         goto error;
     } /* end if */
 
     if (H5Treclaim(cmpd_m1_tid, space_id, H5P_DEFAULT, &rdata1) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't reclaim read data\n");
+        printf("Can't reclaim read data\n");
         goto error;
     } /* end if */
     rdata1.str = NULL;
     if (H5Treclaim(cmpd_m2_tid, space_id, H5P_DEFAULT, &rdata2) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't reclaim read data\n");
+        printf("Can't reclaim read data\n");
         goto error;
     } /* end if */
     rdata2.str = NULL;
@@ -3066,28 +3066,28 @@ test_compound_14(void)
     if ((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("cannot open file\n");
+        printf("cannot open file\n");
         goto error;
     } /* end if */
 
     if ((dset1_id = H5Dopen2(file, "Dataset1", H5P_DEFAULT)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("cannot open dataset\n");
+        printf("cannot open dataset\n");
         goto error;
     } /* end if */
 
     if ((dset2_id = H5Dopen2(file, "Dataset2", H5P_DEFAULT)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("cannot open dataset\n");
+        printf("cannot open dataset\n");
         goto error;
     } /* end if */
 
     if ((space_id = H5Dget_space(dset2_id)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't get space\n");
+        printf("Can't get space\n");
         goto error;
     } /* end if */
 
@@ -3105,21 +3105,21 @@ test_compound_14(void)
     if (H5Dread(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata1) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't read data\n");
+        printf("Can't read data\n");
         goto error;
     } /* end if */
 
     if (H5Dread(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata2) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't read data\n");
+        printf("Can't read data\n");
         goto error;
     } /* end if */
 
     if (rdata1.c1 != wdata1.c1 || rdata1.c2 != wdata1.c2 || HDstrcmp(rdata1.str, wdata1.str) != 0) {
         H5_FAILED();
         AT();
-        HDprintf("incorrect read data\n");
+        printf("incorrect read data\n");
         goto error;
     } /* end if */
 
@@ -3128,21 +3128,21 @@ test_compound_14(void)
         rdata2.l4 != wdata2.l4) {
         H5_FAILED();
         AT();
-        HDprintf("incorrect read data\n");
+        printf("incorrect read data\n");
         goto error;
     } /* end if */
 
     if (H5Treclaim(cmpd_m1_tid, space_id, H5P_DEFAULT, &rdata1) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't reclaim read data\n");
+        printf("Can't reclaim read data\n");
         goto error;
     } /* end if */
     rdata1.str = NULL;
     if (H5Treclaim(cmpd_m2_tid, space_id, H5P_DEFAULT, &rdata2) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't reclaim read data\n");
+        printf("Can't reclaim read data\n");
         goto error;
     } /* end if */
     rdata2.str = NULL;
@@ -3208,7 +3208,7 @@ test_compound_15(void)
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create file!\n");
+        printf("Can't create file!\n");
         goto error;
     } /* end if */
 
@@ -3216,21 +3216,21 @@ test_compound_15(void)
     if ((cmpd_f_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_f_tid, "i1", HOFFSET(struct cmpd_struct, i1), H5T_NATIVE_INT) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'i1'\n");
+        printf("Can't insert field 'i1'\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_f_tid, "i2", HOFFSET(struct cmpd_struct, i2), H5T_NATIVE_INT) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'i2'\n");
+        printf("Can't insert field 'i2'\n");
         goto error;
     } /* end if */
 
@@ -3238,14 +3238,14 @@ test_compound_15(void)
     if ((cmpd_m_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     } /* end if */
 
     if (H5Tinsert(cmpd_m_tid, "i1", (size_t)0, H5T_NATIVE_INT) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't insert field 'i1'\n");
+        printf("Can't insert field 'i1'\n");
         goto error;
     } /* end if */
 
@@ -3254,7 +3254,7 @@ test_compound_15(void)
     if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create space\n");
+        printf("Can't create space\n");
         goto error;
     } /* end if */
 
@@ -3262,14 +3262,14 @@ test_compound_15(void)
         0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't create dataset\n");
+        printf("Can't create dataset\n");
         goto error;
     } /* end if */
 
     if (H5Dwrite(dset_id, cmpd_f_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't write data\n");
+        printf("Can't write data\n");
         goto error;
     } /* end if */
 
@@ -3278,7 +3278,7 @@ test_compound_15(void)
     if (H5Dwrite(dset_id, cmpd_m_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't write data\n");
+        printf("Can't write data\n");
         goto error;
     } /* end if */
 
@@ -3286,7 +3286,7 @@ test_compound_15(void)
     if (H5Dread(dset_id, cmpd_f_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't read data\n");
+        printf("Can't read data\n");
         goto error;
     } /* end if */
 
@@ -3294,7 +3294,7 @@ test_compound_15(void)
     if (rdata.i1 != wdata2[0] || rdata.i2 != wdata1.i2) {
         H5_FAILED();
         AT();
-        HDprintf("incorrect read data\n");
+        printf("incorrect read data\n");
         goto error;
     } /* end if */
 
@@ -3307,7 +3307,7 @@ test_compound_15(void)
     if (H5Dread(dset_id, cmpd_m_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED();
         AT();
-        HDprintf("Can't read data\n");
+        printf("Can't read data\n");
         goto error;
     } /* end if */
 
@@ -3315,7 +3315,7 @@ test_compound_15(void)
     if (rdata.i1 != wdata2[0] || rdata.i2 != wdata2[1]) {
         H5_FAILED();
         AT();
-        HDprintf("incorrect read data\n");
+        printf("incorrect read data\n");
         goto error;
     } /* end if */
 
@@ -3542,7 +3542,7 @@ test_compound_16(void)
     if ((obj_count = H5Fget_obj_count(file, H5F_OBJ_DATATYPE)) != 1) {
         H5_FAILED();
         AT();
-        HDprintf("    H5Fget_obj_count returned: %zd; expected: 1\n", obj_count);
+        printf("    H5Fget_obj_count returned: %zd; expected: 1\n", obj_count);
         goto error;
     }
 
@@ -3552,7 +3552,7 @@ test_compound_16(void)
     if (open_dtypes[1]) {
         H5_FAILED();
         AT();
-        HDprintf("    H5Fget_obj_ids returned as second id: %lld; expected: 0\n", (long long)open_dtypes[1]);
+        printf("    H5Fget_obj_ids returned as second id: %lld; expected: 0\n", (long long)open_dtypes[1]);
         goto error;
     }
 
@@ -3635,7 +3635,7 @@ test_compound_17(void)
     if (2 != H5Tget_size(tmp_dt)) {
         H5_FAILED();
         AT();
-        HDprintf("    Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt));
+        printf("    Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt));
         goto error;
     }
     if (H5Tclose(tmp_dt) < 0)
@@ -3649,7 +3649,7 @@ test_compound_17(void)
     if (4 != H5Tget_size(tmp_dt)) {
         H5_FAILED();
         AT();
-        HDprintf("    Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt));
+        printf("    Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt));
         goto error;
     }
     if (H5Tclose(tmp_dt) < 0)
@@ -3698,7 +3698,7 @@ test_compound_17(void)
     if (2 != H5Tget_size(tmp_dt)) {
         H5_FAILED();
         AT();
-        HDprintf("    Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt));
+        printf("    Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt));
         goto error;
     }
     if (H5Tclose(tmp_dt) < 0)
@@ -3712,7 +3712,7 @@ test_compound_17(void)
     if (4 != H5Tget_size(tmp_dt)) {
         H5_FAILED();
         AT();
-        HDprintf("    Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt));
+        printf("    Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt));
         goto error;
     }
     if (H5Tclose(tmp_dt) < 0)
@@ -3923,112 +3923,112 @@ test_query(void)
     /* Create a compound datatype */
     if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) {
         H5_FAILED();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     } /* end if */
     if (H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field 'a'\n");
+        printf("Can't insert field 'a'\n");
         goto error;
     } /* end if */
     if (H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field 'b'\n");
+        printf("Can't insert field 'b'\n");
         goto error;
     } /* end if */
     if (H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field 'c'\n");
+        printf("Can't insert field 'c'\n");
         goto error;
     } /* end if */
     if (H5Tinsert(tid1, "d", HOFFSET(struct s1, d), H5T_NATIVE_DOUBLE) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field 'd'\n");
+        printf("Can't insert field 'd'\n");
         goto error;
     } /* end if */
 
     /* Create a enumerate datatype */
     if ((tid2 = H5Tcreate(H5T_ENUM, sizeof(short))) < 0) {
         H5_FAILED();
-        HDprintf("Can't create enumerate type\n");
+        printf("Can't create enumerate type\n");
         goto error;
     } /* end if */
     enum_val = 10;
     if (H5Tenum_insert(tid2, "RED", &enum_val) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field into enumeration type\n");
+        printf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
     enum_val = 11;
     if (H5Tenum_insert(tid2, "GREEN", &enum_val) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field into enumeration type\n");
+        printf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
     enum_val = 12;
     if (H5Tenum_insert(tid2, "BLUE", &enum_val) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field into enumeration type\n");
+        printf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
     enum_val = 13;
     if (H5Tenum_insert(tid2, "ORANGE", &enum_val) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field into enumeration type\n");
+        printf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
     enum_val = 14;
     if (H5Tenum_insert(tid2, "YELLOW", &enum_val) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field into enumeration type\n");
+        printf("Can't insert field into enumeration type\n");
         goto error;
     } /* end if */
 
     /* Query member number and member index by name, for compound type. */
     if (H5Tget_nmembers(tid1) != 4) {
         H5_FAILED();
-        HDprintf("Can't get member number\n");
+        printf("Can't get member number\n");
         goto error;
     } /* end if */
     if (H5Tget_member_index(tid1, "c") != 2) {
         H5_FAILED();
-        HDprintf("Can't get correct index number\n");
+        printf("Can't get correct index number\n");
         goto error;
     } /* end if */
 
     /* Query member number and member index by member name, for enumeration type. */
     if (H5Tget_nmembers(tid2) != 5) {
         H5_FAILED();
-        HDprintf("Can't get member number\n");
+        printf("Can't get member number\n");
         goto error;
     } /* end if */
     if (H5Tget_member_index(tid2, "ORANGE") != 3) {
         H5_FAILED();
-        HDprintf("Can't get correct index number\n");
+        printf("Can't get correct index number\n");
         goto error;
     } /* end if */
 
     /* Commit compound datatype and close it */
     if (H5Tcommit2(file, compnd_type, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("Can't commit compound datatype\n");
+        printf("Can't commit compound datatype\n");
         goto error;
     } /* end if */
     if (H5Tclose(tid1) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     } /* end if */
 
     /* Commit enumeration datatype and close it */
     if (H5Tcommit2(file, enum_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("Can't commit compound datatype\n");
+        printf("Can't commit compound datatype\n");
         goto error;
     } /* end if */
     if (H5Tclose(tid2) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     } /* end if */
 
@@ -4041,48 +4041,48 @@ test_query(void)
     /* Query member number and member index by name, for compound type */
     if (H5Tget_nmembers(tid1) != 4) {
         H5_FAILED();
-        HDprintf("Can't get member number\n");
+        printf("Can't get member number\n");
         goto error;
     } /* end if */
     if (H5Tget_member_index(tid1, "c") != 2) {
         H5_FAILED();
-        HDprintf("Can't get correct index number\n");
+        printf("Can't get correct index number\n");
         goto error;
     } /* end if */
 
     /* Query member number and member index by member name, for enumeration type */
     if (H5Tget_nmembers(tid2) != 5) {
         H5_FAILED();
-        HDprintf("Can't get member number\n");
+        printf("Can't get member number\n");
         goto error;
     } /* end if */
     if (H5Tget_member_index(tid2, "ORANGE") != 3) {
         H5_FAILED();
-        HDprintf("Can't get correct index number\n");
+        printf("Can't get correct index number\n");
         goto error;
     } /* end if */
 
     /* Query member value by member name, for enumeration type */
     if (H5Tenum_valueof(tid2, "ORANGE", &enum_val) < 0) {
         H5_FAILED();
-        HDprintf("Can't get value for enumerate member\n");
+        printf("Can't get value for enumerate member\n");
         goto error;
     } /* end if */
     if (enum_val != 13) {
         H5_FAILED();
-        HDprintf("Incorrect value for enum member\n");
+        printf("Incorrect value for enum member\n");
         goto error;
     } /* end if */
 
     /* Query member value by member index, for enumeration type */
     if (H5Tget_member_value(tid2, 2, &enum_val) < 0) {
         H5_FAILED();
-        HDprintf("Can't get value for enum member\n");
+        printf("Can't get value for enum member\n");
         goto error;
     } /* end if */
     if (enum_val != 12) {
         H5_FAILED();
-        HDprintf("Incorrect value for enum member\n");
+        printf("Incorrect value for enum member\n");
         goto error;
     } /* end if */
 
@@ -4090,30 +4090,30 @@ test_query(void)
     enum_val = 14;
     if (H5Tenum_nameof(tid2, &enum_val, enum_name, (size_t)16) < 0) {
         H5_FAILED();
-        HDprintf("Can't get name for enum member\n");
+        printf("Can't get name for enum member\n");
         goto error;
     } /* end if */
     if (HDstrcmp("YELLOW", enum_name) != 0) {
         H5_FAILED();
-        HDprintf("Incorrect name for enum member\n");
+        printf("Incorrect name for enum member\n");
         goto error;
     } /* end if */
 
     /* Close datatype and file */
     if (H5Tclose(tid1) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     } /* end if */
     if (H5Tclose(tid2) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     } /* end if */
 
     if (H5Fclose(file) < 0) {
         H5_FAILED();
-        HDprintf("Can't close file\n");
+        printf("Can't close file\n");
         goto error;
     } /* end if */
 
@@ -5070,7 +5070,7 @@ test_conv_str_2(void)
 
     /* Do the conversions */
     HDsnprintf(s, sizeof(s), "Testing random string conversion speed");
-    HDprintf("%-70s", s);
+    printf("%-70s", s);
     HDfflush(stdout);
     if (H5Tconvert(c_type, f_type, nelmts, buf, NULL, H5P_DEFAULT) < 0)
         goto error;
@@ -5284,14 +5284,14 @@ test_conv_enum_1(void)
 
     /* Conversions */
     HDsnprintf(s, sizeof(s), "Testing random enum conversion O(N)");
-    HDprintf("%-70s", s);
+    printf("%-70s", s);
     HDfflush(stdout);
     if (H5Tconvert(t1, t2, nelmts, buf, NULL, H5P_DEFAULT) < 0)
         goto error;
     PASSED();
 
     HDsnprintf(s, sizeof(s), "Testing random enum conversion O(N log N)");
-    HDprintf("%-70s", s);
+    printf("%-70s", s);
     HDfflush(stdout);
     if (H5Tconvert(t2, t1, nelmts, buf, NULL, H5P_DEFAULT) < 0)
         goto error;
@@ -5372,7 +5372,7 @@ test_conv_enum_2(void)
         if (data[i] != i % 8) {
             if (!nerrors++) {
                 H5_FAILED();
-                HDprintf("element %d is %d but should have been  %d\n", i, data[i], i % 8);
+                printf("element %d is %d but should have been  %d\n", i, data[i], i % 8);
             }
         }
     }
@@ -5385,7 +5385,7 @@ test_conv_enum_2(void)
 
     /* Failure */
     if (nerrors) {
-        HDprintf("total of %d conversion errors out of %d elements for enums\n", nerrors, NTESTELEM);
+        printf("total of %d conversion errors out of %d elements for enums\n", nerrors, NTESTELEM);
         return 1;
     }
 
@@ -5426,7 +5426,7 @@ test_conv_bitfield(void)
         goto error;
     if (buf[0] != 0xAA || buf[1] != 0xAA || buf[2] != 0 || buf[3] != 0) {
         H5_FAILED();
-        HDprintf("    s=0xaaaa, d=0x%02x%02x%02x%02x (test 1)\n", buf[3], buf[2], buf[1], buf[0]);
+        printf("    s=0xaaaa, d=0x%02x%02x%02x%02x (test 1)\n", buf[3], buf[2], buf[1], buf[0]);
         goto error;
     }
 
@@ -5447,7 +5447,7 @@ test_conv_bitfield(void)
         goto error;
     if (buf[0] != 0 || buf[1] != 0xA8 || buf[2] != 0x2A || buf[3] != 0) {
         H5_FAILED();
-        HDprintf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 2)\n", buf[3], buf[2], buf[1], buf[0]);
+        printf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 2)\n", buf[3], buf[2], buf[1], buf[0]);
         goto error;
     }
 
@@ -5463,7 +5463,7 @@ test_conv_bitfield(void)
         goto error;
     if (buf[0] != 0xff || buf[1] != 0xAB || buf[2] != 0xEA || buf[3] != 0xff) {
         H5_FAILED();
-        HDprintf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 3)\n", buf[3], buf[2], buf[1], buf[0]);
+        printf("    s=0x2AA8 d=0x%02x%02x%02x%02x (test 3)\n", buf[3], buf[2], buf[1], buf[0]);
         goto error;
     }
 
@@ -5547,7 +5547,7 @@ test_bitfield_funcs(void)
     H5E_END_TRY
     if (size > 0) {
         H5_FAILED();
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -5558,7 +5558,7 @@ test_bitfield_funcs(void)
     H5E_END_TRY
     if (inpad > -1) {
         H5_FAILED();
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -5569,7 +5569,7 @@ test_bitfield_funcs(void)
     H5E_END_TRY
     if (cset > -1) {
         H5_FAILED();
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -5580,7 +5580,7 @@ test_bitfield_funcs(void)
     H5E_END_TRY
     if (strpad > -1) {
         H5_FAILED();
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -5591,7 +5591,7 @@ test_bitfield_funcs(void)
     H5E_END_TRY
     if (ret >= 0) {
         H5_FAILED();
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -5602,7 +5602,7 @@ test_bitfield_funcs(void)
     H5E_END_TRY
     if (tag) {
         H5_FAILED();
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -5613,7 +5613,7 @@ test_bitfield_funcs(void)
     H5E_END_TRY
     if (super >= 0) {
         H5_FAILED();
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         goto error;
     } /* end if */
 
@@ -5741,7 +5741,7 @@ opaque_check(int tag_it)
     H5E_END_TRY
     if (status >= 0) {
         H5_FAILED();
-        HDprintf("    opaque conversion should have failed but succeeded\n");
+        printf("    opaque conversion should have failed but succeeded\n");
         goto error;
     }
 
@@ -5754,7 +5754,7 @@ opaque_check(int tag_it)
         goto error;
     if (saved + 1 != num_opaque_conversions_g) {
         H5_FAILED();
-        HDprintf("    unexpected number of opaque conversions\n");
+        printf("    unexpected number of opaque conversions\n");
         goto error;
     }
 
@@ -5871,7 +5871,7 @@ opaque_funcs(void)
     }
     H5E_END_TRY
     if (ret >= 0) {
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         TEST_ERROR;
     } /* end if */
 
@@ -5881,7 +5881,7 @@ opaque_funcs(void)
     }
     H5E_END_TRY
     if (ret >= 0) {
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         TEST_ERROR;
     } /* end if */
 
@@ -5891,7 +5891,7 @@ opaque_funcs(void)
     }
     H5E_END_TRY
     if (size > 0) {
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         TEST_ERROR;
     } /* end if */
 
@@ -5901,7 +5901,7 @@ opaque_funcs(void)
     }
     H5E_END_TRY
     if (inpad > -1) {
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         TEST_ERROR;
     } /* end if */
 
@@ -5911,7 +5911,7 @@ opaque_funcs(void)
     }
     H5E_END_TRY
     if (cset > -1) {
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         TEST_ERROR;
     } /* end if */
 
@@ -5921,7 +5921,7 @@ opaque_funcs(void)
     }
     H5E_END_TRY
     if (strpad > -1) {
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         TEST_ERROR;
     } /* end if */
 
@@ -5931,7 +5931,7 @@ opaque_funcs(void)
     }
     H5E_END_TRY
     if (ret >= 0) {
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         TEST_ERROR;
     } /* end if */
 
@@ -5941,7 +5941,7 @@ opaque_funcs(void)
     }
     H5E_END_TRY
     if (sign > -1) {
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         TEST_ERROR;
     } /* end if */
 
@@ -5951,7 +5951,7 @@ opaque_funcs(void)
     }
     H5E_END_TRY
     if (super >= 0) {
-        HDprintf("Operation not allowed for this type.\n");
+        printf("Operation not allowed for this type.\n");
         TEST_ERROR;
     } /* end if */
 
@@ -6019,76 +6019,76 @@ test_encode(void)
     /* Create a compound datatype */
     if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd))) < 0) {
         H5_FAILED();
-        HDprintf("Can't create datatype!\n");
+        printf("Can't create datatype!\n");
         goto error;
     }
     if (H5Tinsert(tid1, "a", HOFFSET(struct cmpd, a), H5T_NATIVE_INT) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field 'a'\n");
+        printf("Can't insert field 'a'\n");
         goto error;
     }
     if (H5Tinsert(tid1, "b", HOFFSET(struct cmpd, b), H5T_NATIVE_FLOAT) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field 'b'\n");
+        printf("Can't insert field 'b'\n");
         goto error;
     }
     if (H5Tinsert(tid1, "c", HOFFSET(struct cmpd, c), H5T_NATIVE_LONG) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field 'c'\n");
+        printf("Can't insert field 'c'\n");
         goto error;
     }
     if (H5Tinsert(tid1, "d", HOFFSET(struct cmpd, d), H5T_NATIVE_DOUBLE) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field 'd'\n");
+        printf("Can't insert field 'd'\n");
         goto error;
     }
 
     /* Create a enumerate datatype */
     if ((tid2 = H5Tcreate(H5T_ENUM, sizeof(short))) < 0) {
         H5_FAILED();
-        HDprintf("Can't create enumerate type\n");
+        printf("Can't create enumerate type\n");
         goto error;
     }
     enum_val = 0;
     if (H5Tenum_insert(tid2, "RED", &enum_val) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field into enumeration type\n");
+        printf("Can't insert field into enumeration type\n");
         goto error;
     }
     enum_val = 1;
     if (H5Tenum_insert(tid2, "GREEN", &enum_val) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field into enumeration type\n");
+        printf("Can't insert field into enumeration type\n");
         goto error;
     }
     enum_val = 2;
     if (H5Tenum_insert(tid2, "BLUE", &enum_val) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field into enumeration type\n");
+        printf("Can't insert field into enumeration type\n");
         goto error;
     }
     enum_val = 3;
     if (H5Tenum_insert(tid2, "ORANGE", &enum_val) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field into enumeration type\n");
+        printf("Can't insert field into enumeration type\n");
         goto error;
     }
     enum_val = 4;
     if (H5Tenum_insert(tid2, "YELLOW", &enum_val) < 0) {
         H5_FAILED();
-        HDprintf("Can't insert field into enumeration type\n");
+        printf("Can't insert field into enumeration type\n");
         goto error;
     }
 
     /* Create a variable-length string type */
     if ((tid3 = H5Tcopy(H5T_C_S1)) < 0) {
         H5_FAILED();
-        HDprintf("Can't copy a string type\n");
+        printf("Can't copy a string type\n");
         goto error;
     }
     if (H5Tset_size(tid3, H5T_VARIABLE) < 0) {
         H5_FAILED();
-        HDprintf("Can't the string type to be variable-length\n");
+        printf("Can't the string type to be variable-length\n");
         goto error;
     }
 
@@ -6099,7 +6099,7 @@ test_encode(void)
     /* Encode compound type in a buffer */
     if (H5Tencode(tid1, NULL, &cmpd_buf_size) < 0) {
         H5_FAILED();
-        HDprintf("Can't encode compound type\n");
+        printf("Can't encode compound type\n");
         goto error;
     }
 
@@ -6114,13 +6114,13 @@ test_encode(void)
     H5E_END_TRY
     if (ret_id != FAIL) {
         H5_FAILED();
-        HDprintf("Decoded an empty buffer!\n");
+        printf("Decoded an empty buffer!\n");
         goto error;
     }
 
     if (H5Tencode(tid1, cmpd_buf, &cmpd_buf_size) < 0) {
         H5_FAILED();
-        HDprintf("Can't encode compound type\n");
+        printf("Can't encode compound type\n");
         goto error;
     }
 
@@ -6131,26 +6131,26 @@ test_encode(void)
     /* Verify that the datatype was copied exactly */
     if (H5Tequal(decoded_tid1, tid1) <= 0) {
         H5_FAILED();
-        HDprintf("Datatype wasn't encoded & decoded identically\n");
+        printf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     }
 
     /* Query member number and member index by name, for compound type. */
     if (H5Tget_nmembers(decoded_tid1) != 4) {
         H5_FAILED();
-        HDprintf("Can't get member number\n");
+        printf("Can't get member number\n");
         goto error;
     }
     if (H5Tget_member_index(decoded_tid1, "c") != 2) {
         H5_FAILED();
-        HDprintf("Can't get correct index number\n");
+        printf("Can't get correct index number\n");
         goto error;
     }
 
     /* Encode enumerate type in a buffer */
     if (H5Tencode(tid2, NULL, &enum_buf_size) < 0) {
         H5_FAILED();
-        HDprintf("Can't encode enumerate type\n");
+        printf("Can't encode enumerate type\n");
         goto error;
     }
 
@@ -6159,40 +6159,40 @@ test_encode(void)
 
     if (H5Tencode(tid2, enum_buf, &enum_buf_size) < 0) {
         H5_FAILED();
-        HDprintf("Can't encode enumerate type\n");
+        printf("Can't encode enumerate type\n");
         goto error;
     }
 
     /* Decode from the enumerate buffer and return an object handle */
     if ((decoded_tid2 = H5Tdecode(enum_buf)) < 0) {
         H5_FAILED();
-        HDprintf("Can't decode enumerate type\n");
+        printf("Can't decode enumerate type\n");
         goto error;
     }
 
     /* Verify that the datatype was copied exactly */
     if (H5Tequal(decoded_tid2, tid2) <= 0) {
         H5_FAILED();
-        HDprintf("Datatype wasn't encoded & decoded identically\n");
+        printf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     }
 
     /* Query member number and member index by name, for enumeration type. */
     if (H5Tget_nmembers(decoded_tid2) != 5) {
         H5_FAILED();
-        HDprintf("Can't get member number\n");
+        printf("Can't get member number\n");
         goto error;
     }
     if (H5Tget_member_index(decoded_tid2, "ORANGE") != 3) {
         H5_FAILED();
-        HDprintf("Can't get correct index number\n");
+        printf("Can't get correct index number\n");
         goto error;
     }
 
     /* Encode VL string type in a buffer */
     if (H5Tencode(tid3, NULL, &vlstr_buf_size) < 0) {
         H5_FAILED();
-        HDprintf("Can't encode VL string type\n");
+        printf("Can't encode VL string type\n");
         goto error;
     }
 
@@ -6201,26 +6201,26 @@ test_encode(void)
 
     if (H5Tencode(tid3, vlstr_buf, &vlstr_buf_size) < 0) {
         H5_FAILED();
-        HDprintf("Can't encode VL string type\n");
+        printf("Can't encode VL string type\n");
         goto error;
     }
 
     /* Decode from the VL string buffer and return an object handle */
     if ((decoded_tid3 = H5Tdecode(vlstr_buf)) < 0) {
         H5_FAILED();
-        HDprintf("Can't decode VL string type\n");
+        printf("Can't decode VL string type\n");
         goto error;
     }
 
     /* Verify that the datatype was copied exactly */
     if (H5Tequal(decoded_tid3, tid3) <= 0) {
         H5_FAILED();
-        HDprintf("Datatype wasn't encoded & decoded identically\n");
+        printf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     }
     if (!H5Tis_variable_str(decoded_tid3)) {
         H5_FAILED();
-        HDprintf("Datatype wasn't encoded & decoded identically\n");
+        printf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     }
 
@@ -6231,17 +6231,17 @@ test_encode(void)
     /* Commit compound datatype and close it */
     if (H5Tcommit2(file, compnd_type, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("Can't commit compound datatype\n");
+        printf("Can't commit compound datatype\n");
         goto error;
     }
     if (H5Tclose(tid1) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
     if (H5Tclose(decoded_tid1) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
     HDfree(cmpd_buf);
@@ -6250,17 +6250,17 @@ test_encode(void)
     /* Commit enumeration datatype and close it */
     if (H5Tcommit2(file, enum_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("Can't commit compound datatype\n");
+        printf("Can't commit compound datatype\n");
         goto error;
     }
     if (H5Tclose(tid2) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
     if (H5Tclose(decoded_tid2) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
     HDfree(enum_buf);
@@ -6269,17 +6269,17 @@ test_encode(void)
     /* Commit enumeration datatype and close it */
     if (H5Tcommit2(file, vlstr_type, tid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("Can't commit vl string datatype\n");
+        printf("Can't commit vl string datatype\n");
         goto error;
     }
     if (H5Tclose(tid3) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
     if (H5Tclose(decoded_tid3) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
     HDfree(vlstr_buf);
@@ -6300,7 +6300,7 @@ test_encode(void)
     /* Encode compound type in a buffer */
     if (H5Tencode(tid1, NULL, &cmpd_buf_size) < 0) {
         H5_FAILED();
-        HDprintf("Can't encode compound type\n");
+        printf("Can't encode compound type\n");
         goto error;
     }
 
@@ -6309,7 +6309,7 @@ test_encode(void)
 
     if (H5Tencode(tid1, cmpd_buf, &cmpd_buf_size) < 0) {
         H5_FAILED();
-        HDprintf("Can't encode compound type\n");
+        printf("Can't encode compound type\n");
         goto error;
     }
 
@@ -6320,26 +6320,26 @@ test_encode(void)
     /* Verify that the datatype was copied exactly */
     if (H5Tequal(decoded_tid1, tid1) <= 0) {
         H5_FAILED();
-        HDprintf("Datatype wasn't encoded & decoded identically\n");
+        printf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     }
 
     /* Query member number and member index by name, for compound type. */
     if (H5Tget_nmembers(decoded_tid1) != 4) {
         H5_FAILED();
-        HDprintf("Can't get member number\n");
+        printf("Can't get member number\n");
         goto error;
     }
     if (H5Tget_member_index(decoded_tid1, "c") != 2) {
         H5_FAILED();
-        HDprintf("Can't get correct index number\n");
+        printf("Can't get correct index number\n");
         goto error;
     }
 
     /* Encode enumerate type in a buffer */
     if (H5Tencode(tid2, NULL, &enum_buf_size) < 0) {
         H5_FAILED();
-        HDprintf("Can't encode enumerate type\n");
+        printf("Can't encode enumerate type\n");
         goto error;
     }
 
@@ -6348,40 +6348,40 @@ test_encode(void)
 
     if (H5Tencode(tid2, enum_buf, &enum_buf_size) < 0) {
         H5_FAILED();
-        HDprintf("Can't encode enumerate type\n");
+        printf("Can't encode enumerate type\n");
         goto error;
     }
 
     /* Decode from the enumerate buffer and return an object handle */
     if ((decoded_tid2 = H5Tdecode(enum_buf)) < 0) {
         H5_FAILED();
-        HDprintf("Can't decode enumerate type\n");
+        printf("Can't decode enumerate type\n");
         goto error;
     }
 
     /* Verify that the datatype was copied exactly */
     if (H5Tequal(decoded_tid2, tid2) <= 0) {
         H5_FAILED();
-        HDprintf("Datatype wasn't encoded & decoded identically\n");
+        printf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     }
 
     /* Query member number and member index by name, for enumeration type. */
     if (H5Tget_nmembers(decoded_tid2) != 5) {
         H5_FAILED();
-        HDprintf("Can't get member number\n");
+        printf("Can't get member number\n");
         goto error;
     }
     if (H5Tget_member_index(decoded_tid2, "ORANGE") != 3) {
         H5_FAILED();
-        HDprintf("Can't get correct index number\n");
+        printf("Can't get correct index number\n");
         goto error;
     }
 
     /* Encode VL string type in a buffer */
     if (H5Tencode(tid3, NULL, &vlstr_buf_size) < 0) {
         H5_FAILED();
-        HDprintf("Can't encode VL string type\n");
+        printf("Can't encode VL string type\n");
         goto error;
     }
 
@@ -6390,14 +6390,14 @@ test_encode(void)
 
     if (H5Tencode(tid3, vlstr_buf, &vlstr_buf_size) < 0) {
         H5_FAILED();
-        HDprintf("Can't encode VL string type\n");
+        printf("Can't encode VL string type\n");
         goto error;
     }
 
     /* Decode from the VL string buffer and return an object handle */
     if ((decoded_tid3 = H5Tdecode(vlstr_buf)) < 0) {
         H5_FAILED();
-        HDprintf("Can't decode VL string type\n");
+        printf("Can't decode VL string type\n");
         goto error;
     }
     HDfree(vlstr_buf);
@@ -6405,12 +6405,12 @@ test_encode(void)
     /* Verify that the datatype was copied exactly */
     if (H5Tequal(decoded_tid3, tid3) <= 0) {
         H5_FAILED();
-        HDprintf("Datatype wasn't encoded & decoded identically\n");
+        printf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     }
     if (!H5Tis_variable_str(decoded_tid3)) {
         H5_FAILED();
-        HDprintf("Datatype wasn't encoded & decoded identically\n");
+        printf("Datatype wasn't encoded & decoded identically\n");
         goto error;
     }
 
@@ -6422,19 +6422,19 @@ test_encode(void)
     /* Make sure the reference counts for the decoded datatypes are one. */
     if (H5Iget_ref(decoded_tid1) != 1) {
         H5_FAILED();
-        HDprintf("Decoded datatype has incorrect reference count\n");
+        printf("Decoded datatype has incorrect reference count\n");
         goto error;
     }
 
     if (H5Iget_ref(decoded_tid2) != 1) {
         H5_FAILED();
-        HDprintf("Decoded datatype has incorrect reference count\n");
+        printf("Decoded datatype has incorrect reference count\n");
         goto error;
     }
 
     if (H5Iget_ref(decoded_tid3) != 1) {
         H5_FAILED();
-        HDprintf("Decoded datatype has incorrect reference count\n");
+        printf("Decoded datatype has incorrect reference count\n");
         goto error;
     }
 
@@ -6442,19 +6442,19 @@ test_encode(void)
      * decremented and the datatypes are closed. */
     if (H5Idec_ref(decoded_tid1) != 0) {
         H5_FAILED();
-        HDprintf("Decoded datatype can't close\n");
+        printf("Decoded datatype can't close\n");
         goto error;
     }
 
     if (H5Idec_ref(decoded_tid2) != 0) {
         H5_FAILED();
-        HDprintf("Decoded datatype can't close\n");
+        printf("Decoded datatype can't close\n");
         goto error;
     }
 
     if (H5Idec_ref(decoded_tid3) != 0) {
         H5_FAILED();
-        HDprintf("Decoded datatype can't close\n");
+        printf("Decoded datatype can't close\n");
         goto error;
     }
 
@@ -6466,7 +6466,7 @@ test_encode(void)
     H5E_END_TRY
     if (ret != FAIL) {
         H5_FAILED();
-        HDprintf("Decoded datatype should have been closed\n");
+        printf("Decoded datatype should have been closed\n");
         goto error;
     }
 
@@ -6477,7 +6477,7 @@ test_encode(void)
     H5E_END_TRY
     if (ret != FAIL) {
         H5_FAILED();
-        HDprintf("Decoded datatype should have been closed\n");
+        printf("Decoded datatype should have been closed\n");
         goto error;
     }
 
@@ -6488,7 +6488,7 @@ test_encode(void)
     H5E_END_TRY
     if (ret != FAIL) {
         H5_FAILED();
-        HDprintf("Decoded datatype should have been closed\n");
+        printf("Decoded datatype should have been closed\n");
         goto error;
     }
 
@@ -6499,23 +6499,23 @@ test_encode(void)
     /* Close datatype and file */
     if (H5Tclose(tid1) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
     if (H5Tclose(tid2) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
     if (H5Tclose(tid3) < 0) {
         H5_FAILED();
-        HDprintf("Can't close datatype\n");
+        printf("Can't close datatype\n");
         goto error;
     }
 
     if (H5Fclose(file) < 0) {
         H5_FAILED();
-        HDprintf("Can't close file\n");
+        printf("Can't close file\n");
         goto error;
     }
 
@@ -8889,12 +8889,12 @@ main(void)
     fapl = h5_fileaccess();
 
     if (h5_using_parallel_driver(fapl, &driver_is_parallel) < 0) {
-        HDprintf("Can't check if driver is parallel-enabled\n");
+        printf("Can't check if driver is parallel-enabled\n");
         HDexit(EXIT_FAILURE);
     }
 
     if (ALIGNMENT)
-        HDprintf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT);
+        printf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT);
 
     /* Do the tests */
     nerrors += test_classes();
@@ -8962,11 +8962,11 @@ main(void)
     nerrors += test_versionbounds();
 
     if (nerrors) {
-        HDprintf("***** %lu FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
+        printf("***** %lu FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
         HDexit(EXIT_FAILURE);
     }
 
-    HDprintf("All datatype tests passed.\n");
+    printf("All datatype tests passed.\n");
 
     return 0;
 }
diff --git a/test/earray.c b/test/earray.c
index 0ce1b32..c3c86da 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -331,64 +331,62 @@ check_stats(const H5EA_t *ea, const earray_state_t *state)
 
     /* Compare information */
     if (earray_stats.stored.max_idx_set != state->max_idx_set) {
-        HDfprintf(stdout,
-                  "earray_stats.stored.max_idx_set = %" PRIuHSIZE ", state->max_idx_set = %" PRIuHSIZE "\n",
-                  earray_stats.stored.max_idx_set, state->max_idx_set);
+        fprintf(stdout,
+                "earray_stats.stored.max_idx_set = %" PRIuHSIZE ", state->max_idx_set = %" PRIuHSIZE "\n",
+                earray_stats.stored.max_idx_set, state->max_idx_set);
         TEST_ERROR;
     } /* end if */
     if (earray_stats.stored.nelmts != state->nelmts) {
-        HDfprintf(stdout, "earray_stats.stored.nelmts = %" PRIuHSIZE ", state->nelmts = %" PRIuHSIZE "\n",
-                  earray_stats.stored.nelmts, state->nelmts);
+        fprintf(stdout, "earray_stats.stored.nelmts = %" PRIuHSIZE ", state->nelmts = %" PRIuHSIZE "\n",
+                earray_stats.stored.nelmts, state->nelmts);
         TEST_ERROR;
     } /* end if */
     if (earray_stats.computed.hdr_size != state->hdr_size) {
-        HDfprintf(stdout,
-                  "earray_stats.computed.hdr_size = %" PRIuHSIZE ", state->hdr_size = %" PRIuHSIZE "\n",
-                  earray_stats.computed.hdr_size, state->hdr_size);
+        fprintf(stdout, "earray_stats.computed.hdr_size = %" PRIuHSIZE ", state->hdr_size = %" PRIuHSIZE "\n",
+                earray_stats.computed.hdr_size, state->hdr_size);
         TEST_ERROR;
     } /* end if */
     if (earray_stats.computed.nindex_blks != state->nindex_blks) {
-        HDfprintf(stdout,
-                  "earray_stats.computed.nindex_blks = %" PRIuHSIZE ", state->nindex_blks = %" PRIuHSIZE "\n",
-                  earray_stats.computed.nindex_blks, state->nindex_blks);
+        fprintf(stdout,
+                "earray_stats.computed.nindex_blks = %" PRIuHSIZE ", state->nindex_blks = %" PRIuHSIZE "\n",
+                earray_stats.computed.nindex_blks, state->nindex_blks);
         TEST_ERROR;
     } /* end if */
     if (earray_stats.computed.index_blk_size != state->index_blk_size) {
-        HDfprintf(stdout,
-                  "earray_stats.computed.index_blk_size = %" PRIuHSIZE ", state->index_blk_size = %" PRIuHSIZE
-                  "\n",
-                  earray_stats.computed.index_blk_size, state->index_blk_size);
+        fprintf(stdout,
+                "earray_stats.computed.index_blk_size = %" PRIuHSIZE ", state->index_blk_size = %" PRIuHSIZE
+                "\n",
+                earray_stats.computed.index_blk_size, state->index_blk_size);
         TEST_ERROR;
     } /* end if */
     if (earray_stats.stored.ndata_blks != state->ndata_blks) {
-        HDfprintf(stdout,
-                  "earray_stats.stored.ndata_blks = %" PRIuHSIZE ", state->ndata_blks = %" PRIuHSIZE "\n",
-                  earray_stats.stored.ndata_blks, state->ndata_blks);
+        fprintf(stdout,
+                "earray_stats.stored.ndata_blks = %" PRIuHSIZE ", state->ndata_blks = %" PRIuHSIZE "\n",
+                earray_stats.stored.ndata_blks, state->ndata_blks);
         TEST_ERROR;
     } /* end if */
 /* Don't compare this currently, it's very hard to compute */
 #ifdef NOT_YET
     if (earray_stats.stored.data_blk_size != state->data_blk_size) {
-        HDfprintf(stdout,
-                  "earray_stats.stored.data_blk_size = %" PRIuHSIZE ", state->data_blk_size = %" PRIuHSIZE
-                  "\n",
-                  earray_stats.stored.data_blk_size, state->data_blk_size);
+        fprintf(stdout,
+                "earray_stats.stored.data_blk_size = %" PRIuHSIZE ", state->data_blk_size = %" PRIuHSIZE "\n",
+                earray_stats.stored.data_blk_size, state->data_blk_size);
         TEST_ERROR;
     }  /* end if */
 #endif /* NOT_YET */
     if (earray_stats.stored.nsuper_blks != state->nsuper_blks) {
-        HDfprintf(stdout,
-                  "earray_stats.stored.nsuper_blks = %" PRIuHSIZE ", state->nsuper_blks = %" PRIuHSIZE "\n",
-                  earray_stats.stored.nsuper_blks, state->nsuper_blks);
+        fprintf(stdout,
+                "earray_stats.stored.nsuper_blks = %" PRIuHSIZE ", state->nsuper_blks = %" PRIuHSIZE "\n",
+                earray_stats.stored.nsuper_blks, state->nsuper_blks);
         TEST_ERROR;
     } /* end if */
 /* Don't compare this currently, it's very hard to compute */
 #ifdef NOT_YET
     if (earray_stats.stored.super_blk_size != state->super_blk_size) {
-        HDfprintf(stdout,
-                  "earray_stats.stored.super_blk_size = %" PRIuHSIZE ", state->super_blk_size = %" PRIuHSIZE
-                  "\n",
-                  earray_stats.stored.super_blk_size, state->super_blk_size);
+        fprintf(stdout,
+                "earray_stats.stored.super_blk_size = %" PRIuHSIZE ", state->super_blk_size = %" PRIuHSIZE
+                "\n",
+                earray_stats.stored.super_blk_size, state->super_blk_size);
         TEST_ERROR;
     }  /* end if */
 #endif /* NOT_YET */
@@ -2419,7 +2417,7 @@ main(void)
     fapl        = h5_fileaccess();
     ExpressMode = GetTestExpress();
     if (ExpressMode > 1)
-        HDprintf("***Express test mode on.  Some tests may be skipped\n");
+        printf("***Express test mode on.  Some tests may be skipped\n");
 
     /* Set the filename to use for this test (dependent on fapl) */
     h5_fixname(FILENAME[0], fapl, filename_g, sizeof(filename_g));
diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c
index 55c80fb..6ace51c 100644
--- a/test/enc_dec_plist.c
+++ b/test/enc_dec_plist.c
@@ -192,7 +192,7 @@ main(void)
             HDputs(msg);
 
             if (VERBOSE_MED)
-                HDprintf("Encode/Decode DCPLs\n");
+                printf("Encode/Decode DCPLs\n");
 
             /******* ENCODE/DECODE DCPLS *****/
             TESTING("Default DCPL Encoding/Decoding");
@@ -242,7 +242,7 @@ main(void)
             /******* ENCODE/DECODE DCPLS *****/
             TESTING("DCPL Encoding/Decoding for virtual layout");
             if (high < H5F_LIBVER_V110)
-                HDprintf(" SKIPPED: virtual layout not supported yet\n");
+                printf(" SKIPPED: virtual layout not supported yet\n");
 
             else {
                 if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
@@ -679,6 +679,6 @@ main(void)
     return 0;
 
 error:
-    HDprintf("***** Plist Encode/Decode tests FAILED! *****\n");
+    printf("***** Plist Encode/Decode tests FAILED! *****\n");
     return 1;
 }
diff --git a/test/enc_dec_plist_cross_platform.c b/test/enc_dec_plist_cross_platform.c
index 8aac862..7092dc4 100644
--- a/test/enc_dec_plist_cross_platform.c
+++ b/test/enc_dec_plist_cross_platform.c
@@ -27,7 +27,7 @@ int
 main(void)
 {
     if (VERBOSE_MED)
-        HDprintf("Encode/Decode property list endianness\n");
+        printf("Encode/Decode property list endianness\n");
 
     /******* ENCODE/DECODE DCPLS *****/
     TESTING("Default DCPL Encoding/Decoding");
@@ -224,6 +224,6 @@ test_plists(const char *filename_prefix)
     return 1;
 
 error:
-    HDprintf("***** Plist Encode/Decode tests FAILED! *****\n");
+    printf("***** Plist Encode/Decode tests FAILED! *****\n");
     return -1;
 }
diff --git a/test/enum.c b/test/enum.c
index 0798e6c..4b8d7c7 100644
--- a/test/enum.c
+++ b/test/enum.c
@@ -185,8 +185,8 @@ test_conv(hid_t file)
     for (i = 0; i < ds_size; i++)
         if (data1[i] != data2[i]) {
             H5_FAILED();
-            HDprintf("    1. data1[%zu]=%d, data2[%zu]=%d (should be same)\n", i, (int)data1[i], i,
-                     (int)data2[i]);
+            printf("    1. data1[%zu]=%d, data2[%zu]=%d (should be same)\n", i, (int)data1[i], i,
+                   (int)data2[i]);
             goto error;
         }
 
@@ -197,8 +197,8 @@ test_conv(hid_t file)
     for (i = 0; i < ds_size; i++)
         if ((int)data1[i] != (int)data_short[i]) {
             H5_FAILED();
-            HDprintf("    2. data1[%zu]=%d, data_short[%zu]=%d (should be same)\n", i, (int)data1[i], i,
-                     (int)data_short[i]);
+            printf("    2. data1[%zu]=%d, data_short[%zu]=%d (should be same)\n", i, (int)data1[i], i,
+                   (int)data_short[i]);
             goto error;
         }
 
@@ -209,8 +209,8 @@ test_conv(hid_t file)
     for (i = 0; i < ds_size; i++)
         if ((int)data1[i] != (int)data_double[i]) {
             H5_FAILED();
-            HDprintf("    3. data1[%zu]=%d, data_double[%zu]=%d (should be same)\n", i, (int)data1[i], i,
-                     (int)data_double[i]);
+            printf("    3. data1[%zu]=%d, data_double[%zu]=%d (should be same)\n", i, (int)data1[i], i,
+                   (int)data_double[i]);
             goto error;
         }
 
@@ -235,8 +235,8 @@ test_conv(hid_t file)
     for (i = 0; i < ds_size; i++)
         if ((int)data1[i] != data_int[i]) {
             H5_FAILED();
-            HDprintf("    4. data1[%zu]=%d, data_int[%zu]=%d (should be same)\n", i, (int)data1[i], i,
-                     data_int[i]);
+            printf("    4. data1[%zu]=%d, data_int[%zu]=%d (should be same)\n", i, (int)data1[i], i,
+                   data_int[i]);
             goto error;
         }
 
@@ -261,8 +261,8 @@ test_conv(hid_t file)
     for (i = 0; i < ds_size; i++)
         if ((int)data1[i] != (int)data_double[i]) {
             H5_FAILED();
-            HDprintf("    5. data1[%zu]=%d, data_double[%zu]=%d (should be same)\n", i, (int)data1[i], i,
-                     (int)data_double[i]);
+            printf("    5. data1[%zu]=%d, data_double[%zu]=%d (should be same)\n", i, (int)data1[i], i,
+                   (int)data_double[i]);
             goto error;
         }
 
@@ -360,8 +360,7 @@ test_tr1(hid_t file)
     for (size_t i = 0; i < ds_size; i++)
         if (data1[i] != data2[i]) {
             H5_FAILED();
-            HDprintf("    data1[%zu]=%d, data2[%zu]=%d (should be same)\n", i, (int)data1[i], i,
-                     (int)data2[i]);
+            printf("    data1[%zu]=%d, data2[%zu]=%d (should be same)\n", i, (int)data1[i], i, (int)data2[i]);
             goto error;
         }
 
@@ -461,8 +460,7 @@ test_tr2(hid_t file)
     for (i = 0; i < ds_size; i++)
         if (data1[i] != data2[i]) {
             H5_FAILED();
-            HDprintf("    data1[%zu]=%d, data2[%zu]=%d (should be same)\n", i, (int)data1[i], i,
-                     (int)data2[i]);
+            printf("    data1[%zu]=%d, data2[%zu]=%d (should be same)\n", i, (int)data1[i], i, (int)data2[i]);
             goto error;
         }
 
@@ -567,7 +565,7 @@ test_value_dsnt_exist(void)
         H5E_END_TRY;
         if (ret >= 0) {
             H5_FAILED();
-            HDprintf("Bad value: %d -- ", BAD_VALUES[i]);
+            printf("Bad value: %d -- ", BAD_VALUES[i]);
             PUTS_ERROR("H5Tenum_nameof should not pass with a non-existing value");
         }
     }
@@ -581,7 +579,7 @@ test_value_dsnt_exist(void)
         H5E_END_TRY;
         if (ret >= 0) {
             H5_FAILED();
-            HDprintf("Bad name: %s -- ", BAD_NAMES[i]);
+            printf("Bad name: %s -- ", BAD_NAMES[i]);
             PUTS_ERROR("H5Tenum_valueof should not pass with a non-existing name");
         }
     }
diff --git a/test/err_compat.c b/test/err_compat.c
index b550b84..4285b05 100644
--- a/test/err_compat.c
+++ b/test/err_compat.c
@@ -22,7 +22,7 @@
 int
 main(void)
 {
-    HDprintf("Test skipped because backward compatibility with v1.6 is NOT configured in\n");
+    printf("Test skipped because backward compatibility with v1.6 is NOT configured in\n");
     return 0;
 }
 #else /* H5_NO_DEPRECATED_SYMBOLS */
@@ -60,7 +60,7 @@ static herr_t
 user_print1(FILE *stream)
 {
     /* Customized way to print errors */
-    HDfprintf(stderr, "\n********* Print error stack in customized way *********\n");
+    fprintf(stderr, "\n********* Print error stack in customized way *********\n");
     if (H5Ewalk1(H5E_WALK_UPWARD, (H5E_walk1_t)custom_print_cb1, stream) < 0)
         TEST_ERROR;
 
@@ -88,7 +88,7 @@ static herr_t
 user_print2(hid_t err_stack, FILE *stream)
 {
     /* Customized way to print errors */
-    HDfprintf(stderr, "\n********* Print error stack in customized way *********\n");
+    fprintf(stderr, "\n********* Print error stack in customized way *********\n");
     if (H5Ewalk2(err_stack, H5E_WALK_UPWARD, (H5E_walk2_t)custom_print_cb2, stream) < 0)
         TEST_ERROR;
 
@@ -125,11 +125,11 @@ custom_print_cb1(int n, H5E_error1_t *err_desc, void *client_data)
     if (NULL == (maj = H5Eget_major(err_desc->maj_num)))
         TEST_ERROR;
 
-    HDfprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name,
-              err_desc->func_name, err_desc->line);
+    fprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name,
+            err_desc->func_name, err_desc->line);
 
-    HDfprintf(stream, "%*smajor: %s\n", indent * 2, "", maj);
-    HDfprintf(stream, "%*sminor: %s\n", indent * 2, "", min);
+    fprintf(stream, "%*smajor: %s\n", indent * 2, "", maj);
+    fprintf(stream, "%*sminor: %s\n", indent * 2, "", min);
 
     H5free_memory(maj);
     H5free_memory(min);
@@ -172,11 +172,11 @@ custom_print_cb2(int n, H5E_error2_t *err_desc, void *client_data)
     if (NULL == (maj = H5Eget_major(err_desc->maj_num)))
         TEST_ERROR;
 
-    HDfprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name,
-              err_desc->func_name, err_desc->line);
+    fprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name,
+            err_desc->func_name, err_desc->line);
 
-    HDfprintf(stream, "%*smajor: %s\n", indent * 2, "", maj);
-    HDfprintf(stream, "%*sminor: %s\n", indent * 2, "", min);
+    fprintf(stream, "%*smajor: %s\n", indent * 2, "", maj);
+    fprintf(stream, "%*sminor: %s\n", indent * 2, "", min);
 
     H5free_memory(maj);
     H5free_memory(min);
@@ -218,7 +218,7 @@ test_error_compat(void)
     TESTING("error API H5Eset/get_auto");
 
     /* Add a newline and flush so the output file looks nicer */
-    HDprintf("\n");
+    printf("\n");
     HDfflush(stdout);
 
     /* Create the dataspace */
@@ -351,7 +351,7 @@ test_h5epush1(hid_t file)
     TESTING("error API based on data I/O");
 
     /* Add a newline and flush so the output file looks nicer */
-    HDprintf("\n");
+    printf("\n");
     HDfflush(stdout);
 
     /* Create the dataspace */
@@ -430,12 +430,12 @@ static herr_t
 dump_error(void)
 {
     /* Print errors in library default way */
-    HDfprintf(stderr, "********* Print error stack in HDF5 default way *********\n");
+    fprintf(stderr, "********* Print error stack in HDF5 default way *********\n");
     if (H5Eprint1(stderr) < 0)
         TEST_ERROR;
 
     /* Customized way to print errors */
-    HDfprintf(stderr, "\n********* Print error stack in customized way *********\n");
+    fprintf(stderr, "\n********* Print error stack in customized way *********\n");
     if (H5Ewalk1(H5E_WALK_UPWARD, custom_print_cb1, stderr) < 0)
         TEST_ERROR;
 
@@ -464,8 +464,8 @@ main(void)
     const char *FUNC_main = "main";
     int         i;
 
-    HDfprintf(stderr, "   This program tests the Error API compatible with HDF5 v1.6.  There are supposed to "
-                      "be some error messages\n");
+    fprintf(stderr, "   This program tests the Error API compatible with HDF5 v1.6.  There are supposed to "
+                    "be some error messages\n");
     fapl_id = h5_fileaccess();
 
     /* Set up data arrays */
@@ -523,7 +523,7 @@ main(void)
     HDfree(icheck2);
     HDfree(icheck2_data);
 
-    HDprintf("All error API tests passed.\n");
+    printf("All error API tests passed.\n");
     return EXIT_SUCCESS;
 
 error:
@@ -539,7 +539,7 @@ error:
     }
     H5E_END_TRY
 
-    HDprintf("***** ERROR TEST FAILED! *****\n");
+    printf("***** ERROR TEST FAILED! *****\n");
     return EXIT_FAILURE;
 }
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
diff --git a/test/error_test.c b/test/error_test.c
index 97802a3..5578af4 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -23,7 +23,7 @@
 int
 main(void)
 {
-    HDfprintf(stderr, "Test skipped because backward compatibility with v1.6 is configured in\n");
+    fprintf(stderr, "Test skipped because backward compatibility with v1.6 is configured in\n");
     return 0;
 }
 #else /* H5_USE_16_API */
@@ -100,7 +100,7 @@ test_error(hid_t file)
     H5E_auto2_t old_func;
     void       *old_data = NULL;
 
-    HDfprintf(stderr, "\nTesting error API based on data I/O\n");
+    fprintf(stderr, "\nTesting error API based on data I/O\n");
 
     /* Create the data space */
     dims[0] = DIM0;
@@ -390,12 +390,12 @@ static herr_t
 dump_error(hid_t estack)
 {
     /* Print errors in library default way */
-    HDfprintf(stderr, "********* Print error stack in HDF5 default way *********\n");
+    fprintf(stderr, "********* Print error stack in HDF5 default way *********\n");
     if (H5Eprint2(estack, stderr) < 0)
         TEST_ERROR;
 
     /* Customized way to print errors */
-    HDfprintf(stderr, "\n********* Print error stack in customized way *********\n");
+    fprintf(stderr, "\n********* Print error stack in customized way *********\n");
     if (H5Ewalk2(estack, H5E_WALK_UPWARD, custom_print_cb, stderr) < 0)
         TEST_ERROR;
 
@@ -434,11 +434,11 @@ custom_print_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
     if (H5Eget_msg(err_desc->min_num, NULL, min, MSG_SIZE) < 0)
         TEST_ERROR;
 
-    HDfprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name,
-              err_desc->func_name, err_desc->line);
-    HDfprintf(stream, "%*sclass: %s\n", indent * 2, "", cls);
-    HDfprintf(stream, "%*smajor: %s\n", indent * 2, "", maj);
-    HDfprintf(stream, "%*sminor: %s\n", indent * 2, "", min);
+    fprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name,
+            err_desc->func_name, err_desc->line);
+    fprintf(stream, "%*sclass: %s\n", indent * 2, "", cls);
+    fprintf(stream, "%*smajor: %s\n", indent * 2, "", maj);
+    fprintf(stream, "%*sminor: %s\n", indent * 2, "", min);
 
     return 0;
 
@@ -744,7 +744,7 @@ test_filter_error(const char *fname, hid_t fapl)
     hid_t       dataset  = -1;
     int         buf[20];
 
-    HDfprintf(stderr, "\nTesting error message during data reading when filter isn't registered\n");
+    fprintf(stderr, "\nTesting error message during data reading when filter isn't registered\n");
 
     /* Open the file */
     if ((file = H5Fopen(pathname, H5F_ACC_RDONLY, fapl)) < 0)
@@ -793,7 +793,7 @@ main(void)
     if (env_h5_drvr == NULL)
         env_h5_drvr = "nomatch";
 
-    HDfprintf(stderr, "   This program tests the Error API.  There're supposed to be some error messages\n");
+    fprintf(stderr, "   This program tests the Error API.  There're supposed to be some error messages\n");
 
     /* Initialize errors */
     if (init_error() < 0)
@@ -900,7 +900,7 @@ main(void)
     HDfree(icheck2);
     HDfree(icheck2_data);
 
-    HDfprintf(stderr, "\nAll error API tests passed.\n");
+    fprintf(stderr, "\nAll error API tests passed.\n");
     return 0;
 
 error:
@@ -909,7 +909,7 @@ error:
     HDfree(icheck2);
     HDfree(icheck2_data);
 
-    HDfprintf(stderr, "\n***** ERROR TEST FAILED (real problem)! *****\n");
+    fprintf(stderr, "\n***** ERROR TEST FAILED (real problem)! *****\n");
     return 1;
 }
 #endif /* H5_USE_16_API */
diff --git a/test/evict_on_close.c b/test/evict_on_close.c
index 07efc98..af87c37 100644
--- a/test/evict_on_close.c
+++ b/test/evict_on_close.c
@@ -601,10 +601,10 @@ check_group_layout(hid_t fid, const char *group_name)
     before = file_ptr->shared->cache->index_len;
 
 #ifdef EOC_MANUAL_INSPECTION
-    HDprintf("\nCACHE BEFORE GROUP OPEN:\n");
+    printf("\nCACHE BEFORE GROUP OPEN:\n");
     if (H5AC_dump_cache(file_ptr) < 0)
         TEST_ERROR;
-    HDprintf("NUMBER OF CACHE ENTRIES: %u\n", before);
+    printf("NUMBER OF CACHE ENTRIES: %u\n", before);
 #endif
 
     /* Open the main group and get its tag */
@@ -641,11 +641,11 @@ check_group_layout(hid_t fid, const char *group_name)
     during = file_ptr->shared->cache->index_len;
 
 #ifdef EOC_MANUAL_INSPECTION
-    HDprintf("\nCACHE AFTER OPENING GROUPS (WHILE OPEN):\n");
+    printf("\nCACHE AFTER OPENING GROUPS (WHILE OPEN):\n");
     if (H5AC_dump_cache(file_ptr) < 0)
         TEST_ERROR;
-    HDprintf("MAIN GROUP TAG: %#X\n", tag1);
-    HDprintf("NUMBER OF CACHE ENTRIES: %u\n", during);
+    printf("MAIN GROUP TAG: %#X\n", tag1);
+    printf("NUMBER OF CACHE ENTRIES: %u\n", during);
 #endif
 
     /* Close the main group */
@@ -656,10 +656,10 @@ check_group_layout(hid_t fid, const char *group_name)
     after = file_ptr->shared->cache->index_len;
 
 #ifdef EOC_MANUAL_INSPECTION
-    HDprintf("\nCACHE AFTER CLOSING GROUPS:\n");
+    printf("\nCACHE AFTER CLOSING GROUPS:\n");
     if (H5AC_dump_cache(file_ptr) < 0)
         TEST_ERROR;
-    HDprintf("NUMBER OF CACHE ENTRIES: %u\n", after);
+    printf("NUMBER OF CACHE ENTRIES: %u\n", after);
 #endif
 
     /* Ensure that the cache does not contain entries with the tag */
@@ -719,10 +719,10 @@ check_dset_scheme(hid_t fid, const char *dset_name)
     before = file_ptr->shared->cache->index_len;
 
 #ifdef EOC_MANUAL_INSPECTION
-    HDprintf("\nCACHE BEFORE DATASET OPEN:\n");
+    printf("\nCACHE BEFORE DATASET OPEN:\n");
     if (H5AC_dump_cache(file_ptr) < 0)
         TEST_ERROR;
-    HDprintf("NUMBER OF CACHE ENTRIES: %u\n", before);
+    printf("NUMBER OF CACHE ENTRIES: %u\n", before);
 #endif
 
     /* Open dataset and get the metadata tag */
@@ -742,11 +742,11 @@ check_dset_scheme(hid_t fid, const char *dset_name)
     during = file_ptr->shared->cache->index_len;
 
 #ifdef EOC_MANUAL_INSPECTION
-    HDprintf("\nCACHE AFTER DATA READ (WHILE OPEN):\n");
+    printf("\nCACHE AFTER DATA READ (WHILE OPEN):\n");
     if (H5AC_dump_cache(file_ptr) < 0)
         TEST_ERROR;
-    HDprintf("TAG: %#X\n", tag);
-    HDprintf("NUMBER OF CACHE ENTRIES: %u\n", during);
+    printf("TAG: %#X\n", tag);
+    printf("NUMBER OF CACHE ENTRIES: %u\n", during);
 #endif
 
     /* Close the dataset */
@@ -757,10 +757,10 @@ check_dset_scheme(hid_t fid, const char *dset_name)
     after = file_ptr->shared->cache->index_len;
 
 #ifdef EOC_MANUAL_INSPECTION
-    HDprintf("\nCACHE AFTER DATASET CLOSE:\n");
+    printf("\nCACHE AFTER DATASET CLOSE:\n");
     if (H5AC_dump_cache(file_ptr) < 0)
         TEST_ERROR;
-    HDprintf("NUMBER OF CACHE ENTRIES: %u\n", after);
+    printf("NUMBER OF CACHE ENTRIES: %u\n", after);
 #endif
 
     /* Ensure that the cache does not contain entries with the tag */
@@ -887,7 +887,7 @@ main(void)
     hid_t    fid     = -1; /* file ID                              */
     unsigned nerrors = 0;  /* number of test errors                */
 
-    HDprintf("Testing evict-on-close cache behavior\n");
+    printf("Testing evict-on-close cache behavior\n");
 
     /* Initialize */
     h5_reset();
@@ -955,13 +955,13 @@ main(void)
     if (nerrors)
         goto error;
 
-    HDprintf("All evict-on-close tests passed.\n");
+    printf("All evict-on-close tests passed.\n");
 
     HDexit(EXIT_SUCCESS);
 
 error:
 
-    HDprintf("***** %u evict-on-close test%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+    printf("***** %u evict-on-close test%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
 
     h5_delete_all_test_files(FILENAMES, fapl_id);
     H5E_BEGIN_TRY
@@ -1035,7 +1035,7 @@ main(void)
 {
     unsigned nerrors = 0; /* number of test errors                */
 
-    HDprintf("Testing evict-on-close cache behavior\n");
+    printf("Testing evict-on-close cache behavior\n");
 
     /* Initialize */
     h5_reset();
@@ -1046,14 +1046,14 @@ main(void)
     if (nerrors)
         goto error;
 
-    HDprintf("All evict-on-close tests passed.\n");
-    HDprintf("Note that EoC is not supported under parallel so most tests are skipped.\n");
+    printf("All evict-on-close tests passed.\n");
+    printf("Note that EoC is not supported under parallel so most tests are skipped.\n");
 
     HDexit(EXIT_SUCCESS);
 
 error:
 
-    HDprintf("***** %u evict-on-close test%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+    printf("***** %u evict-on-close test%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
 
     HDexit(EXIT_FAILURE);
 
diff --git a/test/extend.c b/test/extend.c
index f4ce116..5735266 100644
--- a/test/extend.c
+++ b/test/extend.c
@@ -115,10 +115,10 @@ write_data(const char *msg, hid_t file, const char *name, hid_t cparms, hid_t me
             for (k = 0; k < N2X; k++)
                 for (m = 0; m < N2Y; m++)
                     if (buf2[k][m] != buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]) {
-                        HDprintf("    i=%d, j=%d, k=%d, m=%d\n", i, j, k, m);
-                        HDprintf("    buf2[%d][%d]=%d\n", k, m, buf2[k][m]);
-                        HDprintf("    buf1[%d][%d]=%d\n", (i % 2) * N2X + k, (j % 2) * N2Y + m,
-                                 buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]);
+                        printf("    i=%d, j=%d, k=%d, m=%d\n", i, j, k, m);
+                        printf("    buf2[%d][%d]=%d\n", k, m, buf2[k][m]);
+                        printf("    buf1[%d][%d]=%d\n", (i % 2) * N2X + k, (j % 2) * N2Y + m,
+                               buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]);
                         TEST_ERROR;
                     } /* end if */
         }             /* end for */
@@ -218,10 +218,10 @@ write_data_deprec(const char *msg, hid_t file, const char *name, hid_t cparms, h
             for (k = 0; k < N2X; k++)
                 for (m = 0; m < N2Y; m++)
                     if (buf2[k][m] != buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]) {
-                        HDprintf("    i=%d, j=%d, k=%d, m=%d\n", i, j, k, m);
-                        HDprintf("    buf2[%d][%d]=%d\n", k, m, buf2[k][m]);
-                        HDprintf("    buf1[%d][%d]=%d\n", (i % 2) * N2X + k, (j % 2) * N2Y + m,
-                                 buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]);
+                        printf("    i=%d, j=%d, k=%d, m=%d\n", i, j, k, m);
+                        printf("    buf2[%d][%d]=%d\n", k, m, buf2[k][m]);
+                        printf("    buf1[%d][%d]=%d\n", (i % 2) * N2X + k, (j % 2) * N2Y + m,
+                               buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]);
                         TEST_ERROR;
                     } /* end if */
         }             /* end for */
@@ -338,11 +338,11 @@ main(void)
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
 
     if (nerrors) {
-        HDprintf("***** %d FAILURE%s! *****\n", nerrors, (1 == nerrors) ? "" : "S");
+        printf("***** %d FAILURE%s! *****\n", nerrors, (1 == nerrors) ? "" : "S");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
-    HDprintf("All extend tests passed.\n");
+    printf("All extend tests passed.\n");
     h5_cleanup(FILENAME, fapl);
 
     HDfree(buf1);
@@ -359,6 +359,6 @@ error:
     HDfree(buf2);
     HDfree(buf2_data);
 
-    HDprintf("*** One or more extend tests failed ***\n");
+    printf("*** One or more extend tests failed ***\n");
     HDexit(EXIT_FAILURE);
 } /* end main() */
diff --git a/test/external.c b/test/external.c
index bca7da1..04686fe 100644
--- a/test/external.c
+++ b/test/external.c
@@ -149,7 +149,7 @@ test_non_extendible(hid_t file)
     if (1 != n) {
         H5_FAILED();
         HDputs("    Returned external count is wrong.");
-        HDprintf("   got: %d\n    ans: 1\n", n);
+        printf("   got: %d\n    ans: 1\n", n);
         goto error;
     }
 
@@ -159,13 +159,13 @@ test_non_extendible(hid_t file)
     if (file_offset != 0) {
         H5_FAILED();
         HDputs("    Wrong file offset.");
-        HDprintf("    got: %lu\n    ans: 0\n", (unsigned long)file_offset);
+        printf("    got: %lu\n    ans: 0\n", (unsigned long)file_offset);
         goto error;
     }
     if (file_size != (max_size[0] * sizeof(int))) {
         H5_FAILED();
         HDputs("    Wrong file size.");
-        HDprintf("    got: %" PRIuHSIZE "\n    ans: %" PRIuHSIZE "\n", file_size, max_size[0] * sizeof(int));
+        printf("    got: %" PRIuHSIZE "\n    ans: %" PRIuHSIZE "\n", file_size, max_size[0] * sizeof(int));
         goto error;
     }
 
@@ -418,7 +418,7 @@ test_unlimited(hid_t file)
     if (1 != n) {
         H5_FAILED();
         HDputs("    Returned external count is wrong.");
-        HDprintf("    got: %d\n    ans: 1\n", n);
+        printf("    got: %d\n    ans: 1\n", n);
         goto error;
     } /* end if */
 
@@ -427,13 +427,13 @@ test_unlimited(hid_t file)
     if (file_offset != 0) {
         H5_FAILED();
         HDputs("    Wrong file offset.");
-        HDprintf("    got: %lu\n    ans: 0\n", (unsigned long)file_offset);
+        printf("    got: %lu\n    ans: 0\n", (unsigned long)file_offset);
         goto error;
     }
     if (H5F_UNLIMITED != file_size) {
         H5_FAILED();
         HDputs("    Wrong file size.");
-        HDprintf("    got: %lu\n    ans: INF\n", (unsigned long)file_size);
+        printf("    got: %lu\n    ans: INF\n", (unsigned long)file_size);
         goto error;
     }
 
@@ -482,12 +482,12 @@ add_external_files(hid_t dcpl_id, unsigned int n_external_files, off_t offset, h
     }
     for (i = 0; i < n_external_files; i++) {
         if (HDsnprintf(exname, AEF_EXNAME_MAX_LEN, "ext%d.data", i + 1) > AEF_EXNAME_MAX_LEN) {
-            HDfprintf(stderr, "External file %d overflows name buffer\n", i + 1);
+            fprintf(stderr, "External file %d overflows name buffer\n", i + 1);
             HDfflush(stderr);
             return -1;
         }
         if (H5Pset_external(dcpl_id, exname, offset, max_ext_size) < 0) {
-            HDfprintf(stderr, "Problem adding external file %s\n", exname);
+            fprintf(stderr, "Problem adding external file %s\n", exname);
             HDfflush(stderr);
             return -1;
         }
@@ -1527,6 +1527,6 @@ error:
     }
     H5E_END_TRY
     nerrors = MAX(1, nerrors);
-    HDprintf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s");
+    printf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s");
     return EXIT_FAILURE;
 } /* end main() */
diff --git a/test/external_env.c b/test/external_env.c
index b39358f..cef98bc 100644
--- a/test/external_env.c
+++ b/test/external_env.c
@@ -214,6 +214,6 @@ error:
     }
     H5E_END_TRY
     nerrors = MAX(1, nerrors);
-    HDprintf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s");
+    printf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s");
     return EXIT_FAILURE;
 } /* end main() */
diff --git a/test/farray.c b/test/farray.c
index 6a19e34..39cd014 100644
--- a/test/farray.c
+++ b/test/farray.c
@@ -177,20 +177,20 @@ check_stats(const H5FA_t *fa, const farray_state_t *state)
 
     /* Compare information */
     if (farray_stats.hdr_size != state->hdr_size) {
-        HDfprintf(stdout, "farray_stats.hdr_size = %" PRIuHSIZE ", state->hdr_size = %" PRIuHSIZE "\n",
-                  farray_stats.hdr_size, state->hdr_size);
+        fprintf(stdout, "farray_stats.hdr_size = %" PRIuHSIZE ", state->hdr_size = %" PRIuHSIZE "\n",
+                farray_stats.hdr_size, state->hdr_size);
         TEST_ERROR;
     }
 
     if (farray_stats.dblk_size != state->dblk_size) {
-        HDfprintf(stdout, "farray_stats.dblk_size = %" PRIuHSIZE ", state->dblk_size = %" PRIuHSIZE "\n",
-                  farray_stats.dblk_size, state->dblk_size);
+        fprintf(stdout, "farray_stats.dblk_size = %" PRIuHSIZE ", state->dblk_size = %" PRIuHSIZE "\n",
+                farray_stats.dblk_size, state->dblk_size);
         TEST_ERROR;
     }
 
     if (farray_stats.nelmts != state->nelmts) {
-        HDfprintf(stdout, "farray_stats.nelmts = %" PRIuHSIZE ", state->nelmts = %" PRIuHSIZE "\n",
-                  farray_stats.nelmts, state->nelmts);
+        fprintf(stdout, "farray_stats.nelmts = %" PRIuHSIZE ", state->nelmts = %" PRIuHSIZE "\n",
+                farray_stats.nelmts, state->nelmts);
         TEST_ERROR;
     }
 
@@ -1642,7 +1642,7 @@ main(void)
     fapl        = h5_fileaccess();
     ExpressMode = GetTestExpress();
     if (ExpressMode > 1)
-        HDprintf("***Express test mode on.  Some tests may be skipped\n");
+        printf("***Express test mode on.  Some tests may be skipped\n");
 
     /* Set the filename to use for this test (dependent on fapl) */
     h5_fixname(FILENAME[0], fapl, filename_g, sizeof(filename_g));
diff --git a/test/fheap.c b/test/fheap.c
index e9ce0a2..6aa3919 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -271,45 +271,45 @@ check_stats(const H5HF_t *fh, const fheap_heap_state_t *state)
     if (H5HF_stat_info(fh, &heap_stats) < 0)
         FAIL_STACK_ERROR;
     if (heap_stats.man_nobjs != state->man_nobjs) {
-        HDfprintf(stdout, "heap_stats.man_nobjs = %" PRIuHSIZE ", state->man_nobjs = %zu\n",
-                  heap_stats.man_nobjs, state->man_nobjs);
+        fprintf(stdout, "heap_stats.man_nobjs = %" PRIuHSIZE ", state->man_nobjs = %zu\n",
+                heap_stats.man_nobjs, state->man_nobjs);
         TEST_ERROR;
     } /* end if */
     if (heap_stats.man_size != state->man_size) {
-        HDfprintf(stdout, "heap_stats.man_size = %" PRIuHSIZE ", state->man_size = %" PRIuHSIZE "\n",
-                  heap_stats.man_size, state->man_size);
+        fprintf(stdout, "heap_stats.man_size = %" PRIuHSIZE ", state->man_size = %" PRIuHSIZE "\n",
+                heap_stats.man_size, state->man_size);
         TEST_ERROR;
     } /* end if */
     if (heap_stats.man_alloc_size != state->man_alloc_size) {
-        HDfprintf(stdout,
-                  "heap_stats.man_alloc_size = %" PRIuHSIZE ", state->man_alloc_size = %" PRIuHSIZE "\n",
-                  heap_stats.man_alloc_size, state->man_alloc_size);
+        fprintf(stdout,
+                "heap_stats.man_alloc_size = %" PRIuHSIZE ", state->man_alloc_size = %" PRIuHSIZE "\n",
+                heap_stats.man_alloc_size, state->man_alloc_size);
         TEST_ERROR;
     } /* end if */
     if (heap_stats.man_free_space != state->man_free_space) {
-        HDfprintf(stdout,
-                  "heap_stats.man_free_space = %" PRIuHSIZE ", state->man_free_space = %" PRIuHSIZE "\n",
-                  heap_stats.man_free_space, state->man_free_space);
+        fprintf(stdout,
+                "heap_stats.man_free_space = %" PRIuHSIZE ", state->man_free_space = %" PRIuHSIZE "\n",
+                heap_stats.man_free_space, state->man_free_space);
         TEST_ERROR;
     } /* end if */
     if (heap_stats.huge_nobjs != state->huge_nobjs) {
-        HDfprintf(stdout, "heap_stats.huge_nobjs = %" PRIuHSIZE ", state->huge_nobjs = %zu\n",
-                  heap_stats.huge_nobjs, state->huge_nobjs);
+        fprintf(stdout, "heap_stats.huge_nobjs = %" PRIuHSIZE ", state->huge_nobjs = %zu\n",
+                heap_stats.huge_nobjs, state->huge_nobjs);
         TEST_ERROR;
     } /* end if */
     if (heap_stats.huge_size != state->huge_size) {
-        HDfprintf(stdout, "heap_stats.huge_size = %" PRIuHSIZE ", state->huge_size = %" PRIuHSIZE "\n",
-                  heap_stats.huge_size, state->huge_size);
+        fprintf(stdout, "heap_stats.huge_size = %" PRIuHSIZE ", state->huge_size = %" PRIuHSIZE "\n",
+                heap_stats.huge_size, state->huge_size);
         TEST_ERROR;
     } /* end if */
     if (heap_stats.tiny_nobjs != state->tiny_nobjs) {
-        HDfprintf(stdout, "heap_stats.tiny_nobjs = %" PRIuHSIZE ", state->tiny_nobjs = %zu\n",
-                  heap_stats.tiny_nobjs, state->tiny_nobjs);
+        fprintf(stdout, "heap_stats.tiny_nobjs = %" PRIuHSIZE ", state->tiny_nobjs = %zu\n",
+                heap_stats.tiny_nobjs, state->tiny_nobjs);
         TEST_ERROR;
     } /* end if */
     if (heap_stats.tiny_size != state->tiny_size) {
-        HDfprintf(stdout, "heap_stats.tiny_size = %" PRIuHSIZE ", state->tiny_size = %" PRIuHSIZE "\n",
-                  heap_stats.tiny_size, state->tiny_size);
+        fprintf(stdout, "heap_stats.tiny_size = %" PRIuHSIZE ", state->tiny_size = %" PRIuHSIZE "\n",
+                heap_stats.tiny_size, state->tiny_size);
         TEST_ERROR;
     } /* end if */
 
@@ -6438,7 +6438,7 @@ test_man_remove_bogus(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa
     seed = (unsigned long)HDtime(NULL);
 #if 0
 /* seed = (unsigned long)1155438845; */
-HDfprintf(stderr, "Random # seed was: %lu\n", seed);
+fprintf(stderr, "Random # seed was: %lu\n", seed);
 #endif
     HDsrandom((unsigned)seed);
 
@@ -6510,7 +6510,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
     return (0);
 
 error:
-    HDfprintf(stderr, "Random # seed was: %lu\n", seed);
+    fprintf(stderr, "Random # seed was: %lu\n", seed);
     H5E_BEGIN_TRY
     {
         if (fh)
@@ -15508,7 +15508,7 @@ test_random(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
     seed = (unsigned long)HDtime(NULL);
 #if 0
 /* seed = (unsigned long)1156158635; */
-HDfprintf(stderr, "Random # seed was: %lu\n", seed);
+fprintf(stderr, "Random # seed was: %lu\n", seed);
 #endif
     HDsrandom((unsigned)seed);
 
@@ -15608,7 +15608,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
     return (0);
 
 error:
-    HDfprintf(stderr, "Random # seed was: %lu\n", seed);
+    fprintf(stderr, "Random # seed was: %lu\n", seed);
     H5E_BEGIN_TRY
     {
         H5MM_xfree(keep_ids.ids);
@@ -15714,7 +15714,7 @@ test_random_pow2(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_te
     seed = (unsigned long)HDtime(NULL);
 #if 0
 /* seed = (unsigned long)1155181717; */
-HDfprintf(stderr, "Random # seed was: %lu\n", seed);
+fprintf(stderr, "Random # seed was: %lu\n", seed);
 #endif
     HDsrandom((unsigned)seed);
 
@@ -15826,7 +15826,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
     return (0);
 
 error:
-    HDfprintf(stderr, "Random # seed was: %lu\n", seed);
+    fprintf(stderr, "Random # seed was: %lu\n", seed);
     H5E_BEGIN_TRY
     {
         H5MM_xfree(keep_ids.ids);
@@ -16362,7 +16362,7 @@ main(void)
      *      in the future for parallel build.
      */
     if (ExpressMode > 1)
-        HDprintf("***Express test mode on.  Some tests may be skipped\n");
+        printf("***Express test mode on.  Some tests may be skipped\n");
     else if (ExpressMode == 0) {
 #ifdef H5_HAVE_PARALLEL
         num_pb_fs = NUM_PB_FS - 2;
@@ -16580,7 +16580,7 @@ main(void)
                      * level of complexity gradually. -QAK
                      */
                     if (ExpressMode > 1)
-                        HDprintf(
+                        printf(
                             "***Express test mode on.  test_man_start_5th_recursive_indirect is skipped\n");
                     else
                         nerrors += test_man_start_5th_recursive_indirect(fapl, &small_cparam, &tparam);
@@ -16628,7 +16628,7 @@ main(void)
                                 nerrors += test_man_remove_first_two_rows(fapl, &small_cparam, &tparam);
                                 nerrors += test_man_remove_first_four_rows(fapl, &small_cparam, &tparam);
                                 if (ExpressMode > 1)
-                                    HDprintf("***Express test mode on.  Some tests skipped\n");
+                                    printf("***Express test mode on.  Some tests skipped\n");
                                 else {
                                     nerrors += test_man_remove_all_root_direct(fapl, &small_cparam, &tparam);
                                     nerrors += test_man_remove_2nd_indirect(fapl, &small_cparam, &tparam);
@@ -16678,7 +16678,7 @@ main(void)
                                     test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped(
                                         fapl, &small_cparam, &tparam);
                                 if (ExpressMode > 1)
-                                    HDprintf("***Express test mode on.  Some tests skipped\n");
+                                    printf("***Express test mode on.  Some tests skipped\n");
                                 else {
                                     nerrors +=
                                         test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(
@@ -16808,7 +16808,7 @@ main(void)
 
             /* Random object insertion & deletion */
             if (ExpressMode > 1)
-                HDprintf("***Express test mode on.  Some tests skipped\n");
+                printf("***Express test mode on.  Some tests skipped\n");
             else {
                 /* Random tests using "small" heap creation parameters */
                 HDputs("Using 'small' heap creation parameters");
diff --git a/test/file_image.c b/test/file_image.c
index 60cd186..a43f176 100644
--- a/test/file_image.c
+++ b/test/file_image.c
@@ -1349,7 +1349,7 @@ main(void)
 
     h5_reset();
 
-    HDprintf("Testing File Image Functionality.\n");
+    printf("Testing File Image Functionality.\n");
 
     errors += test_properties();
     errors += test_callbacks();
@@ -1412,10 +1412,10 @@ main(void)
     h5_restore_err();
 
     if (errors) {
-        HDprintf("***** %d File Image TEST%s FAILED! *****\n", errors, errors > 1 ? "S" : "");
+        printf("***** %d File Image TEST%s FAILED! *****\n", errors, errors > 1 ? "S" : "");
         return 1;
     }
 
-    HDprintf("All File Image tests passed.\n");
+    printf("All File Image tests passed.\n");
     return 0;
 }
diff --git a/test/fillval.c b/test/fillval.c
index d701521..03815e4 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -610,8 +610,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
             goto error;
         if (rd_s != fill_s) {
             H5_FAILED();
-            HDprintf("    %d: Got a different fill value than what was set.", __LINE__);
-            HDprintf("    Got %d, set %d\n", rd_s, fill_s);
+            printf("    %d: Got a different fill value than what was set.", __LINE__);
+            printf("    Got %d, set %d\n", rd_s, fill_s);
             goto error;
         }
 #endif
@@ -630,8 +630,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
             goto error;
         if (rd_l != fill_l) {
             H5_FAILED();
-            HDprintf("    %d: Got a different fill value than what was set.", __LINE__);
-            HDprintf("    Got %ld, set %ld\n", rd_l, fill_l);
+            printf("    %d: Got a different fill value than what was set.", __LINE__);
+            printf("    Got %ld, set %ld\n", rd_l, fill_l);
             goto error;
         }
 #endif
@@ -650,8 +650,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
             goto error;
         if (rd_l != fill_l) {
             H5_FAILED();
-            HDprintf("    %d: Got a different fill value than what was set.", __LINE__);
-            HDprintf("    Got %ld, set %ld\n", rd_l, fill_l);
+            printf("    %d: Got a different fill value than what was set.", __LINE__);
+            printf("    Got %ld, set %ld\n", rd_l, fill_l);
             goto error;
         }
 #endif
@@ -662,12 +662,12 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if (alloc_time != H5D_ALLOC_TIME_LATE) {
             H5_FAILED();
             HDputs("    Got non-H5D_ALLOC_TIME_LATE space allocation time.");
-            HDprintf("    Got %d\n", alloc_time);
+            printf("    Got %d\n", alloc_time);
         }
         if (fill_time != H5D_FILL_TIME_ALLOC) {
             H5_FAILED();
             HDputs("    Got non-H5D_FILL_TIME_ALLOC fill value write time.");
-            HDprintf("    Got %d\n", fill_time);
+            printf("    Got %d\n", fill_time);
         }
         if (H5Dclose(dset3) < 0)
             goto error;
@@ -682,7 +682,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if (layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_NOT_ALLOCATED) {
             H5_FAILED();
             HDputs("    Got allocated space instead of unallocated.");
-            HDprintf("    Got %d\n", allocation);
+            printf("    Got %d\n", allocation);
             goto error;
         }
         if ((dcpl = H5Dget_create_plist(dset4)) < 0)
@@ -694,12 +694,12 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         if (alloc_time != H5D_ALLOC_TIME_LATE) {
             H5_FAILED();
             HDputs("    Got non-H5D_ALLOC_TIME_LATE space allocation time.");
-            HDprintf("    Got %d\n", alloc_time);
+            printf("    Got %d\n", alloc_time);
         }
         if (fill_time != H5D_FILL_TIME_NEVER) {
             H5_FAILED();
             HDputs("    Got non-H5D_FILL_TIME_NEVER fill value write time.");
-            HDprintf("    Got %d\n", fill_time);
+            printf("    Got %d\n", fill_time);
         }
         if (H5Dclose(dset4) < 0)
             goto error;
@@ -717,8 +717,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
             rd_c.z != '\0') {
             H5_FAILED();
             HDputs("    Got wrong fill value");
-            HDprintf("    Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n", (double)rd_c.a, rd_c.y,
-                     rd_c.x, rd_c.z);
+            printf("    Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n", (double)rd_c.a, rd_c.y, rd_c.x,
+                   rd_c.z);
         }
         if (H5Dclose(dset9) < 0)
             goto error;
@@ -737,8 +737,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         goto error;
     if (layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_ALLOCATED) {
         H5_FAILED();
-        HDprintf("    %d: Got unallocated space instead of allocated.\n", __LINE__);
-        HDprintf("    Got %d\n", allocation);
+        printf("    %d: Got unallocated space instead of allocated.\n", __LINE__);
+        printf("    Got %d\n", allocation);
         goto error;
     }
     if (H5Pget_alloc_time(dcpl, &alloc_time) < 0)
@@ -746,14 +746,14 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
     if (alloc_time != H5D_ALLOC_TIME_EARLY) {
         H5_FAILED();
         HDputs("    Got non-H5D_ALLOC_TIME_EARLY space allocation time.");
-        HDprintf("    Got %d\n", alloc_time);
+        printf("    Got %d\n", alloc_time);
     }
     if (H5Pget_fill_time(dcpl, &fill_time) < 0)
         goto error;
     if (fill_time != H5D_FILL_TIME_NEVER) {
         H5_FAILED();
         HDputs("    Got non-H5D_FILL_TIME_NEVER fill value write time.");
-        HDprintf("    Got %d\n", fill_time);
+        printf("    Got %d\n", fill_time);
     }
     if (H5Dclose(dset5) < 0)
         goto error;
@@ -769,16 +769,16 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         goto error;
     if (layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_ALLOCATED) {
         H5_FAILED();
-        HDprintf("    %d: Got unallocated space instead of allocated.\n", __LINE__);
-        HDprintf("    Got %d\n", allocation);
+        printf("    %d: Got unallocated space instead of allocated.\n", __LINE__);
+        printf("    Got %d\n", allocation);
         goto error;
     }
     if (H5Pget_fill_value(dcpl, H5T_NATIVE_LONG, &rd_l) < 0)
         goto error;
     if (rd_l != fill_l) {
         H5_FAILED();
-        HDprintf("    %d: Got a different fill value than what was set.", __LINE__);
-        HDprintf("    Got %ld, set %ld\n", rd_l, fill_l);
+        printf("    %d: Got a different fill value than what was set.", __LINE__);
+        printf("    Got %ld, set %ld\n", rd_l, fill_l);
         goto error;
     }
     if (H5Pget_alloc_time(dcpl, &alloc_time) < 0)
@@ -786,14 +786,14 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
     if (alloc_time != H5D_ALLOC_TIME_EARLY) {
         H5_FAILED();
         HDputs("    Got non-H5D_ALLOC_TIME_EARLY space allocation time.");
-        HDprintf("    Got %d\n", alloc_time);
+        printf("    Got %d\n", alloc_time);
     }
     if (H5Pget_fill_time(dcpl, &fill_time) < 0)
         goto error;
     if (fill_time != H5D_FILL_TIME_ALLOC) {
         H5_FAILED();
         HDputs("    Got non-H5D_FILL_TIME_ALLOC fill value write time.");
-        HDprintf("    Got %d\n", fill_time);
+        printf("    Got %d\n", fill_time);
     }
     if (H5Dclose(dset6) < 0)
         goto error;
@@ -811,8 +811,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout)
         rd_c.z != '\0') {
         H5_FAILED();
         HDputs("    Got wrong fill value");
-        HDprintf("    Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n", (double)rd_c.a, rd_c.y, rd_c.x,
-                 rd_c.z);
+        printf("    Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n", (double)rd_c.a, rd_c.y, rd_c.x,
+               rd_c.z);
     }
     if (H5Dclose(dset8) < 0)
         goto error;
@@ -920,13 +920,13 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f
                 goto error;
             if (fill_time != H5D_FILL_TIME_NEVER && val_rd != fillval) {
                 H5_FAILED();
-                HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
-                HDfprintf(stdout,
-                          "    Elmt={%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE
-                          "}, read: %u, "
-                          "Fill value: %u\n",
-                          hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], val_rd,
-                          fillval);
+                fprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
+                fprintf(stdout,
+                        "    Elmt={%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE
+                        "}, read: %u, "
+                        "Fill value: %u\n",
+                        hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], val_rd,
+                        fillval);
                 goto error;
             }
             /* case for compound datatype */
@@ -938,14 +938,13 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f
                 (!H5_FLT_ABS_EQUAL(rd_c.a, fill_c.a) || rd_c.x != fill_c.x ||
                  !H5_DBL_ABS_EQUAL(rd_c.y, fill_c.y) || rd_c.z != fill_c.z)) {
                 H5_FAILED();
-                HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
-                HDfprintf(stdout,
-                          "    Elmt={%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE
-                          "}, read: %f, %d, %f, %c"
-                          "Fill value: %f, %d, %f, %c\n",
-                          hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4],
-                          (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, (double)fill_c.a, fill_c.x, fill_c.y,
-                          fill_c.z);
+                fprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
+                fprintf(stdout,
+                        "    Elmt={%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE
+                        "}, read: %f, %d, %f, %c"
+                        "Fill value: %f, %d, %f, %c\n",
+                        hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], (double)rd_c.a,
+                        rd_c.x, rd_c.y, rd_c.z, (double)fill_c.a, fill_c.x, fill_c.y, fill_c.z);
                 goto error;
             }
         }
@@ -981,13 +980,13 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f
             for (u = 0; u < nelmts; u++) {
                 if (buf[u] != fillval) {
                     H5_FAILED();
-                    HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
-                    HDfprintf(stdout,
-                              "    Elmt={%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
-                              ", %" PRIuHSIZE "}, read: %u, "
-                              "Fill value: %u\n",
-                              hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], buf[u],
-                              fillval);
+                    fprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
+                    fprintf(stdout,
+                            "    Elmt={%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
+                            ", %" PRIuHSIZE "}, read: %u, "
+                            "Fill value: %u\n",
+                            hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], buf[u],
+                            fillval);
                     goto error;
                 } /* end if */
             }     /* end for */
@@ -1008,14 +1007,14 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f
                 if (!H5_FLT_ABS_EQUAL(buf_c[u].a, fill_c.a) || buf_c[u].x != fill_c.x ||
                     !H5_DBL_ABS_EQUAL(buf_c[u].y, fill_c.y) || buf_c[u].z != fill_c.z) {
                     H5_FAILED();
-                    HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
-                    HDfprintf(stdout,
-                              "    Elmt={%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
-                              ", %" PRIuHSIZE "}, read: %f, %d, %f, %c"
-                              "Fill value: %f, %d, %f, %c\n",
-                              hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4],
-                              (double)buf_c[u].a, buf_c[u].x, buf_c[u].y, buf_c[u].z, (double)fill_c.a,
-                              fill_c.x, fill_c.y, fill_c.z);
+                    fprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__);
+                    fprintf(stdout,
+                            "    Elmt={%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
+                            ", %" PRIuHSIZE "}, read: %f, %d, %f, %c"
+                            "Fill value: %f, %d, %f, %c\n",
+                            hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4],
+                            (double)buf_c[u].a, buf_c[u].x, buf_c[u].y, buf_c[u].z, (double)fill_c.a,
+                            fill_c.x, fill_c.y, fill_c.z);
                     goto error;
                 } /* end if */
             }     /* end for */
@@ -1051,8 +1050,8 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f
         goto error;
     if (layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_ALLOCATED) {
         H5_FAILED();
-        HDprintf("    %d: Got unallocated space instead of allocated.\n", __LINE__);
-        HDprintf("    Got %d\n", allocation);
+        printf("    %d: Got unallocated space instead of allocated.\n", __LINE__);
+        printf("    Got %d\n", allocation);
         goto error;
     }
     HDfree(buf);
@@ -1078,11 +1077,11 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f
                 should_be = odd ? fillval : 9999;
                 if (val_rd != should_be) {
                     H5_FAILED();
-                    HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
-                    HDprintf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
-                             "should be: %u\n",
-                             (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3],
-                             (long)hs_offset[4], val_rd, should_be);
+                    fprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
+                    printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
+                           "should be: %u\n",
+                           (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3],
+                           (long)hs_offset[4], val_rd, should_be);
                     goto error;
                 }
             }
@@ -1090,11 +1089,11 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f
                 should_be = 9999;
                 if (val_rd != should_be) {
                     H5_FAILED();
-                    HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
-                    HDprintf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
-                             "should be: %u\n",
-                             (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3],
-                             (long)hs_offset[4], val_rd, should_be);
+                    fprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
+                    printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, "
+                           "should be: %u\n",
+                           (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3],
+                           (long)hs_offset[4], val_rd, should_be);
                     goto error;
                 }
             }
@@ -1122,12 +1121,12 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f
                 if (!H5_FLT_ABS_EQUAL(rd_c.a, should_be_c.a) || rd_c.x != should_be_c.x ||
                     !H5_DBL_ABS_EQUAL(rd_c.y, should_be_c.y) || rd_c.z != should_be_c.z) {
                     H5_FAILED();
-                    HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
-                    HDprintf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c "
-                             "should be: %f,%d,%f,%c\n",
-                             (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3],
-                             (long)hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z,
-                             (double)should_be_c.a, should_be_c.x, should_be_c.y, should_be_c.z);
+                    fprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
+                    printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c "
+                           "should be: %f,%d,%f,%c\n",
+                           (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3],
+                           (long)hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, (double)should_be_c.a,
+                           should_be_c.x, should_be_c.y, should_be_c.z);
                     goto error;
                 }
             } /* end for fill_time == H5D_FILL_TIME_ALLOC */
@@ -1139,12 +1138,12 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f
                 if (!H5_FLT_ABS_EQUAL(rd_c.a, should_be_c.a) || rd_c.x != should_be_c.x ||
                     !H5_DBL_ABS_EQUAL(rd_c.y, should_be_c.y) || rd_c.z != should_be_c.z) {
                     H5_FAILED();
-                    HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
-                    HDprintf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c "
-                             "should be: %f,%d,%f,%c\n",
-                             (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3],
-                             (long)hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z,
-                             (double)should_be_c.a, should_be_c.x, should_be_c.y, should_be_c.z);
+                    fprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__);
+                    printf("    Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c "
+                           "should be: %f,%d,%f,%c\n",
+                           (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3],
+                           (long)hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, (double)should_be_c.a,
+                           should_be_c.x, should_be_c.y, should_be_c.z);
                     goto error;
                 }
             } /* end for fill_time == H5D_FILL_TIME_NEVER */
@@ -1430,12 +1429,12 @@ test_extend_verify_integer(unsigned lineno, const hsize_t *offset, const void *_
 
     /* Verify value */
     if (*test_val != *compare_val) {
-        HDfprintf(stdout, "%u: Value read was not expected.\n", lineno);
-        HDfprintf(stdout,
-                  "    Elmt = {%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
-                  "}, read: %d, "
-                  "expected: %d\n",
-                  offset[0], offset[1], offset[2], offset[3], offset[4], *test_val, *compare_val);
+        fprintf(stdout, "%u: Value read was not expected.\n", lineno);
+        fprintf(stdout,
+                "    Elmt = {%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
+                "}, read: %d, "
+                "expected: %d\n",
+                offset[0], offset[1], offset[2], offset[3], offset[4], *test_val, *compare_val);
         goto error;
     } /* end if */
 
@@ -1522,13 +1521,13 @@ test_extend_verify_cmpd_vl(unsigned lineno, const hsize_t *offset, const void *_
     /* Verify value */
     if ((test_val->x != compare_val->x) || HDstrcmp(test_val->a, compare_val->a) != 0 ||
         HDstrcmp(test_val->b, compare_val->b) != 0 || (test_val->y != compare_val->y)) {
-        HDfprintf(stdout, "%u: Value read was not expected.\n", lineno);
-        HDfprintf(stdout,
-                  "    Elmt = {%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
-                  "}, read: {%d, '%s', '%s', %d} "
-                  "expected: {%d, '%s', '%s', %d}\n",
-                  offset[0], offset[1], offset[2], offset[3], offset[4], test_val->x, test_val->a,
-                  test_val->b, test_val->y, compare_val->x, compare_val->a, compare_val->b, compare_val->y);
+        fprintf(stdout, "%u: Value read was not expected.\n", lineno);
+        fprintf(stdout,
+                "    Elmt = {%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
+                "}, read: {%d, '%s', '%s', %d} "
+                "expected: {%d, '%s', '%s', %d}\n",
+                offset[0], offset[1], offset[2], offset[3], offset[4], test_val->x, test_val->a, test_val->b,
+                test_val->y, compare_val->x, compare_val->a, compare_val->b, compare_val->y);
         goto error;
     } /* end if */
 
@@ -2222,9 +2221,9 @@ test_compatible(void)
     TESTING("contiguous dataset compatibility with v. 1.4");
 
     if ((file = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
-        HDprintf("    Could not open file %s. Try set $srcdir to point at the "
-                 "source directory of test\n",
-                 testfile);
+        printf("    Could not open file %s. Try set $srcdir to point at the "
+               "source directory of test\n",
+               testfile);
         goto error;
     }
 
@@ -2236,8 +2235,8 @@ test_compatible(void)
         goto error;
     if (status != H5D_FILL_VALUE_UNDEFINED) {
         H5_FAILED();
-        HDprintf("    %d: Got a different fill value than what was set.", __LINE__);
-        HDprintf("    Got status=%ld, suppose to be H5D_FILL_VALUE_UNDEFINED\n", (long)status);
+        printf("    %d: Got a different fill value than what was set.", __LINE__);
+        printf("    Got status=%ld, suppose to be H5D_FILL_VALUE_UNDEFINED\n", (long)status);
         goto error;
     }
     if ((fspace = H5Dget_space(dset1)) < 0)
@@ -2247,7 +2246,7 @@ test_compatible(void)
     if (dims[0] != 8 || dims[1] != 8) {
         H5_FAILED();
         HDputs("    Got a different dimension size than what was set.");
-        HDprintf("    Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]);
+        printf("    Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]);
         goto error;
     }
     if ((mspace = H5Screate_simple(2, one, NULL)) < 0)
@@ -2259,7 +2258,7 @@ test_compatible(void)
     if (val_rd != 0) {
         H5_FAILED();
         HDputs("    Got a different value than what was set.");
-        HDprintf("    Got %ld, set 0\n", (long)val_rd);
+        printf("    Got %ld, set 0\n", (long)val_rd);
         goto error;
     }
     if (H5Pclose(dcpl1) < 0)
@@ -2279,16 +2278,16 @@ test_compatible(void)
         goto error;
     if (status != H5D_FILL_VALUE_USER_DEFINED) {
         H5_FAILED();
-        HDprintf("    %d: Got a different fill value than what was set.", __LINE__);
-        HDprintf("    Got status=%ld, suppose to be H5D_FILL_VALUE_USER_DEFINED\n", (long)status);
+        printf("    %d: Got a different fill value than what was set.", __LINE__);
+        printf("    Got status=%ld, suppose to be H5D_FILL_VALUE_USER_DEFINED\n", (long)status);
         goto error;
     }
     if (H5Pget_fill_value(dcpl2, H5T_NATIVE_INT, &rd_fill) < 0)
         goto error;
     if (rd_fill != fill_val) {
         H5_FAILED();
-        HDprintf("    %d: Got a different fill value than what was set.", __LINE__);
-        HDprintf("    Got %ld, set %ld\n", (long)rd_fill, (long)fill_val);
+        printf("    %d: Got a different fill value than what was set.", __LINE__);
+        printf("    Got %ld, set %ld\n", (long)rd_fill, (long)fill_val);
         goto error;
     }
     fspace = -1;
@@ -2300,7 +2299,7 @@ test_compatible(void)
     if (dims[0] != 8 || dims[1] != 8) {
         H5_FAILED();
         HDputs("    Got a different dimension size than what was set.");
-        HDprintf("    Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]);
+        printf("    Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]);
         goto error;
     }
     if ((mspace = H5Screate_simple(2, one, NULL)) < 0)
@@ -2312,7 +2311,7 @@ test_compatible(void)
     if (val_rd != fill_val) {
         H5_FAILED();
         HDputs("    Got a different value than what was set.");
-        HDprintf("    Got %ld, set %ld\n", (long)val_rd, (long)fill_val);
+        printf("    Got %ld, set %ld\n", (long)val_rd, (long)fill_val);
         goto error;
     }
     if (H5Pclose(dcpl2) < 0)
@@ -2430,20 +2429,20 @@ test_partalloc_cases(hid_t file, hid_t dcpl, const char *dname, H5D_fill_time_t
         if ((r_values[0] != w_values[0]) || (r_values[1] != fillval) || (r_values[2] != fillval) ||
             (r_values[3] != fillval)) {
             H5_FAILED();
-            HDfprintf(stdout, "%u: Allocated chunk value read was not correct.\n", (unsigned)__LINE__);
-            HDprintf("    {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n", (long)r_values[0],
-                     (long)r_values[1], (long)r_values[2], (long)r_values[3], (long)w_values[0],
-                     (long)fillval, (long)fillval, (long)fillval);
+            fprintf(stdout, "%u: Allocated chunk value read was not correct.\n", (unsigned)__LINE__);
+            printf("    {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n", (long)r_values[0],
+                   (long)r_values[1], (long)r_values[2], (long)r_values[3], (long)w_values[0], (long)fillval,
+                   (long)fillval, (long)fillval);
             goto error;
         }
         /* check unallocated chunk */
         if ((f_values[0] != fillval) || (f_values[1] != fillval) || (f_values[2] != fillval) ||
             (f_values[3] != fillval)) {
             H5_FAILED();
-            HDfprintf(stdout, "%u: Unallocated chunk value read was not correct.\n", (unsigned)__LINE__);
-            HDprintf("    {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n", (long)f_values[0],
-                     (long)f_values[1], (long)f_values[2], (long)f_values[3], (long)fillval, (long)fillval,
-                     (long)fillval, (long)fillval);
+            fprintf(stdout, "%u: Unallocated chunk value read was not correct.\n", (unsigned)__LINE__);
+            printf("    {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n", (long)f_values[0],
+                   (long)f_values[1], (long)f_values[2], (long)f_values[3], (long)fillval, (long)fillval,
+                   (long)fillval, (long)fillval);
             goto error;
         }
         /* for the "never fill" case expect to get trash values, so skip */
@@ -2509,14 +2508,14 @@ test_partalloc(hid_t fapl, const char *base_name)
     if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_LATE) < 0)
         goto error;
 #ifdef DEBUG
-    HDfprintf(stdout, "\nALLOC_TIME_LATE\n");
+    fprintf(stdout, "\nALLOC_TIME_LATE\n");
 #endif
 
     /* case for H5D_FILL_TIME_ALLOC as fill write time and fill value to be default */
     if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0)
         goto error;
 #ifdef DEBUG
-    HDfprintf(stdout, "   FILL_TIME_ALLOC\n");
+    fprintf(stdout, "   FILL_TIME_ALLOC\n");
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset1", H5D_FILL_TIME_ALLOC);
 
@@ -2524,7 +2523,7 @@ test_partalloc(hid_t fapl, const char *base_name)
     if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0)
         goto error;
 #ifdef DEBUG
-    HDfprintf(stdout, "   FILL_TIME_NEVER\n");
+    fprintf(stdout, "   FILL_TIME_NEVER\n");
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset2", H5D_FILL_TIME_NEVER);
 
@@ -2532,7 +2531,7 @@ test_partalloc(hid_t fapl, const char *base_name)
     if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0)
         goto error;
 #ifdef DEBUG
-    HDfprintf(stdout, "   FILL_TIME_IFSET\n");
+    fprintf(stdout, "   FILL_TIME_IFSET\n");
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset3", H5D_FILL_TIME_IFSET);
 
@@ -2540,14 +2539,14 @@ test_partalloc(hid_t fapl, const char *base_name)
     if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_INCR) < 0)
         goto error;
 #ifdef DEBUG
-    HDfprintf(stdout, "\nALLOC_TIME_INCR\n");
+    fprintf(stdout, "\nALLOC_TIME_INCR\n");
 #endif
 
     /* case for H5D_FILL_TIME_ALLOC as fill write time and fill value to be default */
     if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0)
         goto error;
 #ifdef DEBUG
-    HDfprintf(stdout, "   FILL_TIME_ALLOC\n");
+    fprintf(stdout, "   FILL_TIME_ALLOC\n");
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset4", H5D_FILL_TIME_ALLOC);
 
@@ -2555,7 +2554,7 @@ test_partalloc(hid_t fapl, const char *base_name)
     if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0)
         goto error;
 #ifdef DEBUG
-    HDfprintf(stdout, "   FILL_TIME_NEVER\n");
+    fprintf(stdout, "   FILL_TIME_NEVER\n");
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset5", H5D_FILL_TIME_NEVER);
 
@@ -2563,7 +2562,7 @@ test_partalloc(hid_t fapl, const char *base_name)
     if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0)
         goto error;
 #ifdef DEBUG
-    HDfprintf(stdout, "   FILL_TIME_IFSET\n");
+    fprintf(stdout, "   FILL_TIME_IFSET\n");
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset6", H5D_FILL_TIME_IFSET);
 
@@ -2571,14 +2570,14 @@ test_partalloc(hid_t fapl, const char *base_name)
     if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0)
         goto error;
 #ifdef DEBUG
-    HDfprintf(stdout, "\nALLOC_TIME_EARLY\n");
+    fprintf(stdout, "\nALLOC_TIME_EARLY\n");
 #endif
 
     /* case for H5D_FILL_TIME_ALLOC as fill write time and fill value to be default */
     if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0)
         goto error;
 #ifdef DEBUG
-    HDfprintf(stdout, "   FILL_TIME_ALLOC\n");
+    fprintf(stdout, "   FILL_TIME_ALLOC\n");
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset7", H5D_FILL_TIME_ALLOC);
 
@@ -2586,7 +2585,7 @@ test_partalloc(hid_t fapl, const char *base_name)
     if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0)
         goto error;
 #ifdef DEBUG
-    HDfprintf(stdout, "   FILL_TIME_NEVER\n");
+    fprintf(stdout, "   FILL_TIME_NEVER\n");
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset8", H5D_FILL_TIME_NEVER);
 
@@ -2594,7 +2593,7 @@ test_partalloc(hid_t fapl, const char *base_name)
     if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0)
         goto error;
 #ifdef DEBUG
-    HDfprintf(stdout, "   FILL_TIME_IFSET\n");
+    fprintf(stdout, "   FILL_TIME_IFSET\n");
 #endif
     nerrors += test_partalloc_cases(file, dcpl, "dset9", H5D_FILL_TIME_IFSET);
 
@@ -2649,7 +2648,7 @@ main(int argc, char *argv[])
             else if (!HDstrcmp(argv[argno], "compact"))
                 test_compact = 1;
             else {
-                HDfprintf(stderr, "usage: %s [contiguous] [chunked] [compact]\n", argv[0]);
+                fprintf(stderr, "usage: %s [contiguous] [chunked] [compact]\n", argv[0]);
                 HDexit(EXIT_FAILURE);
             }
         } /* end for */
diff --git a/test/filter_fail.c b/test/filter_fail.c
index c58731e..23041ed 100644
--- a/test/filter_fail.c
+++ b/test/filter_fail.c
@@ -278,16 +278,16 @@ test_filter_read(char *file_name, hid_t my_fapl)
     for (i = 0; i < DIM; i++) {
         if (i < DIM - 2 && rbuf[i] != i) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %d\n", i);
-            HDprintf("    rbuf[%d]=%d\n", i, rbuf[i]);
+            printf("    Read different values than written.\n");
+            printf("    At index %d\n", i);
+            printf("    rbuf[%d]=%d\n", i, rbuf[i]);
             TEST_ERROR;
         }
         else if (i >= DIM - 2 && rbuf[i] != 0) {
             H5_FAILED();
-            HDprintf("    No value should be read.\n");
-            HDprintf("    At index %d\n", i);
-            HDprintf("    rbuf[%d]=%d\n", i, rbuf[i]);
+            printf("    No value should be read.\n");
+            printf("    At index %d\n", i);
+            printf("    rbuf[%d]=%d\n", i, rbuf[i]);
             TEST_ERROR;
         }
     }
@@ -321,16 +321,16 @@ test_filter_read(char *file_name, hid_t my_fapl)
     for (i = 0; i < DIM; i += 2) {
         if (i < DIM - 2 && rbuf[i] != i) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %d\n", i);
-            HDprintf("    rbuf[%d]=%d\n", i, rbuf[i]);
+            printf("    Read different values than written.\n");
+            printf("    At index %d\n", i);
+            printf("    rbuf[%d]=%d\n", i, rbuf[i]);
             TEST_ERROR;
         }
         else if (i >= DIM - 2 && rbuf[i] != 0) {
             H5_FAILED();
-            HDprintf("    No value should be read.\n");
-            HDprintf("    At index %d\n", i);
-            HDprintf("    rbuf[%d]=%d\n", i, rbuf[i]);
+            printf("    No value should be read.\n");
+            printf("    At index %d\n", i);
+            printf("    rbuf[%d]=%d\n", i, rbuf[i]);
             TEST_ERROR;
         }
     }
@@ -420,7 +420,7 @@ main(void)
 
 error:
     if (nerrors) {
-        HDprintf("***** %u FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
+        printf("***** %u FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
         HDexit(EXIT_FAILURE);
     }
 } /* end main() */
diff --git a/test/filter_plugin.c b/test/filter_plugin.c
index c09d196..f1ef4f3 100644
--- a/test/filter_plugin.c
+++ b/test/filter_plugin.c
@@ -984,7 +984,7 @@ test_path_api_calls(void)
     /* Remove all existing paths */
     for (u = n_paths; u > 0; u--)
         if (H5PLremove(u - 1) < 0) {
-            HDfprintf(stderr, "    at %u: %s\n", u, path);
+            fprintf(stderr, "    at %u: %s\n", u, path);
             TEST_ERROR;
         }
 
@@ -1019,7 +1019,7 @@ test_path_api_calls(void)
     for (u = 0; u < n_starting_paths; u++) {
         HDsnprintf(path, sizeof(path), "a_path_%u", u);
         if (H5PLappend(path) < 0) {
-            HDfprintf(stderr, "    at %u: %s\n", u, path);
+            fprintf(stderr, "    at %u: %s\n", u, path);
             TEST_ERROR;
         }
     }
@@ -1052,7 +1052,7 @@ test_path_api_calls(void)
 
     /* Get the path length by passing in NULL */
     if ((path_len = H5PLget(0, NULL, 0)) <= 0) {
-        HDfprintf(stderr, "    get path 0 length failed\n");
+        fprintf(stderr, "    get path 0 length failed\n");
         TEST_ERROR;
     }
     if (path_len != 8)
@@ -1060,11 +1060,11 @@ test_path_api_calls(void)
 
     /* Get the path */
     if ((path_len = H5PLget(0, path, 256)) <= 0) {
-        HDfprintf(stderr, "    get 0 len: %zd : %s\n", path_len, path);
+        fprintf(stderr, "    get 0 len: %zd : %s\n", path_len, path);
         TEST_ERROR;
     }
     if (HDstrcmp(path, "a_path_0") != 0) {
-        HDfprintf(stderr, "    get 0: %s\n", path);
+        fprintf(stderr, "    get 0: %s\n", path);
         TEST_ERROR;
     }
 
@@ -1076,7 +1076,7 @@ test_path_api_calls(void)
     if ((path_len = H5PLget(1, path, 256)) <= 0)
         TEST_ERROR;
     if (HDstrcmp(path, "a_path_1") != 0) {
-        HDfprintf(stderr, "    get 1: %s\n", path);
+        fprintf(stderr, "    get 1: %s\n", path);
         TEST_ERROR;
     }
 
@@ -1085,7 +1085,7 @@ test_path_api_calls(void)
         TEST_ERROR;
     HDsnprintf(temp_name, sizeof(temp_name), "a_path_%u", n_starting_paths - 1);
     if (HDstrcmp(path, temp_name) != 0) {
-        HDfprintf(stderr, "    get %u: %s\n", n_starting_paths - 1, path);
+        fprintf(stderr, "    get %u: %s\n", n_starting_paths - 1, path);
         TEST_ERROR;
     }
 
@@ -1122,7 +1122,7 @@ test_path_api_calls(void)
     if ((path_len = H5PLget(8, path, 256)) <= 0)
         TEST_ERROR;
     if (HDstrcmp(path, "a_path_9") != 0) {
-        HDfprintf(stderr, "    get 8: %s\n", path);
+        fprintf(stderr, "    get 8: %s\n", path);
         TEST_ERROR;
     }
 
@@ -1139,7 +1139,7 @@ test_path_api_calls(void)
     /* Prepend one path */
     HDsnprintf(path, sizeof(path), "a_path_%d", n_starting_paths + 1);
     if (H5PLprepend(path) < 0) {
-        HDfprintf(stderr, "    prepend %u: %s\n", n_starting_paths + 1, path);
+        fprintf(stderr, "    prepend %u: %s\n", n_starting_paths + 1, path);
         TEST_ERROR;
     }
 
@@ -1153,7 +1153,7 @@ test_path_api_calls(void)
     if (H5PLget(8, path, 256) <= 0)
         TEST_ERROR;
     if (HDstrcmp(path, "a_path_7") != 0) {
-        HDfprintf(stderr, "    get 8: %s\n", path);
+        fprintf(stderr, "    get 8: %s\n", path);
         TEST_ERROR;
     }
 
@@ -1162,7 +1162,7 @@ test_path_api_calls(void)
         TEST_ERROR;
     HDsnprintf(temp_name, sizeof(temp_name), "a_path_%d", n_starting_paths + 1);
     if (HDstrcmp(path, temp_name) != 0) {
-        HDfprintf(stderr, "    get 0: %s\n", path);
+        fprintf(stderr, "    get 0: %s\n", path);
         TEST_ERROR;
     }
 
@@ -1177,7 +1177,7 @@ test_path_api_calls(void)
     /* Replace one path at index 1 */
     HDsnprintf(path, sizeof(path), "a_path_%u", n_starting_paths + 4);
     if (H5PLreplace(path, 1) < 0) {
-        HDfprintf(stderr, "    replace 1: %s\n", path);
+        fprintf(stderr, "    replace 1: %s\n", path);
         TEST_ERROR;
     }
 
@@ -1196,7 +1196,7 @@ test_path_api_calls(void)
         TEST_ERROR;
     HDsnprintf(temp_name, sizeof(temp_name), "a_path_%u", n_starting_paths + 1);
     if (HDstrcmp(path, temp_name) != 0) {
-        HDfprintf(stderr, "    get 0: %s\n", path);
+        fprintf(stderr, "    get 0: %s\n", path);
         TEST_ERROR;
     }
 
@@ -1204,7 +1204,7 @@ test_path_api_calls(void)
     if (H5PLget(2, path, 256) <= 0)
         TEST_ERROR;
     if (HDstrcmp(path, "a_path_1") != 0) {
-        HDfprintf(stderr, "    get 2: %s\n", path);
+        fprintf(stderr, "    get 2: %s\n", path);
         TEST_ERROR;
     }
 
@@ -1228,7 +1228,7 @@ test_path_api_calls(void)
     if (H5PLget(4, path, 256) <= 0)
         TEST_ERROR;
     if (HDstrcmp(path, "a_path_4") != 0) {
-        HDfprintf(stderr, "    get 4: %s\n", path);
+        fprintf(stderr, "    get 4: %s\n", path);
         TEST_ERROR;
     }
 
@@ -1244,7 +1244,7 @@ test_path_api_calls(void)
     /* Insert one path at index 3*/
     HDsnprintf(path, sizeof(path), "a_path_%d", n_starting_paths + 5);
     if (H5PLinsert(path, 3) < 0) {
-        HDfprintf(stderr, "    insert 3: %s\n", path);
+        fprintf(stderr, "    insert 3: %s\n", path);
         TEST_ERROR;
     }
 
@@ -1252,7 +1252,7 @@ test_path_api_calls(void)
     if (H5PLget(4, path, 256) <= 0)
         TEST_ERROR;
     if (HDstrcmp(path, "a_path_2") != 0) {
-        HDfprintf(stderr, "    get 4: %s\n", path);
+        fprintf(stderr, "    get 4: %s\n", path);
         TEST_ERROR;
     }
 
@@ -1278,7 +1278,7 @@ test_path_api_calls(void)
     /* Remove all existing paths */
     for (u = n_paths; u > 0; u--)
         if (H5PLremove(u - 1) < 0) {
-            HDfprintf(stderr, "    at %u: %s\n", u, path);
+            fprintf(stderr, "    at %u: %s\n", u, path);
             TEST_ERROR;
         }
 
@@ -1617,7 +1617,7 @@ main(void)
     if (nerrors)
         TEST_ERROR;
 
-    HDprintf("All plugin tests passed.\n");
+    printf("All plugin tests passed.\n");
 
     HDexit(EXIT_SUCCESS);
 
@@ -1637,6 +1637,6 @@ error:
     free_2D_array(&orig_dynlib4_g);
 
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d PLUGIN TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    printf("***** %d PLUGIN TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     HDexit(EXIT_FAILURE);
 } /* end main() */
diff --git a/test/flush1.c b/test/flush1.c
index f64dfac..ea8cbb9 100644
--- a/test/flush1.c
+++ b/test/flush1.c
@@ -312,7 +312,7 @@ main(void)
         SKIPPED();
 
     if (!vfd_supports_swmr)
-        HDprintf("NOTE: Some tests were skipped since the current VFD lacks SWMR support\n");
+        printf("NOTE: Some tests were skipped since the current VFD lacks SWMR support\n");
 
     /* Flush console output streams */
     HDfflush(stdout);
diff --git a/test/flush2.c b/test/flush2.c
index 48c3247..8c3358e 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -255,12 +255,12 @@ main(void)
     vfd_supports_swmr = H5FD__supports_swmr_test(driver);
 
     if (h5_driver_is_default_vfd_compatible(fapl_id, &driver_is_default_vfd_compatible) < 0) {
-        HDprintf("Can't check if VFD is compatible with default VFD\n");
+        printf("Can't check if VFD is compatible with default VFD\n");
         HDexit(EXIT_FAILURE);
     }
 
     if (!driver_is_default_vfd_compatible) {
-        HDprintf("Skipping SWMR tests for VFD incompatible with default VFD\n");
+        printf("Skipping SWMR tests for VFD incompatible with default VFD\n");
         HDexit(EXIT_SUCCESS);
     }
 
@@ -433,7 +433,7 @@ main(void)
         SKIPPED();
 
     if (!vfd_supports_swmr)
-        HDprintf("NOTE: Some tests were skipped since the current VFD lacks SWMR support\n");
+        printf("NOTE: Some tests were skipped since the current VFD lacks SWMR support\n");
 
     h5_cleanup(FILENAME, fapl_id);
 
diff --git a/test/flushrefresh.c b/test/flushrefresh.c
index 1f5ee89..a2a284c 100644
--- a/test/flushrefresh.c
+++ b/test/flushrefresh.c
@@ -71,7 +71,7 @@ static FILE *errorfile;
 #define PROCESS_ERROR                                                                                        \
     {                                                                                                        \
         errorfile = HDfopen(ERRFILE, "w+");                                                                  \
-        HDfprintf(errorfile, "Error occurred in flushrefresh.\n");                                           \
+        fprintf(errorfile, "Error occurred in flushrefresh.\n");                                             \
         HDfflush(errorfile);                                                                                 \
         HDfclose(errorfile);                                                                                 \
         TEST_ERROR;                                                                                          \
@@ -161,8 +161,7 @@ main(int argc, char *argv[])
                 TEST_ERROR;
         } /* end if */
         else {
-            HDfprintf(stdout,
-                      "Skipping all flush/refresh tests (only run with SWMR-enabled file drivers).\n");
+            fprintf(stdout, "Skipping all flush/refresh tests (only run with SWMR-enabled file drivers).\n");
 
             /* Test script is expecting some signals, so send them out to end it. */
             if (end_verification() < 0)
@@ -183,7 +182,7 @@ main(int argc, char *argv[])
     }
     else {
         /* Illegal number of arguments supplied. Error. */
-        HDfprintf(stderr, "Error. %d is an Invalid number of arguments to main().\n", argc);
+        fprintf(stderr, "Error. %d is an Invalid number of arguments to main().\n", argc);
         PROCESS_ERROR
     } /* end if */
 
@@ -267,7 +266,7 @@ test_flush(void)
     hsize_t dims[2] = {3, 5};
 
     /* Testing Message */
-    HDfprintf(stdout, "Testing individual object flush behavior:\n");
+    fprintf(stdout, "Testing individual object flush behavior:\n");
 
     /* Cleanup any old error or signal files */
     CLEANUP_FILES;
@@ -739,7 +738,7 @@ test_refresh(void)
     int     fillval  = 2;
 
     /* Testing Message */
-    HDfprintf(stdout, "Testing individual object refresh behavior:\n");
+    fprintf(stdout, "Testing individual object refresh behavior:\n");
 
     /* Cleanup any old error or signal files */
     CLEANUP_FILES;
@@ -1089,20 +1088,19 @@ flush_verification(const char *obj_pathname, const char *expected)
     /* Compare to expected result */
     if (HDstrcmp(expected, FLUSHED) == 0) {
         if ((oid < 0) || (status < 0)) {
-            HDfprintf(stderr, "Error! %s should be on disk, but was NOT!\n", obj_pathname);
+            fprintf(stderr, "Error! %s should be on disk, but was NOT!\n", obj_pathname);
             PROCESS_ERROR;
         } /* end if */
     }
     else if (HDstrcmp(expected, NOT_FLUSHED) == 0) {
         if ((oid > 0) || (status > 0)) {
-            HDfprintf(stderr, "Error! %s not expected to be flushed, but it was found on disk!\n",
-                      obj_pathname);
+            fprintf(stderr, "Error! %s not expected to be flushed, but it was found on disk!\n",
+                    obj_pathname);
             PROCESS_ERROR;
         } /* end if */
     }
     else {
-        HDfprintf(stderr, "Error! Bad verification parameters. %s is an invalid expected outcome.\n",
-                  expected);
+        fprintf(stderr, "Error! Bad verification parameters. %s is an invalid expected outcome.\n", expected);
         PROCESS_ERROR;
     } /* end if */
 
@@ -1312,7 +1310,7 @@ refresh_verification(const char *obj_pathname)
                 PROCESS_ERROR;
         } /* end if */
         else {
-            HDfprintf(stdout, "Error. %s is an unrecognized object.\n", obj_pathname);
+            fprintf(stdout, "Error. %s is an unrecognized object.\n", obj_pathname);
             PROCESS_ERROR;
         } /* end else */
 
@@ -1343,12 +1341,12 @@ refresh_verification(const char *obj_pathname)
     } while (--tries);
 
     if (!ok) {
-        HDprintf("FLUSHED: num_attrs=%d, nmesgs=%d, nchunks=%d, total=%d\n", (int)flushed_oinfo.num_attrs,
-                 (int)flushed_ninfo.hdr.nmesgs, (int)flushed_ninfo.hdr.nchunks,
-                 (int)flushed_ninfo.hdr.space.total);
-        HDprintf("REFRESHED: num_attrs=%d, nmesgs=%d, nchunks=%d, total=%d\n", (int)refreshed_oinfo.num_attrs,
-                 (int)refreshed_ninfo.hdr.nmesgs, (int)refreshed_ninfo.hdr.nchunks,
-                 (int)refreshed_ninfo.hdr.space.total);
+        printf("FLUSHED: num_attrs=%d, nmesgs=%d, nchunks=%d, total=%d\n", (int)flushed_oinfo.num_attrs,
+               (int)flushed_ninfo.hdr.nmesgs, (int)flushed_ninfo.hdr.nchunks,
+               (int)flushed_ninfo.hdr.space.total);
+        printf("REFRESHED: num_attrs=%d, nmesgs=%d, nchunks=%d, total=%d\n", (int)refreshed_oinfo.num_attrs,
+               (int)refreshed_ninfo.hdr.nmesgs, (int)refreshed_ninfo.hdr.nchunks,
+               (int)refreshed_ninfo.hdr.space.total);
         PROCESS_ERROR;
     }
 
diff --git a/test/freespace.c b/test/freespace.c
index ad53693..4a0856d 100644
--- a/test/freespace.c
+++ b/test/freespace.c
@@ -399,28 +399,27 @@ check_stats(const H5F_t *f, const H5FS_t *frsp, frspace_state_t *state)
         FAIL_STACK_ERROR;
 
     if (frspace_stats.tot_space != state->tot_space) {
-        HDfprintf(stdout, "frspace_stats.tot_space = %" PRIuHSIZE ", state->tot_space = %" PRIuHSIZE "\n",
-                  frspace_stats.tot_space, state->tot_space);
+        fprintf(stdout, "frspace_stats.tot_space = %" PRIuHSIZE ", state->tot_space = %" PRIuHSIZE "\n",
+                frspace_stats.tot_space, state->tot_space);
         TEST_ERROR;
     } /* end if */
     if (frspace_stats.tot_sect_count != state->tot_sect_count) {
-        HDfprintf(stdout,
-                  "frspace_stats.tot_sect_count = %" PRIuHSIZE ", state->tot_sect_count = %" PRIuHSIZE "\n",
-                  frspace_stats.tot_sect_count, state->tot_sect_count);
+        fprintf(stdout,
+                "frspace_stats.tot_sect_count = %" PRIuHSIZE ", state->tot_sect_count = %" PRIuHSIZE "\n",
+                frspace_stats.tot_sect_count, state->tot_sect_count);
         TEST_ERROR;
     } /* end if */
     if (frspace_stats.serial_sect_count != state->serial_sect_count) {
-        HDfprintf(stdout,
-                  "frspace_stats.serial_sect_count = %" PRIuHSIZE ", state->serial_sect_count = %" PRIuHSIZE
-                  "\n",
-                  frspace_stats.serial_sect_count, state->serial_sect_count);
+        fprintf(stdout,
+                "frspace_stats.serial_sect_count = %" PRIuHSIZE ", state->serial_sect_count = %" PRIuHSIZE
+                "\n",
+                frspace_stats.serial_sect_count, state->serial_sect_count);
         TEST_ERROR;
     } /* end if */
     if (frspace_stats.ghost_sect_count != state->ghost_sect_count) {
-        HDfprintf(stdout,
-                  "frspace_stats.ghost_sect_count = %" PRIuHSIZE ", state->ghost_sect_count = %" PRIuHSIZE
-                  "\n",
-                  frspace_stats.ghost_sect_count, state->ghost_sect_count);
+        fprintf(stdout,
+                "frspace_stats.ghost_sect_count = %" PRIuHSIZE ", state->ghost_sect_count = %" PRIuHSIZE "\n",
+                frspace_stats.ghost_sect_count, state->ghost_sect_count);
         TEST_ERROR;
     } /* end if */
 
diff --git a/test/gen_filters.c b/test/gen_filters.c
index 35bfc04..0f0c16e 100644
--- a/test/gen_filters.c
+++ b/test/gen_filters.c
@@ -240,12 +240,12 @@ main(void)
 
     if (nerrors)
         goto error;
-    HDprintf("All tests passed.\n");
+    printf("All tests passed.\n");
 
     return 0;
 
 error:
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d GEN_FILTERS FAILURES *****\n", nerrors);
+    printf("***** %d GEN_FILTERS FAILURES *****\n", nerrors);
     return 1;
 }
diff --git a/test/h5test.c b/test/h5test.c
index 7011121..7c16950 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -596,13 +596,13 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu
             MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
             if (mpi_rank == 0)
-                HDprintf("*** Hint ***\n"
-                         "You can use environment variable HDF5_PARAPREFIX to "
-                         "run parallel test files in a\n"
-                         "different directory or to add file type prefix. e.g.,\n"
-                         "   HDF5_PARAPREFIX=pfs:/PFS/user/me\n"
-                         "   export HDF5_PARAPREFIX\n"
-                         "*** End of Hint ***\n");
+                printf("*** Hint ***\n"
+                       "You can use environment variable HDF5_PARAPREFIX to "
+                       "run parallel test files in a\n"
+                       "different directory or to add file type prefix. e.g.,\n"
+                       "   HDF5_PARAPREFIX=pfs:/PFS/user/me\n"
+                       "   export HDF5_PARAPREFIX\n"
+                       "*** End of Hint ***\n");
 
             explained = TRUE;
 #ifdef HDF5_PARAPREFIX
@@ -928,13 +928,13 @@ h5_show_hostname(void)
 
         if (mpi_initialized && !mpi_finalized) {
             MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
-            HDprintf("MPI-process %d.", mpi_rank);
+            printf("MPI-process %d.", mpi_rank);
         }
         else
-            HDprintf("thread 0.");
+            printf("thread 0.");
     }
 #else
-    HDprintf("thread %" PRIu64 ".", H5TS_thread_id());
+    printf("thread %" PRIu64 ".", H5TS_thread_id());
 #endif
 #ifdef H5_HAVE_WIN32_API
 
@@ -959,11 +959,11 @@ h5_show_hostname(void)
 #endif
 #ifdef H5_HAVE_GETHOSTNAME
     if (HDgethostname(hostname, (size_t)80) < 0)
-        HDprintf(" gethostname failed\n");
+        printf(" gethostname failed\n");
     else
-        HDprintf(" hostname=%s\n", hostname);
+        printf(" hostname=%s\n", hostname);
 #else
-    HDprintf(" gethostname not supported\n");
+    printf(" gethostname not supported\n");
 #endif
 #ifdef H5_HAVE_WIN32_API
     WSACleanup();
@@ -1050,7 +1050,7 @@ h5_set_info_object(void)
 
                 /* actually set the darned thing */
                 if (MPI_SUCCESS != MPI_Info_set(h5_io_info_g, namep, valp)) {
-                    HDprintf("MPI_Info_set failed\n");
+                    printf("MPI_Info_set failed\n");
                     ret_value = -1;
                 }
             }
@@ -1079,17 +1079,17 @@ h5_dump_info_object(MPI_Info info)
     int  flag;
     int  i, nkeys;
 
-    HDprintf("Dumping MPI Info Object (up to %d bytes per item):\n", MPI_MAX_INFO_VAL);
+    printf("Dumping MPI Info Object (up to %d bytes per item):\n", MPI_MAX_INFO_VAL);
     if (info == MPI_INFO_NULL) {
-        HDprintf("object is MPI_INFO_NULL\n");
+        printf("object is MPI_INFO_NULL\n");
     }
     else {
         MPI_Info_get_nkeys(info, &nkeys);
-        HDprintf("object has %d items\n", nkeys);
+        printf("object has %d items\n", nkeys);
         for (i = 0; i < nkeys; i++) {
             MPI_Info_get_nthkey(info, i, key);
             MPI_Info_get(info, key, MPI_MAX_INFO_VAL, value, &flag);
-            HDprintf("%s=%s\n", key, value);
+            printf("%s=%s\n", key, value);
         }
     }
 }
@@ -1600,11 +1600,11 @@ h5_send_message(const char *send, const char *arg1, const char *arg2)
     /* Write messages to signal file, if provided */
     if (arg2 != NULL) {
         assert(arg1);
-        HDfprintf(signalfile, "%s\n%s\n", arg1, arg2);
+        fprintf(signalfile, "%s\n%s\n", arg1, arg2);
     } /* end if */
     else if (arg1 != NULL) {
         assert(arg2 == NULL);
-        HDfprintf(signalfile, "%s\n", arg1);
+        fprintf(signalfile, "%s\n", arg1);
     } /* end if */
     else {
         assert(arg1 == NULL);
@@ -1664,7 +1664,7 @@ h5_wait_message(const char *waitfor)
             it was likely never sent and we should fail rather
             than loop infinitely */
         if (HDdifftime(t1, t0) > MESSAGE_TIMEOUT) {
-            HDfprintf(stdout, "Error communicating between processes. Make sure test script is running.\n");
+            fprintf(stdout, "Error communicating between processes. Make sure test script is running.\n");
             TEST_ERROR;
         } /* end if */
     }     /* end while */
@@ -1907,13 +1907,13 @@ h5_compare_file_bytes(char *f1name, char *f2name)
     /* Open files for reading */
     f1ptr = HDfopen(f1name, "rb");
     if (f1ptr == NULL) {
-        HDfprintf(stderr, "Unable to fopen() %s\n", f1name);
+        fprintf(stderr, "Unable to fopen() %s\n", f1name);
         ret_value = -1;
         goto done;
     }
     f2ptr = HDfopen(f2name, "rb");
     if (f2ptr == NULL) {
-        HDfprintf(stderr, "Unable to fopen() %s\n", f2name);
+        fprintf(stderr, "Unable to fopen() %s\n", f2name);
         ret_value = -1;
         goto done;
     }
@@ -1926,8 +1926,8 @@ h5_compare_file_bytes(char *f1name, char *f2name)
     f2size = HDftell(f2ptr);
 
     if (f1size != f2size) {
-        HDfprintf(stderr, "Files differ in size, %" PRIuHSIZE " vs. %" PRIuHSIZE "\n", (hsize_t)f1size,
-                  (hsize_t)f2size);
+        fprintf(stderr, "Files differ in size, %" PRIuHSIZE " vs. %" PRIuHSIZE "\n", (hsize_t)f1size,
+                (hsize_t)f2size);
         ret_value = -1;
         goto done;
     }
@@ -1945,7 +1945,7 @@ h5_compare_file_bytes(char *f1name, char *f2name)
             goto done;
         }
         if (f1char != f2char) {
-            HDfprintf(stderr, "Mismatch @ 0x%" PRIXHSIZE ": 0x%X != 0x%X\n", (hsize_t)ii, f1char, f2char);
+            fprintf(stderr, "Mismatch @ 0x%" PRIXHSIZE ": 0x%X != 0x%X\n", (hsize_t)ii, f1char, f2char);
             ret_value = -1;
             goto done;
         }
diff --git a/test/h5test.h b/test/h5test.h
index b2c2cda..0b4b36a 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -90,7 +90,7 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g; /* MPI INFO object for IO */
  */
 #define AT()                                                                                                 \
     do {                                                                                                     \
-        HDprintf("   at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);                                  \
+        printf("   at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);                                    \
     } while (0)
 
 /*
@@ -104,13 +104,13 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g; /* MPI INFO object for IO */
  */
 #define TESTING(WHAT)                                                                                        \
     do {                                                                                                     \
-        HDprintf("Testing %-62s", WHAT);                                                                     \
+        printf("Testing %-62s", WHAT);                                                                       \
         HDfflush(stdout);                                                                                    \
         n_tests_run_g++;                                                                                     \
     } while (0)
 #define TESTING_2(WHAT)                                                                                      \
     do {                                                                                                     \
-        HDprintf("  Testing %-60s", WHAT);                                                                   \
+        printf("  Testing %-60s", WHAT);                                                                     \
         HDfflush(stdout);                                                                                    \
         n_tests_run_g++;                                                                                     \
     } while (0)
@@ -174,7 +174,7 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g; /* MPI INFO object for IO */
  */
 #define TESTING_MULTIPART(WHAT)                                                                              \
     do {                                                                                                     \
-        HDprintf("Testing %-62s", WHAT);                                                                     \
+        printf("Testing %-62s", WHAT);                                                                       \
         HDputs("");                                                                                          \
         HDfflush(stdout);                                                                                    \
     } while (0)
diff --git a/test/hdfs.c b/test/hdfs.c
index c1404f7..c5704a1 100644
--- a/test/hdfs.c
+++ b/test/hdfs.c
@@ -102,7 +102,7 @@
  */
 #define JSFAILED_AT()                                                                                        \
     {                                                                                                        \
-        HDprintf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);                            \
+        printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);                              \
     }
 
 /*----------------------------------------------------------------------------
@@ -193,10 +193,10 @@
     {                                                                                                        \
         JSFAILED_AT()                                                                                        \
         if (reason != NULL) {                                                                                \
-            HDprintf("%s\n", (reason));                                                                      \
+            printf("%s\n", (reason));                                                                        \
         }                                                                                                    \
         else {                                                                                               \
-            HDprintf("  ! Expected %ld\n  ! Actual   %ld\n", (long)(expected), (long)(actual));              \
+            printf("  ! Expected %ld\n  ! Actual   %ld\n", (long)(expected), (long)(actual));                \
         }                                                                                                    \
     }
 
@@ -233,10 +233,10 @@
         const char *_reason = reason;                                                                        \
         JSFAILED_AT()                                                                                        \
         if (_reason != NULL) {                                                                               \
-            HDprintf("%s\n", _reason);                                                                       \
+            printf("%s\n", _reason);                                                                         \
         }                                                                                                    \
         else {                                                                                               \
-            HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", (expected), (actual));                           \
+            printf("!!! Expected:\n%s\n!!!Actual:\n%s\n", (expected), (actual));                             \
         }                                                                                                    \
     }
 
@@ -855,7 +855,7 @@ test_vfd_open(void)
         }
 
 #if HDFS_TEST_DEBUG
-        HDfprintf(stderr, "testing: %s\n", T.message);
+        fprintf(stderr, "testing: %s\n", T.message);
 #endif /* HDFS_TEST_DEBUG */
 
         H5E_BEGIN_TRY
@@ -865,9 +865,9 @@ test_vfd_open(void)
         H5E_END_TRY
         if (NULL != fd) {
             if (TRUE == T.might_use_other_driver && H5FD_HDFS != fd->driver_id) {
-                HDfprintf(stderr, "\n!!!!! WARNING !!!!!\n"
-                                  "    Successful open of file on local system "
-                                  "with non-HDFS VFD.\n");
+                fprintf(stderr, "\n!!!!! WARNING !!!!!\n"
+                                "    Successful open of file on local system "
+                                "with non-HDFS VFD.\n");
                 JSVERIFY(SUCCEED, H5FDclose(fd), "unable to close errant open");
                 fd = NULL;
             }
@@ -880,7 +880,7 @@ test_vfd_open(void)
     FAIL_IF(NULL != fd) /* sanity check */
 
 #if HDFS_TEST_DEBUG
-    HDfprintf(stderr, "nominal open\n");
+    fprintf(stderr, "nominal open\n");
 #endif /* HDFS_TEST_DEBUG */
 
     /* finally, show that a file can be opened
@@ -893,7 +893,7 @@ test_vfd_open(void)
      ************/
 
 #if HDFS_TEST_DEBUG
-    HDfprintf(stderr, "teardown...\n");
+    fprintf(stderr, "teardown...\n");
 #endif /* HDFS_TEST_DEBUG */
 
     FAIL_IF(FAIL == H5FDclose(fd))
@@ -1499,7 +1499,7 @@ test_cmp(void)
 {
     TESTING("HDFS cmp (comparison)");
     SKIPPED();
-    HDfprintf(stderr, "    TODO: Distinct valid fapls to open the same file.\n");
+    fprintf(stderr, "    TODO: Distinct valid fapls to open the same file.\n");
 
     return 0;
 
@@ -1596,7 +1596,7 @@ error:
      ***********/
 
 #if HDFS_TEST_DEBUG
-    HDprintf("\nerror!");
+    printf("\nerror!");
     HDfflush(stdout);
 #endif /* HDFS_TEST_DEBUG */
 
@@ -1656,7 +1656,7 @@ main(void)
 
     h5_reset();
 
-    HDprintf("Testing hdfs VFD functionality.\n");
+    printf("Testing hdfs VFD functionality.\n");
 
     nerrors += test_fapl_config_validation();
     nerrors += test_hdfs_fapl();
@@ -1669,11 +1669,11 @@ main(void)
     nerrors += test_H5F_integration();
 
     if (nerrors > 0) {
-        HDprintf("***** %d hdfs TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+        printf("***** %d hdfs TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
         nerrors = 1;
     }
     else {
-        HDprintf("All hdfs tests passed.\n");
+        printf("All hdfs tests passed.\n");
     }
     return nerrors; /* 0 if no errors, 1 if any errors */
 
diff --git a/test/hyperslab.c b/test/hyperslab.c
index b17293f..79f37f9 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -82,19 +82,19 @@ print_array(uint8_t *array, size_t nx, size_t ny, size_t nz)
 
     for (i = 0; i < nx; i++) {
         if (nz > 1)
-            HDprintf("i=%lu:\n", (unsigned long)i);
+            printf("i=%lu:\n", (unsigned long)i);
         else
-            HDprintf("%03lu:", (unsigned long)i);
+            printf("%03lu:", (unsigned long)i);
 
         for (j = 0; j < ny; j++) {
             if (nz > 1)
-                HDprintf("%03lu:", (unsigned long)j);
+                printf("%03lu:", (unsigned long)j);
             for (k = 0; k < nz; k++)
-                HDprintf(" %3d", *array++);
+                printf(" %3d", *array++);
             if (nz > 1)
-                HDprintf("\n");
+                printf("\n");
         } /* end for */
-        HDprintf("\n");
+        printf("\n");
     } /* end for */
 } /* end print_array() */
 
@@ -118,7 +118,7 @@ print_ref(size_t nx, size_t ny, size_t nz)
     uint8_t *array;
 
     if (NULL != (array = (uint8_t *)HDmalloc(nx * ny * nz))) {
-        HDprintf("Reference array:\n");
+        printf("Reference array:\n");
         init_full(array, nx, ny, nz);
         print_array(array, nx, ny, nz);
         HDfree(array);
@@ -175,7 +175,7 @@ test_fill(size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_t dk, size
         HDsnprintf(dim, sizeof(dim), "%lux%lux%lu", (unsigned long)nx, (unsigned long)ny, (unsigned long)nz);
     } /* end else */
     HDsnprintf(s, sizeof(s), "Testing hyperslab fill %-11s variable hyperslab", dim);
-    HDprintf("%-70s", s);
+    printf("%-70s", s);
     HDfflush(stdout);
 
     /* Allocate array */
@@ -235,15 +235,15 @@ test_fill(size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_t dk, size
                                          * is going directly to a terminal.
                                          */
                                         AT();
-                                        HDprintf("   acc != ref_value\n");
-                                        HDprintf("   i=%lu, j=%lu, k=%lu, "
-                                                 "dx=%lu, dy=%lu, dz=%lu, "
-                                                 "fill=%d\n",
-                                                 (unsigned long)i, (unsigned long)j, (unsigned long)k,
-                                                 (unsigned long)dx, (unsigned long)dy, (unsigned long)dz,
-                                                 fill_value);
+                                        printf("   acc != ref_value\n");
+                                        printf("   i=%lu, j=%lu, k=%lu, "
+                                               "dx=%lu, dy=%lu, dz=%lu, "
+                                               "fill=%d\n",
+                                               (unsigned long)i, (unsigned long)j, (unsigned long)k,
+                                               (unsigned long)dx, (unsigned long)dy, (unsigned long)dz,
+                                               fill_value);
                                         print_ref(nx, ny, nz);
-                                        HDprintf("\n   Result is:\n");
+                                        printf("\n   Result is:\n");
                                         print_array(dst, nx, ny, nz);
                                     } /* end if */
                                     goto error;
@@ -364,7 +364,7 @@ test_copy(int mode, size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_
     } /* end switch */
 
     HDsnprintf(s, sizeof(s), "Testing hyperslab copy %-11s %s", dim, sub);
-    HDprintf("%-70s", s);
+    printf("%-70s", s);
     HDfflush(stdout);
 
     /*
@@ -469,13 +469,13 @@ test_copy(int mode, size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_
                                      * going directly to a terminal.
                                      */
                                     AT();
-                                    HDprintf("   acc != ref_value\n");
-                                    HDprintf("   i=%lu, j=%lu, k=%lu, "
-                                             "dx=%lu, dy=%lu, dz=%lu\n",
-                                             (unsigned long)i, (unsigned long)j, (unsigned long)k,
-                                             (unsigned long)dx, (unsigned long)dy, (unsigned long)dz);
+                                    printf("   acc != ref_value\n");
+                                    printf("   i=%lu, j=%lu, k=%lu, "
+                                           "dx=%lu, dy=%lu, dz=%lu\n",
+                                           (unsigned long)i, (unsigned long)j, (unsigned long)k,
+                                           (unsigned long)dx, (unsigned long)dy, (unsigned long)dz);
                                     print_ref(nx, ny, nz);
-                                    HDprintf("\n     Destination array is:\n");
+                                    printf("\n     Destination array is:\n");
                                     print_array(dst, nx, ny, nz);
                                 } /* end if */
                                 goto error;
@@ -506,14 +506,14 @@ test_copy(int mode, size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_
                                      * going directly to a terminal.
                                      */
                                     AT();
-                                    HDprintf("   acc != ref_value + nx*ny*nz - "
-                                             "dx*dy*dz\n");
-                                    HDprintf("   i=%lu, j=%lu, k=%lu, "
-                                             "dx=%lu, dy=%lu, dz=%lu\n",
-                                             (unsigned long)i, (unsigned long)j, (unsigned long)k,
-                                             (unsigned long)dx, (unsigned long)dy, (unsigned long)dz);
+                                    printf("   acc != ref_value + nx*ny*nz - "
+                                           "dx*dy*dz\n");
+                                    printf("   i=%lu, j=%lu, k=%lu, "
+                                           "dx=%lu, dy=%lu, dz=%lu\n",
+                                           (unsigned long)i, (unsigned long)j, (unsigned long)k,
+                                           (unsigned long)dx, (unsigned long)dy, (unsigned long)dz);
                                     print_ref(nx, ny, nz);
-                                    HDprintf("\n     Destination array is:\n");
+                                    printf("\n     Destination array is:\n");
                                     print_array(dst, nx, ny, nz);
                                 } /* end if */
                                 goto error;
@@ -573,7 +573,7 @@ test_multifill(size_t nx)
     } fill, *src = NULL, *dst = NULL;
     hsize_t i, j;
 
-    HDprintf("%-70s", "Testing multi-byte fill value");
+    printf("%-70s", "Testing multi-byte fill value");
     HDfflush(stdout);
 
     /* Initialize the source and destination */
@@ -630,14 +630,14 @@ test_multifill(size_t nx)
             H5_FAILED();
             if (!HDisatty(1)) {
                 AT();
-                HDprintf("   fill={%d,%g,%d}\n   ", fill.left, fill.mid, fill.right);
+                printf("   fill={%d,%g,%d}\n   ", fill.left, fill.mid, fill.right);
                 for (j = 0; j < sizeof(fill); j++)
-                    HDprintf(" %02x", ((uint8_t *)&fill)[j]);
-                HDprintf("\n   dst[%lu]={%d,%g,%d}\n   ", (unsigned long)i, dst[i].left, dst[i].mid,
-                         dst[i].right);
+                    printf(" %02x", ((uint8_t *)&fill)[j]);
+                printf("\n   dst[%lu]={%d,%g,%d}\n   ", (unsigned long)i, dst[i].left, dst[i].mid,
+                       dst[i].right);
                 for (j = 0; j < sizeof(dst[i]); j++)
-                    HDprintf(" %02x", ((uint8_t *)(dst + i))[j]);
-                HDprintf("\n");
+                    printf(" %02x", ((uint8_t *)(dst + i))[j]);
+                printf("\n");
             } /* end if */
             goto error;
         } /* end if */
@@ -685,7 +685,7 @@ test_endian(size_t nx)
     hsize_t  size[2];       /*size vector            */
     hsize_t  i, j;
 
-    HDprintf("%-70s", "Testing endian conversion by stride");
+    printf("%-70s", "Testing endian conversion by stride");
     HDfflush(stdout);
 
     /* Initialize arrays */
@@ -718,10 +718,10 @@ test_endian(size_t nx)
                      * to a terminal.
                      */
                     AT();
-                    HDprintf("   i=%lu, j=%lu\n", (unsigned long)i, (unsigned long)j);
-                    HDprintf("   Source array is:\n");
+                    printf("   i=%lu, j=%lu\n", (unsigned long)i, (unsigned long)j);
+                    printf("   Source array is:\n");
                     print_array(src, nx, (size_t)4, (size_t)1);
-                    HDprintf("\n     Result is:\n");
+                    printf("\n     Result is:\n");
                     print_array(dst, nx, (size_t)4, (size_t)1);
                 } /* end if */
                 goto error;
@@ -772,7 +772,7 @@ test_transpose(size_t nx, size_t ny)
 
     HDsnprintf(s, sizeof(s), "Testing 2d transpose by stride %4lux%-lud", (unsigned long)nx,
                (unsigned long)ny);
-    HDprintf("%-70s", s);
+    printf("%-70s", s);
     HDfflush(stdout);
 
     /* Initialize */
@@ -803,20 +803,20 @@ test_transpose(size_t nx, size_t ny)
                 H5_FAILED();
                 if (!HDisatty(1)) {
                     AT();
-                    HDprintf("   diff at i=%lu, j=%lu\n", (unsigned long)i, (unsigned long)j);
-                    HDprintf("   Source is:\n");
+                    printf("   diff at i=%lu, j=%lu\n", (unsigned long)i, (unsigned long)j);
+                    printf("   Source is:\n");
                     for (i = 0; i < nx; i++) {
-                        HDprintf("%3lu:", (unsigned long)i);
+                        printf("%3lu:", (unsigned long)i);
                         for (j = 0; j < ny; j++)
-                            HDprintf(" %6d", src[i * ny + j]);
-                        HDprintf("\n");
+                            printf(" %6d", src[i * ny + j]);
+                        printf("\n");
                     } /* end for */
-                    HDprintf("\n     Destination is:\n");
+                    printf("\n     Destination is:\n");
                     for (i = 0; i < ny; i++) {
-                        HDprintf("%3lu:", (unsigned long)i);
+                        printf("%3lu:", (unsigned long)i);
                         for (j = 0; j < nx; j++)
-                            HDprintf(" %6d", dst[i * nx + j]);
-                        HDprintf("\n");
+                            printf(" %6d", dst[i * nx + j]);
+                        printf("\n");
                     } /* end for */
                 }     /* end if */
                 goto error;
@@ -871,7 +871,7 @@ test_sub_super(size_t nx, size_t ny)
 
     HDsnprintf(s, sizeof(s), "Testing image sampling %4lux%-4lu to %4lux%-4lu ", (unsigned long)(2 * nx),
                (unsigned long)(2 * ny), (unsigned long)nx, (unsigned long)ny);
-    HDprintf("%-70s", s);
+    printf("%-70s", s);
     HDfflush(stdout);
 
     /* Initialize */
@@ -902,11 +902,11 @@ test_sub_super(size_t nx, size_t ny)
                 H5_FAILED();
                 if (!HDisatty(1)) {
                     AT();
-                    HDprintf("   full[%lu][%lu] != half[%lu][%lu]\n", (unsigned long)i * 2,
-                             (unsigned long)j * 2, (unsigned long)i, (unsigned long)j);
-                    HDprintf("   full is:\n");
+                    printf("   full[%lu][%lu] != half[%lu][%lu]\n", (unsigned long)i * 2,
+                           (unsigned long)j * 2, (unsigned long)i, (unsigned long)j);
+                    printf("   full is:\n");
                     print_array(full, 2 * nx, 2 * ny, (size_t)1);
-                    HDprintf("\n     half is:\n");
+                    printf("\n     half is:\n");
                     print_array(half, nx, ny, (size_t)1);
                 } /* end if */
                 goto error;
@@ -921,7 +921,7 @@ test_sub_super(size_t nx, size_t ny)
      */
     HDsnprintf(s, sizeof(s), "Testing image sampling %4lux%-4lu to %4lux%-4lu ", (unsigned long)nx,
                (unsigned long)ny, (unsigned long)(2 * nx), (unsigned long)(2 * ny));
-    HDprintf("%-70s", s);
+    printf("%-70s", s);
     HDfflush(stdout);
 
     /* Setup stride */
@@ -961,9 +961,9 @@ test_sub_super(size_t nx, size_t ny)
                 H5_FAILED();
                 if (!HDisatty(1)) {
                     AT();
-                    HDprintf("   %s\n   Half is:\n", s);
+                    printf("   %s\n   Half is:\n", s);
                     print_array(half, nx, ny, (size_t)1);
-                    HDprintf("\n     Twice is:\n");
+                    printf("\n     Twice is:\n");
                     print_array(twice, 2 * nx, 2 * ny, (size_t)1);
                 } /* end if */
                 goto error;
@@ -1117,8 +1117,8 @@ test_array_offset_n_calc(size_t n, size_t x, size_t y, size_t z)
         /* Check computed coordinates */
         for (v = 0; v < ARRAY_OFFSET_NDIMS; v++)
             if (coords[v] != new_coords[v]) {
-                HDfprintf(stderr, "coords[%zu]=%" PRIuHSIZE ", new_coords[%zu]=%" PRIuHSIZE "\n", v,
-                          coords[v], v, new_coords[v]);
+                fprintf(stderr, "coords[%zu]=%" PRIuHSIZE ", new_coords[%zu]=%" PRIuHSIZE "\n", v, coords[v],
+                        v, new_coords[v]);
                 TEST_ERROR;
             } /* end if */
     }         /* end for */
@@ -1169,18 +1169,18 @@ main(int argc, char *argv[])
             else if (!HDstrcmp(argv[i], "medium"))
                 size_of_test |= TEST_MEDIUM;
             else {
-                HDprintf("unrecognized argument: %s\n", argv[i]);
+                printf("unrecognized argument: %s\n", argv[i]);
                 HDexit(EXIT_FAILURE);
             } /* end else */
         }     /* end for */
     }         /* end else */
 
-    HDprintf("Test sizes: ");
+    printf("Test sizes: ");
     if (size_of_test & TEST_SMALL)
-        HDprintf(" SMALL");
+        printf(" SMALL");
     if (size_of_test & TEST_MEDIUM)
-        HDprintf(" MEDIUM");
-    HDprintf("\n");
+        printf(" MEDIUM");
+    printf("\n");
 
     /* Set the random # seed */
     HDsrandom((unsigned)HDtime(NULL));
@@ -1384,13 +1384,13 @@ main(int argc, char *argv[])
     /*--- END OF TESTS ---*/
 
     if (nerrors) {
-        HDprintf("***** %d HYPERSLAB TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+        printf("***** %d HYPERSLAB TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
         if (HDisatty(1))
-            HDprintf("(Redirect output to a pager or a file to see debug output)\n");
+            printf("(Redirect output to a pager or a file to see debug output)\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
-    HDprintf("All hyperslab tests passed.\n");
+    printf("All hyperslab tests passed.\n");
 
 #ifdef H5_HAVE_THREADSAFE
     H5close();
diff --git a/test/istore.c b/test/istore.c
index 98ef839..0b651fa 100644
--- a/test/istore.c
+++ b/test/istore.c
@@ -103,22 +103,22 @@ print_array(uint8_t *array, size_t nx, size_t ny, size_t nz)
 
     for (i = 0; i < nx; i++) {
         if (nz > 1) {
-            HDfprintf(stderr, "i=%lu:\n", (unsigned long)i);
+            fprintf(stderr, "i=%lu:\n", (unsigned long)i);
         }
         else {
-            HDfprintf(stderr, "%03lu:", (unsigned long)i);
+            fprintf(stderr, "%03lu:", (unsigned long)i);
         }
 
         for (j = 0; j < ny; j++) {
             if (nz > 1)
-                HDfprintf(stderr, "%03lu:", (unsigned long)j);
+                fprintf(stderr, "%03lu:", (unsigned long)j);
             for (k = 0; k < nz; k++) {
-                HDfprintf(stderr, " %3d", *array++);
+                fprintf(stderr, " %3d", *array++);
             }
             if (nz > 1)
-                HDfprintf(stderr, "\n");
+                fprintf(stderr, "\n");
         }
-        HDfprintf(stderr, "\n");
+        fprintf(stderr, "\n");
     }
 }
 
@@ -287,7 +287,7 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz)
     /* Build the new empty object */
     HDsnprintf(name, sizeof(name), "%s_%s", prefix, dims);
     if ((dataset = new_object(f, name, ndims, whole_size, whole_size)) < 0) {
-        HDfprintf(stderr, "    Cannot create %u-d object `%s'\n", ndims, name);
+        fprintf(stderr, "    Cannot create %u-d object `%s'\n", ndims, name);
         goto error;
     }
 
@@ -333,7 +333,7 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz)
         /* Write to disk */
         if (H5Dwrite(dataset, TEST_DATATYPE, mspace, fspace, H5P_DEFAULT, buf) < 0) {
             H5_FAILED();
-            HDfprintf(stderr, "    Write failed: ctr=%lu\n", (unsigned long)ctr);
+            fprintf(stderr, "    Write failed: ctr=%lu\n", (unsigned long)ctr);
             goto error;
         }
 
@@ -341,15 +341,15 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz)
         HDmemset(check, 0xff, (size_t)nelmts);
         if (H5Dread(dataset, TEST_DATATYPE, mspace, fspace, H5P_DEFAULT, check) < 0) {
             H5_FAILED();
-            HDfprintf(stderr, "    Read failed: ctr=%lu\n", (unsigned long)ctr);
+            fprintf(stderr, "    Read failed: ctr=%lu\n", (unsigned long)ctr);
             goto error;
         }
         if (HDmemcmp(buf, check, (size_t)nelmts) != 0) {
             H5_FAILED();
-            HDfprintf(stderr, "    Read check failed: ctr=%lu\n", (unsigned long)ctr);
-            HDfprintf(stderr, "    Wrote:\n");
+            fprintf(stderr, "    Read check failed: ctr=%lu\n", (unsigned long)ctr);
+            fprintf(stderr, "    Wrote:\n");
             print_array(buf, (size_t)size[0], (size_t)size[1], (size_t)size[2]);
-            HDfprintf(stderr, "    Read:\n");
+            fprintf(stderr, "    Read:\n");
             print_array(check, (size_t)size[0], (size_t)size[1], (size_t)size[2]);
             goto error;
         }
@@ -371,7 +371,7 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz)
     HDmemset(buf, 0xff, nx * ny * nz);
     if (H5Dread(dataset, TEST_DATATYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) {
         H5_FAILED();
-        HDfprintf(stderr, "    Read failed for whole array.\n");
+        fprintf(stderr, "    Read failed for whole array.\n");
         goto error;
     }
     for (i = 0; i < nx; i++) {
@@ -379,16 +379,16 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz)
             for (k = 0; k < nz; k++) {
                 if (whole[i * ny * nz + j * nz + k] != buf[i * ny * nz + j * nz + k]) {
                     H5_FAILED();
-                    HDfprintf(stderr, "    Check failed at i=%lu", (unsigned long)i);
+                    fprintf(stderr, "    Check failed at i=%lu", (unsigned long)i);
                     if (ndims > 1) {
-                        HDfprintf(stderr, ", j=%lu", (unsigned long)j);
+                        fprintf(stderr, ", j=%lu", (unsigned long)j);
                     }
                     if (ndims > 2) {
-                        HDfprintf(stderr, ", k=%lu", (unsigned long)k);
+                        fprintf(stderr, ", k=%lu", (unsigned long)k);
                     }
-                    HDfprintf(stderr, "\n    Check array is:\n");
+                    fprintf(stderr, "\n    Check array is:\n");
                     print_array(whole, nx, ny, nz);
-                    HDfprintf(stderr, "    Value read is:\n");
+                    fprintf(stderr, "    Value read is:\n");
                     print_array(buf, nx, ny, nz);
                     goto error;
                 }
@@ -488,7 +488,7 @@ test_sparse(hid_t f, const char *prefix, size_t nblocks, size_t nx, size_t ny, s
     /* Build the new empty object */
     HDsnprintf(name, sizeof(name), "%s_%s", prefix, dims);
     if ((dataset = new_object(f, name, ndims, whole_size, chunk_dims)) < 0) {
-        HDprintf("    Cannot create %u-d object `%s'\n", ndims, name);
+        printf("    Cannot create %u-d object `%s'\n", ndims, name);
         goto error;
     }
 
@@ -512,18 +512,18 @@ test_sparse(hid_t f, const char *prefix, size_t nblocks, size_t nx, size_t ny, s
         /* write to disk */
         if (H5Dwrite(dataset, TEST_DATATYPE, mspace, fspace, H5P_DEFAULT, buf) < 0) {
             H5_FAILED();
-            HDprintf("    Write failed: ctr=%lu\n", (unsigned long)ctr);
-            HDprintf("    offset=(%lu", (unsigned long)(offset[0]));
+            printf("    Write failed: ctr=%lu\n", (unsigned long)ctr);
+            printf("    offset=(%lu", (unsigned long)(offset[0]));
             if (ndims > 1)
-                HDprintf(",%lu", (unsigned long)(offset[1]));
+                printf(",%lu", (unsigned long)(offset[1]));
             if (ndims > 2)
-                HDprintf(",%lu", (unsigned long)(offset[2]));
-            HDprintf("), size=(%lu", (unsigned long)(size[0]));
+                printf(",%lu", (unsigned long)(offset[2]));
+            printf("), size=(%lu", (unsigned long)(size[0]));
             if (ndims > 1)
-                HDprintf(",%lu", (unsigned long)(size[1]));
+                printf(",%lu", (unsigned long)(size[1]));
             if (ndims > 2)
-                HDprintf(",%lu", (unsigned long)(size[2]));
-            HDprintf(")\n");
+                printf(",%lu", (unsigned long)(size[2]));
+            printf(")\n");
             goto error;
         }
 
@@ -592,18 +592,18 @@ main(int argc, char *argv[])
                 size_of_test |= TEST_LARGE;
             }
             else {
-                HDprintf("unrecognized argument: %s\n", argv[i]);
+                printf("unrecognized argument: %s\n", argv[i]);
             }
         }
     }
-    HDprintf("Test sizes: ");
+    printf("Test sizes: ");
     if (size_of_test & TEST_SMALL)
-        HDprintf(" SMALL");
+        printf(" SMALL");
     if (size_of_test & TEST_MEDIUM)
-        HDprintf(" MEDIUM");
+        printf(" MEDIUM");
     if (size_of_test & TEST_LARGE)
-        HDprintf(" LARGE");
-    HDprintf("\n");
+        printf(" LARGE");
+    printf("\n");
 
     /* Set the random # seed */
     HDsrandom((unsigned)HDtime(NULL));
@@ -625,7 +625,7 @@ main(int argc, char *argv[])
     /* Create the test file */
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
     if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) {
-        HDprintf("Cannot create file %s; test aborted\n", filename);
+        printf("Cannot create file %s; test aborted\n", filename);
         HDexit(EXIT_FAILURE);
     }
 
@@ -680,7 +680,7 @@ main(int argc, char *argv[])
          */
         status = test_sparse(file, "sparse", (size_t)800, (size_t)50, (size_t)50, (size_t)50, skip_test);
         if (skip_test)
-            HDprintf("    The current VFD does not support sparse files on this platform.\n");
+            printf("    The current VFD does not support sparse files on this platform.\n");
         nerrors += status < 0 ? 1 : 0;
     }
 
@@ -692,11 +692,11 @@ main(int argc, char *argv[])
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
 
     if (nerrors) {
-        HDprintf("***** %d I-STORE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+        printf("***** %d I-STORE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
         HDexit(EXIT_FAILURE);
     }
 
-    HDprintf("All i-store tests passed.\n");
+    printf("All i-store tests passed.\n");
 
     h5_cleanup(FILENAME, fapl);
 
diff --git a/test/lheap.c b/test/lheap.c
index e8e7724..9a1744b 100644
--- a/test/lheap.c
+++ b/test/lheap.c
@@ -157,9 +157,9 @@ main(void)
 
         if (HDstrcmp(s, buf) != 0) {
             H5_FAILED();
-            HDprintf("    i=%d, heap offset=%lu\n", i, (unsigned long)(obj[i]));
-            HDprintf("    got: \"%s\"\n", s);
-            HDprintf("    ans: \"%s\"\n", buf);
+            printf("    i=%d, heap offset=%lu\n", i, (unsigned long)(obj[i]));
+            printf("    got: \"%s\"\n", s);
+            printf("    ans: \"%s\"\n", buf);
             goto error;
         }
 
@@ -194,7 +194,7 @@ main(void)
             }
             else {
                 H5_FAILED();
-                HDprintf("***cannot open the pre-created non-default sizes test file (%s)\n", testfile);
+                printf("***cannot open the pre-created non-default sizes test file (%s)\n", testfile);
                 goto error;
             } /* end else */
         }
diff --git a/test/links.c b/test/links.c
index fcafbf8..59e2c42 100644
--- a/test/links.c
+++ b/test/links.c
@@ -639,7 +639,7 @@ cklinks(hid_t fapl, hbool_t new_format)
         FAIL_STACK_ERROR;
     if (H5O_TYPE_DATASET != oinfo2.type) {
         H5_FAILED();
-        HDprintf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
+        printf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
         TEST_ERROR;
     } /* end if */
 
@@ -689,7 +689,7 @@ cklinks(hid_t fapl, hbool_t new_format)
         FAIL_STACK_ERROR;
     if (H5O_TYPE_DATASET != oinfo2.type) {
         H5_FAILED();
-        HDprintf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
+        printf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     if (H5Otoken_cmp(file, &oinfo1.token, &oinfo2.token, &token_cmp) < 0)
@@ -725,12 +725,12 @@ cklinks(hid_t fapl, hbool_t new_format)
         FAIL_STACK_ERROR;
     if (H5L_TYPE_SOFT != linfo.type) {
         H5_FAILED();
-        HDprintf("    %d: Unexpected object type should have been a symbolic link\n", __LINE__);
+        printf("    %d: Unexpected object type should have been a symbolic link\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     if (H5Lget_val(file, "grp1/dangle", linkval, sizeof linkval, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    %d: Can't retrieve link value\n", __LINE__);
+        printf("    %d: Can't retrieve link value\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     if (HDstrcmp(linkval, "foobar") != 0) {
@@ -756,12 +756,12 @@ cklinks(hid_t fapl, hbool_t new_format)
         FAIL_STACK_ERROR;
     if (H5L_TYPE_SOFT != linfo.type) {
         H5_FAILED();
-        HDprintf("    %d: Unexpected object type should have been a symbolic link\n", __LINE__);
+        printf("    %d: Unexpected object type should have been a symbolic link\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     if (H5Lget_val(file, "grp1/recursive", linkval, sizeof linkval, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    %d: Can't retrieve link value\n", __LINE__);
+        printf("    %d: Can't retrieve link value\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     if (HDstrcmp(linkval, "/grp1/recursive") != 0) {
@@ -824,7 +824,7 @@ ck_new_links(hid_t fapl, hbool_t new_format)
     /* Check hard links */
     if (H5O_TYPE_DATASET != oi_hard1.type || H5O_TYPE_DATASET != oi_hard2.type) {
         H5_FAILED();
-        HDprintf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
+        printf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
         TEST_ERROR;
     }
 
@@ -2162,7 +2162,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
         FAIL_STACK_ERROR;
     if (H5O_TYPE_DATASET != oinfo2.type) {
         H5_FAILED();
-        HDprintf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
+        printf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     if (H5_addr_ne(oinfo1.addr, oinfo2.addr)) {
@@ -2207,7 +2207,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
         FAIL_STACK_ERROR;
     if (H5O_TYPE_DATASET != oinfo2.type) {
         H5_FAILED();
-        HDprintf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
+        printf("    %d: Unexpected object type should have been a dataset\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     if (H5_addr_ne(oinfo1.addr, oinfo2.addr)) {
@@ -2241,12 +2241,12 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
         FAIL_STACK_ERROR;
     if (H5L_TYPE_SOFT != linfo.type) {
         H5_FAILED();
-        HDprintf("    %d: Unexpected object type should have been a symbolic link\n", __LINE__);
+        printf("    %d: Unexpected object type should have been a symbolic link\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     if (H5Lget_val(file, "grp1/dangle", linkval, sizeof linkval, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    %d: Can't retrieve link value\n", __LINE__);
+        printf("    %d: Can't retrieve link value\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     if (HDstrcmp(linkval, "foobar") != 0) {
@@ -2272,12 +2272,12 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
         FAIL_STACK_ERROR;
     if (H5L_TYPE_SOFT != linfo.type) {
         H5_FAILED();
-        HDprintf("    %d: Unexpected object type should have been a symbolic link\n", __LINE__);
+        printf("    %d: Unexpected object type should have been a symbolic link\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     if (H5Lget_val(file, "grp1/recursive", linkval, sizeof linkval, H5P_DEFAULT) < 0) {
         H5_FAILED();
-        HDprintf("    %d: Can't retrieve link value\n", __LINE__);
+        printf("    %d: Can't retrieve link value\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     if (HDstrcmp(linkval, "/grp1/recursive") != 0) {
@@ -8064,7 +8064,7 @@ external_link_toomany(hid_t fapl, hbool_t new_format)
     H5E_END_TRY
     if (gid >= 0) {
         H5_FAILED();
-        HDprintf("%d:    Should have failed for sequence of too many nested links.", __LINE__);
+        printf("%d:    Should have failed for sequence of too many nested links.", __LINE__);
         goto error;
     }
 
@@ -22678,13 +22678,13 @@ main(void)
 
     for (minimize_dset_oh = 0; minimize_dset_oh <= 1; minimize_dset_oh++) {
         if (minimize_dset_oh) {
-            HDprintf("\n-Testing with minimized dataset object headers-\n");
+            printf("\n-Testing with minimized dataset object headers-\n");
             dcpl_g = H5Pcreate(H5P_DATASET_CREATE);
             if (0 > dcpl_g)
                 TEST_ERROR;
         }
         else {
-            HDprintf("\n-Testing with unminimzed dataset object headers-\n");
+            printf("\n-Testing with unminimzed dataset object headers-\n");
             dcpl_g = H5P_DEFAULT;
         }
 
@@ -22694,11 +22694,11 @@ main(void)
             /* Check for FAPL to use */
             if (new_format) {
                 my_fapl = fapl2;
-                HDprintf("\n--Testing with 'new format'--\n");
+                printf("\n--Testing with 'new format'--\n");
             }
             else {
                 my_fapl = fapl;
-                HDprintf("\n--Testing with 'old format'--\n");
+                printf("\n--Testing with 'old format'--\n");
             }
 
             /* always enter tests without external cache */
@@ -22752,12 +22752,12 @@ main(void)
                     if (efc) {
                         if (H5Pset_elink_file_cache_size(my_fapl, 8) < 0)
                             TEST_ERROR;
-                        HDprintf("\n---Testing with external file cache---\n");
+                        printf("\n---Testing with external file cache---\n");
                     } /* end if */
                     else {
                         if (H5Pset_elink_file_cache_size(my_fapl, 0) < 0)
                             TEST_ERROR;
-                        HDprintf("\n---Testing without external file cache---\n");
+                        printf("\n---Testing without external file cache---\n");
                     } /* end else */
 
                     nerrors += external_link_root(my_fapl, new_format) < 0 ? 1 : 0;
@@ -22941,10 +22941,10 @@ main(void)
 
     /* Results */
     if (nerrors) {
-        HDprintf("***** %d LINK TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+        printf("***** %d LINK TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
         HDexit(EXIT_FAILURE);
     }
-    HDprintf("All link tests passed.\n");
+    printf("All link tests passed.\n");
 
     /* clean up symlink created by external link tests */
     HDremove(SYMLINK1);
diff --git a/test/links_env.c b/test/links_env.c
index db10269..41daf6a 100644
--- a/test/links_env.c
+++ b/test/links_env.c
@@ -182,11 +182,11 @@ main(void)
 
     /* Results */
     if (nerrors) {
-        HDprintf("***** %d External Link (HDF5_EXT_PREFIX) test%s FAILED! *****\n", nerrors,
-                 1 == nerrors ? "" : "s");
+        printf("***** %d External Link (HDF5_EXT_PREFIX) test%s FAILED! *****\n", nerrors,
+               1 == nerrors ? "" : "s");
         HDexit(EXIT_FAILURE);
     }
-    HDprintf("All external Link (HDF5_EXT_PREFIX) tests passed.\n");
+    printf("All external Link (HDF5_EXT_PREFIX) tests passed.\n");
 
     /* clean up tmp_links_env directory created by external link tests */
     HDrmdir(TMPDIR);
diff --git a/test/mf.c b/test/mf.c
index d73b95c..641e638 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -167,28 +167,27 @@ check_stats(const H5F_t *f, const H5FS_t *frsp, H5FS_stat_t *state)
         FAIL_STACK_ERROR;
 
     if (frspace_stats.tot_space != state->tot_space) {
-        HDfprintf(stdout, "frspace_stats.tot_space = %" PRIuHSIZE ", state->tot_space = %" PRIuHSIZE "\n",
-                  frspace_stats.tot_space, state->tot_space);
+        fprintf(stdout, "frspace_stats.tot_space = %" PRIuHSIZE ", state->tot_space = %" PRIuHSIZE "\n",
+                frspace_stats.tot_space, state->tot_space);
         TEST_ERROR;
     } /* end if */
     if (frspace_stats.tot_sect_count != state->tot_sect_count) {
-        HDfprintf(stdout,
-                  "frspace_stats.tot_sect_count = %" PRIuHSIZE ", state->tot_sect_count = %" PRIuHSIZE "\n",
-                  frspace_stats.tot_sect_count, state->tot_sect_count);
+        fprintf(stdout,
+                "frspace_stats.tot_sect_count = %" PRIuHSIZE ", state->tot_sect_count = %" PRIuHSIZE "\n",
+                frspace_stats.tot_sect_count, state->tot_sect_count);
         TEST_ERROR;
     } /* end if */
     if (frspace_stats.serial_sect_count != state->serial_sect_count) {
-        HDfprintf(stdout,
-                  "frspace_stats.serial_sect_count = %" PRIuHSIZE ", state->serial_sect_count = %" PRIuHSIZE
-                  "\n",
-                  frspace_stats.serial_sect_count, state->serial_sect_count);
+        fprintf(stdout,
+                "frspace_stats.serial_sect_count = %" PRIuHSIZE ", state->serial_sect_count = %" PRIuHSIZE
+                "\n",
+                frspace_stats.serial_sect_count, state->serial_sect_count);
         TEST_ERROR;
     } /* end if */
     if (frspace_stats.ghost_sect_count != state->ghost_sect_count) {
-        HDfprintf(stdout,
-                  "frspace_stats.ghost_sect_count = %" PRIuHSIZE ", state->ghost_sect_count = %" PRIuHSIZE
-                  "\n",
-                  frspace_stats.ghost_sect_count, state->ghost_sect_count);
+        fprintf(stdout,
+                "frspace_stats.ghost_sect_count = %" PRIuHSIZE ", state->ghost_sect_count = %" PRIuHSIZE "\n",
+                frspace_stats.ghost_sect_count, state->ghost_sect_count);
         TEST_ERROR;
     } /* end if */
 
@@ -6315,7 +6314,7 @@ test_mf_fs_persist_split(void)
      * with the split file driver.
      */
     SKIPPED();
-    HDfprintf(stdout, " Persistent FSMs disabled in multi file driver.\n");
+    fprintf(stdout, " Persistent FSMs disabled in multi file driver.\n");
     return 0; /* <========== note return */
 
     /* File creation property list template */
@@ -6325,7 +6324,7 @@ test_mf_fs_persist_split(void)
          * with the split file driver.
          */
         SKIPPED();
-    HDfprintf(stdout, " Persistent FSMs disabled in multi file driver.\n");
+    fprintf(stdout, " Persistent FSMs disabled in multi file driver.\n");
     return 0; /* <========== note return */
 
     /* File creation property list template */
@@ -6638,14 +6637,14 @@ test_mf_fs_persist_multi(void)
      * with the multi file driver.
      */
     SKIPPED();
-    HDfprintf(stdout, " Persistent FSMs disabled in multi file driver.\n");
+    fprintf(stdout, " Persistent FSMs disabled in multi file driver.\n");
     return 0; /* <========== note return */
 
     /* for now, we don't support persistent free space managers
      * with the multi file driver.
      */
     SKIPPED();
-    HDfprintf(stdout, " Persistent FSMs disabled in multi file driver.\n");
+    fprintf(stdout, " Persistent FSMs disabled in multi file driver.\n");
     return 0; /* <========== note return */
 
     /* File creation property list template */
diff --git a/test/mirror_vfd.c b/test/mirror_vfd.c
index bd38d8c..92bdaed 100644
--- a/test/mirror_vfd.c
+++ b/test/mirror_vfd.c
@@ -63,7 +63,7 @@ static unsigned int g_verbosity = DEFAULT_VERBOSITY;
 #define LOGPRINT(lvl, ...)                                                                                   \
     do {                                                                                                     \
         if ((lvl) <= g_verbosity) {                                                                          \
-            HDfprintf(g_log_stream, __VA_ARGS__);                                                            \
+            fprintf(g_log_stream, __VA_ARGS__);                                                              \
             HDfflush(g_log_stream);                                                                          \
         }                                                                                                    \
     } while (0)
@@ -274,16 +274,16 @@ error:
         }                                                                                                    \
         if (_x != (len)) {                                                                                   \
             size_t _y = 0;                                                                                   \
-            HDprintf("First bytes differ at %zu\n", _x);                                                     \
-            HDprintf("exp  ");                                                                               \
+            printf("First bytes differ at %zu\n", _x);                                                       \
+            printf("exp  ");                                                                                 \
             for (_y = _x; _y < (len); _y++) {                                                                \
-                HDprintf("%02X", (unsigned char)(exp)[_y]);                                                  \
+                printf("%02X", (unsigned char)(exp)[_y]);                                                    \
             }                                                                                                \
-            HDprintf("\nact  ");                                                                             \
+            printf("\nact  ");                                                                               \
             for (_y = _x; _y < (len); _y++) {                                                                \
-                HDprintf("%02X", (unsigned char)(act)[_y]);                                                  \
+                printf("%02X", (unsigned char)(act)[_y]);                                                    \
             }                                                                                                \
-            HDprintf("\n");                                                                                  \
+            printf("\n");                                                                                    \
         }                                                                                                    \
     } while (0); /* end PRINT_BUFFER_DIFF */
 
@@ -1963,7 +1963,7 @@ test_on_disk_zoo(const struct mt_opts *opts)
         validate_zoo(file_id, grp_name, 0); /* sanity-check */
 
     if (!pass) {
-        HDprintf("%s", failure_mssg);
+        printf("%s", failure_mssg);
         TEST_ERROR;
     }
 
@@ -2095,7 +2095,7 @@ test_vanishing_datasets(const struct mt_opts *opts)
     if (H5Gget_info(file_id, &group_info) < 0)
         TEST_ERROR;
     if (group_info.nlinks > 0) {
-        HDfprintf(stderr, "links in rw file: %" PRIuHSIZE "\n", group_info.nlinks);
+        fprintf(stderr, "links in rw file: %" PRIuHSIZE "\n", group_info.nlinks);
         TEST_ERROR;
     }
     if (H5Fclose(file_id) < 0)
@@ -2105,7 +2105,7 @@ test_vanishing_datasets(const struct mt_opts *opts)
     if (H5Gget_info(file_id, &group_info) < 0)
         TEST_ERROR;
     if (group_info.nlinks > 0) {
-        HDfprintf(stderr, "links in wo file: %" PRIuHSIZE "\n", group_info.nlinks);
+        fprintf(stderr, "links in wo file: %" PRIuHSIZE "\n", group_info.nlinks);
         TEST_ERROR;
     }
     if (H5Fclose(file_id) < 0)
@@ -2304,7 +2304,7 @@ parse_args(int argc, char **argv, struct mt_opts *opts)
         else if (!HDstrncmp(argv[i], "--port=", 7))
             opts->portno = HDatoi(argv[i] + 7);
         else {
-            HDprintf("Unrecognized option: '%s'\n", argv[i]);
+            printf("Unrecognized option: '%s'\n", argv[i]);
             return -1;
         }
     } /* end for each argument from command line */
@@ -2334,7 +2334,7 @@ confirm_server(struct mt_opts *opts)
 
     live_socket = socket(AF_INET, SOCK_STREAM, 0);
     if (live_socket < 0) {
-        HDprintf("ERROR socket()\n");
+        printf("ERROR socket()\n");
         return -1;
     }
 
@@ -2346,25 +2346,25 @@ confirm_server(struct mt_opts *opts)
     while (1) {
         if (connect(live_socket, (struct sockaddr *)&target_addr, (socklen_t)sizeof(target_addr)) < 0) {
             if (attempt > 10) {
-                HDprintf("ERROR connect() (%d)\n%s\n", errno, HDstrerror(errno));
+                printf("ERROR connect() (%d)\n%s\n", errno, HDstrerror(errno));
                 return -1;
             }
 
             /* Close socket during sleep() */
             if (HDclose(live_socket) < 0) {
-                HDprintf("ERROR close() can't close socket\n");
+                printf("ERROR close() can't close socket\n");
                 return -1;
             }
             live_socket = -1;
 
             attempt++;
             HDsleep(1);
-            HDprintf("attempt #%u: ERROR connect() (%d)\n%s\n", attempt, errno, HDstrerror(errno));
+            printf("attempt #%u: ERROR connect() (%d)\n%s\n", attempt, errno, HDstrerror(errno));
 
             /* Re-open socket for retry */
             live_socket = socket(AF_INET, SOCK_STREAM, 0);
             if (live_socket < 0) {
-                HDprintf("ERROR socket()\n");
+                printf("ERROR socket()\n");
                 return -1;
             }
         }
@@ -2374,22 +2374,22 @@ confirm_server(struct mt_opts *opts)
 
     /* Request confirmation from the server */
     if (HDwrite(live_socket, "CONFIRM", 8) == -1) {
-        HDprintf("ERROR write() (%d)\n%s\n", errno, HDstrerror(errno));
+        printf("ERROR write() (%d)\n%s\n", errno, HDstrerror(errno));
         return -1;
     }
 
     /* Read & verify response from port connection.  */
     if (HDread(live_socket, &mybuf, sizeof(mybuf)) == -1) {
-        HDprintf("ERROR read() can't receive data\n");
+        printf("ERROR read() can't receive data\n");
         return -1;
     }
     if (HDstrncmp("ALIVE", mybuf, 6)) {
-        HDprintf("ERROR read() didn't receive data from server\n");
+        printf("ERROR read() didn't receive data from server\n");
         return -1;
     }
 
     if (HDclose(live_socket) < 0) {
-        HDprintf("ERROR close() can't close socket\n");
+        printf("ERROR close() can't close socket\n");
         return -1;
     }
 
@@ -2415,7 +2415,7 @@ main(int argc, char **argv)
 
     g_log_stream = stdout; /* default debug/logging output stream */
 
-    HDprintf("Testing Mirror VFD functionality.\n");
+    printf("Testing Mirror VFD functionality.\n");
 
     /* SETUP */
 
@@ -2430,12 +2430,12 @@ main(int argc, char **argv)
     }
 
     if (parse_args(argc, argv, &opts) < 0) {
-        HDprintf("Unable to parse arguments\n");
+        printf("Unable to parse arguments\n");
         HDexit(EXIT_FAILURE);
     }
 
     if (confirm_server(&opts) < 0) {
-        HDprintf("Unable to confirm server is running\n");
+        printf("Unable to confirm server is running\n");
         HDexit(EXIT_FAILURE);
     }
 
@@ -2477,11 +2477,11 @@ main(int argc, char **argv)
     }
 
     if (nerrors) {
-        HDprintf("***** %d Mirror VFD TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+        printf("***** %d Mirror VFD TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
         return EXIT_FAILURE;
     }
 
-    HDprintf("All Mirror Virtual File Driver tests passed.\n");
+    printf("All Mirror Virtual File Driver tests passed.\n");
     return EXIT_SUCCESS;
 } /* end main() */
 
@@ -2490,8 +2490,8 @@ main(int argc, char **argv)
 int
 main(void)
 {
-    HDprintf("Testing Mirror VFD functionality.\n");
-    HDprintf("SKIPPED - Mirror VFD not built.\n");
+    printf("Testing Mirror VFD functionality.\n");
+    printf("SKIPPED - Mirror VFD not built.\n");
     return EXIT_SUCCESS;
 }
 
diff --git a/test/mount.c b/test/mount.c
index 9cb65c9..42bfd3a 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -1016,7 +1016,7 @@ test_unlink(hid_t fapl)
     H5E_END_TRY
     if (status >= 0) {
         H5_FAILED();
-        HDprintf("    %d: Unmount by name should not have been allowed!\n", __LINE__);
+        printf("    %d: Unmount by name should not have been allowed!\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     H5E_BEGIN_TRY
@@ -1026,7 +1026,7 @@ test_unlink(hid_t fapl)
     H5E_END_TRY
     if (status >= 0) {
         H5_FAILED();
-        HDprintf("    %d: Unmount by name should not have been allowed!\n", __LINE__);
+        printf("    %d: Unmount by name should not have been allowed!\n", __LINE__);
         TEST_ERROR;
     } /* end if */
     if (H5Funmount(mnt, ".") < 0)
diff --git a/test/mtime.c b/test/mtime.c
index 5b5fc4e..4d4dc00 100644
--- a/test/mtime.c
+++ b/test/mtime.c
@@ -122,7 +122,7 @@ main(void)
         HDstrftime((char *)buf1, sizeof buf1, "%Y-%m-%d %H:%M:%S", tm);
         tm = HDlocaltime(&now);
         HDstrftime((char *)buf2, sizeof buf2, "%Y-%m-%d %H:%M:%S", tm);
-        HDprintf("    got: %s\n    ans: %s\n", buf1, buf2);
+        printf("    got: %s\n    ans: %s\n", buf1, buf2);
         goto error;
     }
     PASSED();
@@ -152,7 +152,7 @@ main(void)
             }
             else {
                 H5_FAILED();
-                HDprintf("***cannot open the pre-created old modification test file (%s)\n", testfile);
+                printf("***cannot open the pre-created old modification test file (%s)\n", testfile);
                 goto error;
             } /* end else */
         }
@@ -182,7 +182,7 @@ main(void)
             }
             else {
                 H5_FAILED();
-                HDprintf("***cannot open the pre-created old modification test file (%s)\n", testfile);
+                printf("***cannot open the pre-created old modification test file (%s)\n", testfile);
                 goto error;
             } /* end else */
         }
diff --git a/test/ntypes.c b/test/ntypes.c
index aa90828..210dc9c 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -152,8 +152,8 @@ test_atomic_dtype(hid_t file)
         for (j = 0; j < DIM1; j++)
             if (ipoints2->arr[i][j] != icheck2->arr[i][j]) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %d,%d\n", i, j);
+                printf("    Read different values than written.\n");
+                printf("    At index %d,%d\n", i, j);
                 goto error;
             } /* end if */
 
@@ -563,8 +563,8 @@ test_compound_dtype2(hid_t file)
                 temp_point->st.c2 != temp_check->st.c2 || temp_point->st.l2 != temp_check->st.l2 ||
                 temp_point->st.ll2 != temp_check->st.ll2 || temp_point->l != temp_check->l) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %d,%d\n", i, j);
+                printf("    Read different values than written.\n");
+                printf("    At index %d,%d\n", i, j);
                 goto error;
             } /* end if */
         }     /* end for */
@@ -783,8 +783,8 @@ test_compound_dtype(hid_t file)
             if (temp_point->c != temp_check->c || temp_point->i != temp_check->i ||
                 temp_point->l != temp_check->l) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %d,%d\n", i, j);
+                printf("    Read different values than written.\n");
+                printf("    At index %d,%d\n", i, j);
                 goto error;
             } /* end if */
 
@@ -1012,16 +1012,16 @@ test_compound_dtype3(hid_t file)
         for (j = 0; j < DIM1; j++, temp_point++, temp_check++) {
             if (temp_point->c != temp_check->c || temp_point->l != temp_check->l) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %d,%d\n", i, j);
+                printf("    Read different values than written.\n");
+                printf("    At index %d,%d\n", i, j);
                 goto error;
             } /* end if */
 
             for (k = 0; k < 5; k++) {
                 if (temp_point->a[k] != temp_check->a[k]) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    At index %d,%d,%d\n", i, j, k);
+                    printf("    Read different values than written.\n");
+                    printf("    At index %d,%d,%d\n", i, j, k);
                     goto error;
                 } /* end if */
             }     /* end for */
@@ -1240,16 +1240,16 @@ test_compound_opaque(hid_t file)
         for (j = 0; j < DIM1; j++, temp_point++, temp_check++) {
             if (temp_point->c != temp_check->c || temp_point->l != temp_check->l) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %d,%d\n", i, j);
+                printf("    Read different values than written.\n");
+                printf("    At index %d,%d\n", i, j);
                 goto error;
             } /* end if */
 
             for (k = 0; k < 5; k++) {
                 if (temp_point->o[k] != temp_check->o[k]) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    At index %d,%d,%d\n", i, j, k);
+                    printf("    Read different values than written.\n");
+                    printf("    At index %d,%d,%d\n", i, j, k);
                     goto error;
                 } /* end if */
             }     /* end for */
@@ -1413,9 +1413,9 @@ test_enum_dtype(hid_t file)
         for (j = 0; j < DIM1; j++)
             if (spoints2->arr[i][j] != scheck2->arr[i][j]) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %d,%d\n", i, j);
-                HDprintf(" spoints2[i][j]=%hd, scheck2[i][j]=%hd\n", spoints2->arr[i][j], scheck2->arr[i][j]);
+                printf("    Read different values than written.\n");
+                printf("    At index %d,%d\n", i, j);
+                printf(" spoints2[i][j]=%hd, scheck2[i][j]=%hd\n", spoints2->arr[i][j], scheck2->arr[i][j]);
                 goto error;
             } /* end if */
 
@@ -1588,8 +1588,8 @@ test_array_dtype(hid_t file)
                 if (temp_point->c != temp_check->c || temp_point->i != temp_check->i ||
                     temp_point->l != temp_check->l) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    At index %d,%d\n", i, j);
+                    printf("    Read different values than written.\n");
+                    printf("    At index %d,%d\n", i, j);
                     goto error;
                 } /* end if */
 
@@ -1744,8 +1744,8 @@ test_array_dtype2(hid_t file)
             for (k = 0; k < 5; k++)
                 if (icheck3->arr[i][j][k] != ipoints3->arr[i][j][k]) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    At index %d,%d\n", i, j);
+                    printf("    Read different values than written.\n");
+                    printf("    At index %d,%d\n", i, j);
                     goto error;
                 } /* end if */
 
@@ -1820,7 +1820,7 @@ test_vl_dtype(hid_t file)
         wdata[i].p = HDmalloc((i + 1) * sizeof(hvl_t));
         if (NULL == wdata[i].p) {
             H5_FAILED();
-            HDprintf("    Cannot allocate memory for VL data! i=%u\n", (unsigned)i);
+            printf("    Cannot allocate memory for VL data! i=%u\n", (unsigned)i);
             goto error;
         } /* end if */
         wdata[i].len = i + 1;
@@ -1828,7 +1828,7 @@ test_vl_dtype(hid_t file)
             t1->p = HDmalloc((j + 1) * sizeof(unsigned int));
             if (NULL == t1->p) {
                 H5_FAILED();
-                HDprintf("    Cannot allocate memory for VL data! i=%u, j=%u\n", (unsigned)i, (unsigned)j);
+                printf("    Cannot allocate memory for VL data! i=%u, j=%u\n", (unsigned)i, (unsigned)j);
                 goto error;
             } /* end if */
             t1->len = j + 1;
@@ -1900,15 +1900,15 @@ test_vl_dtype(hid_t file)
     for (i = 0; i < SPACE1_DIM1; i++) {
         if (wdata[i].len != rdata[i].len) {
             H5_FAILED();
-            HDprintf("    VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n", (int)i,
-                     (int)wdata[i].len, (int)i, (int)rdata[i].len);
+            printf("    VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n", (int)i,
+                   (int)wdata[i].len, (int)i, (int)rdata[i].len);
             goto error;
         } /* end if */
         for (t1 = (hvl_t *)wdata[i].p, t2 = (hvl_t *)rdata[i].p, j = 0; j < rdata[i].len; j++, t1++, t2++) {
             if (t1->len != t2->len) {
                 H5_FAILED();
-                HDprintf("    VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n", (int)i,
-                         (int)wdata[i].len, (int)i, (int)rdata[i].len);
+                printf("    VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n", (int)i,
+                       (int)wdata[i].len, (int)i, (int)rdata[i].len);
                 goto error;
             } /* end if */
 
@@ -1924,8 +1924,8 @@ test_vl_dtype(hid_t file)
             for (k = 0; k < t2->len; k++) {
                 if (((unsigned int *)t1->p)[k] != ((unsigned int *)tmp)[k]) {
                     H5_FAILED();
-                    HDprintf("    VL data don't match!, wdata[%u].p=%d, rdata[%u].p=%u\n", (unsigned)i,
-                             ((unsigned int *)t1->p)[k], (unsigned)i, ((unsigned int *)tmp)[k]);
+                    printf("    VL data don't match!, wdata[%u].p=%d, rdata[%u].p=%u\n", (unsigned)i,
+                           ((unsigned int *)t1->p)[k], (unsigned)i, ((unsigned int *)tmp)[k]);
                     goto error;
                 } /* end if */
             }     /* end for */
@@ -2075,14 +2075,14 @@ test_vlstr_dtype(hid_t file)
     for (i = 0; i < SPACE1_DIM1; i++) {
         if (HDstrlen(wdata[i]) != HDstrlen(rdata[i])) {
             H5_FAILED();
-            HDprintf("    VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", (int)i,
-                     (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i]));
+            printf("    VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", (int)i,
+                   (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i]));
             goto error;
         } /* end if */
         if (HDstrcmp(wdata[i], rdata[i]) != 0) {
             H5_FAILED();
-            HDprintf("    VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i],
-                     (int)i, rdata[i]);
+            printf("    VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i], (int)i,
+                   rdata[i]);
             goto error;
         } /* end if */
     }     /* end for */
@@ -2206,14 +2206,14 @@ test_str_dtype(hid_t file)
     for (i = 0; i < SPACE1_DIM1; i++) {
         if (HDstrlen(wdata[i]) != HDstrlen(rdata[i])) {
             H5_FAILED();
-            HDprintf("    data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", (int)i,
-                     (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i]));
+            printf("    data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", (int)i,
+                   (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i]));
             goto error;
         } /* end if */
         if (HDstrcmp(wdata[i], rdata[i]) != 0) {
             H5_FAILED();
-            HDprintf("    data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i], (int)i,
-                     rdata[i]);
+            printf("    data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i], (int)i,
+                   rdata[i]);
             goto error;
         } /* end if */
     }     /* end for */
@@ -2697,8 +2697,8 @@ test_opaque_dtype(hid_t file)
     for (i = 0; i < sizeof(rbuf); i++)
         if (rbuf[i] != wbuf[i]) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %u\n", (unsigned)i);
+            printf("    Read different values than written.\n");
+            printf("    At index %u\n", (unsigned)i);
             goto error;
         } /* end if */
 
@@ -2817,8 +2817,8 @@ test_bitfield_dtype(hid_t file)
     for (i = 0; i < BITFIELD_ENUMB * 4; i++) {
         if (*p != wbuf[i]) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %zu\n", i);
+            printf("    Read different values than written.\n");
+            printf("    At index %zu\n", i);
             TEST_ERROR;
         }
         p++;
@@ -2850,8 +2850,8 @@ test_bitfield_dtype(hid_t file)
     for (i = 0; i < BITFIELD_ENUMB; i++) {
         if (intr[i] != intw[i]) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %zu\n", i);
+            printf("    Read different values than written.\n");
+            printf("    At index %zu\n", i);
             TEST_ERROR;
         }
     }
@@ -3027,13 +3027,13 @@ test_ninteger(void)
 
     /* check */
     if (H5Tget_precision(nid1) != H5Tget_precision(nid2)) {
-        HDprintf("    Precision differ.\n");
+        printf("    Precision differ.\n");
         TEST_ERROR;
     } /* end if */
 
     /* compare dataset creation property lists */
     if (H5Pequal(dcpl1, dcpl2) <= 0) {
-        HDprintf("    Property lists differ.\n");
+        printf("    Property lists differ.\n");
         TEST_ERROR;
     } /* end if */
 
@@ -3041,8 +3041,8 @@ test_ninteger(void)
     for (i = 0; i < DIM3; i++)
         if (buf[i] != chk[i]) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %d\n", i);
+            printf("    Read different values than written.\n");
+            printf("    At index %d\n", i);
             TEST_ERROR;
         } /* end if */
 
@@ -3155,7 +3155,7 @@ main(void)
     if (nerrors)
         goto error;
 
-    HDprintf("All native datatype tests passed.\n");
+    printf("All native datatype tests passed.\n");
     h5_cleanup(FILENAME, fapl);
 
     return 0;
@@ -3169,7 +3169,7 @@ error:
     H5E_END_TRY
 
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    printf("***** %d DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
 
     return 1;
 }
diff --git a/test/objcopy.c b/test/objcopy.c
index f1c4636..a14421b 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -17395,7 +17395,7 @@ main(void)
 
     ExpressMode = GetTestExpress();
     if (ExpressMode > 1)
-        HDprintf("***Express test mode on.  Some tests may be skipped\n");
+        printf("***Express test mode on.  Some tests may be skipped\n");
 
     /* Copy the file access property list */
     if ((fapl2 = H5Pcopy(fapl)) < 0)
@@ -17657,7 +17657,7 @@ main(void)
 
     /* Results */
     if (nerrors) {
-        HDprintf("***** %d OBJECT COPY TEST%s FAILED! *****\n", nerrors, (1 == nerrors ? "" : "S"));
+        printf("***** %d OBJECT COPY TEST%s FAILED! *****\n", nerrors, (1 == nerrors ? "" : "S"));
         HDexit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/test/objcopy_ref.c b/test/objcopy_ref.c
index 826ba9f..23deb2c 100644
--- a/test/objcopy_ref.c
+++ b/test/objcopy_ref.c
@@ -1867,7 +1867,7 @@ main(void)
 
     ExpressMode = GetTestExpress();
     if (ExpressMode > 1)
-        HDprintf("***Express test mode on.  Some tests may be skipped\n");
+        printf("***Express test mode on.  Some tests may be skipped\n");
 
     /* Copy the file access property list */
     if ((fapl2 = H5Pcopy(fapl)) < 0)
@@ -1971,7 +1971,7 @@ main(void)
 
     /* Results */
     if (nerrors) {
-        HDprintf("***** %d OBJECT COPY TEST%s FAILED! *****\n", nerrors, (1 == nerrors ? "" : "S"));
+        printf("***** %d OBJECT COPY TEST%s FAILED! *****\n", nerrors, (1 == nerrors ? "" : "S"));
         HDexit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/test/onion.c b/test/onion.c
index 20522bd..d87958e 100644
--- a/test/onion.c
+++ b/test/onion.c
@@ -927,7 +927,7 @@ test_header_encode_decode(void)
 
     for (i = 0; i < H5FD_ONION_ENCODED_SIZE_HEADER; i++) {
         if (exp[i] != buf[i]) {
-            HDprintf("first mismatched byte at %zu: %02x %02x\n", i, exp[i], buf[i]);
+            printf("first mismatched byte at %zu: %02x %02x\n", i, exp[i], buf[i]);
             TEST_ERROR;
         }
     }
@@ -1045,7 +1045,7 @@ test_history_encode_decode_empty(void)
         TEST_ERROR;
     for (i = 0; i < 20; i++) {
         if (exp[i] != buf[i]) {
-            HDprintf("first mismatched byte at %zu: %02x %02x\n", i, exp[i], buf[i]);
+            printf("first mismatched byte at %zu: %02x %02x\n", i, exp[i], buf[i]);
             TEST_ERROR;
         }
     }
@@ -1388,26 +1388,26 @@ test_revision_record_encode_decode(void)
     for (i = 0; i < exp_size; i++) {
         if (exp[i] != buf[i]) {
             badness = TRUE;
-            HDprintf("Bad encoded record - Index %zu: expected 0x%02X but got 0x%02X\n", i,
-                     (unsigned int)exp[i], (unsigned int)buf[i]);
+            printf("Bad encoded record - Index %zu: expected 0x%02X but got 0x%02X\n", i,
+                   (unsigned int)exp[i], (unsigned int)buf[i]);
         }
     }
     if (badness) {
         /* If this fragile test breaks, this information is helpful... */
-        HDprintf("INDEX\n");
+        printf("INDEX\n");
         for (i = 0; i < exp_size; i++)
-            HDprintf("%4zu ", i);
-        HDprintf("\n");
+            printf("%4zu ", i);
+        printf("\n");
 
-        HDprintf("EXPECTED\n");
+        printf("EXPECTED\n");
         for (i = 0; i < exp_size; i++)
-            HDprintf("0x%02X ", (unsigned int)exp[i]);
-        HDprintf("\n");
+            printf("0x%02X ", (unsigned int)exp[i]);
+        printf("\n");
 
-        HDprintf("ACTUAL\n");
+        printf("ACTUAL\n");
         for (i = 0; i < exp_size; i++)
-            HDprintf("0x%02X ", (unsigned int)buf[i]);
-        HDprintf("\n");
+            printf("0x%02X ", (unsigned int)buf[i]);
+        printf("\n");
     }
     if (badness)
         TEST_ERROR;
@@ -1545,7 +1545,7 @@ compare_file_bytes_exactly(const char *filepath, hid_t fapl_id, size_t nbytes, c
     /* filesize is wrong w/ stdio - it's zero instead of 40 or whatnot */
     filesize = (uint64_t)H5FDget_eof(raw_vfile, H5FD_MEM_DRAW);
     if ((uint64_t)nbytes != filesize) {
-        HDfprintf(stderr, "\nSizes not the same - nbytes: %zu, filesize: %" PRIu64 "\n", nbytes, filesize);
+        fprintf(stderr, "\nSizes not the same - nbytes: %zu, filesize: %" PRIu64 "\n", nbytes, filesize);
         TEST_ERROR;
     }
 
@@ -1562,7 +1562,7 @@ compare_file_bytes_exactly(const char *filepath, hid_t fapl_id, size_t nbytes, c
     /* Compare raw bytes data */
     for (size_t i = 0; i < nbytes; i++) {
         if (exp[i] != act_buf[i]) {
-            HDprintf("first mismatched byte %zu: expected 0x%02X was 0x%02X\n", i, exp[i], act_buf[i]);
+            printf("first mismatched byte %zu: expected 0x%02X was 0x%02X\n", i, exp[i], act_buf[i]);
             TEST_ERROR;
         }
     }
@@ -2309,7 +2309,7 @@ test_several_revisions_with_logical_gaps(void)
     if (NULL == file)
         TEST_ERROR;
     if (8 != H5FDget_eof(file, H5FD_MEM_DRAW)) {
-        HDprintf("\nEOF is not zero, it is: %" PRIuHADDR "\n", H5FDget_eof(file, H5FD_MEM_DRAW));
+        printf("\nEOF is not zero, it is: %" PRIuHADDR "\n", H5FDget_eof(file, H5FD_MEM_DRAW));
         TEST_ERROR;
     }
     if (H5FDclose(file) < 0)
@@ -2330,7 +2330,7 @@ test_several_revisions_with_logical_gaps(void)
     if (NULL == file)
         TEST_ERROR;
     if (0 != H5FDget_eof(file, H5FD_MEM_DRAW)) {
-        HDprintf("\nEOF is not zero, it is: %" PRIuHADDR "\n", H5FDget_eof(file, H5FD_MEM_DRAW));
+        printf("\nEOF is not zero, it is: %" PRIuHADDR "\n", H5FDget_eof(file, H5FD_MEM_DRAW));
         TEST_ERROR;
     }
     if (H5FDclose(file) < 0)
@@ -2352,8 +2352,8 @@ test_several_revisions_with_logical_gaps(void)
         TEST_ERROR;
     size = a_off + a_list_size_s;
     if (size != H5FDget_eof(file, H5FD_MEM_DRAW)) {
-        HDprintf("\nEOF is not %" PRIuHADDR ", it is: %" PRIuHADDR "\n", size,
-                 H5FDget_eof(file, H5FD_MEM_DRAW));
+        printf("\nEOF is not %" PRIuHADDR ", it is: %" PRIuHADDR "\n", size,
+               H5FDget_eof(file, H5FD_MEM_DRAW));
         TEST_ERROR;
     }
     if (NULL == (buf = HDmalloc(size * sizeof(unsigned char))))
@@ -2618,7 +2618,7 @@ do_onion_open_and_writes(const char *filename, H5FD_onion_fapl_info_t *onion_inf
                 size_t               z    = 0;
                 HDputs("i  exp  act");
                 for (z = 0; z < wi->size; z++)
-                    HDprintf("%02zx %c %c\n", z, _buf[z], buf_vfy[z]);
+                    printf("%02zx %c %c\n", z, _buf[z], buf_vfy[z]);
                 HDfflush(stdout);
                 TEST_ERROR;
             }
@@ -2746,20 +2746,20 @@ test_page_aligned_history_create(void)
         TEST_ERROR;
     if (HDmemcmp(a_list_s, buf + a_off, a_list_size_s) != 0) {
         size_t k;
-        HDprintf("aoff: %" PRIu64 "\n", a_off);
+        printf("aoff: %" PRIu64 "\n", a_off);
         HDputs("i exp act");
         for (k = 0; k < b_list_size_s; k++) {
-            HDprintf("%3zu:: %c : %c\n", k, (k < a_off) ? ' ' : a_list_s[k - a_off], buf[k]);
+            printf("%3zu:: %c : %c\n", k, (k < a_off) ? ' ' : a_list_s[k - a_off], buf[k]);
         }
         HDfflush(stdout);
         TEST_ERROR;
     }
     if (HDmemcmp(b_list_s, buf, a_off) != 0) {
         size_t k;
-        HDprintf("aoff: %" PRIu64 "\n", a_off);
+        printf("aoff: %" PRIu64 "\n", a_off);
         HDputs("i exp act");
         for (k = 0; k < b_list_size_s; k++) {
-            HDprintf("%3zu:: %c : %c\n", k, (k < a_off) ? b_list_s[k] : ' ', buf[k]);
+            printf("%3zu:: %c : %c\n", k, (k < a_off) ? b_list_s[k] : ' ', buf[k]);
         }
         HDfflush(stdout);
         TEST_ERROR;
@@ -3066,7 +3066,7 @@ test_integration_create(void)
         for (int j = 0; j < 256; j++) {
             int expected = i * j - j;
             if (rdata->arr[i][j] != expected) {
-                HDprintf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i][j]);
+                printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i][j]);
                 HDfflush(stdout);
                 TEST_ERROR;
             }
@@ -3104,7 +3104,7 @@ test_integration_create(void)
         for (int j = 0; j < 256; j++) {
             int expected = i * 6 + j + 1;
             if (rdata->arr[i][j] != expected) {
-                HDprintf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i][j]);
+                printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i][j]);
                 HDfflush(stdout);
                 TEST_ERROR;
             }
@@ -3143,7 +3143,7 @@ test_integration_create(void)
         for (int j = 0; j < 256; j++) {
             int expected = i * 3 + j + 5;
             if (rdata->arr[i][j] != expected) {
-                HDprintf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i][j]);
+                printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i][j]);
                 HDfflush(stdout);
                 TEST_ERROR;
             }
@@ -3407,7 +3407,7 @@ test_integration_create_simple(void)
     for (int i = 0; i < ONE_DIM_SIZE; i += 20) {
         int expected = i + 2048;
         if (rdata->arr[i] != expected) {
-            HDprintf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i]);
+            printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i]);
             TEST_ERROR;
         }
     }
@@ -4439,7 +4439,7 @@ test_integration_reference(void)
 
     /* Verify the number of selection */
     if ((nelmts = H5Sget_select_npoints(space)) != 8) {
-        HDprintf("Number of selected elements is supposed to be 8, but got %" PRIuHSIZE "\n", nelmts);
+        printf("Number of selected elements is supposed to be 8, but got %" PRIuHSIZE "\n", nelmts);
         TEST_ERROR;
     }
 
@@ -4526,7 +4526,7 @@ test_integration_reference(void)
         for (int j = 0; j < 4; j++) {
             int expected = i + j;
             if (rdata[i][j] != expected) {
-                HDprintf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata[i][j]);
+                printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata[i][j]);
                 TEST_ERROR;
             }
         }
@@ -4582,7 +4582,7 @@ test_integration_reference(void)
         TEST_ERROR;
 
     if ((nelmts = H5Sget_select_npoints(space2)) != 8) {
-        HDprintf("Number of selected elements is supposed to be 8, but got %" PRIuHSIZE "\n", nelmts);
+        printf("Number of selected elements is supposed to be 8, but got %" PRIuHSIZE "\n", nelmts);
         TEST_ERROR;
     }
 
@@ -4595,7 +4595,7 @@ test_integration_reference(void)
         TEST_ERROR;
 
     if ((nelmts = H5Sget_select_npoints(space2)) != 4) {
-        HDprintf("Number of selected elements is supposed to be 4, but got %" PRIuHSIZE "\n", nelmts);
+        printf("Number of selected elements is supposed to be 4, but got %" PRIuHSIZE "\n", nelmts);
         TEST_ERROR;
     }
 
@@ -4849,7 +4849,7 @@ test_integration_create_by_name(void)
     for (int i = 0; i < ONE_DIM_SIZE; i += 20) {
         int expected = i + 2048;
         if (rdata->arr[i] != expected) {
-            HDprintf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i]);
+            printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i]);
             TEST_ERROR;
         }
     }
@@ -4912,7 +4912,7 @@ main(void)
     const char *env_h5_drvr = NULL; /* VFD value from environment */
     int         nerrors     = 0;
 
-    HDprintf("Testing Onion VFD functionality.\n");
+    printf("Testing Onion VFD functionality.\n");
 
     h5_reset();
 
@@ -4957,11 +4957,11 @@ main(void)
     nerrors -= test_integration_create_by_name();
 
     if (nerrors > 0) {
-        HDprintf("***** %d Onion TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+        printf("***** %d Onion TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
         return EXIT_FAILURE;
     }
 
-    HDprintf("All Onion tests passed.\n");
+    printf("All Onion tests passed.\n");
     return EXIT_SUCCESS;
 
 } /* end main() */
diff --git a/test/page_buffer.c b/test/page_buffer.c
index 2f4e607..55a079d 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -160,7 +160,7 @@ create_file(char *filename, hid_t fcpl, hid_t fapl)
 
         for (j = 0; j < num_elements; j++) {
             if (data[j] != j) {
-                HDfprintf(stderr, "Read different values than written\n");
+                fprintf(stderr, "Read different values than written\n");
                 FAIL_STACK_ERROR;
             }
         }
@@ -270,7 +270,7 @@ open_file(char *filename, hid_t fapl, hsize_t page_size, size_t page_buffer_size
 
         for (j = 0; j < num_elements; j++) {
             if (data[j] != j) {
-                HDfprintf(stderr, "Read different values than written\n");
+                fprintf(stderr, "Read different values than written\n");
                 FAIL_STACK_ERROR;
             }
         }
@@ -673,7 +673,7 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr)
         FAIL_STACK_ERROR;
     for (i = 0; i < 400; i++) {
         if (data[i] != -1) {
-            HDfprintf(stderr, "Read different values than written\n");
+            fprintf(stderr, "Read different values than written\n");
             FAIL_STACK_ERROR;
         }
     }
@@ -687,7 +687,7 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr)
         FAIL_STACK_ERROR;
     for (i = 0; i < 1; i++) {
         if (data[i] != -1) {
-            HDfprintf(stderr, "Read different values than written\n");
+            fprintf(stderr, "Read different values than written\n");
             TEST_ERROR;
         }
     }
@@ -702,7 +702,7 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr)
         FAIL_STACK_ERROR;
     for (i = 0; i < 100; i++) {
         if (data[i] != i + 350) {
-            HDfprintf(stderr, "Read different values than written\n");
+            fprintf(stderr, "Read different values than written\n");
             TEST_ERROR;
         }
     }
@@ -717,13 +717,13 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr)
     while (i < 800) {
         if ((i >= 100 && i < 300) || (i >= 600)) {
             if (data[i] != i) {
-                HDfprintf(stderr, "Read different values than written\n");
+                fprintf(stderr, "Read different values than written\n");
                 TEST_ERROR;
             }
         }
         else {
             if (data[i] != -1) {
-                HDfprintf(stderr, "Read different values than written\n");
+                fprintf(stderr, "Read different values than written\n");
                 TEST_ERROR;
             }
         }
@@ -739,7 +739,7 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr)
         TEST_ERROR;
     for (i = 0; i < 800; i++) {
         if (data[i] != i) {
-            HDfprintf(stderr, "Read different values than written\n");
+            fprintf(stderr, "Read different values than written\n");
             TEST_ERROR;
         }
     }
@@ -765,13 +765,13 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr)
     while (i < 1000) {
         if (i < 400) {
             if (data[i] != i) {
-                HDfprintf(stderr, "Read different values than written\n");
+                fprintf(stderr, "Read different values than written\n");
                 TEST_ERROR;
             }
         }
         else {
             if (data[i] != 0) {
-                HDfprintf(stderr, "Read different values than written\n");
+                fprintf(stderr, "Read different values than written\n");
                 TEST_ERROR;
             }
         }
@@ -952,7 +952,7 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr)
         FAIL_STACK_ERROR;
     for (i = 0; i < 1; i++) {
         if (data[i] != -1) {
-            HDfprintf(stderr, "Read different values than written\n");
+            fprintf(stderr, "Read different values than written\n");
             TEST_ERROR;
         } /* end if */
     }     /* end for */
@@ -979,7 +979,7 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr)
         FAIL_STACK_ERROR;
     for (i = 0; i < 100; i++) {
         if (data[i] != i + 350) {
-            HDfprintf(stderr, "Read different values than written\n");
+            fprintf(stderr, "Read different values than written\n");
             TEST_ERROR;
         } /* end if */
     }     /* end for */
@@ -1083,7 +1083,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr)
     H5F_t  *f         = NULL;
 
     TESTING("Minimum Metadata threshold Processing");
-    HDprintf("\n");
+    printf("\n");
     h5_fixname(FILENAME[0], orig_fapl, filename, sizeof(filename));
 
     if ((fapl = H5Pcopy(orig_fapl)) < 0)
@@ -1104,7 +1104,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr)
     if (H5Pset_file_space_page_size(fcpl, sizeof(int) * 200) < 0)
         FAIL_STACK_ERROR;
 
-    HDprintf("\tMinimum metadata threshold = 100%%\n");
+    printf("\tMinimum metadata threshold = 100%%\n");
 
     /* keep 5 pages at max in the page buffer and 5 meta page minimum */
     if (H5Pset_page_buffer_size(fapl, sizeof(int) * 1000, 100, 0) < 0)
@@ -1235,7 +1235,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr)
     if (H5Fclose(file_id) < 0)
         FAIL_STACK_ERROR;
 
-    HDprintf("\tMinimum raw data threshold = 100%%\n");
+    printf("\tMinimum raw data threshold = 100%%\n");
 
     page_count = 0;
 
@@ -1365,7 +1365,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr)
     if (H5Fclose(file_id) < 0)
         FAIL_STACK_ERROR;
 
-    HDprintf("\tMinimum metadata threshold = 40%%, Minimum rawdata threshold = 40%%\n");
+    printf("\tMinimum metadata threshold = 40%%, Minimum rawdata threshold = 40%%\n");
     page_count = 0;
     /* keep 5 pages at max in the page buffer 2 meta pages, 2 raw pages
      * minimum
@@ -1510,7 +1510,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr)
     if (H5Fclose(file_id) < 0)
         FAIL_STACK_ERROR;
 
-    HDprintf("\tMinimum metadata threshold = 20%%\n");
+    printf("\tMinimum metadata threshold = 20%%\n");
     page_count = 0;
     /* keep 5 pages at max in the page buffer and 1 meta page minimum */
     if (H5Pset_page_buffer_size(fapl, sizeof(int) * 1000, 39, 0) < 0)
@@ -2154,7 +2154,7 @@ main(void)
     HDexit(EXIT_SUCCESS);
 
 error:
-    HDprintf("***** %d Page Buffering TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+    printf("***** %d Page Buffering TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
 
     H5E_BEGIN_TRY
     {
diff --git a/test/reserved.c b/test/reserved.c
index 7ebe60c..465b66c 100644
--- a/test/reserved.c
+++ b/test/reserved.c
@@ -491,7 +491,7 @@ main(void)
         num_errs += rsrv_vlen();
 
         if (num_errs > 0)
-            HDprintf("**** %d FAILURE%s! ****\n", num_errs, num_errs == 1 ? "" : "S");
+            printf("**** %d FAILURE%s! ****\n", num_errs, num_errs == 1 ? "" : "S");
         else
             HDputs("All address space reservation tests passed.");
 
diff --git a/test/ros3.c b/test/ros3.c
index 7eb4230..12ead60 100644
--- a/test/ros3.c
+++ b/test/ros3.c
@@ -106,7 +106,7 @@
  */
 #define JSFAILED_AT()                                                                                        \
     {                                                                                                        \
-        HDprintf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);                            \
+        printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);                              \
     }
 
 /*----------------------------------------------------------------------------
@@ -197,10 +197,10 @@ static inline void
 jserr_long(long expected, long actual, const char *reason)
 {
     if (reason != NULL) {
-        HDprintf("%s\n", reason);
+        printf("%s\n", reason);
     }
     else {
-        HDprintf("  ! Expected %ld\n  ! Actual   %ld\n", expected, actual);
+        printf("  ! Expected %ld\n  ! Actual   %ld\n", expected, actual);
     }
 }
 
@@ -242,10 +242,10 @@ static inline void
 jserr_str(const char *expected, const char *actual, const char *reason)
 {
     if (reason != NULL) {
-        HDprintf("%s\n", reason);
+        printf("%s\n", reason);
     }
     else {
-        HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", expected, actual);
+        printf("!!! Expected:\n%s\n!!!Actual:\n%s\n", expected, actual);
     }
 }
 
@@ -1711,7 +1711,7 @@ error:
     /***********
      * CLEANUP *
      ***********/
-    HDprintf("\nerror!");
+    printf("\nerror!");
     HDfflush(stdout);
 
     if (fapl_id >= 0) {
@@ -1753,7 +1753,7 @@ main(void)
 
 #endif /* H5_HAVE_ROS3_VFD */
 
-    HDprintf("Testing ros3 VFD functionality.\n");
+    printf("Testing ros3 VFD functionality.\n");
 
 #ifdef H5_HAVE_ROS3_VFD
 
@@ -1763,8 +1763,8 @@ main(void)
 
     bucket_url_env = HDgetenv("HDF5_ROS3_TEST_BUCKET_URL");
     if (bucket_url_env == NULL || bucket_url_env[0] == '\0') {
-        HDprintf("WARNING: S3 bucket url is not defined in environment "
-                 "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n");
+        printf("WARNING: S3 bucket url is not defined in environment "
+               "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n");
     }
     else {
         HDstrncpy(s3_test_bucket_url, bucket_url_env, S3_TEST_MAX_URL_SIZE);
@@ -1774,25 +1774,25 @@ main(void)
     if (S3_TEST_MAX_URL_SIZE < HDsnprintf(url_text_restricted, (size_t)S3_TEST_MAX_URL_SIZE, "%s/%s",
                                           (const char *)s3_test_bucket_url,
                                           (const char *)S3_TEST_RESOURCE_TEXT_RESTRICTED)) {
-        HDprintf("* ros3 setup failed (text_restricted) ! *\n");
+        printf("* ros3 setup failed (text_restricted) ! *\n");
         return 1;
     }
     if (S3_TEST_MAX_URL_SIZE < HDsnprintf(url_text_public, (size_t)S3_TEST_MAX_URL_SIZE, "%s/%s",
                                           (const char *)s3_test_bucket_url,
                                           (const char *)S3_TEST_RESOURCE_TEXT_PUBLIC)) {
-        HDprintf("* ros3 setup failed (text_public) ! *\n");
+        printf("* ros3 setup failed (text_public) ! *\n");
         return 1;
     }
     if (S3_TEST_MAX_URL_SIZE < HDsnprintf(url_h5_public, (size_t)S3_TEST_MAX_URL_SIZE, "%s/%s",
                                           (const char *)s3_test_bucket_url,
                                           (const char *)S3_TEST_RESOURCE_H5_PUBLIC)) {
-        HDprintf("* ros3 setup failed (h5_public) ! *\n");
+        printf("* ros3 setup failed (h5_public) ! *\n");
         return 1;
     }
     if (S3_TEST_MAX_URL_SIZE < HDsnprintf(url_missing, S3_TEST_MAX_URL_SIZE, "%s/%s",
                                           (const char *)s3_test_bucket_url,
                                           (const char *)S3_TEST_RESOURCE_MISSING)) {
-        HDprintf("* ros3 setup failed (missing) ! *\n");
+        printf("* ros3 setup failed (missing) ! *\n");
         return 1;
     }
 
@@ -1836,17 +1836,17 @@ main(void)
     nerrors += test_H5F_integration();
 
     if (nerrors > 0) {
-        HDprintf("***** %d ros3 TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+        printf("***** %d ros3 TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
         nerrors = 1;
     }
     else {
-        HDprintf("All ros3 tests passed.\n");
+        printf("All ros3 tests passed.\n");
     }
     return nerrors; /* 0 if no errors, 1 if any errors */
 
 #else
 
-    HDprintf("SKIPPED - read-only S3 VFD not built\n");
+    printf("SKIPPED - read-only S3 VFD not built\n");
     return EXIT_SUCCESS;
 
 #endif /* H5_HAVE_ROS3_VFD */
diff --git a/test/s3comms.c b/test/s3comms.c
index 7cf3057..7a6b09c 100644
--- a/test/s3comms.c
+++ b/test/s3comms.c
@@ -96,7 +96,7 @@
  */
 #define JSFAILED_AT()                                                                                        \
     {                                                                                                        \
-        HDprintf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);                            \
+        printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);                              \
     }
 
 /*----------------------------------------------------------------------------
@@ -185,10 +185,10 @@ static inline void
 jserr_long(long expected, long actual, const char *reason)
 {
     if (reason != NULL) {
-        HDprintf("%s\n", reason);
+        printf("%s\n", reason);
     }
     else {
-        HDprintf("  ! Expected %ld\n  ! Actual   %ld\n", expected, actual);
+        printf("  ! Expected %ld\n  ! Actual   %ld\n", expected, actual);
     }
 }
 
@@ -230,10 +230,10 @@ static inline void
 jserr_str(const char *expected, const char *actual, const char *reason)
 {
     if (reason != NULL) {
-        HDprintf("%s\n", reason);
+        printf("%s\n", reason);
     }
     else {
-        HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", expected, actual);
+        printf("!!! Expected:\n%s\n!!!Actual:\n%s\n", expected, actual);
     }
 }
 
@@ -1287,7 +1287,7 @@ test_HMAC_SHA256(void)
                 dest = (char *)HDrealloc(dest, cases[i].dest_size + 1);
                 assert(dest != NULL);
                 dest[cases[i].dest_size] = 0;
-                HDfprintf(stdout, "ERROR:\n!!! \"%s\"\n != \"%s\"\n", cases[i].exp, dest);
+                fprintf(stdout, "ERROR:\n!!! \"%s\"\n != \"%s\"\n", cases[i].exp, dest);
                 TEST_ERROR;
             }
 #else  /* VERBOSE not defined */
@@ -1910,7 +1910,7 @@ test_s3r_open(void)
      *************************/
 
 #if S3_TEST_RUN_TIMEOUT
-    HDprintf("Opening on inactive port may hang for a minute; waiting for timeout\n");
+    printf("Opening on inactive port may hang for a minute; waiting for timeout\n");
     handle = H5FD_s3comms_s3r_open(url_raven_badport, NULL, NULL, NULL);
     FAIL_IF(handle != NULL);
 #endif
@@ -2580,7 +2580,7 @@ main(void)
 
 #endif /* H5_HAVE_ROS3_VFD */
 
-    HDprintf("Testing S3Communications functionality.\n");
+    printf("Testing S3Communications functionality.\n");
 
 #ifdef H5_HAVE_ROS3_VFD
 
@@ -2603,8 +2603,8 @@ main(void)
 
     bucket_url_env = HDgetenv("HDF5_ROS3_TEST_BUCKET_URL");
     if (bucket_url_env == NULL || bucket_url_env[0] == '\0') {
-        HDprintf("WARNING: S3 bucket url is not defined in environment "
-                 "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n");
+        printf("WARNING: S3 bucket url is not defined in environment "
+               "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n");
     }
     else {
         HDstrncpy(s3_test_bucket_url, bucket_url_env, S3_TEST_MAX_URL_SIZE);
@@ -2630,17 +2630,17 @@ main(void)
     nerrors += test_s3r_read() < 0 ? 1 : 0;
 
     if (nerrors) {
-        HDprintf("***** %d S3comms TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+        printf("***** %d S3comms TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
         return 1;
     }
 
-    HDprintf("All S3comms tests passed.\n");
+    printf("All S3comms tests passed.\n");
 
     return 0;
 
 #else
 
-    HDprintf("SKIPPED - read-only S3 VFD not built\n");
+    printf("SKIPPED - read-only S3 VFD not built\n");
     return EXIT_SUCCESS;
 
 #endif /* H5_HAVE_ROS3_VFD */
diff --git a/test/select_io_dset.c b/test/select_io_dset.c
index 0724365..7a766b4 100644
--- a/test/select_io_dset.c
+++ b/test/select_io_dset.c
@@ -196,8 +196,8 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf)
     for (i = 0; i < DSET_SELECT_DIM; i++)
         if (rbuf[i] != (dtrans ? trans_wbuf[i] : wbuf[i])) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %d\n", i);
+            printf("    Read different values than written.\n");
+            printf("    At index %d\n", i);
             TEST_ERROR;
         }
 
@@ -211,8 +211,8 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf)
         for (i = 0; i < DSET_SELECT_DIM; i++)
             if (rbuf[i] != (2 * trans_wbuf[i])) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %d\n", i);
+                printf("    Read different values than written.\n");
+                printf("    At index %d\n", i);
                 TEST_ERROR;
             }
     }
@@ -337,8 +337,8 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         if (rbuf[4 * i + 0] != wbuf[4 * i + 0] || rbuf[4 * i + 1] != wbuf[4 * i + 1] ||
             rbuf[4 * i + 2] != wbuf[4 * i + 2] || rbuf[4 * i + 3] != wbuf[4 * i + 3]) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %d\n", i);
+            printf("    Read different values than written.\n");
+            printf("    At index %d\n", i);
             TEST_ERROR;
         }
 
@@ -351,8 +351,8 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         if (rbuf[4 * i + 0] != wbuf[4 * i + 3] || rbuf[4 * i + 1] != wbuf[4 * i + 2] ||
             rbuf[4 * i + 2] != wbuf[4 * i + 1] || rbuf[4 * i + 3] != wbuf[4 * i + 0]) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %d\n", i);
+            printf("    Read different values than written.\n");
+            printf("    At index %d\n", i);
             TEST_ERROR;
         }
 
@@ -486,8 +486,8 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign
     for (i = 0; i < DSET_SELECT_DIM; i++)
         if (rbuf[i] != (long long)(dtrans ? trans_wbuf[i] : wbuf[i])) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %d\n", i);
+            printf("    Read different values than written.\n");
+            printf("    At index %d\n", i);
             TEST_ERROR;
         }
 
@@ -501,8 +501,8 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign
         for (i = 0; i < DSET_SELECT_DIM; i++)
             if (rbuf[i] != (long long)(5 * (10 - trans_wbuf[i]))) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %d\n", i);
+                printf("    Read different values than written.\n");
+                printf("    At index %d\n", i);
                 TEST_ERROR;
             }
     }
@@ -629,8 +629,8 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig
     for (i = 0; i < DSET_SELECT_DIM; i++)
         if (rbuf[i] != (dtrans ? trans_wbuf[i] : wbuf[i])) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %d\n", i);
+            printf("    Read different values than written.\n");
+            printf("    At index %d\n", i);
             TEST_ERROR;
         }
 
@@ -644,8 +644,8 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig
         for (i = 0; i < DSET_SELECT_DIM; i++)
             if (rbuf[i] != (2 * (10 + trans_wbuf[i]))) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    At index %d\n", i);
+                printf("    Read different values than written.\n");
+                printf("    At index %d\n", i);
                 TEST_ERROR;
             }
     }
@@ -812,8 +812,8 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         if (s1_wbuf[i].a != s1_rbuf[i].a || s1_wbuf[i].b != s1_rbuf[i].b || s1_wbuf[i].c != s1_rbuf[i].c ||
             s1_wbuf[i].d != s1_rbuf[i].d) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %d\n", i);
+            printf("    Read different values than written.\n");
+            printf("    At index %d\n", i);
             TEST_ERROR;
         }
     }
@@ -858,8 +858,8 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         if (s1_rbuf[i].a != s1_wbuf[i].a || s1_rbuf[i].b != ((4 * i) + 1) || s1_rbuf[i].c != s1_wbuf[i].c ||
             s1_rbuf[i].d != ((4 * i) + 3)) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %d\n", i);
+            printf("    Read different values than written.\n");
+            printf("    At index %d\n", i);
             TEST_ERROR;
         }
     }
@@ -893,8 +893,8 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             s1_rbuf[i].c != ((4 * i) + DSET_SELECT_DIM + 2) ||
             s1_rbuf[i].d != ((4 * i) + (2 * DSET_SELECT_DIM) + 3)) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %d\n", i);
+            printf("    Read different values than written.\n");
+            printf("    At index %d\n", i);
             TEST_ERROR;
         }
     }
@@ -944,8 +944,8 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         if (s2_wbuf[i].a != s2_rbuf[i].a || s2_wbuf[i].b != s2_rbuf[i].b || s2_wbuf[i].c != s2_rbuf[i].c ||
             s2_wbuf[i].d != s2_rbuf[i].d) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    At index %d\n", i);
+            printf("    Read different values than written.\n");
+            printf("    At index %d\n", i);
             TEST_ERROR;
         }
     }
@@ -1180,8 +1180,8 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m
         for (j = 0; j < DSET_SELECT_DIM; j++)
             if (rbufi[i][j] != (dtrans ? trans_wbufi[i][j] : wbufi[i][j])) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    For dset %d at index %d\n", i, j);
+                printf("    Read different values than written.\n");
+                printf("    For dset %d at index %d\n", i, j);
                 TEST_ERROR;
             }
 
@@ -1196,8 +1196,8 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m
             for (j = 0; j < DSET_SELECT_DIM; j++)
                 if (rbufi[i][j] != (2 * trans_wbufi[i][j])) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    For dset %d at index %d\n", i, j);
+                    printf("    Read different values than written.\n");
+                    printf("    For dset %d at index %d\n", i, j);
                     TEST_ERROR;
                 }
     }
@@ -1244,8 +1244,8 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m
         for (j = 0; j < DSET_SELECT_DIM; j++) {
             if (lrbufi[i][j] != (dtrans ? (2 * trans_lwbufi[i][j]) : lwbufi[i][j])) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    For dset %d at index %d\n", i, j);
+                printf("    Read different values than written.\n");
+                printf("    For dset %d at index %d\n", i, j);
                 TEST_ERROR;
             }
         }
@@ -1504,8 +1504,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             if (wbufi[i][j].a != rbufi[i][j].a || wbufi[i][j].b != rbufi[i][j].b ||
                 wbufi[i][j].c != rbufi[i][j].c || wbufi[i][j].d != rbufi[i][j].d) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    For dset %d at index %d\n", i, j);
+                printf("    Read different values than written.\n");
+                printf("    For dset %d at index %d\n", i, j);
                 TEST_ERROR;
             }
         }
@@ -1564,8 +1564,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
                 if (wbufi[i][j].a != rbufi[i][j].a || ((4 * (int)j) + 1) != rbufi[i][j].b ||
                     wbufi[i][j].c != rbufi[i][j].c || ((4 * (int)j) + 3) != rbufi[i][j].d) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    For dset %d at index %d\n", i, j);
+                    printf("    Read different values than written.\n");
+                    printf("    For dset %d at index %d\n", i, j);
                     TEST_ERROR;
                 }
             }
@@ -1574,8 +1574,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
                     if ((4 * (int)j) != rbufi[i][j].a || ((4 * (int)j) + 1) != rbufi[i][j].b ||
                         ((4 * (int)j) + 2) != rbufi[i][j].c || ((4 * (int)j) + 3) != rbufi[i][j].d) {
                         H5_FAILED();
-                        HDprintf("    Read different values than written.\n");
-                        HDprintf("    For dset %d at index %d\n", i, j);
+                        printf("    Read different values than written.\n");
+                        printf("    For dset %d at index %d\n", i, j);
                         TEST_ERROR;
                     }
             }
@@ -1630,8 +1630,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         if (wbufi[0][j].a != rbufi[0][j].a || ((4 * (int)j) + 1) != rbufi[0][j].b ||
             wbufi[0][j].c != rbufi[0][j].c || ((4 * (int)j) + 3) != rbufi[0][j].d) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    For dset0 at index %d\n", j);
+            printf("    Read different values than written.\n");
+            printf("    For dset0 at index %d\n", j);
             TEST_ERROR;
         }
 
@@ -1641,8 +1641,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             rbufi[mm][j].b != ((4 * (int)j) + 1) || rbufi[mm][j].c != ((4 * (int)j) + 2) ||
             rbufi[mm][j].d != ((4 * (int)j) + (2 * DSET_SELECT_DIM) + 3)) {
             H5_FAILED();
-            HDprintf("    Read different values than written.\n");
-            HDprintf("    For dset1 at index %d\n", j);
+            printf("    Read different values than written.\n");
+            printf("    For dset1 at index %d\n", j);
             TEST_ERROR;
         }
 
@@ -1655,8 +1655,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             if (rbufi[i][j].a != (4 * (int)j) || rbufi[i][j].b != ((4 * (int)j) + 1) ||
                 rbufi[i][j].c != ((4 * (int)j) + 2) || rbufi[i][j].d != ((4 * (int)j) + 3)) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    For dset %d at index %d\n", i, j);
+                printf("    Read different values than written.\n");
+                printf("    For dset %d at index %d\n", i, j);
                 TEST_ERROR;
             }
     }
@@ -1721,8 +1721,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             if (s2_wbufi[i][j].a != s2_rbufi[i][j].a || s2_wbufi[i][j].b != s2_rbufi[i][j].b ||
                 s2_wbufi[i][j].c != s2_rbufi[i][j].c || s2_wbufi[i][j].d != s2_rbufi[i][j].d) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    For dset %d at index %d\n", i, j);
+                printf("    Read different values than written.\n");
+                printf("    For dset %d at index %d\n", i, j);
                 TEST_ERROR;
             }
 
@@ -1937,8 +1937,8 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
                     rbufi[i][(int)ss * j + 2] != wbufi[i][(int)ss * j + 2] ||
                     rbufi[i][(int)ss * j + 3] != wbufi[i][(int)ss * j + 3]) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    For dset %d at index %d\n", i, j);
+                    printf("    Read different values than written.\n");
+                    printf("    For dset %d at index %d\n", i, j);
                     TEST_ERROR;
                 }
         }
@@ -2012,8 +2012,8 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
                     lrbufi[i][(int)ss * j + 6] != lwbufi[i][(int)ss * j + 6] ||
                     lrbufi[i][(int)ss * j + 7] != lwbufi[i][(int)ss * j + 7]) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    For dset %d at index %d\n", i, j);
+                    printf("    Read different values than written.\n");
+                    printf("    For dset %d at index %d\n", i, j);
                     TEST_ERROR;
                 }
         }
@@ -2074,8 +2074,8 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             if (srbufi[i][(int)ss * j + 0] != swbufi[i][(int)ss * j + 0] ||
                 srbufi[i][(int)ss * j + 1] != swbufi[i][(int)ss * j + 1]) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    For dset %d at index %d\n", i, j);
+                printf("    Read different values than written.\n");
+                printf("    For dset %d at index %d\n", i, j);
                 TEST_ERROR;
             }
 
@@ -2550,8 +2550,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                         for (j = 0; j < DSET_SELECT_DIM; j++)
                             if (rbufi1[i][j] != wbufi1[i][j]) {
                                 H5_FAILED();
-                                HDprintf("    Read different values than written.\n");
-                                HDprintf("    For dset %d at index %d\n", i, j);
+                                printf("    Read different values than written.\n");
+                                printf("    For dset %d at index %d\n", i, j);
                                 TEST_ERROR;
                             }
 
@@ -2562,8 +2562,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                             for (j = 0; j < DSET_SELECT_DIM; j++)
                                 if (l_rbufi2[i][j] != LONG_MAX) {
                                     H5_FAILED();
-                                    HDprintf("    Read different values than written.\n");
-                                    HDprintf("    For dset %d at index %d\n", i, j);
+                                    printf("    Read different values than written.\n");
+                                    printf("    For dset %d at index %d\n", i, j);
                                     TEST_ERROR;
                                 }
                         }
@@ -2571,8 +2571,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                             for (j = 0; j < DSET_SELECT_DIM; j++)
                                 if (s_rbufi2[i][j] != SHRT_MAX) {
                                     H5_FAILED();
-                                    HDprintf("    Read different values than written.\n");
-                                    HDprintf("    For dset %d at index %d\n", i, j);
+                                    printf("    Read different values than written.\n");
+                                    printf("    For dset %d at index %d\n", i, j);
                                 }
                         }
 
@@ -2586,8 +2586,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                                     s3_rbufi3[i][j].c != s1_wbufi3[i][j].c ||
                                     s3_rbufi3[i][j].d != s1_wbufi3[i][j].d) {
                                     H5_FAILED();
-                                    HDprintf("    Read different values than written.\n");
-                                    HDprintf("    For dset %d at index %d\n", i, j);
+                                    printf("    Read different values than written.\n");
+                                    printf("    For dset %d at index %d\n", i, j);
                                 }
                         }
                         else if (s == SETTING_B) {
@@ -2597,8 +2597,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                                     s1_rbufi3[i][j].c != s1_wbufi3[i][j].c ||
                                     s1_rbufi3[i][j].d != (DSET_SELECT_DIM + j)) {
                                     H5_FAILED();
-                                    HDprintf("    Read different values than written.\n");
-                                    HDprintf("    For dset %d at index %d\n", i, j);
+                                    printf("    Read different values than written.\n");
+                                    printf("    For dset %d at index %d\n", i, j);
                                 }
                         }
 
@@ -2745,7 +2745,7 @@ test_set_get_select_io_mode(hid_t fid)
     long                    wbuf[DSET_SELECT_DIM];
     H5D_selection_io_mode_t selection_io_mode;
 
-    HDprintf("\n");
+    printf("\n");
     TESTING("H5Pget/set_selection_io_mode()");
 
     if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
@@ -3069,7 +3069,7 @@ test_get_no_selection_io_cause(const char *filename, hid_t fapl)
 
     int errs = 0;
 
-    HDprintf("\n");
+    printf("\n");
     TESTING("H5Pget_no_selection_io_cause()");
 
     errs += test_no_selection_io_cause_mode(filename, fapl, TEST_DISABLE_BY_API);
@@ -3088,7 +3088,7 @@ test_get_no_selection_io_cause(const char *filename, hid_t fapl)
 #endif
 
     if (errs) {
-        HDprintf(" FAILED\n");
+        printf(" FAILED\n");
         return FAIL;
     }
     else {
@@ -3265,7 +3265,7 @@ main(void)
         goto error;
 
     printf("\n===================================\n");
-    HDprintf("All selection I/O dataset tests passed.\n");
+    printf("All selection I/O dataset tests passed.\n");
     printf("===================================\n");
 
     h5_cleanup(FILENAME, fapl);
@@ -3274,7 +3274,7 @@ main(void)
 
 error:
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d SELECTION I/O DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    printf("***** %d SELECTION I/O DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     HDexit(EXIT_FAILURE);
 
 } /* end main() */
diff --git a/test/set_extent.c b/test/set_extent.c
index f4758b5..462c5d2 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -41,12 +41,12 @@ static const char *FILENAME[] = {"set_extent1", "set_extent2", "set_extent3", "s
 #define FILL_VALUE         (-1)
 #define DO_RANKS_PRINT_CONFIG(TEST)                                                                          \
     {                                                                                                        \
-        HDprintf("  Config:\n");                                                                             \
-        HDprintf("   Test: %s\n", TEST);                                                                     \
-        HDprintf("   Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" : "no"));                         \
-        HDprintf("   Fill value: %s\n", (do_fillvalue ? "yes" : "no"));                                      \
-        HDprintf("   Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC ? "yes" : "no"));                 \
-        HDprintf("   Edge chunk filters: %s\n", (config & CONFIG_UNFILT_EDGE ? "disabled" : "enabled"));     \
+        printf("  Config:\n");                                                                               \
+        printf("   Test: %s\n", TEST);                                                                       \
+        printf("   Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" : "no"));                           \
+        printf("   Fill value: %s\n", (do_fillvalue ? "yes" : "no"));                                        \
+        printf("   Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC ? "yes" : "no"));                   \
+        printf("   Edge chunk filters: %s\n", (config & CONFIG_UNFILT_EDGE ? "disabled" : "enabled"));       \
     } /* end DO_RANKS_PRINT_CONFIG */
 
 #define RANK1               1
@@ -152,9 +152,9 @@ main(void)
         for (chunk_cache = FALSE; chunk_cache <= TRUE; chunk_cache++) {
             /* Output message about the type of format */
             if (new_format)
-                HDprintf("Testing with new file format");
+                printf("Testing with new file format");
             else
-                HDprintf("Testing with old file format");
+                printf("Testing with old file format");
 
             /* Set the FAPL for the chunk cache settings */
             if (chunk_cache) {
@@ -211,7 +211,7 @@ main(void)
 
 error:
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d H5Dset_extent TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    printf("***** %d H5Dset_extent TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     return 1;
 }
 
@@ -285,22 +285,22 @@ do_ranks(hid_t fapl, hbool_t new_format)
 
                 if (test_rank1(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) {
                     DO_RANKS_PRINT_CONFIG("Rank 1")
-                    HDprintf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC"));
+                    printf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC"));
                     goto error;
                 } /* end if */
                 if (test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) {
                     DO_RANKS_PRINT_CONFIG("Rank 2")
-                    HDprintf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC"));
+                    printf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC"));
                     goto error;
                 } /* end if */
                 if (test_rank3(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) {
                     DO_RANKS_PRINT_CONFIG("Rank 3")
-                    HDprintf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC"));
+                    printf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC"));
                     goto error;
                 } /* end if */
                 if (test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE) < 0) {
                     DO_RANKS_PRINT_CONFIG("Rank 2 with non-default indexed storage B-tree")
-                    HDprintf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC"));
+                    printf("   Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC"));
                     goto error;
                 } /* end if */
             }     /* end for */
@@ -340,9 +340,9 @@ do_ranks(hid_t fapl, hbool_t new_format)
             /* Standard test */
             if (test_random_rank4(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE, index_type) < 0) {
                 DO_RANKS_PRINT_CONFIG("Randomized rank 4")
-                HDprintf("   Index: %s\n", index_type == RANK4_INDEX_BTREE
-                                               ? "btree"
-                                               : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray"));
+                printf("   Index: %s\n", index_type == RANK4_INDEX_BTREE
+                                             ? "btree"
+                                             : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray"));
                 goto error;
             } /* end if */
 
@@ -351,10 +351,9 @@ do_ranks(hid_t fapl, hbool_t new_format)
                 if (test_random_rank4_vl(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE, index_type) <
                     0) {
                     DO_RANKS_PRINT_CONFIG("Randomized rank 4 variable length")
-                    HDprintf("   Index: %s\n",
-                             index_type == RANK4_INDEX_BTREE
-                                 ? "btree"
-                                 : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray"));
+                    printf("   Index: %s\n", index_type == RANK4_INDEX_BTREE
+                                                 ? "btree"
+                                                 : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray"));
                     goto error;
                 } /* end if */
             }
@@ -363,10 +362,9 @@ do_ranks(hid_t fapl, hbool_t new_format)
             if (!(config & CONFIG_EARLY_ALLOC)) {
                 if (test_random_rank4(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE, index_type) < 0) {
                     DO_RANKS_PRINT_CONFIG("Randomized rank 4 with sparse allocation")
-                    HDprintf("   Index: %s\n",
-                             index_type == RANK4_INDEX_BTREE
-                                 ? "btree"
-                                 : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray"));
+                    printf("   Index: %s\n", index_type == RANK4_INDEX_BTREE
+                                                 ? "btree"
+                                                 : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray"));
                     goto error;
                 } /* end if */
 
@@ -374,10 +372,10 @@ do_ranks(hid_t fapl, hbool_t new_format)
                     if (test_random_rank4_vl(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE,
                                              index_type) < 0) {
                         DO_RANKS_PRINT_CONFIG("Randomized rank 4 variable length with sparse allocation")
-                        HDprintf("   Index: %s\n",
-                                 index_type == RANK4_INDEX_BTREE
-                                     ? "btree"
-                                     : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray"));
+                        printf("   Index: %s\n",
+                               index_type == RANK4_INDEX_BTREE
+                                   ? "btree"
+                                   : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray"));
                         goto error;
                     } /* end if */
                 }
@@ -545,10 +543,10 @@ test_rank1(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
         TEST_ERROR;
 
 #if defined(H5_SET_EXTENT_DEBUG)
-    HDprintf("\n buf_o: ");
+    printf("\n buf_o: ");
     for (i = 0; i < (int)dims_o[0]; i++)
-        HDprintf("%d ", buf_o[i]);
-    HDprintf("\n");
+        printf("%d ", buf_o[i]);
+    printf("\n");
 #endif
 
     if (H5Sclose(sid) < 0)
@@ -584,18 +582,18 @@ test_rank1(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
         TEST_ERROR;
 
 #if defined(H5_SET_EXTENT_DEBUG)
-    HDprintf("\n buf_e: ");
+    printf("\n buf_e: ");
     for (i = 0; i < (int)dims_r[0]; i++)
-        HDprintf("%d ", buf_e[i]);
-    HDprintf("\n");
+        printf("%d ", buf_e[i]);
+    printf("\n");
 #endif
 
     /* compare the read array with the expanded array */
     for (i = 0; i < (int)dims_r[0]; i++)
         if (i >= DIM0) {
             if (buf_e[i] != comp_value) {
-                HDprintf("buf_e[%d] = %d\n", i, buf_e[i]);
-                HDprintf("expected = %d\n", comp_value);
+                printf("buf_e[%d] = %d\n", i, buf_e[i]);
+                printf("expected = %d\n", comp_value);
                 TEST_ERROR;
             } /* end if */
         }     /* end if */
@@ -653,17 +651,17 @@ test_rank1(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
         TEST_ERROR;
 
 #if defined(H5_SET_EXTENT_DEBUG)
-    HDprintf("\n dims_r: ");
+    printf("\n dims_r: ");
     for (i = 0; i < (int)dims_r[0]; i++)
-        HDprintf("%d ", buf_s[i]);
-    HDprintf("\n");
+        printf("%d ", buf_s[i]);
+    printf("\n");
 #endif
 
     /* compare the read array with the shrunk array */
     for (i = 0; i < (int)dims_r[0]; i++)
         if (buf_s[i] != buf_o[i]) {
-            HDprintf("buf_s[%d] = %d\n", i, buf_s[i]);
-            HDprintf("buf_o[%d] = %d\n", i, buf_o[i]);
+            printf("buf_s[%d] = %d\n", i, buf_s[i]);
+            printf("buf_o[%d] = %d\n", i, buf_o[i]);
             TEST_ERROR;
         } /* end if */
 
@@ -697,18 +695,18 @@ test_rank1(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
         TEST_ERROR;
 
 #if defined(H5_SET_EXTENT_DEBUG)
-    HDprintf("\n dims_r: ");
+    printf("\n dims_r: ");
     for (i = 0; i < (int)dims_r[0]; i++)
-        HDprintf("%d ", buf_r[i]);
-    HDprintf("\n");
+        printf("%d ", buf_r[i]);
+    printf("\n");
 #endif
 
     /* compare the read array with the original array */
     for (i = 0; i < (int)dims_r[0]; i++)
         if (i >= DIMS0) {
             if (buf_r[i] != comp_value) {
-                HDprintf("buf_r[%d] = %d\n", i, buf_r[i]);
-                HDprintf("expected = %d\n", comp_value);
+                printf("buf_r[%d] = %d\n", i, buf_r[i]);
+                printf("expected = %d\n", comp_value);
                 TEST_ERROR;
             } /* end if */
         }     /* end if */
@@ -901,12 +899,12 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
     }
 
 #if defined(H5_SET_EXTENT_DEBUG2)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_o[0]; i++) {
         for (j = 0; j < (int)dims_o[1]; j++) {
-            HDprintf("%d ", buf_o[i][j]);
+            printf("%d ", buf_o[i][j]);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 #endif
 
@@ -959,12 +957,12 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
         TEST_ERROR;
 
 #if defined(H5_SET_EXTENT_DEBUG2)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++) {
         for (j = 0; j < (int)dims_r[1]; j++) {
-            HDprintf("%d ", buf_e[i][j]);
+            printf("%d ", buf_e[i][j]);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 #endif
 
@@ -973,8 +971,8 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
         for (j = 0; j < (int)dims_r[1]; j++) {
             if (i >= DIM0 || j >= DIM1) {
                 if (buf_e[i][j] != comp_value) {
-                    HDprintf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
-                    HDprintf("value = %d\n", comp_value);
+                    printf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
+                    printf("value = %d\n", comp_value);
                     TEST_ERROR;
                 }
             }
@@ -1056,12 +1054,12 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
     }
 
 #if defined(H5_SET_EXTENT_DEBUG2)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++) {
         for (j = 0; j < (int)dims_r[1]; j++) {
-            HDprintf("%d ", buf_s[i][j]);
+            printf("%d ", buf_s[i][j]);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 #endif
 
@@ -1069,8 +1067,8 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
     for (i = 0; i < (int)dims_r[0]; i++) {
         for (j = 0; j < (int)dims_r[1]; j++) {
             if (buf_s[i][j] != buf_o[i][j]) {
-                HDprintf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
-                HDprintf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
+                printf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
+                printf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
                 TEST_ERROR;
             }
         }
@@ -1123,12 +1121,12 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
         TEST_ERROR;
 
 #if defined(H5_SET_EXTENT_DEBUG2)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++) {
         for (j = 0; j < (int)dims_r[1]; j++) {
-            HDprintf("%d ", buf_r[i][j]);
+            printf("%d ", buf_r[i][j]);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 #endif
 
@@ -1137,8 +1135,8 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
         for (j = 0; j < (int)dims_r[1]; j++) {
             if (i >= DIMS0 || j >= DIMS1) {
                 if (buf_r[i][j] != comp_value) {
-                    HDprintf("buf_r[%d][%d] = %d\n", i, j, buf_r[i][j]);
-                    HDprintf("value = %d\n", comp_value);
+                    printf("buf_r[%d][%d] = %d\n", i, j, buf_r[i][j]);
+                    printf("value = %d\n", comp_value);
                     TEST_ERROR;
                 }
             }
@@ -1388,17 +1386,17 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
     }
 
 #if defined(H5_SET_EXTENT_DEBUG3)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_o[0]; i++) {
         for (j = 0; j < (int)dims_o[1]; j++) {
             for (k = 0; k < (int)dims_o[2]; k++) {
-                HDprintf("%d ", buf_o[i][j][k]);
+                printf("%d ", buf_o[i][j][k]);
             }
-            HDprintf("[%d] ", j);
+            printf("[%d] ", j);
         }
-        HDprintf("\n");
+        printf("\n");
     }
-    HDprintf("\n");
+    printf("\n");
 #endif
 
     if (H5Sclose(sid) < 0) {
@@ -1441,17 +1439,17 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
         TEST_ERROR;
 
 #if defined(H5_SET_EXTENT_DEBUG3)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++) {
         for (j = 0; j < (int)dims_r[1]; j++) {
             for (k = 0; k < (int)dims_r[2]; k++) {
-                HDprintf("%d ", buf_e[i][j][k]);
+                printf("%d ", buf_e[i][j][k]);
             }
-            HDprintf("[%d] ", j);
+            printf("[%d] ", j);
         }
-        HDprintf("\n");
+        printf("\n");
     }
-    HDprintf("\n");
+    printf("\n");
 #endif
 
     /* compare the read array with the expanded array */
@@ -1460,8 +1458,8 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
             for (k = 0; k < (int)dims_r[2]; k++) {
                 if (i >= DIM0 || j >= DIM1 || k >= DIM2) {
                     if (buf_e[i][j][k] != comp_value) {
-                        HDprintf("buf_e[%d][%d][%d] = %d\n", i, j, k, buf_e[i][j][k]);
-                        HDprintf("value = %d\n", comp_value);
+                        printf("buf_e[%d][%d][%d] = %d\n", i, j, k, buf_e[i][j][k]);
+                        printf("value = %d\n", comp_value);
                         TEST_ERROR;
                     }
                 }
@@ -1533,17 +1531,17 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
     }
 
 #if defined(H5_SET_EXTENT_DEBUG3)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++) {
         for (j = 0; j < (int)dims_r[1]; j++) {
             for (k = 0; k < (int)dims_r[2]; k++) {
-                HDprintf("%d ", buf_s[i][j][k]);
+                printf("%d ", buf_s[i][j][k]);
             }
-            HDprintf("[%d] ", j);
+            printf("[%d] ", j);
         }
-        HDprintf("\n");
+        printf("\n");
     }
-    HDprintf("\n");
+    printf("\n");
 #endif
 
     /* compare the read array with the shrunk array */
@@ -1551,8 +1549,8 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
         for (j = 0; j < (int)dims_r[1]; j++) {
             for (k = 0; k < (int)dims_r[2]; k++) {
                 if (buf_s[i][j][k] != buf_o[i][j][k]) {
-                    HDprintf("buf_s[%d][%d][%d] = %d\n", i, j, k, buf_s[i][j][k]);
-                    HDprintf("buf_o[%d][%d][%d] = %d\n", i, j, k, buf_o[i][j][k]);
+                    printf("buf_s[%d][%d][%d] = %d\n", i, j, k, buf_s[i][j][k]);
+                    printf("buf_o[%d][%d][%d] = %d\n", i, j, k, buf_o[i][j][k]);
                     TEST_ERROR;
                 }
             }
@@ -1594,18 +1592,18 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
         TEST_ERROR;
 
 #if defined(H5_SET_EXTENT_DEBUG3)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++) {
         for (j = 0; j < (int)dims_r[1]; j++) {
             for (k = 0; k < (int)dims_r[2]; k++) {
 
-                HDprintf("%d ", buf_r[i][j][k]);
+                printf("%d ", buf_r[i][j][k]);
             }
-            HDprintf("[%d] ", j);
+            printf("[%d] ", j);
         }
-        HDprintf("\n");
+        printf("\n");
     }
-    HDprintf("\n");
+    printf("\n");
 #endif
 
     /* compare the read array with the original array */
@@ -1614,8 +1612,8 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f
             for (k = 0; k < (int)dims_r[2]; k++) {
                 if (i >= DIMS0 || j >= DIMS1 || k >= DIMS2) {
                     if (buf_r[i][j][k] != comp_value) {
-                        HDprintf("buf_r[%d][%d][%d] = %d\n", i, j, k, buf_r[i][j][k]);
-                        HDprintf("value = %d\n", comp_value);
+                        printf("buf_r[%d][%d][%d] = %d\n", i, j, k, buf_r[i][j][k]);
+                        printf("value = %d\n", comp_value);
                         TEST_ERROR;
                     }
                 }
@@ -1824,12 +1822,12 @@ test_external(hid_t fapl)
         FAIL_STACK_ERROR;
 
 #if defined(H5_SET_EXTENT_DEBUG)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_o[0]; i++) {
         for (j = 0; j < (int)dims_o[1]; j++) {
-            HDprintf("%d ", buf_ro[i][j]);
+            printf("%d ", buf_ro[i][j]);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 #endif
 
@@ -1879,12 +1877,12 @@ test_external(hid_t fapl)
         FAIL_STACK_ERROR;
 
 #if defined(H5_SET_EXTENT_DEBUG)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++) {
         for (j = 0; j < (int)dims_r[1]; j++) {
-            HDprintf("%d ", buf_e[i][j]);
+            printf("%d ", buf_e[i][j]);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 #endif
 
@@ -1893,8 +1891,8 @@ test_external(hid_t fapl)
         for (j = 0; j < (int)dims_r[1]; j++) {
             if (i >= DIM0 || j >= DIM1) {
                 if (buf_e[i][j] != comp_value) {
-                    HDprintf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
-                    HDprintf("value = %d\n", comp_value);
+                    printf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
+                    printf("value = %d\n", comp_value);
                     TEST_ERROR;
                 }
             }
@@ -1947,12 +1945,12 @@ test_external(hid_t fapl)
         FAIL_STACK_ERROR;
 
 #if defined(H5_SET_EXTENT_DEBUG)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++) {
         for (j = 0; j < (int)dims_r[1]; j++) {
-            HDprintf("%d ", buf_s[i][j]);
+            printf("%d ", buf_s[i][j]);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 #endif
 
@@ -1960,8 +1958,8 @@ test_external(hid_t fapl)
     for (i = 0; i < (int)dims_r[0]; i++) {
         for (j = 0; j < (int)dims_r[1]; j++) {
             if (buf_s[i][j] != buf_o[i][j]) {
-                HDprintf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
-                HDprintf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
+                printf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
+                printf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
                 TEST_ERROR;
             }
         }
@@ -2075,12 +2073,12 @@ test_layouts(H5D_layout_t layout, hid_t fapl)
     }
 
 #if defined(H5_SET_EXTENT_DEBUG4)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_o[0]; i++) {
         for (j = 0; j < (int)dims_o[1]; j++) {
-            HDprintf("%d ", buf_o[i][j]);
+            printf("%d ", buf_o[i][j]);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 #endif
 
@@ -2128,12 +2126,12 @@ test_layouts(H5D_layout_t layout, hid_t fapl)
         TEST_ERROR;
 
 #if defined(H5_SET_EXTENT_DEBUG4)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++) {
         for (j = 0; j < (int)dims_r[1]; j++) {
-            HDprintf("%d ", buf_r[i][j]);
+            printf("%d ", buf_r[i][j]);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 #endif
 
@@ -2183,12 +2181,12 @@ test_layouts(H5D_layout_t layout, hid_t fapl)
     }
 
 #if defined(H5_SET_EXTENT_DEBUG4)
-    HDprintf("\n");
+    printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++) {
         for (j = 0; j < (int)dims_r[1]; j++) {
-            HDprintf("%d ", buf_r[i][j]);
+            printf("%d ", buf_r[i][j]);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 #endif
 
@@ -2747,12 +2745,12 @@ test_random_rank4_dump(unsigned ndim_sets, hsize_t dim_log[][4], hsize_t cdims[4
 {
     unsigned i;
 
-    HDprintf("  Chunk dimensions: ( %u, %u, %u, %u )\n", (unsigned)cdims[0], (unsigned)cdims[1],
-             (unsigned)cdims[2], (unsigned)cdims[3]);
-    HDprintf("  Log of dataset dimensions (oldest first):\n");
+    printf("  Chunk dimensions: ( %u, %u, %u, %u )\n", (unsigned)cdims[0], (unsigned)cdims[1],
+           (unsigned)cdims[2], (unsigned)cdims[3]);
+    printf("  Log of dataset dimensions (oldest first):\n");
     for (i = 0; i < ndim_sets; i++)
-        HDprintf("  Iteration %-3u: ( %2u, %2u, %2u, %2u )\n", i, (unsigned)dim_log[i][0],
-                 (unsigned)dim_log[i][1], (unsigned)dim_log[i][2], (unsigned)dim_log[i][3]);
+        printf("  Iteration %-3u: ( %2u, %2u, %2u, %2u )\n", i, (unsigned)dim_log[i][0],
+               (unsigned)dim_log[i][1], (unsigned)dim_log[i][2], (unsigned)dim_log[i][3]);
     if (j >= 0)
-        HDprintf("  First incorrect value read: ( %d, %d, %d, %d )\n", j, k, l, m);
+        printf("  First incorrect value read: ( %d, %d, %d, %d )\n", j, k, l, m);
 } /* end test_random_rank4_dump */
diff --git a/test/stab.c b/test/stab.c
index dcd2791..779d4bb 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -136,7 +136,7 @@ test_misc(hid_t fcpl, hid_t fapl, hbool_t new_format)
     if (HDstrcmp(comment, "hello world") != 0) {
         H5_FAILED();
         HDputs("    Read the wrong comment string from the group.");
-        HDprintf("    got: \"%s\"\n    ans: \"hello world\"\n", comment);
+        printf("    got: \"%s\"\n    ans: \"hello world\"\n", comment);
         TEST_ERROR;
     }
     if (H5Gclose(g1) < 0)
diff --git a/test/swmr.c b/test/swmr.c
index 43392b6..63da6b2 100644
--- a/test/swmr.c
+++ b/test/swmr.c
@@ -7743,7 +7743,7 @@ main(void)
      */
     driver = HDgetenv(HDF5_DRIVER);
     if (!H5FD__supports_swmr_test(driver)) {
-        HDprintf("This VFD does not support SWMR I/O\n");
+        printf("This VFD does not support SWMR I/O\n");
         return EXIT_SUCCESS;
     }
 
@@ -7760,7 +7760,7 @@ main(void)
     /* Check if file locking is enabled on this file system */
     if (use_file_locking)
         if (h5_check_if_file_locking_enabled(&file_locking_enabled) < 0) {
-            HDprintf("Error when determining if file locks are enabled\n");
+            printf("Error when determining if file locks are enabled\n");
             return EXIT_FAILURE;
         }
 
@@ -7847,7 +7847,7 @@ main(void)
     if (nerrors)
         goto error;
 
-    HDprintf("All tests passed.\n");
+    printf("All tests passed.\n");
 
     h5_cleanup(FILENAME, fapl);
 
@@ -7855,7 +7855,7 @@ main(void)
 
 error:
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d SWMR TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    printf("***** %d SWMR TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     return EXIT_FAILURE;
 
 } /* end main() */
diff --git a/test/swmr_addrem_writer.c b/test/swmr_addrem_writer.c
index 4681d4f..2a41dc4 100644
--- a/test/swmr_addrem_writer.c
+++ b/test/swmr_addrem_writer.c
@@ -95,7 +95,7 @@ open_skeleton(const char *filename, unsigned verbose)
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Opening datasets\n");
+        fprintf(stderr, "Opening datasets\n");
 
     /* Open the datasets */
     for (u = 0; u < NLEVELS; u++)
@@ -250,7 +250,7 @@ addrem_records(hid_t fid, unsigned verbose, unsigned long nops, unsigned long fl
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Closing datasets\n");
+        fprintf(stderr, "Closing datasets\n");
 
     /* Close the datasets */
     for (u = 0; u < NLEVELS; u++)
@@ -264,20 +264,20 @@ addrem_records(hid_t fid, unsigned verbose, unsigned long nops, unsigned long fl
 static void
 usage(void)
 {
-    HDprintf("\n");
-    HDprintf("Usage error!\n");
-    HDprintf("\n");
-    HDprintf("Usage: swmr_addrem_writer [-q] [-f <# of operations between flushing\n");
-    HDprintf("    file contents>] [-r <random seed>] <# of operations>\n");
-    HDprintf("\n");
-    HDprintf("<# of operations between flushing file contents> should be 0 (for\n");
-    HDprintf("no flushing) or between 1 and (<# of operations> - 1).\n");
-    HDprintf("\n");
-    HDprintf("<# of operations> must be specified.\n");
-    HDprintf("\n");
-    HDprintf("Defaults to verbose (no '-q' given), flushing every 1000 operations\n");
-    HDprintf("('-f 1000'), and will generate a random seed (no -r given).\n");
-    HDprintf("\n");
+    printf("\n");
+    printf("Usage error!\n");
+    printf("\n");
+    printf("Usage: swmr_addrem_writer [-q] [-f <# of operations between flushing\n");
+    printf("    file contents>] [-r <random seed>] <# of operations>\n");
+    printf("\n");
+    printf("<# of operations between flushing file contents> should be 0 (for\n");
+    printf("no flushing) or between 1 and (<# of operations> - 1).\n");
+    printf("\n");
+    printf("<# of operations> must be specified.\n");
+    printf("\n");
+    printf("Defaults to verbose (no '-q' given), flushing every 1000 operations\n");
+    printf("('-f 1000'), and will generate a random seed (no -r given).\n");
+    printf("\n");
     HDexit(EXIT_FAILURE);
 }
 
@@ -348,9 +348,9 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose) {
-        HDfprintf(stderr, "Parameters:\n");
-        HDfprintf(stderr, "\t# of operations between flushes = %ld\n", flush_count);
-        HDfprintf(stderr, "\t# of operations = %ld\n", nops);
+        fprintf(stderr, "Parameters:\n");
+        fprintf(stderr, "\t# of operations between flushes = %ld\n", flush_count);
+        fprintf(stderr, "\t# of operations = %ld\n", nops);
     } /* end if */
 
     /* Set the random seed */
@@ -361,11 +361,11 @@ main(int argc, char *argv[])
     } /* end if */
     HDsrandom(random_seed);
     /* ALWAYS emit the random seed for possible debugging */
-    HDfprintf(stderr, "Using writer random seed: %u\n", random_seed);
+    fprintf(stderr, "Using writer random seed: %u\n", random_seed);
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Generating symbol names\n");
+        fprintf(stderr, "Generating symbol names\n");
 
     /* Generate dataset names */
     if (generate_symbols() < 0)
@@ -373,11 +373,11 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Opening skeleton file: %s\n", FILENAME);
+        fprintf(stderr, "Opening skeleton file: %s\n", FILENAME);
 
     /* Open file skeleton */
     if ((fid = open_skeleton(FILENAME, verbose)) < 0) {
-        HDfprintf(stderr, "Error opening skeleton file!\n");
+        fprintf(stderr, "Error opening skeleton file!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
@@ -386,31 +386,31 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Adding and removing records\n");
+        fprintf(stderr, "Adding and removing records\n");
 
     /* Grow and shrink datasets */
     if (addrem_records(fid, verbose, (unsigned long)nops, (unsigned long)flush_count) < 0) {
-        HDfprintf(stderr, "Error adding and removing records from datasets!\n");
+        fprintf(stderr, "Error adding and removing records from datasets!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Releasing symbols\n");
+        fprintf(stderr, "Releasing symbols\n");
 
     /* Clean up the symbols */
     if (shutdown_symbols() < 0) {
-        HDfprintf(stderr, "Error releasing symbols!\n");
+        fprintf(stderr, "Error releasing symbols!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Closing objects\n");
+        fprintf(stderr, "Closing objects\n");
 
     /* Close objects opened */
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "Error closing file!\n");
+        fprintf(stderr, "Error closing file!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/test/swmr_common.c b/test/swmr_common.c
index 0143cf8..173dea8 100644
--- a/test/swmr_common.c
+++ b/test/swmr_common.c
@@ -275,12 +275,12 @@ print_metadata_retries_info(hid_t fid)
         if (NULL == info.retries[i])
             continue;
 
-        HDfprintf(stderr, "Metadata read retries for item %u:\n", i);
+        fprintf(stderr, "Metadata read retries for item %u:\n", i);
         power = 1;
         for (j = 0; j < info.nbins; j++) {
             if (info.retries[i][j])
-                HDfprintf(stderr, "\t# of retries for %u - %u retries: %u\n", power, (power * 10) - 1,
-                          info.retries[i][j]);
+                fprintf(stderr, "\t# of retries for %u - %u retries: %u\n", power, (power * 10) - 1,
+                        info.retries[i][j]);
             power *= 10;
         } /* end for */
     }     /* end for */
diff --git a/test/swmr_generator.c b/test/swmr_generator.c
index d8d4adc..9b8a689 100644
--- a/test/swmr_generator.c
+++ b/test/swmr_generator.c
@@ -124,7 +124,7 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Creating file\n");
+        fprintf(stderr, "Creating file\n");
 
     /* Create the file */
     if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC | (swmr_write ? H5F_ACC_SWMR_WRITE : 0), fcpl, fapl)) < 0)
@@ -177,7 +177,7 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Creating datasets\n");
+        fprintf(stderr, "Creating datasets\n");
 
     /* Create the datasets */
     for (u = 0; u < NLEVELS; u++)
@@ -218,7 +218,7 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Closing objects\n");
+        fprintf(stderr, "Closing objects\n");
 
     /* Close everything */
     if (H5Pclose(dcpl) < 0)
@@ -236,23 +236,23 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp
 static void
 usage(void)
 {
-    HDprintf("\n");
-    HDprintf("Usage error!\n");
-    HDprintf("\n");
-    HDprintf("Usage: swmr_generator [-q] [-s] [-c <deflate compression level>]\n");
-    HDprintf("    [-i <index type>] [-r <random seed>]\n");
-    HDprintf("\n");
-    HDprintf("NOTE: The random seed option is only used by the sparse test.  Other\n");
-    HDprintf("      tests specify the random seed as a reader/writer option.\n");
-    HDprintf("\n");
-    HDprintf("<deflate compression level> should be -1 (for no compression) or 0-9\n");
-    HDprintf("\n");
-    HDprintf("<index type> should be b2 or ea\n");
-    HDprintf("\n");
-    HDprintf("Defaults to verbose (no '-q' given), no SWMR_WRITE mode (no '-s' given) no\n");
-    HDprintf("compression ('-c -1'), v1 b-tree indexing (-i b1), and will generate a random\n");
-    HDprintf("seed (no -r given).\n");
-    HDprintf("\n");
+    printf("\n");
+    printf("Usage error!\n");
+    printf("\n");
+    printf("Usage: swmr_generator [-q] [-s] [-c <deflate compression level>]\n");
+    printf("    [-i <index type>] [-r <random seed>]\n");
+    printf("\n");
+    printf("NOTE: The random seed option is only used by the sparse test.  Other\n");
+    printf("      tests specify the random seed as a reader/writer option.\n");
+    printf("\n");
+    printf("<deflate compression level> should be -1 (for no compression) or 0-9\n");
+    printf("\n");
+    printf("<index type> should be b2 or ea\n");
+    printf("\n");
+    printf("Defaults to verbose (no '-q' given), no SWMR_WRITE mode (no '-s' given) no\n");
+    printf("compression ('-c -1'), v1 b-tree indexing (-i b1), and will generate a random\n");
+    printf("seed (no -r given).\n");
+    printf("\n");
     HDexit(EXIT_FAILURE);
 } /* end usage() */
 
@@ -323,10 +323,10 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose) {
-        HDfprintf(stderr, "Parameters:\n");
-        HDfprintf(stderr, "\tswmr writes %s\n", swmr_write ? "on" : "off");
-        HDfprintf(stderr, "\tcompression level = %d\n", comp_level);
-        HDfprintf(stderr, "\tindex type = %s\n", index_type);
+        fprintf(stderr, "Parameters:\n");
+        fprintf(stderr, "\tswmr writes %s\n", swmr_write ? "on" : "off");
+        fprintf(stderr, "\tcompression level = %d\n", comp_level);
+        fprintf(stderr, "\tindex type = %s\n", index_type);
     } /* end if */
 
     /* Set the random seed */
@@ -338,15 +338,15 @@ main(int argc, char *argv[])
     } /* end if */
     HDsrandom(random_seed);
     /* ALWAYS emit the random seed for possible debugging */
-    HDfprintf(stderr, "Using generator random seed (used in sparse test only): %u\n", random_seed);
+    fprintf(stderr, "Using generator random seed (used in sparse test only): %u\n", random_seed);
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Generating skeleton file: %s\n", FILENAME);
+        fprintf(stderr, "Generating skeleton file: %s\n", FILENAME);
 
     /* Generate file skeleton */
     if (gen_skeleton(FILENAME, verbose, swmr_write, comp_level, index_type, random_seed) < 0) {
-        HDfprintf(stderr, "Error generating skeleton file!\n");
+        fprintf(stderr, "Error generating skeleton file!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/test/swmr_reader.c b/test/swmr_reader.c
index 47a1288..c293b49 100644
--- a/test/swmr_reader.c
+++ b/test/swmr_reader.c
@@ -105,7 +105,7 @@ check_dataset(hid_t fid, hbool_t verbose, FILE *verbose_file, const char *sym_na
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Symbol = '%s', # of records = %lld\n", sym_name, (long long)snpoints);
+        fprintf(verbose_file, "Symbol = '%s', # of records = %lld\n", sym_name, (long long)snpoints);
 
     /* Check if there are records for symbol */
     if (snpoints > 0) {
@@ -126,12 +126,12 @@ check_dataset(hid_t fid, hbool_t verbose, FILE *verbose_file, const char *sym_na
             HDgettimeofday(&tv, NULL);
 
             if (verbose) {
-                HDfprintf(verbose_file, "*** ERROR ***\n");
-                HDfprintf(verbose_file, "Incorrect record value!\n");
-                HDfprintf(verbose_file,
-                          "Time = %llu.%llu, Symbol = '%s', # of records = %lld, record->rec_id = %llu\n",
-                          (unsigned long long)tv.tv_sec, (unsigned long long)tv.tv_usec, sym_name,
-                          (long long)snpoints, (unsigned long long)record->rec_id);
+                fprintf(verbose_file, "*** ERROR ***\n");
+                fprintf(verbose_file, "Incorrect record value!\n");
+                fprintf(verbose_file,
+                        "Time = %llu.%llu, Symbol = '%s', # of records = %lld, record->rec_id = %llu\n",
+                        (unsigned long long)tv.tv_sec, (unsigned long long)tv.tv_usec, sym_name,
+                        (long long)snpoints, (unsigned long long)record->rec_id);
             } /* end if */
             return -1;
         } /* end if */
@@ -214,7 +214,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Choosing datasets\n");
+        fprintf(verbose_file, "Choosing datasets\n");
 
     /* Allocate space for 'common' datasets, if any */
     if (ncommon > 0) {
@@ -233,7 +233,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned
 
             /* Emit informational message */
             if (verbose)
-                HDfprintf(verbose_file, "Common symbol #%u = '%s'\n", v, symbol_info[0][offset].name);
+                fprintf(verbose_file, "Common symbol #%u = '%s'\n", v, symbol_info[0][offset].name);
         } /* end for */
     }     /* end if */
 
@@ -254,7 +254,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned
 
             /* Emit informational message */
             if (verbose)
-                HDfprintf(verbose_file, "Random symbol #%u = '%s'\n", v, sym->name);
+                fprintf(verbose_file, "Random symbol #%u = '%s'\n", v, sym->name);
         } /* end for */
     }     /* end if */
 
@@ -264,7 +264,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Reading records\n");
+        fprintf(verbose_file, "Reading records\n");
 
     /* Get the starting time */
     start_time = HDtime(NULL);
@@ -288,7 +288,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned
 
         /* Emit informational message */
         if (verbose)
-            HDfprintf(verbose_file, "Opening file: %s\n", filename);
+            fprintf(verbose_file, "Opening file: %s\n", filename);
 
         /* Open the file */
         if ((fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0)
@@ -298,7 +298,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned
         if (ncommon > 0) {
             /* Emit informational message */
             if (verbose)
-                HDfprintf(verbose_file, "Checking common symbols\n");
+                fprintf(verbose_file, "Checking common symbols\n");
 
             /* Iterate over common datasets */
             for (v = 0; v < ncommon; v++) {
@@ -313,7 +313,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned
         if (nrandom > 0) {
             /* Emit informational message */
             if (verbose)
-                HDfprintf(verbose_file, "Checking random symbols\n");
+                fprintf(verbose_file, "Checking random symbols\n");
 
             /* Iterate over random datasets */
             for (v = 0; v < nrandom; v++) {
@@ -326,7 +326,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned
 
         /* Emit informational message */
         if (verbose)
-            HDfprintf(verbose_file, "Closing file\n");
+            fprintf(verbose_file, "Closing file\n");
 
         /* Close the file */
         if (H5Fclose(fid) < 0)
@@ -349,7 +349,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Closing datasets\n");
+        fprintf(verbose_file, "Closing datasets\n");
 
     /* Close 'random' datasets, if any */
     if (nrandom > 0) {
@@ -369,19 +369,19 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned
 static void
 usage(void)
 {
-    HDprintf("\n");
-    HDprintf("Usage error!\n");
-    HDprintf("\n");
-    HDprintf("Usage: swmr_reader [-q] [-s <# of seconds to sleep between polling>]\n");
-    HDprintf("    [-h <# of common symbols to poll>] [-l <# of random symbols to poll>]\n");
-    HDprintf("    [-r <random seed>] <# of seconds to test>\n");
-    HDprintf("\n");
-    HDprintf("<# of seconds to test> must be specified.\n");
-    HDprintf("\n");
-    HDprintf("Defaults to verbose (no '-q' given), 1 second between polling ('-s 1'),\n");
-    HDprintf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n");
-    HDprintf("and will generate a random seed (no -r given).\n");
-    HDprintf("\n");
+    printf("\n");
+    printf("Usage error!\n");
+    printf("\n");
+    printf("Usage: swmr_reader [-q] [-s <# of seconds to sleep between polling>]\n");
+    printf("    [-h <# of common symbols to poll>] [-l <# of random symbols to poll>]\n");
+    printf("    [-r <random seed>] <# of seconds to test>\n");
+    printf("\n");
+    printf("<# of seconds to test> must be specified.\n");
+    printf("\n");
+    printf("Defaults to verbose (no '-q' given), 1 second between polling ('-s 1'),\n");
+    printf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n");
+    printf("and will generate a random seed (no -r given).\n");
+    printf("\n");
     HDexit(EXIT_FAILURE);
 }
 
@@ -483,30 +483,30 @@ main(int argc, char *argv[])
 
         HDsnprintf(verbose_name, sizeof(verbose_name), "swmr_reader.out.%u", random_seed);
         if (NULL == (verbose_file = HDfopen(verbose_name, "w"))) {
-            HDfprintf(stderr, "Can't open verbose output file!\n");
+            fprintf(stderr, "Can't open verbose output file!\n");
             HDexit(EXIT_FAILURE);
         }
     } /* end if */
 
     /* Emit informational message */
     if (verbose) {
-        HDfprintf(verbose_file, "Parameters:\n");
-        HDfprintf(verbose_file, "\t# of seconds between polling = %d\n", poll_time);
-        HDfprintf(verbose_file, "\t# of common symbols to poll = %d\n", ncommon);
-        HDfprintf(verbose_file, "\t# of random symbols to poll = %d\n", nrandom);
-        HDfprintf(verbose_file, "\t# of seconds to test = %ld\n", nseconds);
+        fprintf(verbose_file, "Parameters:\n");
+        fprintf(verbose_file, "\t# of seconds between polling = %d\n", poll_time);
+        fprintf(verbose_file, "\t# of common symbols to poll = %d\n", ncommon);
+        fprintf(verbose_file, "\t# of random symbols to poll = %d\n", nrandom);
+        fprintf(verbose_file, "\t# of seconds to test = %ld\n", nseconds);
     } /* end if */
 
     /* ALWAYS emit the random seed for possible debugging */
-    HDfprintf(stdout, "Using reader random seed: %u\n", random_seed);
+    fprintf(stdout, "Using reader random seed: %u\n", random_seed);
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Generating symbol names\n");
+        fprintf(verbose_file, "Generating symbol names\n");
 
     /* Generate dataset names */
     if (generate_symbols() < 0) {
-        HDfprintf(stderr, "Error generating symbol names!\n");
+        fprintf(stderr, "Error generating symbol names!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
@@ -517,27 +517,27 @@ main(int argc, char *argv[])
     /* Reading records from datasets */
     if (read_records(FILENAME, verbose, verbose_file, random_seed, (unsigned long)nseconds,
                      (unsigned)poll_time, (unsigned)ncommon, (unsigned)nrandom) < 0) {
-        HDfprintf(stderr, "Error reading records from datasets (random_seed = %u)!\n", random_seed);
+        fprintf(stderr, "Error reading records from datasets (random_seed = %u)!\n", random_seed);
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Releasing symbols\n");
+        fprintf(verbose_file, "Releasing symbols\n");
 
     /* Clean up the symbols */
     if (shutdown_symbols() < 0) {
-        HDfprintf(stderr, "Error releasing symbols!\n");
+        fprintf(stderr, "Error releasing symbols!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Closing objects\n");
+        fprintf(verbose_file, "Closing objects\n");
 
     /* Close objects created */
     if (H5Tclose(symbol_tid) < 0) {
-        HDfprintf(stderr, "Error closing symbol datatype!\n");
+        fprintf(stderr, "Error closing symbol datatype!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/test/swmr_remove_reader.c b/test/swmr_remove_reader.c
index eca81ad..cc525c8 100644
--- a/test/swmr_remove_reader.c
+++ b/test/swmr_remove_reader.c
@@ -102,7 +102,7 @@ check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *recor
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Symbol = '%s', # of records = %lld\n", sym_name, (long long)snpoints);
+        fprintf(stderr, "Symbol = '%s', # of records = %lld\n", sym_name, (long long)snpoints);
 
     /* Check if there are records for symbol */
     if (snpoints > 0) {
@@ -131,10 +131,10 @@ check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *recor
          * chunk may be deleted before the object header has the updated
          * dimensions */
         if (record->rec_id != start[1] && record->rec_id != (uint64_t)0) {
-            HDfprintf(stderr, "*** ERROR ***\n");
-            HDfprintf(stderr, "Incorrect record value!\n");
-            HDfprintf(stderr, "Symbol = '%s', # of records = %lld, record->rec_id = %llx\n", sym_name,
-                      (long long)snpoints, (unsigned long long)record->rec_id);
+            fprintf(stderr, "*** ERROR ***\n");
+            fprintf(stderr, "Incorrect record value!\n");
+            fprintf(stderr, "Symbol = '%s', # of records = %lld, record->rec_id = %llx\n", sym_name,
+                    (long long)snpoints, (unsigned long long)record->rec_id);
             return -1;
         } /* end if */
     }     /* end if */
@@ -209,7 +209,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Choosing datasets\n");
+        fprintf(stderr, "Choosing datasets\n");
 
     /* Allocate space for 'common' datasets, if any */
     if (ncommon > 0) {
@@ -228,7 +228,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns
 
             /* Emit informational message */
             if (verbose)
-                HDfprintf(stderr, "Common symbol #%u = '%s'\n", v, symbol_info[0][offset].name);
+                fprintf(stderr, "Common symbol #%u = '%s'\n", v, symbol_info[0][offset].name);
         } /* end for */
     }     /* end if */
 
@@ -249,7 +249,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns
 
             /* Emit informational message */
             if (verbose)
-                HDfprintf(stderr, "Random symbol #%u = '%s'\n", v, sym->name);
+                fprintf(stderr, "Random symbol #%u = '%s'\n", v, sym->name);
         } /* end for */
     }     /* end if */
 
@@ -259,7 +259,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Reading records\n");
+        fprintf(stderr, "Reading records\n");
 
     /* Get the starting time */
     start_time = HDtime(NULL);
@@ -274,7 +274,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns
 
         /* Emit informational message */
         if (verbose)
-            HDfprintf(stderr, "Opening file: %s\n", filename);
+            fprintf(stderr, "Opening file: %s\n", filename);
 
         /* Open the file */
         if ((fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0)
@@ -284,7 +284,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns
         if (ncommon > 0) {
             /* Emit informational message */
             if (verbose)
-                HDfprintf(stderr, "Checking common symbols\n");
+                fprintf(stderr, "Checking common symbols\n");
 
             /* Iterate over common datasets */
             for (v = 0; v < ncommon; v++) {
@@ -299,7 +299,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns
         if (nrandom > 0) {
             /* Emit informational message */
             if (verbose)
-                HDfprintf(stderr, "Checking random symbols\n");
+                fprintf(stderr, "Checking random symbols\n");
 
             /* Iterate over random datasets */
             for (v = 0; v < nrandom; v++) {
@@ -312,7 +312,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns
 
         /* Emit informational message */
         if (verbose)
-            HDfprintf(stderr, "Closing file\n");
+            fprintf(stderr, "Closing file\n");
 
         /* Close the file */
         if (H5Fclose(fid) < 0)
@@ -335,7 +335,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Closing datasets\n");
+        fprintf(stderr, "Closing datasets\n");
 
     /* Close 'random' datasets, if any */
     if (nrandom > 0) {
@@ -355,17 +355,17 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns
 static void
 usage(void)
 {
-    HDprintf("\n");
-    HDprintf("Usage error!\n");
-    HDprintf("\n");
-    HDprintf("Usage: swmr_remove_reader [-q] [-s <# of seconds to sleep between\n");
-    HDprintf("    polling>] [-h <# of common symbols to poll>] [-l <# of random symbols\n");
-    HDprintf("    to poll>] [-r <random seed>] <# of seconds to test>\n");
-    HDprintf("\n");
-    HDprintf("Defaults to verbose (no '-q' given), 1 second between polling ('-s 1'),\n");
-    HDprintf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n");
-    HDprintf("and will generate a random seed (no -r given).\n");
-    HDprintf("\n");
+    printf("\n");
+    printf("Usage error!\n");
+    printf("\n");
+    printf("Usage: swmr_remove_reader [-q] [-s <# of seconds to sleep between\n");
+    printf("    polling>] [-h <# of common symbols to poll>] [-l <# of random symbols\n");
+    printf("    to poll>] [-r <random seed>] <# of seconds to test>\n");
+    printf("\n");
+    printf("Defaults to verbose (no '-q' given), 1 second between polling ('-s 1'),\n");
+    printf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n");
+    printf("and will generate a random seed (no -r given).\n");
+    printf("\n");
     HDexit(EXIT_FAILURE);
 }
 
@@ -453,11 +453,11 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose) {
-        HDfprintf(stderr, "Parameters:\n");
-        HDfprintf(stderr, "\t# of seconds between polling = %d\n", poll_time);
-        HDfprintf(stderr, "\t# of common symbols to poll = %d\n", ncommon);
-        HDfprintf(stderr, "\t# of random symbols to poll = %d\n", nrandom);
-        HDfprintf(stderr, "\t# of seconds to test = %ld\n", nseconds);
+        fprintf(stderr, "Parameters:\n");
+        fprintf(stderr, "\t# of seconds between polling = %d\n", poll_time);
+        fprintf(stderr, "\t# of common symbols to poll = %d\n", ncommon);
+        fprintf(stderr, "\t# of random symbols to poll = %d\n", nrandom);
+        fprintf(stderr, "\t# of seconds to test = %ld\n", nseconds);
     } /* end if */
 
     /* Set the random seed */
@@ -468,15 +468,15 @@ main(int argc, char *argv[])
     } /* end if */
     HDsrandom(random_seed);
     /* ALWAYS emit the random seed for possible debugging */
-    HDfprintf(stderr, "Using reader random seed: %u\n", random_seed);
+    fprintf(stderr, "Using reader random seed: %u\n", random_seed);
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Generating symbol names\n");
+        fprintf(stderr, "Generating symbol names\n");
 
     /* Generate dataset names */
     if (generate_symbols() < 0) {
-        HDfprintf(stderr, "Error generating symbol names!\n");
+        fprintf(stderr, "Error generating symbol names!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
@@ -487,27 +487,27 @@ main(int argc, char *argv[])
     /* Reading records from datasets */
     if (read_records(FILENAME, verbose, (unsigned long)nseconds, (unsigned)poll_time, (unsigned)ncommon,
                      (unsigned)nrandom) < 0) {
-        HDfprintf(stderr, "Error reading records from datasets!\n");
+        fprintf(stderr, "Error reading records from datasets!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Releasing symbols\n");
+        fprintf(stderr, "Releasing symbols\n");
 
     /* Clean up the symbols */
     if (shutdown_symbols() < 0) {
-        HDfprintf(stderr, "Error releasing symbols!\n");
+        fprintf(stderr, "Error releasing symbols!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Closing objects\n");
+        fprintf(stderr, "Closing objects\n");
 
     /* Close objects created */
     if (H5Tclose(symbol_tid) < 0) {
-        HDfprintf(stderr, "Error closing symbol datatype!\n");
+        fprintf(stderr, "Error closing symbol datatype!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/test/swmr_remove_writer.c b/test/swmr_remove_writer.c
index d383e54..3e989f8 100644
--- a/test/swmr_remove_writer.c
+++ b/test/swmr_remove_writer.c
@@ -97,7 +97,7 @@ open_skeleton(const char *filename, unsigned verbose, unsigned old)
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Opening datasets\n");
+        fprintf(stderr, "Opening datasets\n");
 
     /* Open the datasets */
     for (u = 0; u < NLEVELS; u++)
@@ -186,7 +186,7 @@ remove_records(hid_t fid, unsigned verbose, unsigned long nshrinks, unsigned lon
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Closing datasets\n");
+        fprintf(stderr, "Closing datasets\n");
 
     /* Close the datasets */
     for (u = 0; u < NLEVELS; u++)
@@ -200,18 +200,18 @@ remove_records(hid_t fid, unsigned verbose, unsigned long nshrinks, unsigned lon
 static void
 usage(void)
 {
-    HDprintf("\n");
-    HDprintf("Usage error!\n");
-    HDprintf("\n");
-    HDprintf("Usage: swmr_remove_writer [-q] [-o] [-f <# of shrinks between flushing\n");
-    HDprintf("    file contents>] [-r <random seed>] <# of shrinks>\n");
-    HDprintf("\n");
-    HDprintf("<# of shrinks between flushing file contents> should be 0 (for no\n");
-    HDprintf("flushing) or between 1 and (<# of shrinks> - 1)\n");
-    HDprintf("\n");
-    HDprintf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n");
-    HDprintf("flushing every 1000 shrinks ('-f 1000'), and will generate a random seed (no -r given).\n");
-    HDprintf("\n");
+    printf("\n");
+    printf("Usage error!\n");
+    printf("\n");
+    printf("Usage: swmr_remove_writer [-q] [-o] [-f <# of shrinks between flushing\n");
+    printf("    file contents>] [-r <random seed>] <# of shrinks>\n");
+    printf("\n");
+    printf("<# of shrinks between flushing file contents> should be 0 (for no\n");
+    printf("flushing) or between 1 and (<# of shrinks> - 1)\n");
+    printf("\n");
+    printf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n");
+    printf("flushing every 1000 shrinks ('-f 1000'), and will generate a random seed (no -r given).\n");
+    printf("\n");
     HDexit(EXIT_FAILURE);
 }
 
@@ -286,9 +286,9 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose) {
-        HDfprintf(stderr, "Parameters:\n");
-        HDfprintf(stderr, "\t# of shrinks between flushes = %ld\n", flush_count);
-        HDfprintf(stderr, "\t# of shrinks = %ld\n", nshrinks);
+        fprintf(stderr, "Parameters:\n");
+        fprintf(stderr, "\t# of shrinks between flushes = %ld\n", flush_count);
+        fprintf(stderr, "\t# of shrinks = %ld\n", nshrinks);
     } /* end if */
 
     /* Set the random seed */
@@ -299,11 +299,11 @@ main(int argc, char *argv[])
     } /* end if */
     HDsrandom(random_seed);
     /* ALWAYS emit the random seed for possible debugging */
-    HDfprintf(stderr, "Using writer random seed: %u\n", random_seed);
+    fprintf(stderr, "Using writer random seed: %u\n", random_seed);
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Generating symbol names\n");
+        fprintf(stderr, "Generating symbol names\n");
 
     /* Generate dataset names */
     if (generate_symbols() < 0)
@@ -311,11 +311,11 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Opening skeleton file: %s\n", FILENAME);
+        fprintf(stderr, "Opening skeleton file: %s\n", FILENAME);
 
     /* Open file skeleton */
     if ((fid = open_skeleton(FILENAME, verbose, old)) < 0) {
-        HDfprintf(stderr, "Error opening skeleton file!\n");
+        fprintf(stderr, "Error opening skeleton file!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
@@ -324,31 +324,31 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Removing records\n");
+        fprintf(stderr, "Removing records\n");
 
     /* Remove records from datasets */
     if (remove_records(fid, verbose, (unsigned long)nshrinks, (unsigned long)flush_count) < 0) {
-        HDfprintf(stderr, "Error removing records from datasets!\n");
+        fprintf(stderr, "Error removing records from datasets!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Releasing symbols\n");
+        fprintf(stderr, "Releasing symbols\n");
 
     /* Clean up the symbols */
     if (shutdown_symbols() < 0) {
-        HDfprintf(stderr, "Error releasing symbols!\n");
+        fprintf(stderr, "Error releasing symbols!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Closing objects\n");
+        fprintf(stderr, "Closing objects\n");
 
     /* Close objects opened */
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "Error closing file!\n");
+        fprintf(stderr, "Error closing file!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/test/swmr_sparse_reader.c b/test/swmr_sparse_reader.c
index ff55a5b..b26ee4a 100644
--- a/test/swmr_sparse_reader.c
+++ b/test/swmr_sparse_reader.c
@@ -112,8 +112,8 @@ check_dataset(hid_t fid, unsigned verbose, const symbol_info_t *symbol, symbol_t
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Symbol = '%s', location = %" PRIuMAX ",%" PRIuMAX "\n", symbol->name,
-                  (uintmax_t)start[0], (uintmax_t)start[1]);
+        fprintf(stderr, "Symbol = '%s', location = %" PRIuMAX ",%" PRIuMAX "\n", symbol->name,
+                (uintmax_t)start[0], (uintmax_t)start[1]);
 
     /* Read record from dataset */
     record->rec_id = UINT64_MAX;
@@ -122,11 +122,10 @@ check_dataset(hid_t fid, unsigned verbose, const symbol_info_t *symbol, symbol_t
 
     /* Verify record value */
     if (record->rec_id != start[1]) {
-        HDfprintf(stderr, "*** ERROR ***\n");
-        HDfprintf(stderr, "Incorrect record value!\n");
-        HDfprintf(stderr,
-                  "Symbol = '%s', location = %" PRIuMAX ",%" PRIuMAX ", record->rec_id = %" PRIu64 "\n",
-                  symbol->name, (uintmax_t)start[0], (uintmax_t)start[1], record->rec_id);
+        fprintf(stderr, "*** ERROR ***\n");
+        fprintf(stderr, "Incorrect record value!\n");
+        fprintf(stderr, "Symbol = '%s', location = %" PRIuMAX ",%" PRIuMAX ", record->rec_id = %" PRIu64 "\n",
+                symbol->name, (uintmax_t)start[0], (uintmax_t)start[1], record->rec_id);
         return -1;
     } /* end if */
 
@@ -193,7 +192,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Opening file: %s\n", filename);
+        fprintf(stderr, "Opening file: %s\n", filename);
 
     /* Open the file */
     if ((fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0)
@@ -218,7 +217,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Reading records\n");
+        fprintf(stderr, "Reading records\n");
 
     /* Get the starting time */
     start_time = HDtime(NULL);
@@ -259,7 +258,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns
 
             /* Check for timeout */
             if (HDtime(NULL) >= (time_t)(start_time + (time_t)TIMEOUT)) {
-                HDfprintf(stderr, "Reader timed out\n");
+                fprintf(stderr, "Reader timed out\n");
                 return -1;
             } /* end if */
 
@@ -268,7 +267,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns
 
             /* Retrieve and print the collection of metadata read retries */
             if (print_metadata_retries_info(fid) < 0)
-                HDfprintf(stderr, "Warning: could not obtain metadata retries info\n");
+                fprintf(stderr, "Warning: could not obtain metadata retries info\n");
 
             /* Reopen the file */
             if (H5Fclose(fid) < 0)
@@ -280,7 +279,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns
 
         /* Emit informational message */
         if (verbose)
-            HDfprintf(stderr, "Checking dataset %lu\n", u);
+            fprintf(stderr, "Checking dataset %lu\n", u);
 
         /* Check dataset */
         if (check_dataset(fid, verbose, symbol, &record, mem_sid) < 0)
@@ -292,11 +291,11 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns
         if (iter_to_reopen == 0) {
             /* Emit informational message */
             if (verbose)
-                HDfprintf(stderr, "Reopening file: %s\n", filename);
+                fprintf(stderr, "Reopening file: %s\n", filename);
 
             /* Retrieve and print the collection of metadata read retries */
             if (print_metadata_retries_info(fid) < 0)
-                HDfprintf(stderr, "Warning: could not obtain metadata retries info\n");
+                fprintf(stderr, "Warning: could not obtain metadata retries info\n");
 
             /* Reopen the file */
             if (H5Fclose(fid) < 0)
@@ -309,7 +308,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns
 
     /* Retrieve and print the collection of metadata read retries */
     if (print_metadata_retries_info(fid) < 0)
-        HDfprintf(stderr, "Warning: could not obtain metadata retries info\n");
+        fprintf(stderr, "Warning: could not obtain metadata retries info\n");
 
     /* Close file */
     if (H5Fclose(fid) < 0)
@@ -325,18 +324,18 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns
 static void
 usage(void)
 {
-    HDprintf("\n");
-    HDprintf("Usage error!\n");
-    HDprintf("\n");
-    HDprintf("Usage: swmr_sparse_reader [-q] [-s <# of seconds to wait for writer>]\n");
-    HDprintf("    [-n <# of reads between reopens>] <# of records>\n");
-    HDprintf("\n");
-    HDprintf("Defaults to verbose (no '-q' given), 1 second wait ('-s 1') and 1 read\n");
-    HDprintf("between reopens ('-r 1')\n");
-    HDprintf("\n");
-    HDprintf("Note that the # of records *must* be the same as that supplied to\n");
-    HDprintf("swmr_sparse_writer\n");
-    HDprintf("\n");
+    printf("\n");
+    printf("Usage error!\n");
+    printf("\n");
+    printf("Usage: swmr_sparse_reader [-q] [-s <# of seconds to wait for writer>]\n");
+    printf("    [-n <# of reads between reopens>] <# of records>\n");
+    printf("\n");
+    printf("Defaults to verbose (no '-q' given), 1 second wait ('-s 1') and 1 read\n");
+    printf("between reopens ('-r 1')\n");
+    printf("\n");
+    printf("Note that the # of records *must* be the same as that supplied to\n");
+    printf("swmr_sparse_writer\n");
+    printf("\n");
     HDexit(EXIT_FAILURE);
 } /* end usage() */
 
@@ -397,19 +396,19 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose) {
-        HDfprintf(stderr, "Parameters:\n");
-        HDfprintf(stderr, "\t# of seconds between polling = %d\n", poll_time);
-        HDfprintf(stderr, "\t# of reads between reopens = %d\n", reopen_count);
-        HDfprintf(stderr, "\t# of records to read = %ld\n", nrecords);
+        fprintf(stderr, "Parameters:\n");
+        fprintf(stderr, "\t# of seconds between polling = %d\n", poll_time);
+        fprintf(stderr, "\t# of reads between reopens = %d\n", reopen_count);
+        fprintf(stderr, "\t# of records to read = %ld\n", nrecords);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Generating symbol names\n");
+        fprintf(stderr, "Generating symbol names\n");
 
     /* Generate dataset names */
     if (generate_symbols() < 0) {
-        HDfprintf(stderr, "Error generating symbol names!\n");
+        fprintf(stderr, "Error generating symbol names!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
@@ -420,27 +419,27 @@ main(int argc, char *argv[])
     /* Reading records from datasets */
     if (read_records(FILENAME, verbose, (unsigned long)nrecords, (unsigned)poll_time,
                      (unsigned)reopen_count) < 0) {
-        HDfprintf(stderr, "Error reading records from datasets!\n");
+        fprintf(stderr, "Error reading records from datasets!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Releasing symbols\n");
+        fprintf(stderr, "Releasing symbols\n");
 
     /* Clean up the symbols */
     if (shutdown_symbols() < 0) {
-        HDfprintf(stderr, "Error releasing symbols!\n");
+        fprintf(stderr, "Error releasing symbols!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Closing objects\n");
+        fprintf(stderr, "Closing objects\n");
 
     /* Close objects created */
     if (H5Tclose(symbol_tid) < 0) {
-        HDfprintf(stderr, "Error closing symbol datatype!\n");
+        fprintf(stderr, "Error closing symbol datatype!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/test/swmr_sparse_writer.c b/test/swmr_sparse_writer.c
index e8937e0..b3c471d 100644
--- a/test/swmr_sparse_writer.c
+++ b/test/swmr_sparse_writer.c
@@ -93,7 +93,7 @@ open_skeleton(const char *filename, unsigned verbose)
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Opening datasets\n");
+        fprintf(stderr, "Opening datasets\n");
 
     /* Seed the random number generator with the attribute in the file */
     if ((aid = H5Aopen(fid, "seed", H5P_DEFAULT)) < 0)
@@ -287,7 +287,7 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Closing datasets\n");
+        fprintf(stderr, "Closing datasets\n");
 
     /* Close the datasets */
     for (u = 0; u < NLEVELS; u++)
@@ -301,18 +301,18 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f
 static void
 usage(void)
 {
-    HDprintf("\n");
-    HDprintf("Usage error!\n");
-    HDprintf("\n");
-    HDprintf("Usage: swmr_sparse_writer [-q] [-f <# of records to write between\n");
-    HDprintf("    flushing file contents>] <# of records>\n");
-    HDprintf("\n");
-    HDprintf("<# of records to write between flushing file contents> should be 0\n");
-    HDprintf("(for no flushing) or between 1 and (<# of records> - 1)\n");
-    HDprintf("\n");
-    HDprintf("Defaults to verbose (no '-q' given) and flushing every 1000 records\n");
-    HDprintf("('-f 1000')\n");
-    HDprintf("\n");
+    printf("\n");
+    printf("Usage error!\n");
+    printf("\n");
+    printf("Usage: swmr_sparse_writer [-q] [-f <# of records to write between\n");
+    printf("    flushing file contents>] <# of records>\n");
+    printf("\n");
+    printf("<# of records to write between flushing file contents> should be 0\n");
+    printf("(for no flushing) or between 1 and (<# of records> - 1)\n");
+    printf("\n");
+    printf("Defaults to verbose (no '-q' given) and flushing every 1000 records\n");
+    printf("('-f 1000')\n");
+    printf("\n");
     HDexit(EXIT_FAILURE);
 }
 
@@ -369,14 +369,14 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose) {
-        HDfprintf(stderr, "Parameters:\n");
-        HDfprintf(stderr, "\t# of records between flushes = %ld\n", flush_count);
-        HDfprintf(stderr, "\t# of records to write = %ld\n", nrecords);
+        fprintf(stderr, "Parameters:\n");
+        fprintf(stderr, "\t# of records between flushes = %ld\n", flush_count);
+        fprintf(stderr, "\t# of records to write = %ld\n", nrecords);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Generating symbol names\n");
+        fprintf(stderr, "Generating symbol names\n");
 
     /* Generate dataset names */
     if (generate_symbols() < 0)
@@ -384,11 +384,11 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Opening skeleton file: %s\n", FILENAME);
+        fprintf(stderr, "Opening skeleton file: %s\n", FILENAME);
 
     /* Open file skeleton */
     if ((fid = open_skeleton(FILENAME, verbose)) < 0) {
-        HDfprintf(stderr, "Error opening skeleton file!\n");
+        fprintf(stderr, "Error opening skeleton file!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
@@ -397,31 +397,31 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Adding records\n");
+        fprintf(stderr, "Adding records\n");
 
     /* Append records to datasets */
     if (add_records(fid, verbose, (unsigned long)nrecords, (unsigned long)flush_count) < 0) {
-        HDfprintf(stderr, "Error appending records to datasets!\n");
+        fprintf(stderr, "Error appending records to datasets!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Releasing symbols\n");
+        fprintf(stderr, "Releasing symbols\n");
 
     /* Clean up the symbols */
     if (shutdown_symbols() < 0) {
-        HDfprintf(stderr, "Error releasing symbols!\n");
+        fprintf(stderr, "Error releasing symbols!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(stderr, "Closing objects\n");
+        fprintf(stderr, "Closing objects\n");
 
     /* Close objects opened */
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "Error closing file!\n");
+        fprintf(stderr, "Error closing file!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/test/swmr_start_write.c b/test/swmr_start_write.c
index 40014fb..1568214 100644
--- a/test/swmr_start_write.c
+++ b/test/swmr_start_write.c
@@ -87,7 +87,7 @@ create_file(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Creating file without SWMR access\n");
+        fprintf(verbose_file, "Creating file without SWMR access\n");
 
     /* Create the file */
     if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
@@ -174,7 +174,7 @@ create_datasets(hid_t fid, int comp_level, hbool_t verbose, FILE *verbose_file,
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Creating datasets\n");
+        fprintf(verbose_file, "Creating datasets\n");
 
     /* Create the datasets */
     for (u = 0; u < NLEVELS; u++)
@@ -306,7 +306,7 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecor
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Closing datasets\n");
+        fprintf(verbose_file, "Closing datasets\n");
 
     /* Close the datasets */
     for (u = 0; u < NLEVELS; u++)
@@ -320,26 +320,26 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecor
 static void
 usage(void)
 {
-    HDprintf("\n");
-    HDprintf("Usage error!\n");
-    HDprintf("\n");
-    HDprintf("Usage: swmr_start_write [-f <# of records to write between flushing file contents>]\n");
-    HDprintf("    [-i <index type>] [-c <deflate compression level>]\n");
-    HDprintf("    [-r <random seed>] [-q] <# of records>\n");
-    HDprintf("\n");
-    HDprintf("<# of records to write between flushing file contents> should be 0\n");
-    HDprintf("(for no flushing) or between 1 and (<# of records> - 1).\n");
-    HDprintf("\n");
-    HDprintf("<index type> should be b2 or ea\n");
-    HDprintf("\n");
-    HDprintf("<deflate compression level> should be -1 (for no compression) or 0-9\n");
-    HDprintf("\n");
-    HDprintf("<# of records> must be specified.\n");
-    HDprintf("\n");
-    HDprintf("Defaults to flushing every 10000 records ('-f 10000'),\n");
-    HDprintf("v1 b-tree indexing (-i b1), compression ('-c -1'),\n");
-    HDprintf("will generate a random seed (no -r given), and verbose (no '-q' given)\n");
-    HDprintf("\n");
+    printf("\n");
+    printf("Usage error!\n");
+    printf("\n");
+    printf("Usage: swmr_start_write [-f <# of records to write between flushing file contents>]\n");
+    printf("    [-i <index type>] [-c <deflate compression level>]\n");
+    printf("    [-r <random seed>] [-q] <# of records>\n");
+    printf("\n");
+    printf("<# of records to write between flushing file contents> should be 0\n");
+    printf("(for no flushing) or between 1 and (<# of records> - 1).\n");
+    printf("\n");
+    printf("<index type> should be b2 or ea\n");
+    printf("\n");
+    printf("<deflate compression level> should be -1 (for no compression) or 0-9\n");
+    printf("\n");
+    printf("<# of records> must be specified.\n");
+    printf("\n");
+    printf("Defaults to flushing every 10000 records ('-f 10000'),\n");
+    printf("v1 b-tree indexing (-i b1), compression ('-c -1'),\n");
+    printf("will generate a random seed (no -r given), and verbose (no '-q' given)\n");
+    printf("\n");
     HDexit(EXIT_FAILURE);
 } /* usage() */
 
@@ -450,32 +450,32 @@ main(int argc, char *argv[])
 
         HDsnprintf(verbose_name, sizeof(verbose_name), "swmr_writer.out.%u", random_seed);
         if (NULL == (verbose_file = HDfopen(verbose_name, "w"))) {
-            HDfprintf(stderr, "Can't open verbose output file!\n");
+            fprintf(stderr, "Can't open verbose output file!\n");
             HDexit(EXIT_FAILURE);
         }
     } /* end if */
 
     /* Emit informational message */
     if (verbose) {
-        HDfprintf(verbose_file, "Parameters:\n");
-        HDfprintf(verbose_file, "\tindex type = %s\n", index_type);
-        HDfprintf(verbose_file, "\tcompression level = %d\n", comp_level);
-        HDfprintf(verbose_file, "\t# of records between flushes = %ld\n", flush_count);
-        HDfprintf(verbose_file, "\t# of records to write = %ld\n", nrecords);
+        fprintf(verbose_file, "Parameters:\n");
+        fprintf(verbose_file, "\tindex type = %s\n", index_type);
+        fprintf(verbose_file, "\tcompression level = %d\n", comp_level);
+        fprintf(verbose_file, "\t# of records between flushes = %ld\n", flush_count);
+        fprintf(verbose_file, "\t# of records to write = %ld\n", nrecords);
     } /* end if */
 
     /* ALWAYS emit the random seed for possible debugging */
-    HDfprintf(stdout, "Using writer random seed: %u\n", random_seed);
+    fprintf(stdout, "Using writer random seed: %u\n", random_seed);
 
     /* Create the test file */
     if ((fid = create_file(FILENAME, verbose, verbose_file, random_seed)) < 0) {
-        HDfprintf(stderr, "Error creating the file...\n");
+        fprintf(stderr, "Error creating the file...\n");
         HDexit(EXIT_FAILURE);
     }
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Generating symbol names\n");
+        fprintf(verbose_file, "Generating symbol names\n");
 
     /* Generate dataset names */
     if (generate_symbols() < 0)
@@ -483,13 +483,13 @@ main(int argc, char *argv[])
 
     /* Create the datasets in the file */
     if (create_datasets(fid, comp_level, verbose, verbose_file, index_type) < 0) {
-        HDfprintf(stderr, "Error creating datasets...\n");
+        fprintf(stderr, "Error creating datasets...\n");
         HDexit(EXIT_FAILURE);
     }
 
     /* Enable SWMR writing mode */
     if (H5Fstart_swmr_write(fid) < 0) {
-        HDfprintf(stderr, "Error starting SWMR writing mode...\n");
+        fprintf(stderr, "Error starting SWMR writing mode...\n");
         HDexit(EXIT_FAILURE);
     }
 
@@ -498,31 +498,31 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Adding records\n");
+        fprintf(verbose_file, "Adding records\n");
 
     /* Append records to datasets */
     if (add_records(fid, verbose, verbose_file, (unsigned long)nrecords, (unsigned long)flush_count) < 0) {
-        HDfprintf(stderr, "Error appending records to datasets!\n");
+        fprintf(stderr, "Error appending records to datasets!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Releasing symbols\n");
+        fprintf(verbose_file, "Releasing symbols\n");
 
     /* Clean up the symbols */
     if (shutdown_symbols() < 0) {
-        HDfprintf(stderr, "Error releasing symbols!\n");
+        fprintf(stderr, "Error releasing symbols!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Closing the file\n");
+        fprintf(verbose_file, "Closing the file\n");
 
     /* Close objects opened */
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "Error closing file!\n");
+        fprintf(stderr, "Error closing file!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/test/swmr_writer.c b/test/swmr_writer.c
index 3b86dea..fa24880 100644
--- a/test/swmr_writer.c
+++ b/test/swmr_writer.c
@@ -105,7 +105,7 @@ open_skeleton(const char *filename, hbool_t verbose, FILE *verbose_file, unsigne
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Opening datasets\n");
+        fprintf(verbose_file, "Opening datasets\n");
 
     /* Open the datasets */
     for (u = 0; u < NLEVELS; u++)
@@ -242,7 +242,7 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecor
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Closing datasets\n");
+        fprintf(verbose_file, "Closing datasets\n");
 
     /* Close the datasets */
     for (u = 0; u < NLEVELS; u++)
@@ -256,20 +256,20 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecor
 static void
 usage(void)
 {
-    HDprintf("\n");
-    HDprintf("Usage error!\n");
-    HDprintf("\n");
-    HDprintf("Usage: swmr_writer [-q] [-o] [-f <# of records to write between flushing\n");
-    HDprintf("    file contents>] [-r <random seed>] <# of records>\n");
-    HDprintf("\n");
-    HDprintf("<# of records to write between flushing file contents> should be 0\n");
-    HDprintf("(for no flushing) or between 1 and (<# of records> - 1).\n");
-    HDprintf("\n");
-    HDprintf("<# of records> must be specified.\n");
-    HDprintf("\n");
-    HDprintf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n");
-    HDprintf("flushing every 10000 records ('-f 10000'), and will generate a random seed (no -r given).\n");
-    HDprintf("\n");
+    printf("\n");
+    printf("Usage error!\n");
+    printf("\n");
+    printf("Usage: swmr_writer [-q] [-o] [-f <# of records to write between flushing\n");
+    printf("    file contents>] [-r <random seed>] <# of records>\n");
+    printf("\n");
+    printf("<# of records to write between flushing file contents> should be 0\n");
+    printf("(for no flushing) or between 1 and (<# of records> - 1).\n");
+    printf("\n");
+    printf("<# of records> must be specified.\n");
+    printf("\n");
+    printf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n");
+    printf("flushing every 10000 records ('-f 10000'), and will generate a random seed (no -r given).\n");
+    printf("\n");
     HDexit(EXIT_FAILURE);
 }
 
@@ -358,24 +358,24 @@ main(int argc, char *argv[])
 
         HDsnprintf(verbose_name, sizeof(verbose_name), "swmr_writer.out.%u", random_seed);
         if (NULL == (verbose_file = HDfopen(verbose_name, "w"))) {
-            HDfprintf(stderr, "Can't open verbose output file!\n");
+            fprintf(stderr, "Can't open verbose output file!\n");
             HDexit(EXIT_FAILURE);
         }
     } /* end if */
 
     /* Emit informational message */
     if (verbose) {
-        HDfprintf(verbose_file, "Parameters:\n");
-        HDfprintf(verbose_file, "\t# of records between flushes = %ld\n", flush_count);
-        HDfprintf(verbose_file, "\t# of records to write = %ld\n", nrecords);
+        fprintf(verbose_file, "Parameters:\n");
+        fprintf(verbose_file, "\t# of records between flushes = %ld\n", flush_count);
+        fprintf(verbose_file, "\t# of records to write = %ld\n", nrecords);
     } /* end if */
 
     /* ALWAYS emit the random seed for possible debugging */
-    HDfprintf(stdout, "Using writer random seed: %u\n", random_seed);
+    fprintf(stdout, "Using writer random seed: %u\n", random_seed);
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Generating symbol names\n");
+        fprintf(verbose_file, "Generating symbol names\n");
 
     /* Generate dataset names */
     if (generate_symbols() < 0)
@@ -383,11 +383,11 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Opening skeleton file: %s\n", FILENAME);
+        fprintf(verbose_file, "Opening skeleton file: %s\n", FILENAME);
 
     /* Open file skeleton */
     if ((fid = open_skeleton(FILENAME, verbose, verbose_file, random_seed, old)) < 0) {
-        HDfprintf(stderr, "Error opening skeleton file!\n");
+        fprintf(stderr, "Error opening skeleton file!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
@@ -396,31 +396,31 @@ main(int argc, char *argv[])
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Adding records\n");
+        fprintf(verbose_file, "Adding records\n");
 
     /* Append records to datasets */
     if (add_records(fid, verbose, verbose_file, (unsigned long)nrecords, (unsigned long)flush_count) < 0) {
-        HDfprintf(stderr, "Error appending records to datasets!\n");
+        fprintf(stderr, "Error appending records to datasets!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Releasing symbols\n");
+        fprintf(verbose_file, "Releasing symbols\n");
 
     /* Clean up the symbols */
     if (shutdown_symbols() < 0) {
-        HDfprintf(stderr, "Error releasing symbols!\n");
+        fprintf(stderr, "Error releasing symbols!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Emit informational message */
     if (verbose)
-        HDfprintf(verbose_file, "Closing objects\n");
+        fprintf(verbose_file, "Closing objects\n");
 
     /* Close objects opened */
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "Error closing file!\n");
+        fprintf(stderr, "Error closing file!\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/test/tarray.c b/test/tarray.c
index 7f4cec4..9602b41 100644
--- a/test/tarray.c
+++ b/test/tarray.c
@@ -1937,7 +1937,7 @@ test_compat(void)
     if (h5_driver_is_default_vfd_compatible(H5P_DEFAULT, &driver_is_default_compatible) < 0)
         TestErrPrintf("can't check if VFD is default VFD compatible\n");
     if (!driver_is_default_compatible) {
-        HDprintf(" -- SKIPPED --\n");
+        printf(" -- SKIPPED --\n");
         return;
     }
 
@@ -2193,7 +2193,7 @@ test_compat(void)
         CHECK_I(ret, "H5Fclose");
     } /* end if */
     else
-        HDprintf("***cannot open the pre-created compound datatype test file (%s)\n", testfile);
+        printf("***cannot open the pre-created compound datatype test file (%s)\n", testfile);
 
 } /* end test_compat() */
 
diff --git a/test/tattr.c b/test/tattr.c
index d38aaa7..b0442f6 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -919,10 +919,10 @@ test_attr_compound_read(hid_t fapl)
     for (i = 0; i < ATTR4_DIM1; i++)
         for (j = 0; j < ATTR4_DIM2; j++)
             if (HDmemcmp(&attr_data4[i][j], &read_data4[i][j], sizeof(struct attr4_struct)) != 0) {
-                HDprintf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n",
-                         __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i);
-                HDprintf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n",
-                         __LINE__, i, j, attr_data4[i][j].d, i, j, read_data4[i][j].d);
+                printf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n",
+                       __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i);
+                printf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n",
+                       __LINE__, i, j, attr_data4[i][j].d, i, j, read_data4[i][j].d);
                 TestErrPrintf(
                     "%d: attribute data different: attr_data4[%d][%d].c=%c, read_data4[%d][%d].c=%c\n",
                     __LINE__, i, j, attr_data4[i][j].c, i, j, read_data4[i][j].c);
@@ -1063,8 +1063,8 @@ test_attr_scalar_read(hid_t fapl)
 
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_FLT_ABS_EQUAL(rdata, attr_data5))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Aread",
-                 (double)attr_data5, (double)rdata, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Aread",
+               (double)attr_data5, (double)rdata, (int)__LINE__, __FILE__);
 
     /* Get the attribute's dataspace */
     sid = H5Aget_space(attr);
diff --git a/test/tcheck_version.c b/test/tcheck_version.c
index f14c61c..8bcebab 100644
--- a/test/tcheck_version.c
+++ b/test/tcheck_version.c
@@ -45,13 +45,13 @@ static unsigned release = H5_VERS_RELEASE;
 void
 showhelp(void)
 {
-    HDprintf("Usage: " progname " [-h] [-t<vers>]\n");
-    HDprintf("\t-h\tShow this page and version information\n");
-    HDprintf("\t-t<vers>: Test by changing (adding 1 to) the <vers> to trigger\n");
-    HDprintf("\t\t  the warning. <vers> can be:\n");
-    HDprintf("\t\t\tM for Major version number (%d)\n", H5_VERS_MAJOR);
-    HDprintf("\t\t\tm for Minor version number (%d)\n", H5_VERS_MINOR);
-    HDprintf("\t\t\tr for Release number (%d)\n", H5_VERS_RELEASE);
+    printf("Usage: " progname " [-h] [-t<vers>]\n");
+    printf("\t-h\tShow this page and version information\n");
+    printf("\t-t<vers>: Test by changing (adding 1 to) the <vers> to trigger\n");
+    printf("\t\t  the warning. <vers> can be:\n");
+    printf("\t\t\tM for Major version number (%d)\n", H5_VERS_MAJOR);
+    printf("\t\t\tm for Minor version number (%d)\n", H5_VERS_MINOR);
+    printf("\t\t\tr for Release number (%d)\n", H5_VERS_RELEASE);
 }
 
 void
@@ -62,7 +62,7 @@ parse(int ac, char **av)
     while (--ac > 0) {
         pt = *(++av);
         if (*pt != '-') {
-            HDfprintf(stderr, "Unknown option(%s). Aborted.\n", *av);
+            fprintf(stderr, "Unknown option(%s). Aborted.\n", *av);
             HDexit(EXIT_FAILURE);
         }
         else {
@@ -79,7 +79,7 @@ parse(int ac, char **av)
                             release++;
                             break;
                         default:
-                            HDfprintf(stderr, "Unknown -v parameter (%s). Aborted.\n", *av);
+                            fprintf(stderr, "Unknown -v parameter (%s). Aborted.\n", *av);
                             HDexit(EXIT_FAILURE);
                     }
                     break;
@@ -87,7 +87,7 @@ parse(int ac, char **av)
                     showhelp();
                     HDexit(EXIT_SUCCESS);
                 default:
-                    HDfprintf(stderr, "Unknown option(%s). Aborted.\n", *av);
+                    fprintf(stderr, "Unknown option(%s). Aborted.\n", *av);
                     HDexit(EXIT_FAILURE);
             }
         }
diff --git a/test/testframe.c b/test/testframe.c
index b0fb7d8..ea5cc18 100644
--- a/test/testframe.c
+++ b/test/testframe.c
@@ -72,11 +72,11 @@ AddTest(const char *TheName, void (*TheCall)(void), void (*Cleanup)(void), const
 {
     /* Sanity checking */
     if (HDstrlen(TheDescr) >= MAXTESTDESC) {
-        HDprintf("Test description ('%s') too long, increase MAXTESTDESC(%d).\n", TheDescr, MAXTESTDESC);
+        printf("Test description ('%s') too long, increase MAXTESTDESC(%d).\n", TheDescr, MAXTESTDESC);
         HDexit(EXIT_FAILURE);
     } /* end if */
     if (HDstrlen(TheName) >= MAXTESTNAME) {
-        HDprintf("Test name too long, increase MAXTESTNAME(%d).\n", MAXTESTNAME);
+        printf("Test name too long, increase MAXTESTNAME(%d).\n", MAXTESTNAME);
         HDexit(EXIT_FAILURE);
     } /* end if */
 
@@ -87,8 +87,8 @@ AddTest(const char *TheName, void (*TheCall)(void), void (*Cleanup)(void), const
 
         /* Reallocate array */
         if (NULL == (newTest = (TestStruct *)HDrealloc(Test, newAlloc * sizeof(TestStruct)))) {
-            HDprintf("Out of memory for tests, Index = %u, TestAlloc = %u, newAlloc = %u\n", Index, TestAlloc,
-                     newAlloc);
+            printf("Out of memory for tests, Index = %u, TestAlloc = %u, newAlloc = %u\n", Index, TestAlloc,
+                   newAlloc);
             HDexit(EXIT_FAILURE);
         } /* end if */
 
@@ -624,7 +624,7 @@ SetTest(const char *testname, int action)
             break;
         default:
             /* error */
-            HDprintf("*** ERROR: Unknown action (%d) for SetTest\n", action);
+            printf("*** ERROR: Unknown action (%d) for SetTest\n", action);
             break;
     }
 }
diff --git a/test/testmeta.c b/test/testmeta.c
index d844c2e..1d843a4 100644
--- a/test/testmeta.c
+++ b/test/testmeta.c
@@ -101,7 +101,7 @@ main(void)
     for (j = 0; j < NDATAOBJECTS; j++) {
         /* Removed print statement as it would lock system resources on Windows */
         /*
-         * HDprintf("\rWriting Object #%d of %d", j+1, NDATAOBJECTS);
+         * printf("\rWriting Object #%d of %d", j+1, NDATAOBJECTS);
          * HDfflush(stdout);
          */
         floatval = (float)j;
@@ -110,7 +110,7 @@ main(void)
         HDsnprintf(name, sizeof(name), "/DataArray/%06d", j);
         group_id = H5Gcreate2(file_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         if (group_id < 0) {
-            HDfprintf(stderr, "Failed to create DataArray group.\n");
+            fprintf(stderr, "Failed to create DataArray group.\n");
             status = H5Fclose(file_id);
             return -1;
         }
@@ -127,7 +127,7 @@ main(void)
             dataset_id = H5Dcreate2(group_id, name, H5T_NATIVE_FLOAT, dataspace_id, H5P_DEFAULT, H5P_DEFAULT,
                                     H5P_DEFAULT);
             if (dataset_id < 0) {
-                HDfprintf(stderr, "Failed to create DataArray dataset.\n");
+                fprintf(stderr, "Failed to create DataArray dataset.\n");
                 status = H5Fclose(file_id);
                 return -1;
             }
@@ -135,7 +135,7 @@ main(void)
             /* Write the data array data */
             status = H5Dwrite(dataset_id, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
             if (status < 0) {
-                HDfprintf(stderr, "Failed to write DataArray dataset.\n");
+                fprintf(stderr, "Failed to write DataArray dataset.\n");
                 status = H5Fclose(file_id);
                 return -1;
             }
@@ -148,7 +148,7 @@ main(void)
         /* Open NumDataObj dataset */
         dataset_id = H5Dopen2(file_id, "/NumDataObj", H5P_DEFAULT);
         if (dataset_id < 0) {
-            HDfprintf(stderr, "Failed to open NumDataObj dataset.\n");
+            fprintf(stderr, "Failed to open NumDataObj dataset.\n");
             status = H5Fclose(file_id);
             return -1;
         }
@@ -157,7 +157,7 @@ main(void)
         numdataobj = j + 1;
         status     = H5Dwrite(dataset_id, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &numdataobj);
         if (status < 0) {
-            HDfprintf(stderr, "Failed to write NumDataObj dataset.\n");
+            fprintf(stderr, "Failed to write NumDataObj dataset.\n");
             status = H5Fclose(file_id);
             return -1;
         }
@@ -172,7 +172,7 @@ main(void)
             HDsnprintf(name, sizeof(name), "/ExtArray%06d", i);
             dataset_id = H5Dopen2(file_id, name, H5P_DEFAULT);
             if (dataset_id < 0) {
-                HDfprintf(stderr, "Failed to open ExtArray dataset.\n");
+                fprintf(stderr, "Failed to open ExtArray dataset.\n");
                 status = H5Fclose(file_id);
                 return -1;
             } /* end if */
@@ -181,7 +181,7 @@ main(void)
             dims[0] = (hsize_t)j + 1;
             status  = H5Dset_extent(dataset_id, dims);
             if (status < 0) {
-                HDfprintf(stderr, "Failed to extend DataArray dataset.\n");
+                fprintf(stderr, "Failed to extend DataArray dataset.\n");
                 status = H5Fclose(file_id);
                 return -1;
             } /* end if */
@@ -198,7 +198,7 @@ main(void)
             status   = H5Sselect_hyperslab(dataspace_id, H5S_SELECT_SET, start, stride, count, NULL);
             status   = H5Dwrite(dataset_id, type_id, memspace_id, dataspace_id, H5P_DEFAULT, &floatval);
             if (status < 0) {
-                HDfprintf(stderr, "Failed to write DataArray dataset.\n");
+                fprintf(stderr, "Failed to write DataArray dataset.\n");
                 status = H5Fclose(file_id);
                 return -1;
             }
@@ -214,7 +214,7 @@ main(void)
     /* Close the file */
     status = H5Fclose(file_id);
 
-    HDprintf("\n");
+    printf("\n");
 
     return 0;
 }
diff --git a/test/tfile.c b/test/tfile.c
index fca33ab..9da1c9b 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -5631,7 +5631,7 @@ test_libver_bounds_copy(void)
     CHECK_I(ret, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
diff --git a/test/tgenprop.c b/test/tgenprop.c
index 7bfd590..3955bb9 100644
--- a/test/tgenprop.c
+++ b/test/tgenprop.c
@@ -703,8 +703,8 @@ test_genprop_basic_list(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
-                 (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
+               (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
 
     /* Close list */
     ret = H5Pclose(lid1);
@@ -796,8 +796,8 @@ test_genprop_basic_list_prop(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
-                 (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
+               (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
 
     /* Check values of temporary properties (set with regular values) */
     ret = H5Pget(lid1, PROP3_NAME, &prop3_value);
@@ -808,8 +808,8 @@ test_genprop_basic_list_prop(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
-                 *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
+               *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
 
     /* Delete permanent property */
     ret = H5Premove(lid1, PROP2_NAME);
@@ -845,8 +845,8 @@ test_genprop_basic_list_prop(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
-                 *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
+               *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
 
     /* Close list */
     ret = H5Pclose(lid1);
@@ -1253,8 +1253,8 @@ test_genprop_list_callback(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
-                 (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
+               (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
 
     /* Check values of temporary properties (set with regular values) */
     ret = H5Pget(lid1, PROP3_NAME, &prop3_value);
@@ -1268,8 +1268,8 @@ test_genprop_list_callback(void)
     CHECK_I(ret, "H5Pget");
     /* Verify the floating-poing value in this way to avoid compiler warning. */
     if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE))
-        HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
-                 *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
+        printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget",
+               *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
 
     /* Verify get callback information for properties tracked */
     VERIFY(prop1_cb_info.get_count, 1, "H5Pget");
diff --git a/test/th5s.c b/test/th5s.c
index 8717e85..5a43e60 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -209,7 +209,7 @@ test_h5s_basic(void)
             CHECK_I(ret, "H5Fclose");
         }
         else
-            HDprintf("***cannot open the pre-created H5S_MAX_RANK test file (%s)\n", testfile);
+            printf("***cannot open the pre-created H5S_MAX_RANK test file (%s)\n", testfile);
     }
 
     /* Verify that incorrect dimensions don't work */
@@ -710,7 +710,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
         }
@@ -731,7 +731,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata_short[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]);
                 }
             }
         }
@@ -804,7 +804,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
 
@@ -829,8 +829,8 @@ test_h5s_zero_dim(void)
                 for (k = 0; k < SPACE1_DIM3; k++) {
                     if (rdata_real[i][j][k] != wdata_real[i][j][k]) {
                         H5_FAILED();
-                        HDprintf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k,
-                                 rdata_real[i][j][k], wdata_real[i][j][k]);
+                        printf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k,
+                               rdata_real[i][j][k], wdata_real[i][j][k]);
                     }
                 }
             }
@@ -853,7 +853,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
 
@@ -901,7 +901,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
 
@@ -944,7 +944,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
         }
@@ -975,7 +975,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
         }
@@ -996,7 +996,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata_short[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]);
                 }
             }
         }
@@ -1056,8 +1056,8 @@ test_h5s_zero_dim(void)
                 for (k = 0; k < SPACE1_DIM3; k++) {
                     if (rdata_real[i][j][k] != wdata_real[i][j][k]) {
                         H5_FAILED();
-                        HDprintf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k,
-                                 rdata_real[i][j][k], wdata_real[i][j][k]);
+                        printf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k,
+                               rdata_real[i][j][k], wdata_real[i][j][k]);
                     }
                 }
             }
@@ -1143,7 +1143,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]);
                 }
             }
         }
@@ -1180,7 +1180,7 @@ test_h5s_zero_dim(void)
             for (j = 0; j < SPACE1_DIM3; j++) {
                 if (rdata_short[i][j] != 7) {
                     H5_FAILED();
-                    HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]);
+                    printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]);
                 }
             }
         }
@@ -2461,10 +2461,10 @@ test_h5s_compound_scalar_read(void)
     ret = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
     CHECK(ret, FAIL, "H5Dread");
     if (HDmemcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) {
-        HDprintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c1);
-        HDprintf("scalar data different: space4_data.u=%u, read_data4.u=%u\n", space4_data.u, rdata.u);
-        HDprintf("scalar data different: space4_data.f=%f, read_data4.f=%f\n", (double)space4_data.f,
-                 (double)rdata.f);
+        printf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c1);
+        printf("scalar data different: space4_data.u=%u, read_data4.u=%u\n", space4_data.u, rdata.u);
+        printf("scalar data different: space4_data.f=%f, read_data4.f=%f\n", (double)space4_data.f,
+               (double)rdata.f);
         TestErrPrintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1,
                       rdata.c2);
     } /* end if */
diff --git a/test/thread_id.c b/test/thread_id.c
index c0614f4..ebe4a79 100644
--- a/test/thread_id.c
+++ b/test/thread_id.c
@@ -34,7 +34,7 @@ my_errx(int code, const char *fmt, ...)
 {
     va_list ap;
 
-    (void)HDfprintf(stderr, "thread_id: ");
+    (void)fprintf(stderr, "thread_id: ");
     va_start(ap, fmt);
     (void)HDvfprintf(stderr, fmt, ap);
     va_end(ap);
@@ -176,11 +176,11 @@ my_err(int code, const char *fmt, ...)
     va_list ap;
     int     errno_copy = errno;
 
-    (void)HDfprintf(stderr, "thread_id: ");
+    (void)fprintf(stderr, "thread_id: ");
     va_start(ap, fmt);
     (void)HDvfprintf(stderr, fmt, ap);
     va_end(ap);
-    (void)HDfprintf(stderr, ": %s\n", HDstrerror(errno_copy));
+    (void)fprintf(stderr, ": %s\n", HDstrerror(errno_copy));
     HDexit(code);
 }
 
@@ -318,7 +318,7 @@ main(void)
 int
 main(void)
 {
-    HDfprintf(stderr, "not implemented in this configuration.\n");
+    fprintf(stderr, "not implemented in this configuration.\n");
     return EXIT_SUCCESS;
 }
 #endif /*H5_HAVE_THREADSAFE && !H5_HAVE_WIN_THREADS*/
diff --git a/test/timer.c b/test/timer.c
index 9254596..d271f41 100644
--- a/test/timer.c
+++ b/test/timer.c
@@ -143,7 +143,7 @@ test_timer_system_user(void)
      */
     if (timer.initial.system < 0.0 || timer.initial.user < 0.0) {
         SKIPPED();
-        HDprintf("NOTE: No suitable way to get system/user times on this platform.\n");
+        printf("NOTE: No suitable way to get system/user times on this platform.\n");
         return 0;
     }
 
@@ -380,7 +380,7 @@ main(void)
 
     h5_reset();
 
-    HDprintf("Testing platform-independent timer functionality.\n");
+    printf("Testing platform-independent timer functionality.\n");
 
     nerrors += test_time_formatting() < 0 ? 1 : 0;
     nerrors += test_timer_system_user() < 0 ? 1 : 0;
@@ -388,12 +388,11 @@ main(void)
     nerrors += test_timer_functionality() < 0 ? 1 : 0;
 
     if (nerrors) {
-        HDprintf("***** %d platform-independent timer TEST%s FAILED! *****\n", nerrors,
-                 nerrors > 1 ? "S" : "");
+        printf("***** %d platform-independent timer TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
         return 1;
     }
     else {
-        HDprintf("All platform-independent timer tests passed.\n");
+        printf("All platform-independent timer tests passed.\n");
         return 0;
     }
 }
diff --git a/test/titerate.c b/test/titerate.c
index 458be8e..3b6ecc7 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -108,7 +108,7 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR
             return (count2 > 10 ? 1 : 0);
 
         default:
-            HDprintf("invalid iteration command");
+            printf("invalid iteration command");
             return (-1);
     } /* end switch */
 } /* end liter_cb() */
@@ -397,7 +397,7 @@ aiter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5A_info_t H5_ATTR_
             return (count2 > 10 ? 1 : 0);
 
         default:
-            HDprintf("invalid iteration command");
+            printf("invalid iteration command");
             return (-1);
     } /* end switch */
 } /* end aiter_cb() */
@@ -1024,7 +1024,7 @@ test_corrupted_attnamelen(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
diff --git a/test/tmisc.c b/test/tmisc.c
index 76aed7b..8d4e417 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -996,16 +996,16 @@ test_misc5(void)
 
     /* Verify the correct information was read in */
     for (i = 0; i < (buf.len); i++) {
-        /* HDprintf("[%d]=%d\n",i, ((misc5_struct1 *)(buf.p))[i].st1_el1); */
+        /* printf("[%d]=%d\n",i, ((misc5_struct1 *)(buf.p))[i].st1_el1); */
         VERIFY(((misc5_struct1 *)(buf.p))[i].st1_el1, MISC5_DBGELVAL1, "H5Dread");
         for (j = 0; j < (((misc5_struct1 *)(buf.p))[i].st1_el2.len); j++) {
-            /* HDprintf("   [%d]=%d\n",j, ((misc5_struct2 *)(((misc5_struct1 *)
+            /* printf("   [%d]=%d\n",j, ((misc5_struct2 *)(((misc5_struct1 *)
              * (buf.p))[i].st1_el2.p))[j].st2_el1); */
             VERIFY(((misc5_struct2 *)(((misc5_struct1 *)(buf.p))[i].st1_el2.p))[j].st2_el1, MISC5_DBGELVAL2,
                    "H5Dread");
             for (k = 0; k < (((misc5_struct2 *)(((misc5_struct1 *)(buf.p))[i].st1_el2.p))[j].st2_el2.len);
                  k++) {
-                /* HDprintf("      [%d]=%d\n",k, ((misc5_struct3 *)(((misc5_struct2 *) (((misc5_struct1
+                /* printf("      [%d]=%d\n",k, ((misc5_struct3 *)(((misc5_struct2 *) (((misc5_struct1
                  * *)(buf.p))[i].  st1_el2.p))[j].st2_el2.p))[k].st3_el1); */
                 VERIFY(((misc5_struct3 *)(((misc5_struct2 *)(((misc5_struct1 *)(buf.p))[i].st1_el2.p))[j]
                                               .st2_el2.p))[k]
@@ -1810,7 +1810,7 @@ test_misc10(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
@@ -3713,7 +3713,7 @@ test_misc20(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
@@ -5009,7 +5009,7 @@ test_misc25b(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
@@ -5270,7 +5270,7 @@ test_misc27(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
@@ -5494,7 +5494,7 @@ test_misc29(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
@@ -5785,7 +5785,7 @@ test_misc33(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
@@ -6084,7 +6084,7 @@ test_misc37(void)
     CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
diff --git a/test/trefer.c b/test/trefer.c
index e1cee21..b725b90 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -3259,7 +3259,7 @@ test_reference_perf(void)
         CHECK(ret, FAIL, "H5Rdestroy");
     }
     if (VERBOSE_MED)
-        HDprintf("--- Object reference create time: %lfs\n", t / MAX_ITER_CREATE);
+        printf("--- Object reference create time: %lfs\n", t / MAX_ITER_CREATE);
 
     /* Create reference to dataset */
     ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, &wbuf[0]);
@@ -3278,7 +3278,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Object reference  write time: %lfs\n", t / MAX_ITER_WRITE);
+        printf("--- Object reference  write time: %lfs\n", t / MAX_ITER_WRITE);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -3297,7 +3297,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Deprecated object reference create time: %lfs\n", t / MAX_ITER_CREATE);
+        printf("--- Deprecated object reference create time: %lfs\n", t / MAX_ITER_CREATE);
 
     /* Create reference to dataset */
     ret = H5Rcreate(&wbuf_deprec[0], fid1, "/Group1/Dataset1", H5R_OBJECT1, H5I_INVALID_HID);
@@ -3313,7 +3313,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Deprecated object reference  write time: %lfs\n", t / MAX_ITER_WRITE);
+        printf("--- Deprecated object reference  write time: %lfs\n", t / MAX_ITER_WRITE);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -3335,7 +3335,7 @@ test_reference_perf(void)
         CHECK(ret, FAIL, "H5Rdestroy");
     }
     if (VERBOSE_MED)
-        HDprintf("--- Region reference create time: %lfs\n", t / MAX_ITER_CREATE);
+        printf("--- Region reference create time: %lfs\n", t / MAX_ITER_CREATE);
 
     /* Store first dataset region */
     ret = H5Rcreate_region(fid1, "/Group1/Dataset1", sid1, H5P_DEFAULT, &wbuf_reg[0]);
@@ -3351,7 +3351,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Region reference  write time: %lfs\n", t / MAX_ITER_WRITE);
+        printf("--- Region reference  write time: %lfs\n", t / MAX_ITER_WRITE);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -3371,7 +3371,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Deprecated region reference create time: %lfs\n", t / MAX_ITER_CREATE);
+        printf("--- Deprecated region reference create time: %lfs\n", t / MAX_ITER_CREATE);
 
     t = 0;
     for (i = 0; i < MAX_ITER_WRITE; i++) {
@@ -3383,7 +3383,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Deprecated region reference  write time: %lfs\n", t / MAX_ITER_WRITE);
+        printf("--- Deprecated region reference  write time: %lfs\n", t / MAX_ITER_WRITE);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -3417,7 +3417,7 @@ test_reference_perf(void)
         CHECK(ret, FAIL, "H5Rdestroy");
     }
     if (VERBOSE_MED)
-        HDprintf("--- Object reference read time: %lfs\n", t / MAX_ITER_READ);
+        printf("--- Object reference read time: %lfs\n", t / MAX_ITER_READ);
 
     /* Read selection from disk */
     ret = H5Dread(dataset, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf);
@@ -3463,7 +3463,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Deprecated object reference read time: %lfs\n", t / MAX_ITER_READ);
+        printf("--- Deprecated object reference read time: %lfs\n", t / MAX_ITER_READ);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -3485,7 +3485,7 @@ test_reference_perf(void)
         CHECK(ret, FAIL, "H5Rdestroy");
     }
     if (VERBOSE_MED)
-        HDprintf("--- Region reference read time: %lfs\n", t / MAX_ITER_READ);
+        printf("--- Region reference read time: %lfs\n", t / MAX_ITER_READ);
 
     /* Read selection from disk */
     ret = H5Dread(dataset, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf_reg);
@@ -3509,7 +3509,7 @@ test_reference_perf(void)
         t += t2 - t1;
     }
     if (VERBOSE_MED)
-        HDprintf("--- Deprecated region reference read time: %lfs\n", t / MAX_ITER_READ);
+        printf("--- Deprecated region reference read time: %lfs\n", t / MAX_ITER_READ);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
diff --git a/test/trefer_shutdown.c b/test/trefer_shutdown.c
index 50bdb26..118d660 100644
--- a/test/trefer_shutdown.c
+++ b/test/trefer_shutdown.c
@@ -10,39 +10,39 @@ main(int argc, char **argv)
     int       i;
 
     if ((fid = H5Fcreate("HDFFV-10992.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        HDfprintf(stderr, "H5Fcreate failed\n");
+        fprintf(stderr, "H5Fcreate failed\n");
         return 1;
     }
 
     if ((sid = H5Screate(H5S_SCALAR)) < 0) {
-        HDfprintf(stderr, "H5Screate failed\n");
+        fprintf(stderr, "H5Screate failed\n");
         return 1;
     }
 
     /* Create a dataset of object references */
     if ((did = H5Dcreate2(fid, "dset", H5T_STD_REF, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        HDfprintf(stderr, "H5Dcreate failed\n");
+        fprintf(stderr, "H5Dcreate failed\n");
         return 1;
     }
 
     for (i = 0; i < 100; i++) {
         /* Create reference to the root group */
         if (H5Rcreate_object(fid, "/dset", H5P_DEFAULT, &write_ref) < 0) {
-            HDfprintf(stderr, "H5Rcreate_object failed\n");
+            fprintf(stderr, "H5Rcreate_object failed\n");
             return 1;
         }
     }
 
     /* Write reference to dataset */
     if (H5Dwrite(did, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, &write_ref) < 0) {
-        HDfprintf(stderr, "H5Dwrite failed\n");
+        fprintf(stderr, "H5Dwrite failed\n");
         return 1;
     }
 
     for (i = 0; i < 500; i++) {
         /* Read reference back into different reference buffer */
         if (H5Dread(did, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, &read_ref) < 0) {
-            HDfprintf(stderr, "H5Dread failed\n");
+            fprintf(stderr, "H5Dread failed\n");
             return 1;
         }
     }
@@ -55,27 +55,27 @@ main(int argc, char **argv)
      */
 #if 0
     if (H5Rdestroy(&write_ref) < 0) {
-        HDfprintf(stderr, "H5Rdestroy on reference write buffer failed\n");
+        fprintf(stderr, "H5Rdestroy on reference write buffer failed\n");
         return 1;
     }
     if (H5Rdestroy(&read_ref) < 0) {
-        HDfprintf(stderr, "H5Rdestroy on reference read buffer failed\n");
+        fprintf(stderr, "H5Rdestroy on reference read buffer failed\n");
         return 1;
     }
 #endif
 
     if (H5Sclose(sid) < 0) {
-        HDfprintf(stderr, "H5Sclose failed\n");
+        fprintf(stderr, "H5Sclose failed\n");
         return 1;
     }
 
     if (H5Dclose(did) < 0) {
-        HDfprintf(stderr, "H5Dclose failed\n");
+        fprintf(stderr, "H5Dclose failed\n");
         return 1;
     }
 
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "H5Fclose failed\n");
+        fprintf(stderr, "H5Fclose failed\n");
         return 1;
     }
 
diff --git a/test/tselect.c b/test/tselect.c
index 8fc6c65..f55f5c3 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -1389,10 +1389,10 @@ test_select_hyper_stride(hid_t xfer_plist)
         tbuf  = wbuf + loc1[i];
         tbuf2 = rbuf + loc2[i];
         if (*tbuf != *tbuf2) {
-            HDprintf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n", __LINE__, i,
-                     (int)loc1[i], i, (int)loc2[i]);
-            HDprintf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n", (void *)wbuf, (void *)tbuf, (void *)rbuf,
-                     (void *)tbuf2);
+            printf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n", __LINE__, i, (int)loc1[i],
+                   i, (int)loc2[i]);
+            printf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n", (void *)wbuf, (void *)tbuf, (void *)rbuf,
+                   (void *)tbuf2);
             TestErrPrintf("*tbuf=%u, *tbuf2=%u\n", (unsigned)*tbuf, (unsigned)*tbuf2);
         } /* end if */
     }     /* end for */
@@ -1834,14 +1834,14 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist)
                         (k >= start[2] && k < (start[2] + count[2])) &&
                         (l >= start[3] && l < (start[3] + count[3]))) {
                         if (*tbuf != *tbuf2) {
-                            HDprintf("Error: hyperslab values don't match!\n");
+                            printf("Error: hyperslab values don't match!\n");
                             TestErrPrintf("Line: %d, i=%u, j=%u, k=%u, l=%u, *tbuf=%u,*tbuf2=%u\n", __LINE__,
                                           i, j, k, l, (unsigned)*tbuf, (unsigned)*tbuf2);
                         } /* end if */
                     }     /* end if */
                     else {
                         if (*tbuf2 != 0) {
-                            HDprintf("Error: invalid data in read buffer!\n");
+                            printf("Error: invalid data in read buffer!\n");
                             TestErrPrintf("Line: %d, i=%u, j=%u, k=%u, l=%u, *tbuf=%u,*tbuf2=%u\n", __LINE__,
                                           i, j, k, l, (unsigned)*tbuf, (unsigned)*tbuf2);
                         } /* end if */
@@ -5305,10 +5305,10 @@ test_select_hyper_union_stagger(void)
     /* Verify input data */
     for (i = 0; i < 8; i++) {
         if (data[input_loc[i][0]][input_loc[i][1]] != data_out[output_loc[i][0]][output_loc[i][1]]) {
-            HDprintf("input data #%d is wrong!\n", i);
-            HDprintf("input_loc=[%d][%d]\n", input_loc[i][0], input_loc[i][1]);
-            HDprintf("output_loc=[%d][%d]\n", output_loc[i][0], output_loc[i][1]);
-            HDprintf("data=%d\n", data[input_loc[i][0]][input_loc[i][1]]);
+            printf("input data #%d is wrong!\n", i);
+            printf("input_loc=[%d][%d]\n", input_loc[i][0], input_loc[i][1]);
+            printf("output_loc=[%d][%d]\n", output_loc[i][0], output_loc[i][1]);
+            printf("data=%d\n", data[input_loc[i][0]][input_loc[i][1]]);
             TestErrPrintf("data_out=%d\n", data_out[output_loc[i][0]][output_loc[i][1]]);
         } /* end if */
     }     /* end for */
@@ -5784,14 +5784,14 @@ test_select_hyper_and_2d(void)
         for (j = 0; j < SPACE2_DIM2; j++, tbuf++) {
             if ((i >= 5 && i <= 9) && (j >= 5 && j <= 9)) {
                 if (*tbuf != *tbuf2)
-                    HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__,
-                             i, j, (int)*tbuf, (int)*tbuf2);
+                    printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__,
+                           i, j, (int)*tbuf, (int)*tbuf2);
                 tbuf2++;
             } /* end if */
             else {
                 if (*tbuf != 0)
-                    HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j,
-                             (int)*tbuf);
+                    printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j,
+                           (int)*tbuf);
             } /* end else */
         }     /* end for */
 
@@ -5925,14 +5925,14 @@ test_select_hyper_xor_2d(void)
                 ((i >= 5 && i <= 9) && ((j >= 0 && j <= 4) || (j >= 10 && j <= 14))) ||
                 ((i >= 10 && i <= 14) && (j >= 5 && j <= 14))) {
                 if (*tbuf != *tbuf2)
-                    HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__,
-                             i, j, (int)*tbuf, (int)*tbuf2);
+                    printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__,
+                           i, j, (int)*tbuf, (int)*tbuf2);
                 tbuf2++;
             } /* end if */
             else {
                 if (*tbuf != 0)
-                    HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j,
-                             (int)*tbuf);
+                    printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j,
+                           (int)*tbuf);
             } /* end else */
         }     /* end for */
 
@@ -6064,14 +6064,14 @@ test_select_hyper_notb_2d(void)
         for (j = 0; j < SPACE2_DIM2; j++, tbuf++) {
             if (((i >= 0 && i <= 4) && (j >= 0 && j <= 9)) || ((i >= 5 && i <= 9) && (j >= 0 && j <= 4))) {
                 if (*tbuf != *tbuf2)
-                    HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__,
-                             i, j, (int)*tbuf, (int)*tbuf2);
+                    printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__,
+                           i, j, (int)*tbuf, (int)*tbuf2);
                 tbuf2++;
             } /* end if */
             else {
                 if (*tbuf != 0)
-                    HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j,
-                             (int)*tbuf);
+                    printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j,
+                           (int)*tbuf);
             } /* end else */
         }     /* end for */
 
@@ -6251,14 +6251,14 @@ test_select_hyper_iter2(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned ndim
 
     if (*tbuf != **tbuf2) {
         TestErrPrintf("Error in hyperslab iteration!\n");
-        HDprintf("location: { ");
+        printf("location: { ");
         for (u = 0; u < ndim; u++) {
-            HDprintf("%2d", (int)point[u]);
+            printf("%2d", (int)point[u]);
             if (u < (ndim - 1))
-                HDprintf(", ");
+                printf(", ");
         } /* end for */
-        HDprintf("}\n");
-        HDprintf("*tbuf=%d, **tbuf2=%d\n", *tbuf, **tbuf2);
+        printf("}\n");
+        printf("*tbuf=%d, **tbuf2=%d\n", *tbuf, **tbuf2);
         return (-1);
     } /* end if */
     else {
diff --git a/test/tsohm.c b/test/tsohm.c
index e8de093..27dafce 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -615,13 +615,13 @@ size1_helper(hid_t file, const char *filename, hid_t fapl_id, hbool_t test_file_
         if (0 > H5Dread((dset_id), (dtype_id), H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata)) {                     \
             H5_FAILED();                                                                                     \
             AT();                                                                                            \
-            HDprintf("Can't read data\n");                                                                   \
+            printf("Can't read data\n");                                                                     \
             goto error;                                                                                      \
         }                                                                                                    \
         if ((rdata.i1 != wdata.i1) || (rdata.i2 != wdata.i2) || HDstrcmp(rdata.str, wdata.str) != 0) {       \
             H5_FAILED();                                                                                     \
             AT();                                                                                            \
-            HDprintf("incorrect read data\n");                                                               \
+            printf("incorrect read data\n");                                                                 \
             goto error;                                                                                      \
         }                                                                                                    \
     } /* TSOHM_S1H_VERIFY_DATA() definition */
@@ -1524,21 +1524,21 @@ static void
 size2_dump_struct(const char *name, size2_helper_struct *sizes)
 {
     HDputs(name);
-    HDprintf("    empty size: %llu\n", (unsigned long long)sizes->empty_size);
-    HDprintf(" first dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->first_dset,
-             (unsigned long long)(sizes->first_dset - sizes->empty_size));
-    HDprintf("second dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->second_dset,
-             (unsigned long long)(sizes->second_dset - sizes->first_dset));
-    HDprintf("       dsets 1: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets1,
-             (unsigned long long)(sizes->dsets1 - sizes->second_dset));
-    HDprintf("       dsets 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets2,
-             (unsigned long long)(sizes->dsets2 - sizes->dsets1));
-    HDprintf("   interleaved: %llu \tdelta: %llu\n", (unsigned long long)sizes->interleaved,
-             (unsigned long long)(sizes->interleaved - sizes->dsets2));
-    HDprintf("    attributes: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs1,
-             (unsigned long long)(sizes->attrs1 - sizes->interleaved));
-    HDprintf("  attributes 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs2,
-             (unsigned long long)(sizes->attrs2 - sizes->attrs1));
+    printf("    empty size: %llu\n", (unsigned long long)sizes->empty_size);
+    printf(" first dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->first_dset,
+           (unsigned long long)(sizes->first_dset - sizes->empty_size));
+    printf("second dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->second_dset,
+           (unsigned long long)(sizes->second_dset - sizes->first_dset));
+    printf("       dsets 1: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets1,
+           (unsigned long long)(sizes->dsets1 - sizes->second_dset));
+    printf("       dsets 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets2,
+           (unsigned long long)(sizes->dsets2 - sizes->dsets1));
+    printf("   interleaved: %llu \tdelta: %llu\n", (unsigned long long)sizes->interleaved,
+           (unsigned long long)(sizes->interleaved - sizes->dsets2));
+    printf("    attributes: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs1,
+           (unsigned long long)(sizes->attrs1 - sizes->interleaved));
+    printf("  attributes 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs2,
+           (unsigned long long)(sizes->attrs2 - sizes->attrs1));
 } /* size2_dump_struct */
 #endif /* NOT_NOW */
 
@@ -3279,7 +3279,7 @@ test_sohm_extlink(void)
     CHECK_I(ret, "h5_driver_is_default_vfd_compatible");
 
     if (!driver_is_default_compatible) {
-        HDprintf("-- SKIPPED --\n");
+        printf("-- SKIPPED --\n");
         return;
     }
 
diff --git a/test/ttime.c b/test/ttime.c
index 81c5015..bd31873 100644
--- a/test/ttime.c
+++ b/test/ttime.c
@@ -176,13 +176,13 @@ test_time_io(void)
     tid = H5Dget_type(dsid);
     CHECK(tid, FAIL, "H5Dget_type");
     if (H5Tget_class(tid) == H5T_TIME)
-        HDfprintf(stderr, "datatype class is H5T_TIME\n");
+        fprintf(stderr, "datatype class is H5T_TIME\n");
     status = H5Tclose(tid);
     CHECK(status, FAIL, "H5Tclose");
 
     status = H5Dread(dsid, H5T_UNIX_D32LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &timethen);
     CHECK(status, FAIL, "H5Dread");
-    HDfprintf(stderr, "time written was: %s\n", HDctime(&timethen));
+    fprintf(stderr, "time written was: %s\n", HDctime(&timethen));
 
     status = H5Dclose(dsid);
     CHECK(status, FAIL, "H5Dclose");
diff --git a/test/ttsafe.c b/test/ttsafe.c
index 761a3b3..cea1e84 100644
--- a/test/ttsafe.c
+++ b/test/ttsafe.c
@@ -113,7 +113,7 @@ main(int argc, char *argv[])
 
 #else /* H5_HAVE_THREADSAFE */
 
-    HDprintf("Most thread-safety tests skipped because THREADSAFE not enabled\n");
+    printf("Most thread-safety tests skipped because THREADSAFE not enabled\n");
 
 #endif /* H5_HAVE_THREADSAFE */
 
diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c
index 8e01c66..5cc408b 100644
--- a/test/ttsafe_error.c
+++ b/test/ttsafe_error.c
@@ -136,7 +136,7 @@ tts_error(void)
         if (error_flag_g) {
             TestErrPrintf(
                 "At least one thread reported a value that was different from the expected value\n");
-            HDprintf(
+            printf(
                 "(Update the expected_g[] array in tts_error for this test if the error stack changed!)\n");
         }
 
@@ -158,7 +158,7 @@ tts_error(void)
         CHECK(status, FAIL, "H5Fclose");
     } /* end if */
     else
-        HDprintf("Non-native VOL connector used, skipping test\n");
+        printf("Non-native VOL connector used, skipping test\n");
 
     status = H5Idec_ref(vol_id);
     CHECK(status, FAIL, "H5Idec_ref");
@@ -245,15 +245,15 @@ walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void H5_ATTR_UNUSE
     }
 
     /* Unexpected error stack entry, print some info and set flag */
-    HDfprintf(stderr, "Unexpected error stack entry!\n");
-    HDfprintf(stderr, "Stack entry: %d\n", n);
-    HDfprintf(stderr,
-              "Actual: maj_num = %" PRIxHID ", min_num = %" PRIxHID
-              ", line = %u, func = '%s', file = '%s', desc = '%s'\n",
-              err_desc->maj_num, err_desc->min_num, err_desc->line, err_desc->func_name, err_desc->file_name,
-              err_desc->desc);
-    HDfprintf(stderr, "Expected: maj_num = %" PRIxHID ", min_num = %" PRIxHID "\n", expected_g[n].maj_num,
-              expected_g[n].min_num);
+    fprintf(stderr, "Unexpected error stack entry!\n");
+    fprintf(stderr, "Stack entry: %d\n", n);
+    fprintf(stderr,
+            "Actual: maj_num = %" PRIxHID ", min_num = %" PRIxHID
+            ", line = %u, func = '%s', file = '%s', desc = '%s'\n",
+            err_desc->maj_num, err_desc->min_num, err_desc->line, err_desc->func_name, err_desc->file_name,
+            err_desc->desc);
+    fprintf(stderr, "Expected: maj_num = %" PRIxHID ", min_num = %" PRIxHID "\n", expected_g[n].maj_num,
+            expected_g[n].min_num);
     error_flag_g = -1;
 
     return SUCCEED;
diff --git a/test/tunicode.c b/test/tunicode.c
index 7bc4c68..114c79c 100644
--- a/test/tunicode.c
+++ b/test/tunicode.c
@@ -779,15 +779,15 @@ dump_string(const char *string)
     size_t length;
     size_t x;
 
-    HDprintf("The string was:\n %s", string);
-    HDprintf("Or in hex:\n");
+    printf("The string was:\n %s", string);
+    printf("Or in hex:\n");
 
     length = HDstrlen(string);
 
     for (x = 0; x < length; x++)
-        HDprintf("%x ", string[x] & (0x000000FF));
+        printf("%x ", string[x] & (0x000000FF));
 
-    HDprintf("\n");
+    printf("\n");
 }
 
 /* Main test.
diff --git a/test/twriteorder.c b/test/twriteorder.c
index dd608c7..5f47a95 100644
--- a/test/twriteorder.c
+++ b/test/twriteorder.c
@@ -104,15 +104,15 @@ part_t      launch_g;
 void
 usage(const char *prog)
 {
-    HDfprintf(stderr, "usage: %s [OPTIONS]\n", prog);
-    HDfprintf(stderr, "  OPTIONS\n");
-    HDfprintf(stderr, "     -h            Print a usage message and exit\n");
-    HDfprintf(stderr, "     -l w|r        launch writer or reader only. [default: launch both]\n");
-    HDfprintf(stderr, "     -b N          Block size [default: %d]\n", BLOCKSIZE_DFT);
-    HDfprintf(stderr, "     -p N          Partition size [default: %d]\n", PARTITION_DFT);
-    HDfprintf(stderr, "     -n N          Number of linked blocks [default: %d]\n", NLINKEDBLOCKS_DFT);
-    HDfprintf(stderr, "     where N is an integer value\n");
-    HDfprintf(stderr, "\n");
+    fprintf(stderr, "usage: %s [OPTIONS]\n", prog);
+    fprintf(stderr, "  OPTIONS\n");
+    fprintf(stderr, "     -h            Print a usage message and exit\n");
+    fprintf(stderr, "     -l w|r        launch writer or reader only. [default: launch both]\n");
+    fprintf(stderr, "     -b N          Block size [default: %d]\n", BLOCKSIZE_DFT);
+    fprintf(stderr, "     -p N          Partition size [default: %d]\n", PARTITION_DFT);
+    fprintf(stderr, "     -n N          Number of linked blocks [default: %d]\n", NLINKEDBLOCKS_DFT);
+    fprintf(stderr, "     where N is an integer value\n");
+    fprintf(stderr, "\n");
 }
 
 /* Setup test parameters by parsing command line options.
@@ -140,21 +140,21 @@ parse_option(int argc, char *const argv[])
                 break;
             case 'b': /* number of planes to write/read */
                 if ((blocksize_g = HDatoi(optarg)) <= 0) {
-                    HDfprintf(stderr, "bad blocksize %s, must be a positive integer\n", optarg);
+                    fprintf(stderr, "bad blocksize %s, must be a positive integer\n", optarg);
                     usage(progname_g);
                     Hgoto_error(-1);
                 };
                 break;
             case 'n': /* number of planes to write/read */
                 if ((nlinkedblock_g = HDatoi(optarg)) < 2) {
-                    HDfprintf(stderr, "bad number of linked blocks %s, must be greater than 1.\n", optarg);
+                    fprintf(stderr, "bad number of linked blocks %s, must be greater than 1.\n", optarg);
                     usage(progname_g);
                     Hgoto_error(-1);
                 };
                 break;
             case 'p': /* number of planes to write/read */
                 if ((part_size_g = HDatoi(optarg)) <= 0) {
-                    HDfprintf(stderr, "bad partition size %s, must be a positive integer\n", optarg);
+                    fprintf(stderr, "bad partition size %s, must be a positive integer\n", optarg);
                     usage(progname_g);
                     Hgoto_error(-1);
                 };
@@ -168,28 +168,28 @@ parse_option(int argc, char *const argv[])
                         launch_g = UC_WRITER;
                         break;
                     default:
-                        HDfprintf(stderr, "launch value(%c) should be w or r only.\n", *optarg);
+                        fprintf(stderr, "launch value(%c) should be w or r only.\n", *optarg);
                         usage(progname_g);
                         Hgoto_error(-1);
                         break;
                 } /* end inner switch */
-                HDprintf("launch = %d\n", launch_g);
+                printf("launch = %d\n", launch_g);
                 break;
             case '?':
-                HDfprintf(stderr, "getopt returned '%c'.\n", c);
+                fprintf(stderr, "getopt returned '%c'.\n", c);
                 usage(progname_g);
                 Hgoto_error(-1);
             default:
-                HDfprintf(stderr, "getopt returned unexpected value.\n");
-                HDfprintf(stderr, "Unexpected value is %d\n", c);
+                fprintf(stderr, "getopt returned unexpected value.\n");
+                fprintf(stderr, "Unexpected value is %d\n", c);
                 Hgoto_error(-1);
         } /* end outer switch */
     }     /* end while */
 
     /* verify partition size must be >= blocksize */
     if (part_size_g < blocksize_g) {
-        HDfprintf(stderr, "Blocksize %d should not be bigger than partition size %d\n", blocksize_g,
-                  part_size_g);
+        fprintf(stderr, "Blocksize %d should not be bigger than partition size %d\n", blocksize_g,
+                part_size_g);
         Hgoto_error(-1);
     }
 
@@ -216,10 +216,10 @@ setup_parameters(int argc, char *const argv[])
     }
 
     /* show parameters and return */
-    HDprintf("blocksize = %ld\n", (long)blocksize_g);
-    HDprintf("part_size = %ld\n", (long)part_size_g);
-    HDprintf("nlinkedblock = %ld\n", (long)nlinkedblock_g);
-    HDprintf("launch = %d\n", launch_g);
+    printf("blocksize = %ld\n", (long)blocksize_g);
+    printf("part_size = %ld\n", (long)part_size_g);
+    printf("nlinkedblock = %ld\n", (long)nlinkedblock_g);
+    printf("launch = %d\n", launch_g);
 
     return 0;
 }
@@ -237,13 +237,13 @@ create_wo_file(void)
 
     /* Create the data file */
     if ((write_fd_g = HDopen(DATAFILE, O_RDWR | O_TRUNC | O_CREAT, H5_POSIX_CREATE_MODE_RW)) < 0) {
-        HDprintf("WRITER: error from open\n");
+        printf("WRITER: error from open\n");
         return -1;
     }
     blkaddr = 0;
     /* write it to partition 0 */
     if ((bytes_wrote = HDwrite(write_fd_g, &blkaddr, (size_t)SIZE_BLKADDR)) != SIZE_BLKADDR) {
-        HDprintf("blkaddr write failed\n");
+        printf("blkaddr write failed\n");
         return -1;
     }
 
@@ -275,7 +275,7 @@ write_wo_file(void)
         /* write the block */
         HDlseek(write_fd_g, (HDoff_t)blkaddr, SEEK_SET);
         if ((bytes_wrote = HDwrite(write_fd_g, buffer, (size_t)blocksize_g)) != blocksize_g) {
-            HDprintf("blkaddr write failed in partition %d\n", i);
+            printf("blkaddr write failed in partition %d\n", i);
             return -1;
         }
 
@@ -287,7 +287,7 @@ write_wo_file(void)
     HDlseek(write_fd_g, (HDoff_t)0, SEEK_SET);
     if ((bytes_wrote = HDwrite(write_fd_g, &blkaddr_old, (size_t)sizeof(blkaddr_old))) !=
         sizeof(blkaddr_old)) {
-        HDprintf("blkaddr write failed in partition %d\n", 0);
+        printf("blkaddr write failed in partition %d\n", 0);
         return -1;
     }
 
@@ -305,7 +305,7 @@ read_wo_file(void)
 
     /* Open the data file */
     if ((read_fd = HDopen(DATAFILE, O_RDONLY)) < 0) {
-        HDprintf("READER: error from open\n");
+        printf("READER: error from open\n");
         return -1;
     }
 
@@ -313,7 +313,7 @@ read_wo_file(void)
     while (blkaddr == 0) {
         HDlseek(read_fd, (HDoff_t)0, SEEK_SET);
         if ((bytes_read = HDread(read_fd, &blkaddr, (size_t)sizeof(blkaddr))) != sizeof(blkaddr)) {
-            HDprintf("blkaddr read failed in partition %d\n", 0);
+            printf("blkaddr read failed in partition %d\n", 0);
             return -1;
         }
     }
@@ -322,7 +322,7 @@ read_wo_file(void)
     while (blkaddr != 0) {
         HDlseek(read_fd, (HDoff_t)blkaddr, SEEK_SET);
         if ((bytes_read = HDread(read_fd, buffer, (size_t)blocksize_g)) != blocksize_g) {
-            HDprintf("blkaddr read failed in partition %d\n", 0);
+            printf("blkaddr read failed in partition %d\n", 0);
             return -1;
         }
 
@@ -366,13 +366,13 @@ main(int argc, char *argv[])
     /* Create file */
     /* ============*/
     if (launch_g != UC_READER) {
-        HDprintf("Creating skeleton data file for test...\n");
+        printf("Creating skeleton data file for test...\n");
         if (create_wo_file() < 0) {
-            HDfprintf(stderr, "***encounter error\n");
+            fprintf(stderr, "***encounter error\n");
             Hgoto_error(1);
         }
         else
-            HDprintf("File created.\n");
+            printf("File created.\n");
     }
     /* flush output before possible fork */
     HDfflush(stdout);
@@ -392,9 +392,9 @@ main(int argc, char *argv[])
     if (launch_g != UC_WRITER) {
         /* child process launch the reader */
         if (0 == childpid) {
-            HDprintf("%d: launch reader process\n", mypid);
+            printf("%d: launch reader process\n", mypid);
             if (read_wo_file() < 0) {
-                HDfprintf(stderr, "read_wo_file encountered error\n");
+                fprintf(stderr, "read_wo_file encountered error\n");
                 HDexit(EXIT_FAILURE);
             }
 
@@ -409,7 +409,7 @@ main(int argc, char *argv[])
     /* ============= */
     /* this process continues to launch the writer */
     if (write_wo_file() < 0) {
-        HDfprintf(stderr, "write_wo_file encountered error\n");
+        fprintf(stderr, "write_wo_file encountered error\n");
         Hgoto_error(1);
     }
 
@@ -423,12 +423,12 @@ main(int argc, char *argv[])
         }
         if (WIFEXITED(child_status)) {
             if ((child_ret_value = WEXITSTATUS(child_status)) != 0) {
-                HDprintf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value);
+                printf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value);
                 Hgoto_error(2);
             }
         }
         else {
-            HDprintf("%d: child process terminated abnormally\n", mypid);
+            printf("%d: child process terminated abnormally\n", mypid);
             Hgoto_error(2);
         }
     }
@@ -436,10 +436,10 @@ main(int argc, char *argv[])
 done:
     /* Print result and exit */
     if (ret_value != 0) {
-        HDprintf("Error(s) encountered\n");
+        printf("Error(s) encountered\n");
     }
     else {
-        HDprintf("All passed\n");
+        printf("All passed\n");
     }
 
     return ret_value;
@@ -450,7 +450,7 @@ done:
 int
 main(void)
 {
-    HDfprintf(stderr, "Non-POSIX platform. Skipping.\n");
+    fprintf(stderr, "Non-POSIX platform. Skipping.\n");
     return EXIT_SUCCESS;
 } /* end main() */
 
diff --git a/test/unlink.c b/test/unlink.c
index a8fe2d8..68cc0ec 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -1490,12 +1490,12 @@ test_create_unlink(const char *msg, hid_t fapl)
         HDsnprintf(groupname, sizeof(groupname), "%s %u", GROUPNAME, u);
         if ((group = H5Gcreate2(file, groupname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("group %s creation failed\n", groupname);
+            printf("group %s creation failed\n", groupname);
             goto error;
         } /* end if */
         if (H5Gclose(group) < 0) {
             H5_FAILED();
-            HDprintf("closing group %s failed\n", groupname);
+            printf("closing group %s failed\n", groupname);
             goto error;
         } /* end if */
     }     /* end for */
@@ -1505,7 +1505,7 @@ test_create_unlink(const char *msg, hid_t fapl)
         HDsnprintf(groupname, sizeof(groupname), "%s %u", GROUPNAME, u);
         if (H5Ldelete(file, groupname, H5P_DEFAULT) < 0) {
             H5_FAILED();
-            HDprintf("Unlinking group %s failed\n", groupname);
+            printf("Unlinking group %s failed\n", groupname);
             goto error;
         } /* end if */
     }     /* end for */
@@ -3022,12 +3022,12 @@ main(void)
 
             /* Get FAPL cache settings */
             if (H5Pget_cache(fapl_small_mdc, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0) < 0)
-                HDprintf("H5Pget_cache failed\n");
+                printf("H5Pget_cache failed\n");
 
             /* Change FAPL cache settings */
             mdc_nelmts = 1;
             if (H5Pset_cache(fapl_small_mdc, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0) < 0)
-                HDprintf("H5Pset_cache failed\n");
+                printf("H5Pset_cache failed\n");
 
             /* Test creating & unlinking lots of objects with a 1-element metadata cache FAPL */
             nerrors += test_create_unlink("create and unlink large number of objects with small cache",
@@ -3075,7 +3075,7 @@ main(void)
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
 
     if (nerrors) {
-        HDprintf("***** %d FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
+        printf("***** %d FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S");
         HDexit(EXIT_FAILURE);
     }
 
diff --git a/test/unregister.c b/test/unregister.c
index 5338b09..3e7b3b7 100644
--- a/test/unregister.c
+++ b/test/unregister.c
@@ -155,7 +155,7 @@ test_unregister_filters(hid_t fapl_id)
     H5E_END_TRY
     if (ret >= 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Should not be able to unregister filter\n", __LINE__);
+        printf("    Line %d: Should not be able to unregister filter\n", __LINE__);
         goto error;
     }
 
@@ -206,7 +206,7 @@ test_unregister_filters(hid_t fapl_id)
     H5E_END_TRY
     if (ret >= 0) {
         H5_FAILED();
-        HDprintf("    Line %d: Should not be able to unregister filter\n", __LINE__);
+        printf("    Line %d: Should not be able to unregister filter\n", __LINE__);
         goto error;
     }
 
@@ -298,7 +298,7 @@ main(void)
 
     if (nerrors)
         goto error;
-    HDprintf("All filter unregistration tests passed.\n");
+    printf("All filter unregistration tests passed.\n");
 
     /* Pop API context */
     if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
@@ -309,7 +309,7 @@ main(void)
 
 error:
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d FILTER UNREGISTRATION TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    printf("***** %d FILTER UNREGISTRATION TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
 
     if (api_ctx_pushed)
         H5CX_pop(FALSE);
diff --git a/test/use_append_chunk.c b/test/use_append_chunk.c
index 8b02faa..71b8019 100644
--- a/test/use_append_chunk.c
+++ b/test/use_append_chunk.c
@@ -141,25 +141,25 @@ main(int argc, char *argv[])
     /* Create file */
     /* =========== */
     if (UC_opts.launch != UC_READER) {
-        HDprintf("Creating skeleton data file for test...\n");
+        printf("Creating skeleton data file for test...\n");
         if ((UC_opts.fapl_id = h5_fileaccess()) < 0) {
-            HDfprintf(stderr, "can't create creation FAPL\n");
+            fprintf(stderr, "can't create creation FAPL\n");
             Hgoto_error(1);
         }
         if (H5Pset_libver_bounds(UC_opts.fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
-            HDfprintf(stderr, "can't set creation FAPL libver bounds\n");
+            fprintf(stderr, "can't set creation FAPL libver bounds\n");
             Hgoto_error(1);
         }
         if (create_uc_file(&UC_opts) < 0) {
-            HDfprintf(stderr, "***encounter error\n");
+            fprintf(stderr, "***encounter error\n");
             Hgoto_error(1);
         }
         else {
-            HDprintf("File created.\n");
+            printf("File created.\n");
         }
         /* Close FAPL to prevent issues with forking later */
         if (H5Pclose(UC_opts.fapl_id) < 0) {
-            HDfprintf(stderr, "can't close creation FAPL\n");
+            fprintf(stderr, "can't close creation FAPL\n");
             Hgoto_error(1);
         }
         UC_opts.fapl_id = H5I_INVALID_HID;
@@ -182,17 +182,17 @@ main(int argc, char *argv[])
     if (UC_opts.launch != UC_WRITER) {
         /* child process launch the reader */
         if (0 == childpid) {
-            HDprintf("%d: launch reader process\n", mypid);
+            printf("%d: launch reader process\n", mypid);
             if ((UC_opts.fapl_id = h5_fileaccess()) < 0) {
-                HDfprintf(stderr, "can't create read FAPL\n");
+                fprintf(stderr, "can't create read FAPL\n");
                 HDexit(EXIT_FAILURE);
             }
             if (read_uc_file(send_wait, &UC_opts) < 0) {
-                HDfprintf(stderr, "read_uc_file encountered error\n");
+                fprintf(stderr, "read_uc_file encountered error\n");
                 HDexit(EXIT_FAILURE);
             }
             if (H5Pclose(UC_opts.fapl_id) < 0) {
-                HDfprintf(stderr, "can't close read FAPL\n");
+                fprintf(stderr, "can't close read FAPL\n");
                 HDexit(EXIT_FAILURE);
             }
             HDexit(EXIT_SUCCESS);
@@ -203,38 +203,38 @@ main(int argc, char *argv[])
     /* launch writer */
     /* ============= */
     /* this process continues to launch the writer */
-    HDprintf("%d: continue as the writer process\n", mypid);
+    printf("%d: continue as the writer process\n", mypid);
 
     if ((fapl = h5_fileaccess()) < 0) {
-        HDfprintf(stderr, "can't create write FAPL\n");
+        fprintf(stderr, "can't create write FAPL\n");
         Hgoto_error(1);
     }
 
     if (UC_opts.use_swmr) {
         if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
-            HDfprintf(stderr, "can't set write FAPL libver bounds\n");
+            fprintf(stderr, "can't set write FAPL libver bounds\n");
             Hgoto_error(1);
         }
     }
 
     if ((fid = H5Fopen(UC_opts.filename, H5F_ACC_RDWR | (UC_opts.use_swmr ? H5F_ACC_SWMR_WRITE : 0), fapl)) <
         0) {
-        HDfprintf(stderr, "H5Fopen failed\n");
+        fprintf(stderr, "H5Fopen failed\n");
         Hgoto_error(1);
     }
 
     if (write_uc_file(send_wait, fid, &UC_opts) < 0) {
-        HDfprintf(stderr, "write_uc_file encountered error\n");
+        fprintf(stderr, "write_uc_file encountered error\n");
         Hgoto_error(1);
     }
 
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "Failed to close write\n");
+        fprintf(stderr, "Failed to close write\n");
         Hgoto_error(1);
     }
 
     if (H5Pclose(fapl) < 0) {
-        HDfprintf(stderr, "can't close write FAPL\n");
+        fprintf(stderr, "can't close write FAPL\n");
         Hgoto_error(1);
     }
 
@@ -249,22 +249,22 @@ main(int argc, char *argv[])
 
         if (WIFEXITED(child_status)) {
             if ((child_ret_value = WEXITSTATUS(child_status)) != 0) {
-                HDprintf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value);
+                printf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value);
                 Hgoto_error(2);
             }
         }
         else {
-            HDprintf("%d: child process terminated abnormally\n", mypid);
+            printf("%d: child process terminated abnormally\n", mypid);
             Hgoto_error(2);
         }
     }
 
 done:
     if (ret_value != 0) {
-        HDprintf("Error(s) encountered\n");
+        printf("Error(s) encountered\n");
     }
     else {
-        HDprintf("All passed\n");
+        printf("All passed\n");
     }
 
     return (ret_value);
@@ -275,7 +275,7 @@ done:
 int
 main(void)
 {
-    HDfprintf(stderr, "Non-POSIX platform. Skipping.\n");
+    fprintf(stderr, "Non-POSIX platform. Skipping.\n");
     return EXIT_SUCCESS;
 } /* end main() */
 
diff --git a/test/use_append_chunk_mirror.c b/test/use_append_chunk_mirror.c
index fbc4452..f9019a5 100644
--- a/test/use_append_chunk_mirror.c
+++ b/test/use_append_chunk_mirror.c
@@ -174,7 +174,7 @@ main(int argc, char *argv[])
     HDstrncpy(mirr_fa.remote_ip, SERVER_IP, H5FD_MIRROR_MAX_IP_LEN);
 
     if (NULL == (split_fa = HDcalloc(1, sizeof(H5FD_splitter_vfd_config_t)))) {
-        HDfprintf(stderr, "can't allocate memory for splitter config\n");
+        fprintf(stderr, "can't allocate memory for splitter config\n");
         Hgoto_error(1);
     }
 
@@ -201,16 +201,16 @@ main(int argc, char *argv[])
     /* Create file */
     /* =========== */
     if (UC_opts.launch != UC_READER) {
-        HDprintf("Creating skeleton data file for test...\n");
+        printf("Creating skeleton data file for test...\n");
 
         /* Prepare mirror child driver */
         mirr_fapl_id = H5Pcreate(H5P_FILE_ACCESS);
         if (mirr_fapl_id == H5I_INVALID_HID) {
-            HDfprintf(stderr, "can't create creation mirror FAPL\n");
+            fprintf(stderr, "can't create creation mirror FAPL\n");
             Hgoto_error(1);
         }
         if (H5Pset_fapl_mirror(mirr_fapl_id, &mirr_fa) < 0) {
-            HDfprintf(stderr, "can't set creation mirror FAPL\n");
+            fprintf(stderr, "can't set creation mirror FAPL\n");
             H5Eprint2(H5E_DEFAULT, stdout);
             Hgoto_error(1);
         }
@@ -220,37 +220,37 @@ main(int argc, char *argv[])
         split_fa->rw_fapl_id = H5P_DEFAULT;
         UC_opts.fapl_id      = H5Pcreate(H5P_FILE_ACCESS);
         if (UC_opts.fapl_id == H5I_INVALID_HID) {
-            HDfprintf(stderr, "can't create creation FAPL\n");
+            fprintf(stderr, "can't create creation FAPL\n");
             Hgoto_error(1);
         }
         if (H5Pset_fapl_splitter(UC_opts.fapl_id, split_fa) < 0) {
-            HDfprintf(stderr, "can't set creation FAPL\n");
+            fprintf(stderr, "can't set creation FAPL\n");
             H5Eprint2(H5E_DEFAULT, stdout);
             Hgoto_error(1);
         }
 
         if (H5Pset_libver_bounds(UC_opts.fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
-            HDfprintf(stderr, "can't set creation FAPL libver bounds\n");
+            fprintf(stderr, "can't set creation FAPL libver bounds\n");
             Hgoto_error(1);
         }
 
         /* Create file */
         if (create_uc_file(&UC_opts) < 0) {
-            HDfprintf(stderr, "***encounter error\n");
+            fprintf(stderr, "***encounter error\n");
             Hgoto_error(1);
         }
         else {
-            HDprintf("File created.\n");
+            printf("File created.\n");
         }
 
         /* Close FAPLs to prevent issues with forking later */
         if (H5Pclose(UC_opts.fapl_id) < 0) {
-            HDfprintf(stderr, "can't close creation FAPL\n");
+            fprintf(stderr, "can't close creation FAPL\n");
             Hgoto_error(1);
         }
         UC_opts.fapl_id = H5I_INVALID_HID;
         if (H5Pclose(mirr_fapl_id) < 0) {
-            HDfprintf(stderr, "can't close creation mirror FAPL\n");
+            fprintf(stderr, "can't close creation mirror FAPL\n");
             Hgoto_error(1);
         }
         mirr_fapl_id = H5I_INVALID_HID;
@@ -274,11 +274,11 @@ main(int argc, char *argv[])
         /* child process -- launch the reader */
         /* reader only opens the one file -- separate reader needed for mirrored file 'shinano.h5' */
         if (0 == childpid) {
-            HDprintf("%d: launch reader process\n", mypid);
+            printf("%d: launch reader process\n", mypid);
 
             UC_opts.fapl_id = H5P_DEFAULT;
             if (read_uc_file(send_wait, &UC_opts) < 0) {
-                HDfprintf(stderr, "read_uc_file encountered error (%d)\n", mypid);
+                fprintf(stderr, "read_uc_file encountered error (%d)\n", mypid);
                 HDexit(1);
             }
 
@@ -290,16 +290,16 @@ main(int argc, char *argv[])
     /* launch writer */
     /* ============= */
     /* this process continues to launch the writer */
-    HDprintf("%d: continue as the writer process\n", mypid);
+    printf("%d: continue as the writer process\n", mypid);
 
     /* Prepare mirror child driver */
     mirr_fapl_id = H5Pcreate(H5P_FILE_ACCESS);
     if (mirr_fapl_id == H5I_INVALID_HID) {
-        HDfprintf(stderr, "can't create creation mirror FAPL\n");
+        fprintf(stderr, "can't create creation mirror FAPL\n");
         Hgoto_error(1);
     }
     if (H5Pset_fapl_mirror(mirr_fapl_id, &mirr_fa) < 0) {
-        HDfprintf(stderr, "can't set creation mirror FAPL\n");
+        fprintf(stderr, "can't set creation mirror FAPL\n");
         H5Eprint2(H5E_DEFAULT, stdout);
         Hgoto_error(1);
     }
@@ -309,45 +309,45 @@ main(int argc, char *argv[])
     split_fa->rw_fapl_id = H5P_DEFAULT;
     UC_opts.fapl_id      = H5Pcreate(H5P_FILE_ACCESS);
     if (UC_opts.fapl_id == H5I_INVALID_HID) {
-        HDfprintf(stderr, "can't create creation FAPL\n");
+        fprintf(stderr, "can't create creation FAPL\n");
         Hgoto_error(1);
     }
     if (H5Pset_fapl_splitter(UC_opts.fapl_id, split_fa) < 0) {
-        HDfprintf(stderr, "can't set creation FAPL\n");
+        fprintf(stderr, "can't set creation FAPL\n");
         H5Eprint2(H5E_DEFAULT, stdout);
         Hgoto_error(1);
     }
 
     if (UC_opts.use_swmr) {
         if (H5Pset_libver_bounds(UC_opts.fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
-            HDfprintf(stderr, "can't set write FAPL libver bounds\n");
+            fprintf(stderr, "can't set write FAPL libver bounds\n");
             Hgoto_error(1);
         }
     }
 
     if ((fid = H5Fopen(UC_opts.filename, H5F_ACC_RDWR | (UC_opts.use_swmr ? H5F_ACC_SWMR_WRITE : 0),
                        UC_opts.fapl_id)) < 0) {
-        HDfprintf(stderr, "H5Fopen failed\n");
+        fprintf(stderr, "H5Fopen failed\n");
         Hgoto_error(1);
     }
 
     if (write_uc_file(send_wait, fid, &UC_opts) < 0) {
-        HDfprintf(stderr, "write_uc_file encountered error\n");
+        fprintf(stderr, "write_uc_file encountered error\n");
         Hgoto_error(1);
     }
 
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "Failed to close write\n");
+        fprintf(stderr, "Failed to close write\n");
         Hgoto_error(1);
     }
 
     if (H5Pclose(UC_opts.fapl_id) < 0) {
-        HDfprintf(stderr, "can't close write FAPL\n");
+        fprintf(stderr, "can't close write FAPL\n");
         Hgoto_error(1);
     }
 
     if (H5Pclose(mirr_fapl_id) < 0) {
-        HDfprintf(stderr, "can't close write mirror FAPL\n");
+        fprintf(stderr, "can't close write mirror FAPL\n");
         Hgoto_error(1);
     }
 
@@ -362,12 +362,12 @@ main(int argc, char *argv[])
 
         if (WIFEXITED(child_status)) {
             if ((child_ret_value = WEXITSTATUS(child_status)) != 0) {
-                HDprintf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value);
+                printf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value);
                 Hgoto_error(2);
             }
         }
         else {
-            HDprintf("%d: child process terminated abnormally\n", mypid);
+            printf("%d: child process terminated abnormally\n", mypid);
             Hgoto_error(2);
         }
     }
@@ -376,10 +376,10 @@ done:
     HDfree(split_fa);
 
     if (ret_value != 0) {
-        HDprintf("Error(s) encountered\n");
+        printf("Error(s) encountered\n");
     }
     else {
-        HDprintf("All passed\n");
+        printf("All passed\n");
     }
 
     return ret_value;
@@ -390,7 +390,7 @@ done:
 int
 main(void)
 {
-    HDfprintf(stderr, "Mirror VFD is not built. Skipping.\n");
+    fprintf(stderr, "Mirror VFD is not built. Skipping.\n");
     return EXIT_SUCCESS;
 } /* end main() */
 
@@ -401,7 +401,7 @@ main(void)
 int
 main(void)
 {
-    HDfprintf(stderr, "Non-POSIX platform. Skipping.\n");
+    fprintf(stderr, "Non-POSIX platform. Skipping.\n");
     return EXIT_SUCCESS;
 } /* end main() */
 
diff --git a/test/use_append_mchunks.c b/test/use_append_mchunks.c
index ff9625e..ed56ca3 100644
--- a/test/use_append_mchunks.c
+++ b/test/use_append_mchunks.c
@@ -135,25 +135,25 @@ main(int argc, char *argv[])
     /* Create file */
     /* =========== */
     if (UC_opts.launch != UC_READER) {
-        HDprintf("Creating skeleton data file for test...\n");
+        printf("Creating skeleton data file for test...\n");
         if ((UC_opts.fapl_id = h5_fileaccess()) < 0) {
-            HDfprintf(stderr, "can't create creation FAPL\n");
+            fprintf(stderr, "can't create creation FAPL\n");
             Hgoto_error(1);
         }
         if (H5Pset_libver_bounds(UC_opts.fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
-            HDfprintf(stderr, "can't set creation FAPL libver bounds\n");
+            fprintf(stderr, "can't set creation FAPL libver bounds\n");
             Hgoto_error(1);
         }
         if (create_uc_file(&UC_opts) < 0) {
-            HDfprintf(stderr, "***encounter error\n");
+            fprintf(stderr, "***encounter error\n");
             Hgoto_error(1);
         }
         else {
-            HDprintf("File created.\n");
+            printf("File created.\n");
         }
         /* Close FAPL to prevent issues with forking later */
         if (H5Pclose(UC_opts.fapl_id) < 0) {
-            HDfprintf(stderr, "can't close creation FAPL\n");
+            fprintf(stderr, "can't close creation FAPL\n");
             Hgoto_error(1);
         }
         UC_opts.fapl_id = H5I_INVALID_HID;
@@ -176,17 +176,17 @@ main(int argc, char *argv[])
     if (UC_opts.launch != UC_WRITER) {
         /* child process launch the reader */
         if (0 == childpid) {
-            HDprintf("%d: launch reader process\n", mypid);
+            printf("%d: launch reader process\n", mypid);
             if ((UC_opts.fapl_id = h5_fileaccess()) < 0) {
-                HDfprintf(stderr, "can't create read FAPL\n");
+                fprintf(stderr, "can't create read FAPL\n");
                 HDexit(EXIT_FAILURE);
             }
             if (read_uc_file(send_wait, &UC_opts) < 0) {
-                HDfprintf(stderr, "read_uc_file encountered error\n");
+                fprintf(stderr, "read_uc_file encountered error\n");
                 HDexit(EXIT_FAILURE);
             }
             if (H5Pclose(UC_opts.fapl_id) < 0) {
-                HDfprintf(stderr, "can't close read FAPL\n");
+                fprintf(stderr, "can't close read FAPL\n");
                 HDexit(EXIT_FAILURE);
             }
             HDexit(EXIT_SUCCESS);
@@ -197,39 +197,39 @@ main(int argc, char *argv[])
     /* launch writer */
     /* ============= */
     /* this process continues to launch the writer */
-    HDprintf("%d: continue as the writer process\n", mypid);
+    printf("%d: continue as the writer process\n", mypid);
 
     /* Set the file access property list */
     if ((fapl = h5_fileaccess()) < 0) {
-        HDfprintf(stderr, "can't get write FAPL\n");
+        fprintf(stderr, "can't get write FAPL\n");
         Hgoto_error(1);
     }
 
     if (UC_opts.use_swmr) {
         if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
-            HDfprintf(stderr, "can't set write FAPL libver bounds\n");
+            fprintf(stderr, "can't set write FAPL libver bounds\n");
             Hgoto_error(1);
         }
     }
 
     if ((fid = H5Fopen(UC_opts.filename, H5F_ACC_RDWR | (UC_opts.use_swmr ? H5F_ACC_SWMR_WRITE : 0), fapl)) <
         0) {
-        HDfprintf(stderr, "H5Fopen failed\n");
+        fprintf(stderr, "H5Fopen failed\n");
         Hgoto_error(1);
     }
 
     if (write_uc_file(send_wait, fid, &UC_opts) < 0) {
-        HDfprintf(stderr, "write_uc_file encountered error\n");
+        fprintf(stderr, "write_uc_file encountered error\n");
         Hgoto_error(1);
     }
 
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "Failed to close file id\n");
+        fprintf(stderr, "Failed to close file id\n");
         Hgoto_error(1);
     }
 
     if (H5Pclose(fapl) < 0) {
-        HDfprintf(stderr, "can't close write FAPL\n");
+        fprintf(stderr, "can't close write FAPL\n");
         Hgoto_error(1);
     }
 
@@ -244,22 +244,22 @@ main(int argc, char *argv[])
 
         if (WIFEXITED(child_status)) {
             if ((child_ret_value = WEXITSTATUS(child_status)) != 0) {
-                HDprintf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value);
+                printf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value);
                 Hgoto_error(1);
             }
         }
         else {
-            HDprintf("%d: child process terminated abnormally\n", mypid);
+            printf("%d: child process terminated abnormally\n", mypid);
             Hgoto_error(2);
         }
     }
 
 done:
     if (ret_value != 0) {
-        HDprintf("Error(s) encountered\n");
+        printf("Error(s) encountered\n");
     }
     else {
-        HDprintf("All passed\n");
+        printf("All passed\n");
     }
 
     return (ret_value);
@@ -270,7 +270,7 @@ done:
 int
 main(void)
 {
-    HDfprintf(stderr, "Non-POSIX platform. Skipping.\n");
+    fprintf(stderr, "Non-POSIX platform. Skipping.\n");
     return EXIT_SUCCESS;
 } /* end main() */
 
diff --git a/test/use_common.c b/test/use_common.c
index 7b5df53..f97c875 100644
--- a/test/use_common.c
+++ b/test/use_common.c
@@ -27,18 +27,18 @@
 void
 usage(const char *prog)
 {
-    HDfprintf(stderr, "usage: %s [OPTIONS]\n", prog);
-    HDfprintf(stderr, "  OPTIONS\n");
-    HDfprintf(stderr, "     -h, --help            Print a usage message and exit\n");
-    HDfprintf(stderr, "     -f FN                 Test file name [default: %s.h5]\n", prog);
-    HDfprintf(stderr,
-              "     -i N, --iteration=N   Number of iterations to repeat the whole thing. [default: 1]\n");
-    HDfprintf(stderr, "     -l w|r                launch writer or reader only. [default: launch both]\n");
-    HDfprintf(stderr, "     -n N, --nplanes=N     Number of planes to write/read. [default: 1000]\n");
-    HDfprintf(stderr, "     -s N, --swmr=N        Use SWMR mode (0: no, non-0: yes) default is yes\n");
-    HDfprintf(stderr, "     -z N, --chunksize=N   Chunk size [default: %d]\n", Chunksize_DFT);
-    HDfprintf(stderr, "     -y N, --chunkplanes=N Number of planes per chunk [default: 1]\n");
-    HDfprintf(stderr, "\n");
+    fprintf(stderr, "usage: %s [OPTIONS]\n", prog);
+    fprintf(stderr, "  OPTIONS\n");
+    fprintf(stderr, "     -h, --help            Print a usage message and exit\n");
+    fprintf(stderr, "     -f FN                 Test file name [default: %s.h5]\n", prog);
+    fprintf(stderr,
+            "     -i N, --iteration=N   Number of iterations to repeat the whole thing. [default: 1]\n");
+    fprintf(stderr, "     -l w|r                launch writer or reader only. [default: launch both]\n");
+    fprintf(stderr, "     -n N, --nplanes=N     Number of planes to write/read. [default: 1000]\n");
+    fprintf(stderr, "     -s N, --swmr=N        Use SWMR mode (0: no, non-0: yes) default is yes\n");
+    fprintf(stderr, "     -z N, --chunksize=N   Chunk size [default: %d]\n", Chunksize_DFT);
+    fprintf(stderr, "     -y N, --chunkplanes=N Number of planes per chunk [default: 1]\n");
+    fprintf(stderr, "\n");
 } /* end usage() */
 
 /* ----------------------------------------------------------------------------
@@ -73,7 +73,7 @@ parse_option(int argc, char *const argv[], options_t *opts)
                 break;
             case 'i': /* iterations */
                 if ((opts->iterations = HDatoi(optarg)) <= 0) {
-                    HDfprintf(stderr, "bad iterations number %s, must be a positive integer\n", optarg);
+                    fprintf(stderr, "bad iterations number %s, must be a positive integer\n", optarg);
                     usage(opts->progname);
                     Hgoto_error(-1);
                 }
@@ -87,7 +87,7 @@ parse_option(int argc, char *const argv[], options_t *opts)
                         opts->launch = UC_WRITER;
                         break;
                     default:
-                        HDfprintf(stderr, "launch value(%c) should be w or r only.\n", *optarg);
+                        fprintf(stderr, "launch value(%c) should be w or r only.\n", *optarg);
                         usage(opts->progname);
                         Hgoto_error(-1);
                         break;
@@ -95,7 +95,7 @@ parse_option(int argc, char *const argv[], options_t *opts)
                 break;
             case 'n': /* number of planes to write/read */
                 if ((opts->nplanes = HDstrtoul(optarg, NULL, 0)) <= 0) {
-                    HDfprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg);
+                    fprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg);
                     usage(opts->progname);
                     Hgoto_error(-1);
                 }
@@ -103,7 +103,7 @@ parse_option(int argc, char *const argv[], options_t *opts)
             case 's': /* use swmr file open mode */
                 use_swmr = HDatoi(optarg);
                 if (use_swmr != 0 && use_swmr != 1) {
-                    HDfprintf(stderr, "swmr value should be 0(no) or 1(yes)\n");
+                    fprintf(stderr, "swmr value should be 0(no) or 1(yes)\n");
                     usage(opts->progname);
                     Hgoto_error(-1);
                 }
@@ -111,25 +111,25 @@ parse_option(int argc, char *const argv[], options_t *opts)
                 break;
             case 'y': /* Number of planes per chunk */
                 if ((opts->chunkplanes = HDstrtoul(optarg, NULL, 0)) <= 0) {
-                    HDfprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n",
-                              optarg);
+                    fprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n",
+                            optarg);
                     usage(opts->progname);
                     Hgoto_error(-1);
                 }
                 break;
             case 'z': /* size of chunk=(z,z) */
                 if ((opts->chunksize = HDstrtoull(optarg, NULL, 0)) <= 0) {
-                    HDfprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg);
+                    fprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg);
                     usage(opts->progname);
                     Hgoto_error(-1);
                 }
                 break;
             case '?':
-                HDfprintf(stderr, "getopt returned '%c'.\n", c);
+                fprintf(stderr, "getopt returned '%c'.\n", c);
                 Hgoto_error(-1);
             default:
-                HDfprintf(stderr, "getopt returned unexpected value.\n");
-                HDfprintf(stderr, "Unexpected value is %d\n", c);
+                fprintf(stderr, "getopt returned unexpected value.\n");
+                fprintf(stderr, "Unexpected value is %d\n", c);
                 Hgoto_error(-1);
         } /* end switch (argument symbol) */
     }     /* end while (there are still arguments) */
@@ -138,7 +138,7 @@ parse_option(int argc, char *const argv[], options_t *opts)
     if (!opts->filename) {
         /* default data file name is <progname>.h5 */
         if ((opts->filename = (char *)HDmalloc(HDstrlen(opts->progname) + 4)) == NULL) {
-            HDfprintf(stderr, "malloc: failed\n");
+            fprintf(stderr, "malloc: failed\n");
             Hgoto_error(-1);
         }
         HDstrcpy(opts->filename, opts->progname);
@@ -156,31 +156,31 @@ done:
 void
 show_parameters(options_t *opts)
 {
-    HDprintf("===Parameters used:===\n");
-    HDprintf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)opts->chunkdims[0],
-             (unsigned long long)opts->chunkdims[1], (unsigned long long)opts->chunkdims[2]);
-    HDprintf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)opts->max_dims[0],
-             (unsigned long long)opts->max_dims[1], (unsigned long long)opts->max_dims[2]);
-    HDprintf("number of planes to write=%llu\n", (unsigned long long)opts->nplanes);
-    HDprintf("using SWMR mode=%s\n", opts->use_swmr ? "yes(1)" : "no(0)");
-    HDprintf("data filename=%s\n", opts->filename);
-    HDprintf("launch part=");
+    printf("===Parameters used:===\n");
+    printf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)opts->chunkdims[0],
+           (unsigned long long)opts->chunkdims[1], (unsigned long long)opts->chunkdims[2]);
+    printf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)opts->max_dims[0],
+           (unsigned long long)opts->max_dims[1], (unsigned long long)opts->max_dims[2]);
+    printf("number of planes to write=%llu\n", (unsigned long long)opts->nplanes);
+    printf("using SWMR mode=%s\n", opts->use_swmr ? "yes(1)" : "no(0)");
+    printf("data filename=%s\n", opts->filename);
+    printf("launch part=");
     switch (opts->launch) {
         case UC_READWRITE:
-            HDprintf("Reader/Writer\n");
+            printf("Reader/Writer\n");
             break;
         case UC_WRITER:
-            HDprintf("Writer\n");
+            printf("Writer\n");
             break;
         case UC_READER:
-            HDprintf("Reader\n");
+            printf("Reader\n");
             break;
         default:
             /* should not happen */
-            HDprintf("Illegal part(%d)\n", opts->launch);
+            printf("Illegal part(%d)\n", opts->launch);
     }
-    HDprintf("number of iterations=%d (not used yet)\n", opts->iterations);
-    HDprintf("===Parameters shown===\n");
+    printf("number of iterations=%d (not used yet)\n", opts->iterations);
+    printf("===Parameters shown===\n");
 } /* end show_parameters() */
 
 /* ----------------------------------------------------------------------------
@@ -230,7 +230,7 @@ create_uc_file(options_t *opts)
     if (H5Dget_chunk_index_type(dsid, &idx_type) < 0)
         return -1;
     if (idx_type == H5D_CHUNK_IDX_BTREE) {
-        HDfprintf(stderr, "ERROR: Chunk index is version 1 B-tree: aborting.\n");
+        fprintf(stderr, "ERROR: Chunk index is version 1 B-tree: aborting.\n");
         return -1;
     }
 
@@ -280,29 +280,29 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts)
 
     /* Open the dataset of the program name */
     if ((dsid = H5Dopen2(file_id, opts->progname, H5P_DEFAULT)) < 0) {
-        HDfprintf(stderr, "H5Dopen2 failed\n");
+        fprintf(stderr, "H5Dopen2 failed\n");
         return -1;
     }
 
     /* Find chunksize used */
     if ((dcpl = H5Dget_create_plist(dsid)) < 0) {
-        HDfprintf(stderr, "H5Dget_create_plist failed\n");
+        fprintf(stderr, "H5Dget_create_plist failed\n");
         return -1;
     }
     if (H5D_CHUNKED != H5Pget_layout(dcpl)) {
-        HDfprintf(stderr, "storage layout is not chunked\n");
+        fprintf(stderr, "storage layout is not chunked\n");
         return -1;
     }
     if ((rank = H5Pget_chunk(dcpl, 3, chunk_dims)) != 3) {
-        HDfprintf(stderr, "storage rank is not 3\n");
+        fprintf(stderr, "storage rank is not 3\n");
         return -1;
     }
 
     /* verify chunk_dims against set parameters */
     if (chunk_dims[0] != opts->chunkdims[0] || chunk_dims[1] != cz || chunk_dims[2] != cz) {
-        HDfprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n",
-                  (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1],
-                  (unsigned long long)chunk_dims[2]);
+        fprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n",
+                (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1],
+                (unsigned long long)chunk_dims[2]);
         return -1;
     }
 
@@ -311,7 +311,7 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts)
     memdims[1] = opts->dims[1];
     memdims[2] = opts->dims[2];
     if ((buffer = (UC_CTYPE *)HDmalloc((size_t)memdims[1] * (size_t)memdims[2] * sizeof(UC_CTYPE))) == NULL) {
-        HDfprintf(stderr, "malloc: failed\n");
+        fprintf(stderr, "malloc: failed\n");
         return -1;
     }
 
@@ -321,28 +321,28 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts)
     f_sid = H5Dget_space(dsid); /* Get filespace handle first. */
     rank  = H5Sget_simple_extent_ndims(f_sid);
     if (rank != UC_RANK) {
-        HDfprintf(stderr, "rank(%d) of dataset does not match\n", rank);
+        fprintf(stderr, "rank(%d) of dataset does not match\n", rank);
         HDfree(buffer);
         return -1;
     }
     if (H5Sget_simple_extent_dims(f_sid, dims, NULL) < 0) {
-        HDfprintf(stderr, "H5Sget_simple_extent_dims got error\n");
+        fprintf(stderr, "H5Sget_simple_extent_dims got error\n");
         HDfree(buffer);
         return -1;
     }
-    HDprintf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]),
-             (unsigned long long)(dims[1]), (unsigned long long)(dims[2]));
+    printf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]),
+           (unsigned long long)(dims[1]), (unsigned long long)(dims[2]));
     /* verify that file space dims are as expected and are consistent with memory space dims */
     if (dims[0] != 0 || dims[1] != memdims[1] || dims[2] != memdims[2]) {
-        HDfprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n", (unsigned long long)dims[0],
-                  (unsigned long long)dims[1], (unsigned long long)dims[2]);
+        fprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n", (unsigned long long)dims[0],
+                (unsigned long long)dims[1], (unsigned long long)dims[2]);
         HDfree(buffer);
         return -1;
     }
 
     /* setup mem-space for buffer */
     if ((m_sid = H5Screate_simple(rank, memdims, NULL)) < 0) {
-        HDfprintf(stderr, "H5Screate_simple for memory failed\n");
+        fprintf(stderr, "H5Screate_simple for memory failed\n");
         HDfree(buffer);
         return -1;
     }
@@ -363,7 +363,7 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts)
         /* Cork the dataset's metadata in the cache, if SWMR is enabled */
         if (opts->use_swmr) {
             if (H5Odisable_mdc_flushes(dsid) < 0) {
-                HDfprintf(stderr, "H5Odisable_mdc_flushes failed\n");
+                fprintf(stderr, "H5Odisable_mdc_flushes failed\n");
                 HDfree(buffer);
                 return -1;
             }
@@ -372,14 +372,14 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts)
         /* extend the dataset by one for new plane */
         dims[0] = i + 1;
         if (H5Dset_extent(dsid, dims) < 0) {
-            HDfprintf(stderr, "H5Dset_extent failed\n");
+            fprintf(stderr, "H5Dset_extent failed\n");
             HDfree(buffer);
             return -1;
         }
 
         /* Get the dataset's dataspace */
         if ((f_sid = H5Dget_space(dsid)) < 0) {
-            HDfprintf(stderr, "H5Dset_extent failed\n");
+            fprintf(stderr, "H5Dset_extent failed\n");
             HDfree(buffer);
             return -1;
         }
@@ -387,14 +387,14 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts)
         start[0] = i;
         /* Choose the next plane to write */
         if (H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
-            HDfprintf(stderr, "Failed H5Sselect_hyperslab\n");
+            fprintf(stderr, "Failed H5Sselect_hyperslab\n");
             HDfree(buffer);
             return -1;
         }
 
         /* Write plane to the dataset */
         if (H5Dwrite(dsid, UC_DATATYPE, m_sid, f_sid, H5P_DEFAULT, buffer) < 0) {
-            HDfprintf(stderr, "Failed H5Dwrite\n");
+            fprintf(stderr, "Failed H5Dwrite\n");
             HDfree(buffer);
             return -1;
         }
@@ -402,7 +402,7 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts)
         /* Uncork the dataset's metadata from the cache, if SWMR is enabled */
         if (opts->use_swmr) {
             if (H5Oenable_mdc_flushes(dsid) < 0) {
-                HDfprintf(stderr, "H5Oenable_mdc_flushes failed\n");
+                fprintf(stderr, "H5Oenable_mdc_flushes failed\n");
                 HDfree(buffer);
                 return -1;
             }
@@ -410,7 +410,7 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts)
 
         /* flush file to make the just written plane available. */
         if (H5Dflush(dsid) < 0) {
-            HDfprintf(stderr, "Failed to H5Fflush file\n");
+            fprintf(stderr, "Failed to H5Fflush file\n");
             HDfree(buffer);
             return -1;
         }
@@ -419,15 +419,15 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts)
     /* Done writing. Free/Close all resources including data file */
     HDfree(buffer);
     if (H5Dclose(dsid) < 0) {
-        HDfprintf(stderr, "Failed to close datasete\n");
+        fprintf(stderr, "Failed to close datasete\n");
         return -1;
     }
     if (H5Sclose(m_sid) < 0) {
-        HDfprintf(stderr, "Failed to close memory space\n");
+        fprintf(stderr, "Failed to close memory space\n");
         return -1;
     }
     if (H5Sclose(f_sid) < 0) {
-        HDfprintf(stderr, "Failed to close file space\n");
+        fprintf(stderr, "Failed to close file space\n");
         return -1;
     }
 
@@ -466,19 +466,19 @@ read_uc_file(hbool_t towait, options_t *opts)
 
     /* Before reading, wait for the message that H5Fopen is complete--file lock is released */
     if (towait && h5_wait_message(WRITER_MESSAGE) < 0) {
-        HDfprintf(stderr, "Cannot find writer message file...failed\n");
+        fprintf(stderr, "Cannot find writer message file...failed\n");
         return -1;
     }
 
-    HDfprintf(stderr, "Opening to read %s\n", opts->filename);
+    fprintf(stderr, "Opening to read %s\n", opts->filename);
     if ((fid = H5Fopen(opts->filename, H5F_ACC_RDONLY | (opts->use_swmr ? H5F_ACC_SWMR_READ : 0),
                        opts->fapl_id)) < 0) {
-        HDfprintf(stderr, "H5Fopen failed\n");
+        fprintf(stderr, "H5Fopen failed\n");
         return -1;
     }
 
     if ((dsid = H5Dopen2(fid, opts->progname, H5P_DEFAULT)) < 0) {
-        HDfprintf(stderr, "H5Dopen2 failed\n");
+        fprintf(stderr, "H5Dopen2 failed\n");
         return -1;
     }
 
@@ -487,7 +487,7 @@ read_uc_file(hbool_t towait, options_t *opts)
     memdims[1] = opts->dims[1];
     memdims[2] = opts->dims[2];
     if ((buffer = (UC_CTYPE *)HDmalloc((size_t)memdims[1] * (size_t)memdims[2] * sizeof(UC_CTYPE))) == NULL) {
-        HDfprintf(stderr, "malloc: failed\n");
+        fprintf(stderr, "malloc: failed\n");
         return -1;
     }
 
@@ -498,30 +498,30 @@ read_uc_file(hbool_t towait, options_t *opts)
     f_sid = H5Dget_space(dsid); /* Get filespace handle first. */
     rank  = H5Sget_simple_extent_ndims(f_sid);
     if (rank != UC_RANK) {
-        HDfprintf(stderr, "rank(%d) of dataset does not match\n", rank);
+        fprintf(stderr, "rank(%d) of dataset does not match\n", rank);
         HDfree(buffer);
         return -1;
     }
     if (H5Sget_simple_extent_dims(f_sid, dims, NULL) < 0) {
-        HDfprintf(stderr, "H5Sget_simple_extent_dims got error\n");
+        fprintf(stderr, "H5Sget_simple_extent_dims got error\n");
         HDfree(buffer);
         return -1;
     }
-    HDprintf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]),
-             (unsigned long long)(dims[1]), (unsigned long long)(dims[2]));
+    printf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]),
+           (unsigned long long)(dims[1]), (unsigned long long)(dims[2]));
     /* verify that file space dims are as expected and are consistent with memory space dims */
     if (dims[1] != memdims[1] || dims[2] != memdims[2]) {
-        HDfprintf(stderr, "dataset dimension is not as expected. Got dims=(%llu,%llu,%llu)\n",
-                  (unsigned long long)dims[0], (unsigned long long)dims[1], (unsigned long long)dims[2]);
-        HDfprintf(stderr, "But memdims=(%llu,%llu,%llu)\n", (unsigned long long)memdims[0],
-                  (unsigned long long)memdims[1], (unsigned long long)memdims[2]);
+        fprintf(stderr, "dataset dimension is not as expected. Got dims=(%llu,%llu,%llu)\n",
+                (unsigned long long)dims[0], (unsigned long long)dims[1], (unsigned long long)dims[2]);
+        fprintf(stderr, "But memdims=(%llu,%llu,%llu)\n", (unsigned long long)memdims[0],
+                (unsigned long long)memdims[1], (unsigned long long)memdims[2]);
         HDfree(buffer);
         return -1;
     }
 
     /* Setup mem-space for buffer */
     if ((m_sid = H5Screate_simple(rank, memdims, NULL)) < 0) {
-        HDfprintf(stderr, "H5Screate_simple for memory failed\n");
+        fprintf(stderr, "H5Screate_simple for memory failed\n");
         HDfree(buffer);
         return -1;
     }
@@ -537,24 +537,24 @@ read_uc_file(hbool_t towait, options_t *opts)
         if (nplanes_seen < dims[0]) {
             if (loops_waiting_for_plane) {
                 /* end the previous message */
-                HDprintf("\n");
+                printf("\n");
                 loops_waiting_for_plane = 0;
             }
-            HDprintf("reading planes %llu to %llu\n", (unsigned long long)nplanes_seen,
-                     (unsigned long long)dims[0]);
+            printf("reading planes %llu to %llu\n", (unsigned long long)nplanes_seen,
+                   (unsigned long long)dims[0]);
         }
         else {
             if (loops_waiting_for_plane) {
-                HDprintf(".");
+                printf(".");
                 if (loops_waiting_for_plane >= 30) {
-                    HDfprintf(stderr, "waited too long for new plane, quit.\n");
+                    fprintf(stderr, "waited too long for new plane, quit.\n");
                     HDfree(buffer);
                     return -1;
                 }
             }
             else {
                 /* print mesg only the first time; dots still no new plane */
-                HDprintf("waiting for new planes to read ");
+                printf("waiting for new planes to read ");
             }
             loops_waiting_for_plane++;
             /* pause for a second */
@@ -565,7 +565,7 @@ read_uc_file(hbool_t towait, options_t *opts)
             /* read planes between last old nplanes and current extent */
             /* Get the dataset's dataspace */
             if ((f_sid = H5Dget_space(dsid)) < 0) {
-                HDfprintf(stderr, "H5Dget_space failed\n");
+                fprintf(stderr, "H5Dget_space failed\n");
                 HDfree(buffer);
                 return -1;
             }
@@ -573,14 +573,14 @@ read_uc_file(hbool_t towait, options_t *opts)
             start[0] = nplane;
             /* Choose the next plane to read */
             if (H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
-                HDfprintf(stderr, "H5Sselect_hyperslab failed\n");
+                fprintf(stderr, "H5Sselect_hyperslab failed\n");
                 HDfree(buffer);
                 return -1;
             }
 
             /* Read the plane from the dataset */
             if (H5Dread(dsid, UC_DATATYPE, m_sid, f_sid, H5P_DEFAULT, buffer) < 0) {
-                HDfprintf(stderr, "H5Dread failed\n");
+                fprintf(stderr, "H5Dread failed\n");
                 HDfree(buffer);
                 return -1;
             }
@@ -592,17 +592,17 @@ read_uc_file(hbool_t towait, options_t *opts)
                 for (k = 0; k < dims[2]; k++) {
                     if ((hsize_t)*bufptr++ != nplane) {
                         if (++nerrs < ErrorReportMax) {
-                            HDfprintf(stderr, "found error %llu plane(%llu,%llu), expected %llu, got %d\n",
-                                      (unsigned long long)nplane, (unsigned long long)j,
-                                      (unsigned long long)k, (unsigned long long)nplane, (int)*(bufptr - 1));
+                            fprintf(stderr, "found error %llu plane(%llu,%llu), expected %llu, got %d\n",
+                                    (unsigned long long)nplane, (unsigned long long)j, (unsigned long long)k,
+                                    (unsigned long long)nplane, (int)*(bufptr - 1));
                         } /* end if should print error */
                     }     /* end if value mismatch */
                 }         /* end for plane second dimension */
             }             /* end for plane first dimension */
             if (nerrs) {
                 nreadererr++;
-                HDfprintf(stderr, "found %d unexpected values in plane %llu\n", nerrs,
-                          (unsigned long long)nplane);
+                fprintf(stderr, "found %d unexpected values in plane %llu\n", nerrs,
+                        (unsigned long long)nplane);
             }
         } /* end for each plane added since last read */
 
@@ -612,14 +612,14 @@ read_uc_file(hbool_t towait, options_t *opts)
         H5Drefresh(dsid);
         f_sid = H5Dget_space(dsid); /* Get filespace handle first. */
         if (H5Sget_simple_extent_dims(f_sid, dims, NULL) < 0) {
-            HDfprintf(stderr, "H5Sget_simple_extent_dims got error\n");
+            fprintf(stderr, "H5Sget_simple_extent_dims got error\n");
             HDfree(buffer);
             return -1;
         }
     } /* end while (expecting more planes to read) */
 
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "H5Fclose failed\n");
+        fprintf(stderr, "H5Fclose failed\n");
         HDfree(buffer);
         return -1;
     }
diff --git a/test/use_disable_mdc_flushes.c b/test/use_disable_mdc_flushes.c
index 04319ab..6d4a051 100644
--- a/test/use_disable_mdc_flushes.c
+++ b/test/use_disable_mdc_flushes.c
@@ -70,15 +70,15 @@ static int  setup_parameters(int argc, char *const argv[]);
 static void
 usage(const char *prog)
 {
-    HDfprintf(stderr, "usage: %s [OPTIONS]\n", prog);
-    HDfprintf(stderr, "  OPTIONS\n");
-    HDfprintf(stderr, "     -h          Print a usage message and exit\n");
-    HDfprintf(stderr, "     -f FN       Test file name [default: %s.h5]\n", prog);
-    HDfprintf(stderr, "     -n N        Number of planes to write. [default: 1000]\n");
-    HDfprintf(stderr, "     -s N        Use SWMR mode (0: no, non-0: yes) default is yes\n");
-    HDfprintf(stderr, "     -z N        Chunk size [default: %d]\n", Chunksize_DFT);
-    HDfprintf(stderr, "     -y N        Number of planes per chunk [default: 1]\n");
-    HDfprintf(stderr, "\n");
+    fprintf(stderr, "usage: %s [OPTIONS]\n", prog);
+    fprintf(stderr, "  OPTIONS\n");
+    fprintf(stderr, "     -h          Print a usage message and exit\n");
+    fprintf(stderr, "     -f FN       Test file name [default: %s.h5]\n", prog);
+    fprintf(stderr, "     -n N        Number of planes to write. [default: 1000]\n");
+    fprintf(stderr, "     -s N        Use SWMR mode (0: no, non-0: yes) default is yes\n");
+    fprintf(stderr, "     -z N        Chunk size [default: %d]\n", Chunksize_DFT);
+    fprintf(stderr, "     -y N        Number of planes per chunk [default: 1]\n");
+    fprintf(stderr, "\n");
 } /* usage() */
 
 /*
@@ -109,39 +109,39 @@ parse_option(int argc, char *const argv[])
                 break;
             case 'n': /* number of planes to write/read */
                 if ((nplanes_g = (hsize_t)HDatoi(optarg)) <= 0) {
-                    HDfprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg);
+                    fprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg);
                     usage(progname_g);
                     Hgoto_error(-1);
                 };
                 break;
             case 's': /* use swmr file open mode */
                 if ((use_swmr_g = HDatoi(optarg)) < 0) {
-                    HDfprintf(stderr, "swmr value should be 0(no) or 1(yes)\n");
+                    fprintf(stderr, "swmr value should be 0(no) or 1(yes)\n");
                     usage(progname_g);
                     Hgoto_error(-1);
                 };
                 break;
             case 'y': /* Number of planes per chunk */
                 if ((chunkplanes_g = HDatoi(optarg)) <= 0) {
-                    HDfprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n",
-                              optarg);
+                    fprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n",
+                            optarg);
                     usage(progname_g);
                     Hgoto_error(-1);
                 };
                 break;
             case 'z': /* size of chunk=(z,z) */
                 if ((chunksize_g = HDatoi(optarg)) <= 0) {
-                    HDfprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg);
+                    fprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg);
                     usage(progname_g);
                     Hgoto_error(-1);
                 };
                 break;
             case '?':
-                HDfprintf(stderr, "getopt returned '%c'.\n", c);
+                fprintf(stderr, "getopt returned '%c'.\n", c);
                 Hgoto_error(-1);
             default:
-                HDfprintf(stderr, "getopt returned unexpected value.\n");
-                HDfprintf(stderr, "Unexpected value is %d\n", c);
+                fprintf(stderr, "getopt returned unexpected value.\n");
+                fprintf(stderr, "Unexpected value is %d\n", c);
                 Hgoto_error(-1);
         }
     }
@@ -150,7 +150,7 @@ parse_option(int argc, char *const argv[])
     if (!filename_g) {
         /* default data file name is <progname>.h5 */
         if ((filename_g = (char *)HDmalloc(HDstrlen(progname_g) + 4)) == NULL) {
-            HDfprintf(stderr, "malloc: failed\n");
+            fprintf(stderr, "malloc: failed\n");
             Hgoto_error(-1);
         };
         HDstrcpy(filename_g, progname_g);
@@ -166,15 +166,15 @@ done:
 static void
 show_parameters(void)
 {
-    HDprintf("===Parameters used:===\n");
-    HDprintf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)chunkdims_g[0],
-             (unsigned long long)chunkdims_g[1], (unsigned long long)chunkdims_g[2]);
-    HDprintf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)max_dims_g[0],
-             (unsigned long long)max_dims_g[1], (unsigned long long)max_dims_g[2]);
-    HDprintf("number of planes to write=%llu\n", (unsigned long long)nplanes_g);
-    HDprintf("using SWMR mode=%s\n", use_swmr_g ? "yes(1)" : "no(0)");
-    HDprintf("data filename=%s\n", filename_g);
-    HDprintf("===Parameters shown===\n");
+    printf("===Parameters used:===\n");
+    printf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)chunkdims_g[0],
+           (unsigned long long)chunkdims_g[1], (unsigned long long)chunkdims_g[2]);
+    printf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)max_dims_g[0],
+           (unsigned long long)max_dims_g[1], (unsigned long long)max_dims_g[2]);
+    printf("number of planes to write=%llu\n", (unsigned long long)nplanes_g);
+    printf("using SWMR mode=%s\n", use_swmr_g ? "yes(1)" : "no(0)");
+    printf("data filename=%s\n", filename_g);
+    printf("===Parameters shown===\n");
 } /* show_parameters() */
 
 /*
@@ -263,7 +263,7 @@ create_file(void)
     if (H5D__layout_idx_type_test(dsid, &idx_type) < 0)
         return -1;
     if (idx_type == H5D_CHUNK_IDX_BTREE) {
-        HDfprintf(stderr, "ERROR: Chunk index is version 1 B-tree: aborting.\n");
+        fprintf(stderr, "ERROR: Chunk index is version 1 B-tree: aborting.\n");
         return -1;
     }
 
@@ -320,51 +320,51 @@ write_file(void)
         if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
             return -1;
     if ((fid = H5Fopen(name, H5F_ACC_RDWR | (use_swmr_g ? H5F_ACC_SWMR_WRITE : 0), fapl)) < 0) {
-        HDfprintf(stderr, "H5Fopen failed\n");
+        fprintf(stderr, "H5Fopen failed\n");
         return -1;
     }
 
     /* Open the dataset of the program name */
     if ((dsid = H5Dopen2(fid, progname_g, H5P_DEFAULT)) < 0) {
-        HDfprintf(stderr, "H5Dopen2 failed\n");
+        fprintf(stderr, "H5Dopen2 failed\n");
         return -1;
     }
 
     /* Disabled mdc flushed for the dataset */
     if (H5Odisable_mdc_flushes(dsid) < 0) {
-        HDfprintf(stderr, "H5Odisable_mdc_flushes failed\n");
+        fprintf(stderr, "H5Odisable_mdc_flushes failed\n");
         return -1;
     }
 
     /* Get mdc disabled status of the dataset */
     if (H5Oare_mdc_flushes_disabled(dsid, &disabled) < 0) {
-        HDfprintf(stderr, "H5Oare_mdc_flushes_disabled failed\n");
+        fprintf(stderr, "H5Oare_mdc_flushes_disabled failed\n");
         return -1;
     }
     else if (disabled)
-        HDprintf("Dataset has disabled mdc flushes.\n");
+        printf("Dataset has disabled mdc flushes.\n");
     else
-        HDprintf("Dataset should have disabled its mdc flushes.\n");
+        printf("Dataset should have disabled its mdc flushes.\n");
 
     /* Find chunksize used */
     if ((dcpl = H5Dget_create_plist(dsid)) < 0) {
-        HDfprintf(stderr, "H5Dget_create_plist failed\n");
+        fprintf(stderr, "H5Dget_create_plist failed\n");
         return -1;
     }
     if (H5D_CHUNKED != H5Pget_layout(dcpl)) {
-        HDfprintf(stderr, "storage layout is not chunked\n");
+        fprintf(stderr, "storage layout is not chunked\n");
         return -1;
     }
     if ((rank = H5Pget_chunk(dcpl, 3, chunk_dims)) != 3) {
-        HDfprintf(stderr, "storage rank is not 3\n");
+        fprintf(stderr, "storage rank is not 3\n");
         return -1;
     }
 
     /* verify chunk_dims against set parameters */
     if (chunk_dims[0] != chunkdims_g[0] || chunk_dims[1] != cz || chunk_dims[2] != cz) {
-        HDfprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n",
-                  (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1],
-                  (unsigned long long)chunk_dims[2]);
+        fprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n",
+                (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1],
+                (unsigned long long)chunk_dims[2]);
         return -1;
     }
 
@@ -373,7 +373,7 @@ write_file(void)
     memdims[1] = dims_g[1];
     memdims[2] = dims_g[2];
     if ((buffer = (UC_CTYPE *)HDmalloc((size_t)memdims[1] * (size_t)memdims[2] * sizeof(UC_CTYPE))) == NULL) {
-        HDfprintf(stderr, "malloc: failed\n");
+        fprintf(stderr, "malloc: failed\n");
         return -1;
     };
 
@@ -383,25 +383,25 @@ write_file(void)
     f_sid = H5Dget_space(dsid); /* Get filespace handle first. */
     rank  = H5Sget_simple_extent_ndims(f_sid);
     if (rank != UC_RANK) {
-        HDfprintf(stderr, "rank(%d) of dataset does not match\n", rank);
+        fprintf(stderr, "rank(%d) of dataset does not match\n", rank);
         return -1;
     }
     if (H5Sget_simple_extent_dims(f_sid, dims, NULL) < 0) {
-        HDfprintf(stderr, "H5Sget_simple_extent_dims got error\n");
+        fprintf(stderr, "H5Sget_simple_extent_dims got error\n");
         return -1;
     }
-    HDprintf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]),
-             (unsigned long long)(dims[1]), (unsigned long long)(dims[2]));
+    printf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]),
+           (unsigned long long)(dims[1]), (unsigned long long)(dims[2]));
     /* verify that file space dims are as expected and are consistent with memory space dims */
     if (dims[0] != 0 || dims[1] != memdims[1] || dims[2] != memdims[2]) {
-        HDfprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n", (unsigned long long)dims[0],
-                  (unsigned long long)dims[1], (unsigned long long)dims[2]);
+        fprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n", (unsigned long long)dims[0],
+                (unsigned long long)dims[1], (unsigned long long)dims[2]);
         return -1;
     }
 
     /* setup mem-space for buffer */
     if ((m_sid = H5Screate_simple(rank, memdims, NULL)) < 0) {
-        HDfprintf(stderr, "H5Screate_simple for memory failed\n");
+        fprintf(stderr, "H5Screate_simple for memory failed\n");
         return -1;
     };
 
@@ -415,7 +415,7 @@ write_file(void)
         for (j = 0; j < dims[1]; j++)
             for (k = 0; k < dims[2]; k++) {
                 if (i > SHRT_MAX) {
-                    HDfprintf(stderr, "rank(%d) of dataset overflow\n", rank);
+                    fprintf(stderr, "rank(%d) of dataset overflow\n", rank);
                     return -1;
                 }
                 *bufptr++ = (short)i;
@@ -424,40 +424,40 @@ write_file(void)
         /* extend the dataset by one for new plane */
         dims[0] = i + 1;
         if (H5Dset_extent(dsid, dims) < 0) {
-            HDfprintf(stderr, "H5Dset_extent failed\n");
+            fprintf(stderr, "H5Dset_extent failed\n");
             return -1;
         }
 
         /* Get the dataset's dataspace */
         if ((f_sid = H5Dget_space(dsid)) < 0) {
-            HDfprintf(stderr, "H5Dset_extent failed\n");
+            fprintf(stderr, "H5Dset_extent failed\n");
             return -1;
         }
 
         start[0] = i;
         /* Choose the next plane to write */
         if (H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
-            HDfprintf(stderr, "Failed H5Sselect_hyperslab\n");
+            fprintf(stderr, "Failed H5Sselect_hyperslab\n");
             return -1;
         }
 
         /* Write plane to the dataset */
         if (H5Dwrite(dsid, UC_DATATYPE, m_sid, f_sid, H5P_DEFAULT, buffer) < 0) {
-            HDfprintf(stderr, "Failed H5Dwrite\n");
+            fprintf(stderr, "Failed H5Dwrite\n");
             return -1;
         }
 
         /* Flush the dataset for every "chunkplanes_g" planes */
         if (!((i + 1) % (hsize_t)chunkplanes_g)) {
             if (H5Dflush(dsid) < 0) {
-                HDfprintf(stderr, "Failed to H5Dflush dataset\n");
+                fprintf(stderr, "Failed to H5Dflush dataset\n");
                 return -1;
             }
         }
     }
 
     if (H5Dflush(dsid) < 0) {
-        HDfprintf(stderr, "Failed to H5Dflush dataset\n");
+        fprintf(stderr, "Failed to H5Dflush dataset\n");
         return -1;
     }
 
@@ -465,7 +465,7 @@ write_file(void)
     /* Closing the dataset later will enable mdc flushes automatically if this is not done */
     if (disabled)
         if (H5Oenable_mdc_flushes(dsid) < 0) {
-            HDfprintf(stderr, "Failed to H5Oenable_mdc_flushes\n");
+            fprintf(stderr, "Failed to H5Oenable_mdc_flushes\n");
             return -1;
         }
 
@@ -473,23 +473,23 @@ write_file(void)
     HDfree(buffer);
 
     if (H5Dclose(dsid) < 0) {
-        HDfprintf(stderr, "Failed to close datasete\n");
+        fprintf(stderr, "Failed to close datasete\n");
         return -1;
     }
     if (H5Sclose(m_sid) < 0) {
-        HDfprintf(stderr, "Failed to close memory space\n");
+        fprintf(stderr, "Failed to close memory space\n");
         return -1;
     }
     if (H5Sclose(f_sid) < 0) {
-        HDfprintf(stderr, "Failed to close file space\n");
+        fprintf(stderr, "Failed to close file space\n");
         return -1;
     }
     if (H5Pclose(fapl) < 0) {
-        HDfprintf(stderr, "Failed to property list\n");
+        fprintf(stderr, "Failed to property list\n");
         return -1;
     }
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "Failed to close file id\n");
+        fprintf(stderr, "Failed to close file id\n");
         return -1;
     }
 
@@ -513,26 +513,26 @@ main(int argc, char *argv[])
     /* ============*/
     /* Create file */
     /* ============*/
-    HDprintf("Creating skeleton data file for testing H5Odisable_mdc_flushes()...\n");
+    printf("Creating skeleton data file for testing H5Odisable_mdc_flushes()...\n");
     if (create_file() < 0) {
-        HDfprintf(stderr, "***encounter error\n");
+        fprintf(stderr, "***encounter error\n");
         Hgoto_error(1);
     } /* end if */
     else
-        HDprintf("File created.\n");
+        printf("File created.\n");
 
-    HDprintf("writing to the file\n");
+    printf("writing to the file\n");
     if (write_file() < 0) {
-        HDfprintf(stderr, "write_file encountered error\n");
+        fprintf(stderr, "write_file encountered error\n");
         Hgoto_error(1);
     }
 
 done:
     /* Print result and exit */
     if (ret_value != 0)
-        HDprintf("Error(s) encountered\n");
+        printf("Error(s) encountered\n");
     else
-        HDprintf("All passed\n");
+        printf("All passed\n");
 
     return (ret_value);
 }
@@ -542,7 +542,7 @@ done:
 int
 main(void)
 {
-    HDfprintf(stderr, "Non-POSIX platform. Skipping.\n");
+    fprintf(stderr, "Non-POSIX platform. Skipping.\n");
     HDexit(EXIT_SUCCESS);
 } /* end main() */
 
diff --git a/test/vds.c b/test/vds.c
index c006673..e678e88 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -55,7 +55,7 @@ static const char *FILENAME[] = {"vds_virt_0", "vds_virt_1", "vds_src_0",  "vds_
 /* Print config directly to output */
 #define PRINT_CONFIG(...)                                                                                    \
     do {                                                                                                     \
-        HDprintf("Config: " __VA_ARGS__);                                                                    \
+        printf("Config: " __VA_ARGS__);                                                                      \
         HDputs("");                                                                                          \
     } while (0)
 
@@ -80,11 +80,11 @@ char vds_test_str_g[128]   = "";
 /* Replacement for TEST_ERROR for non-verbose output */
 #define TEST_ERROR_SUPPRESSED                                                                                \
     do {                                                                                                     \
-        HDprintf("Failed config: %s\nFailed test: %s\n", vds_config_str_g, vds_test_str_g);                  \
+        printf("Failed config: %s\nFailed test: %s\n", vds_config_str_g, vds_test_str_g);                    \
         TEST_ERROR;                                                                                          \
     } while (0)
 
-/* Replacement for HDprintf for printing configuration for non-verbose output */
+/* Replacement for printf for printing configuration for non-verbose output */
 #define PRINT_CONFIG(...)                                                                                    \
     do {                                                                                                     \
         HDsnprintf(vds_config_str_g, sizeof(vds_config_str_g), __VA_ARGS__);                                 \
@@ -426,9 +426,8 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex
             TEST_ERROR;
         if (config == TEST_API_REOPEN_FILE) {
             if (ninfo.meta_size.obj.heap_size != exp_meta_size) {
-                HDprintf("VDS metadata size: %llu Expected: %llu\n",
-                         (long long unsigned)ninfo.meta_size.obj.heap_size,
-                         (long long unsigned)exp_meta_size);
+                printf("VDS metadata size: %llu Expected: %llu\n",
+                       (long long unsigned)ninfo.meta_size.obj.heap_size, (long long unsigned)exp_meta_size);
                 TEST_ERROR;
             }
         }
@@ -12437,13 +12436,13 @@ main(void)
 
     if (nerrors)
         goto error;
-    HDprintf("All virtual dataset tests passed.\n");
+    printf("All virtual dataset tests passed.\n");
     h5_cleanup(FILENAME, fapl);
 
     return EXIT_SUCCESS;
 
 error:
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d VIRTUAL DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    printf("***** %d VIRTUAL DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     return EXIT_FAILURE;
 } /* end main() */
diff --git a/test/vds_env.c b/test/vds_env.c
index bb95d03..ff3cea6 100644
--- a/test/vds_env.c
+++ b/test/vds_env.c
@@ -383,9 +383,9 @@ main(void)
             HDputs(msg);
 
             for (bit_config = 0; bit_config < TEST_IO_NTESTS; bit_config++) {
-                HDprintf("Config: %s%s%s\n", bit_config & TEST_IO_CLOSE_SRC ? "closed source dataset, " : "",
-                         bit_config & TEST_IO_DIFFERENT_FILE ? "different source file" : "same source file",
-                         bit_config & TEST_IO_REOPEN_VIRT ? ", reopen virtual file" : "");
+                printf("Config: %s%s%s\n", bit_config & TEST_IO_CLOSE_SRC ? "closed source dataset, " : "",
+                       bit_config & TEST_IO_DIFFERENT_FILE ? "different source file" : "same source file",
+                       bit_config & TEST_IO_REOPEN_VIRT ? ", reopen virtual file" : "");
                 nerrors += test_vds_prefix_second(bit_config, fapl);
             }
 
@@ -400,13 +400,13 @@ main(void)
 
     if (nerrors)
         goto error;
-    HDprintf("All virtual dataset tests passed.\n");
+    printf("All virtual dataset tests passed.\n");
     h5_cleanup(FILENAME, fapl);
 
     return EXIT_SUCCESS;
 
 error:
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d VIRTUAL DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    printf("***** %d VIRTUAL DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     return EXIT_FAILURE;
 } /* end main() */
diff --git a/test/vds_swmr_reader.c b/test/vds_swmr_reader.c
index 5752d02..109af6d 100644
--- a/test/vds_swmr_reader.c
+++ b/test/vds_swmr_reader.c
@@ -119,7 +119,7 @@ main(void)
 
     HDfree(buffer);
 
-    HDfprintf(stderr, "SWMR reader exited successfully\n");
+    fprintf(stderr, "SWMR reader exited successfully\n");
     return EXIT_SUCCESS;
 
 error:
@@ -141,7 +141,7 @@ error:
 
     HDfree(buffer);
 
-    HDfprintf(stderr, "ERROR: SWMR reader exited with errors\n");
+    fprintf(stderr, "ERROR: SWMR reader exited with errors\n");
     return EXIT_FAILURE;
 
 } /* end main */
diff --git a/test/vds_swmr_writer.c b/test/vds_swmr_writer.c
index 33f2a86..2617497 100644
--- a/test/vds_swmr_writer.c
+++ b/test/vds_swmr_writer.c
@@ -43,7 +43,7 @@ main(int argc, char *argv[])
      * This is an integer index into the FILE_NAMES array.
      */
     if (argc != 2) {
-        HDfprintf(stderr, "ERROR: Must pass the source file number on the command line.\n");
+        fprintf(stderr, "ERROR: Must pass the source file number on the command line.\n");
         return EXIT_FAILURE;
     }
 
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
         TEST_ERROR;
     HDfree(buffer);
 
-    HDfprintf(stderr, "SWMR writer exited successfully\n");
+    fprintf(stderr, "SWMR writer exited successfully\n");
     return EXIT_SUCCESS;
 
 error:
@@ -156,7 +156,7 @@ error:
     }
     H5E_END_TRY
 
-    HDfprintf(stderr, "ERROR: SWMR writer exited with errors\n");
+    fprintf(stderr, "ERROR: SWMR writer exited with errors\n");
     return EXIT_FAILURE;
 
 } /* end main */
diff --git a/test/vfd.c b/test/vfd.c
index adacd5e..e28a7c1 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -81,9 +81,9 @@ static int __k;
     do {                                                                                                     \
         for (__k = 0; __k < (size); __k++) {                                                                 \
             if (__k % 16 == 0) {                                                                             \
-                HDprintf("\n%04x", __k);                                                                     \
+                printf("\n%04x", __k);                                                                       \
             }                                                                                                \
-            HDprintf((__k % 4 == 0) ? "  %02X" : " %02X", (unsigned char)(buf)[__k]);                        \
+            printf((__k % 4 == 0) ? "  %02X" : " %02X", (unsigned char)(buf)[__k]);                          \
         }                                                                                                    \
     } while (0) /* end #define HEXPRINT() */
 
@@ -532,8 +532,8 @@ test_core(void)
         for (j = 0; j < CORE_DSET_DIM2; j++)
             if (*pr++ != *pw++) {
                 H5_FAILED();
-                HDprintf("    Read different values than written in data set.\n");
-                HDprintf("    At index %d,%d\n", i, j);
+                printf("    Read different values than written in data set.\n");
+                printf("    At index %d,%d\n", i, j);
                 TEST_ERROR;
             } /* end if */
 
@@ -600,8 +600,8 @@ test_core(void)
         for (j = 0; j < CORE_DSET_DIM2; j++)
             if (*pw++ != *pr++) {
                 H5_FAILED();
-                HDprintf("    Read different values than written in data set.\n");
-                HDprintf("    At index %d,%d\n", i, j);
+                printf("    Read different values than written in data set.\n");
+                printf("    At index %d,%d\n", i, j);
                 TEST_ERROR;
             } /* end if */
 
@@ -753,7 +753,7 @@ test_direct(void)
     if (file < 0) {
         H5Pclose(fapl);
         SKIPPED();
-        HDprintf("  Probably the file system doesn't support Direct I/O\n");
+        printf("  Probably the file system doesn't support Direct I/O\n");
         return 0;
     }
 
@@ -833,8 +833,8 @@ test_direct(void)
         for (j = 0; j < DSET1_DIM2; j++)
             if (*p1++ != *p2++) {
                 H5_FAILED();
-                HDprintf("    Read different values than written in data set 1.\n");
-                HDprintf("    At index %d,%d\n", i, j);
+                printf("    Read different values than written in data set 1.\n");
+                printf("    At index %d,%d\n", i, j);
                 TEST_ERROR;
             } /* end if */
 
@@ -866,8 +866,8 @@ test_direct(void)
     for (i = 0; i < DSET2_DIM; i++)
         if (wdata2[i] != rdata2[i]) {
             H5_FAILED();
-            HDprintf("    Read different values than written in data set 2.\n");
-            HDprintf("    At index %d\n", i);
+            printf("    Read different values than written in data set 2.\n");
+            printf("    At index %d\n", i);
             TEST_ERROR;
         } /* end if */
 
@@ -2386,7 +2386,7 @@ error:
     do {                                                                                                     \
         H5_FAILED();                                                                                         \
         AT();                                                                                                \
-        HDfprintf(stderr, mesg);                                                                             \
+        fprintf(stderr, mesg);                                                                               \
         H5Eprint2(H5E_DEFAULT, stderr);                                                                      \
         HDfflush(stderr);                                                                                    \
         ret_value = -1;                                                                                      \
@@ -2443,7 +2443,7 @@ compare_splitter_config_info(hid_t fapl_id, H5FD_splitter_vfd_config_t *info)
     }
     if ((HDstrlen(info->wo_path) != HDstrlen(fetched_info->wo_path)) ||
         HDstrncmp(info->wo_path, fetched_info->wo_path, H5FD_SPLITTER_PATH_MAX) != 0) {
-        HDfprintf(stderr, "MISMATCH: '%s' :: '%s'\n", info->wo_path, fetched_info->wo_path);
+        fprintf(stderr, "MISMATCH: '%s' :: '%s'\n", info->wo_path, fetched_info->wo_path);
         HEXPRINT(H5FD_SPLITTER_PATH_MAX, info->wo_path);
         HEXPRINT(H5FD_SPLITTER_PATH_MAX, fetched_info->wo_path);
         SPLITTER_TEST_FAULT("Write-Only file path mismatch\n");
@@ -3417,7 +3417,7 @@ test_splitter(void)
 
     if (!driver_is_splitter_compatible(child_fapl_id)) {
         SKIPPED();
-        HDprintf("  given driver is not Splitter W/O compatible.\n");
+        printf("  given driver is not Splitter W/O compatible.\n");
         return 0;
     }
 
@@ -3502,7 +3502,7 @@ setup_rand(void)
 
         seed = predefined_seed;
 
-        HDfprintf(stdout, "\n%s: predefined_seed = %d.\n\n", __func__, seed);
+        fprintf(stdout, "\n%s: predefined_seed = %d.\n\n", __func__, seed);
         HDfflush(stdout);
 
         HDsrand(seed);
@@ -3511,14 +3511,14 @@ setup_rand(void)
 
         if (HDgettimeofday(&tv, NULL) != 0) {
 
-            HDfprintf(stdout, "\n%s: gettimeofday() failed -- srand() not called.\n\n", __func__);
+            fprintf(stdout, "\n%s: gettimeofday() failed -- srand() not called.\n\n", __func__);
             HDfflush(stdout);
         }
         else {
 
             seed = (unsigned)tv.tv_usec;
 
-            HDfprintf(stdout, "\n%s: seed = %d.\n\n", __func__, seed);
+            fprintf(stdout, "\n%s: seed = %d.\n\n", __func__, seed);
             HDfflush(stdout);
 
             HDsrand(seed);
@@ -4081,7 +4081,7 @@ test_vector_io__setup_v(uint32_t count, H5FD_mem_t types[], haddr_t addrs[], siz
 
         if ((NULL == temp_buf) || (NULL == read_bufs[i])) {
 
-            HDfprintf(stderr, "%s: can't malloc read / write bufs.\n", __func__);
+            fprintf(stderr, "%s: can't malloc read / write bufs.\n", __func__);
             result = FALSE;
             break;
         }
@@ -4218,7 +4218,7 @@ test_vector_io__setup_fixed_size_v(uint32_t count, H5FD_mem_t types[], haddr_t a
 
         if ((NULL == temp_buf) || (NULL == read_bufs[i])) {
 
-            HDfprintf(stderr, "%s: can't malloc read / write bufs.\n", __func__);
+            fprintf(stderr, "%s: can't malloc read / write bufs.\n", __func__);
             result = FALSE;
             break;
         }
@@ -4305,7 +4305,7 @@ test_vector_io__read_v_indiv(H5FD_t *lf, uint32_t count, H5FD_mem_t types[], had
 
             if (verbose) {
 
-                HDfprintf(stdout, "%s: H5FDread() failed on entry %d.\n", __func__, i);
+                fprintf(stdout, "%s: H5FDread() failed on entry %d.\n", __func__, i);
             }
             result = FALSE;
             break;
@@ -4356,7 +4356,7 @@ test_vector_io__write_v_indiv(H5FD_t *lf, uint32_t count, H5FD_mem_t types[], ha
 
             if (verbose) {
 
-                HDfprintf(stdout, "%s: HDwrite() failed on entry %d.\n", __func__, i);
+                fprintf(stdout, "%s: HDwrite() failed on entry %d.\n", __func__, i);
             }
             result = FALSE;
             break;
@@ -4420,10 +4420,10 @@ test_vector_io__verify_v(uint32_t count, H5FD_mem_t types[], size_t sizes[], con
 
                 if (verbose) {
 
-                    HDfprintf(stdout, "\n\nread/write buf mismatch in vector/entry");
-                    HDfprintf(stdout, "\"%s\"/%u at offset %llu/%llu w/r = %c/%c type = %s\n\n", name,
-                              (unsigned)i, (long long unsigned)j, (long long unsigned)size, w_buf[j],
-                              r_buf[j], mem_type_names[type]);
+                    fprintf(stdout, "\n\nread/write buf mismatch in vector/entry");
+                    fprintf(stdout, "\"%s\"/%u at offset %llu/%llu w/r = %c/%c type = %s\n\n", name,
+                            (unsigned)i, (long long unsigned)j, (long long unsigned)size, w_buf[j], r_buf[j],
+                            mem_type_names[type]);
                 }
             }
             j++;
@@ -4467,7 +4467,7 @@ test_vector_io__dump_test_vectors(uint32_t count, H5FD_mem_t types[], haddr_t ad
     const char *w_buf;
     char       *r_buf;
 
-    HDfprintf(stdout, "\n\nDumping test vector \"%s\" of length %d\n\n", name, count);
+    fprintf(stdout, "\n\nDumping test vector \"%s\" of length %d\n\n", name, count);
 
     for (i = 0; i < count; i++) {
 
@@ -4488,12 +4488,12 @@ test_vector_io__dump_test_vectors(uint32_t count, H5FD_mem_t types[], haddr_t ad
             r_buf = NULL;
         }
 
-        HDfprintf(stdout, "%u: addr/len = %llu/%llu, type = %s, w_buf = \"%s\"\n", (unsigned)i,
-                  (long long unsigned)(addrs[i]), (long long unsigned)(size), mem_type_names[type], w_buf);
+        fprintf(stdout, "%u: addr/len = %llu/%llu, type = %s, w_buf = \"%s\"\n", (unsigned)i,
+                (long long unsigned)(addrs[i]), (long long unsigned)(size), mem_type_names[type], w_buf);
 
         if (r_buf) {
 
-            HDfprintf(stdout, " r_buf = \"%s\"\n", r_buf);
+            fprintf(stdout, " r_buf = \"%s\"\n", r_buf);
         }
     }
 
@@ -4609,7 +4609,7 @@ test_vector_io(const char *vfd_name)
     }
     else {
 
-        HDfprintf(stdout, "un-supported VFD\n");
+        fprintf(stdout, "un-supported VFD\n");
         TEST_ERROR;
     }
 
@@ -5049,15 +5049,15 @@ test_selection_io_read_verify(H5FD_t *lf, H5FD_mem_t type, uint32_t count, hid_t
             if (rbufs[i][j] != erbufs[i][j]) {
                 H5_FAILED();
                 AT();
-                HDprintf("data read from file does not match expected values at mapping array location %d\n",
-                         i);
-                HDprintf("expected data: \n");
+                printf("data read from file does not match expected values at mapping array location %d\n",
+                       i);
+                printf("expected data: \n");
                 for (j = 0; j < SEL_IO_DIM0 * SEL_IO_DIM1; j++) {
                     printf("%6d", erbufs[i][j]);
                     if (!((j + 1) % SEL_IO_DIM1))
                         printf("\n");
                 }
-                HDprintf("read data: \n");
+                printf("read data: \n");
                 for (j = 0; j < SEL_IO_DIM0 * SEL_IO_DIM1; j++) {
                     printf("%6d", rbufs[i][j]);
                     if (!((j + 1) % SEL_IO_DIM1))
@@ -5148,7 +5148,7 @@ test_selection_io(const char *vfd_name)
     }
     else {
 
-        HDfprintf(stdout, "un-supported VFD\n");
+        fprintf(stdout, "un-supported VFD\n");
         TEST_ERROR;
     }
 
@@ -5953,13 +5953,13 @@ main(void)
      */
     env_h5_drvr = HDgetenv(HDF5_DRIVER);
     if (env_h5_drvr) {
-        HDprintf(" -- SKIPPED VFD tests because %s is set -- \n", HDF5_DRIVER);
+        printf(" -- SKIPPED VFD tests because %s is set -- \n", HDF5_DRIVER);
         HDexit(EXIT_SUCCESS);
     }
 
     h5_reset();
 
-    HDprintf("Testing basic Virtual File Driver functionality.\n");
+    printf("Testing basic Virtual File Driver functionality.\n");
 
     setup_rand();
 
@@ -5983,11 +5983,11 @@ main(void)
     nerrors += test_ctl() < 0 ? 1 : 0;
 
     if (nerrors) {
-        HDprintf("***** %d Virtual File Driver TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+        printf("***** %d Virtual File Driver TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
         return EXIT_FAILURE;
     }
 
-    HDprintf("All Virtual File Driver tests passed.\n");
+    printf("All Virtual File Driver tests passed.\n");
 
     return EXIT_SUCCESS;
 } /* end main() */
diff --git a/test/vfd_plugin.c b/test/vfd_plugin.c
index e722405..60148aa 100644
--- a/test/vfd_plugin.c
+++ b/test/vfd_plugin.c
@@ -429,7 +429,7 @@ main(void)
     nerrors += (test_env_var() < 0) ? 1 : 0;
 
     if (nerrors) {
-        HDprintf("***** %d VFD plugin TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+        printf("***** %d VFD plugin TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
         HDexit(EXIT_FAILURE);
     }
 
diff --git a/test/vol.c b/test/vol.c
index 1690614..551abd1 100644
--- a/test/vol.c
+++ b/test/vol.c
@@ -579,7 +579,7 @@ fake_vol_info_to_str(const void *info, char **str)
 
     /* Verify the info is correct before continuing */
     if (val != INT_MAX) {
-        HDprintf("The value of info (%d) is incorrect\n", val);
+        printf("The value of info (%d) is incorrect\n", val);
         return FAIL;
     }
 
@@ -2345,7 +2345,7 @@ test_get_vol_name(void)
     /* Skip the connectors other than the native and pass_through connector */
     if (HDstrcmp(conn_env_str, "native") && HDstrcmp(conn_env_str, "pass_through")) {
         SKIPPED();
-        HDprintf("    only test the native or internal pass_through connector\n");
+        printf("    only test the native or internal pass_through connector\n");
         return SUCCEED;
     }
 
@@ -2655,7 +2655,7 @@ main(void)
     nerrors += test_query_optional() < 0 ? 1 : 0;
 
     if (nerrors) {
-        HDprintf("***** %d Virtual Object Layer TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+        printf("***** %d Virtual Object Layer TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
         HDexit(EXIT_FAILURE);
     }
 
diff --git a/test/vol_plugin.c b/test/vol_plugin.c
index 4b8d263..d3ff4fd 100644
--- a/test/vol_plugin.c
+++ b/test/vol_plugin.c
@@ -342,7 +342,7 @@ main(void)
     nerrors += test_getters() < 0 ? 1 : 0;
 
     if (nerrors) {
-        HDprintf("***** %d VOL connector plugin TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+        printf("***** %d VOL connector plugin TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
         HDexit(EXIT_FAILURE);
     }
 
diff --git a/testpar/API/H5_api_async_test_parallel.c b/testpar/API/H5_api_async_test_parallel.c
index 663e690..97944df 100644
--- a/testpar/API/H5_api_async_test_parallel.c
+++ b/testpar/API/H5_api_async_test_parallel.c
@@ -84,7 +84,7 @@ test_one_dataset_io(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf(
+            printf(
                 "    API functions for basic file, dataset, or flush aren't supported with this connector\n");
         }
 
@@ -127,13 +127,13 @@ test_one_dataset_io(void)
 
     if (NULL == (write_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         TEST_ERROR;
     }
 
     if (NULL == (read_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         TEST_ERROR;
     }
 
@@ -154,7 +154,7 @@ test_one_dataset_io(void)
 
     if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -164,7 +164,7 @@ test_one_dataset_io(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -206,7 +206,7 @@ test_one_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(single_dset_eswait);
                 } /* end if */
 
@@ -247,7 +247,7 @@ test_one_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(single_dset_dclose);
                 } /* end if */
 
@@ -292,7 +292,7 @@ test_one_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(single_dset_dflush);
                 } /* end if */
 
@@ -345,7 +345,7 @@ test_one_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(single_dset_fclose);
                 } /* end if */
 
@@ -449,7 +449,7 @@ test_multi_dataset_io(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf(
+            printf(
                 "    API functions for basic file, dataset, or flush aren't supported with this connector\n");
         }
 
@@ -485,13 +485,13 @@ test_multi_dataset_io(void)
 
     if (NULL == (write_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         TEST_ERROR;
     }
 
     if (NULL == (read_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         TEST_ERROR;
     }
 
@@ -512,7 +512,7 @@ test_multi_dataset_io(void)
 
     if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -522,7 +522,7 @@ test_multi_dataset_io(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -587,7 +587,7 @@ test_multi_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_dset_open);
                 } /* end if */
 
@@ -668,7 +668,7 @@ test_multi_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_dset_close);
                 } /* end if */
 
@@ -775,7 +775,7 @@ test_multi_file_dataset_io(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf(
+            printf(
                 "    API functions for basic file, dataset, or flush aren't supported with this connector\n");
         }
 
@@ -807,13 +807,13 @@ test_multi_file_dataset_io(void)
 
     if (NULL == (write_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         TEST_ERROR;
     }
 
     if (NULL == (read_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         TEST_ERROR;
     }
 
@@ -834,7 +834,7 @@ test_multi_file_dataset_io(void)
 
     if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -844,7 +844,7 @@ test_multi_file_dataset_io(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -919,7 +919,7 @@ test_multi_file_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_file_dset_open);
                 } /* end if */
 
@@ -994,7 +994,7 @@ test_multi_file_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_file_dset_dclose);
                 } /* end if */
 
@@ -1092,7 +1092,7 @@ test_multi_file_dataset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_file_dset_fclose);
                 } /* end if */
 
@@ -1198,7 +1198,7 @@ test_multi_file_grp_dset_io(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf(
+            printf(
                 "    API functions for basic file, group, or dataset aren't supported with this connector\n");
         }
 
@@ -1230,13 +1230,13 @@ test_multi_file_grp_dset_io(void)
 
     if (NULL == (write_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         TEST_ERROR;
     }
 
     if (NULL == (read_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         TEST_ERROR;
     }
 
@@ -1257,7 +1257,7 @@ test_multi_file_grp_dset_io(void)
 
     if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -1267,7 +1267,7 @@ test_multi_file_grp_dset_io(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -1382,7 +1382,7 @@ test_multi_file_grp_dset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_file_grp_dset_no_kick);
                 } /* end if */
 
@@ -1508,7 +1508,7 @@ test_multi_file_grp_dset_io(void)
             for (i = 0; i < data_size / sizeof(int); i++)
                 if (write_buf[i] != read_buf[i]) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     PART_ERROR(multi_file_grp_dset_kick);
                 } /* end if */
 
@@ -1619,8 +1619,8 @@ test_set_extent(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, dataset, dataset more, or flush aren't supported "
-                     "with this connector\n");
+            printf("    API functions for basic file, dataset, dataset more, or flush aren't supported "
+                   "with this connector\n");
         }
 
         return 0;
@@ -1635,13 +1635,13 @@ test_set_extent(void)
 
     if (NULL == (maxdims = HDmalloc(SET_EXTENT_TEST_SPACE_RANK * sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate max dataspace dimension buffer\n");
+        printf("    couldn't allocate max dataspace dimension buffer\n");
         TEST_ERROR;
     }
 
     if (NULL == (cdims = HDmalloc(SET_EXTENT_TEST_SPACE_RANK * sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate chunk dimension buffer\n");
+        printf("    couldn't allocate chunk dimension buffer\n");
         TEST_ERROR;
     }
 
@@ -1687,13 +1687,13 @@ test_set_extent(void)
 
     if (NULL == (write_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         TEST_ERROR;
     }
 
     if (NULL == (read_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         TEST_ERROR;
     }
 
@@ -1714,7 +1714,7 @@ test_set_extent(void)
 
     if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -1724,7 +1724,7 @@ test_set_extent(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -1766,7 +1766,7 @@ test_set_extent(void)
 
             if (H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't select hyperslab for dataset write\n");
+                printf("    couldn't select hyperslab for dataset write\n");
                 goto error;
             }
 
@@ -1821,7 +1821,7 @@ test_set_extent(void)
     for (i = 0; i < data_size / sizeof(int); i++)
         if (write_buf[i] != read_buf[i]) {
             H5_FAILED();
-            HDprintf("    data verification failed, expected %d but got %d\n", write_buf[i], read_buf[i]);
+            printf("    data verification failed, expected %d but got %d\n", write_buf[i], read_buf[i]);
             goto error;
         } /* end if */
 
@@ -1952,8 +1952,8 @@ test_attribute_exists(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
-                     "supported with this connector\n");
+            printf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
+                   "supported with this connector\n");
         }
 
         return 0;
@@ -2105,8 +2105,8 @@ test_attribute_io(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
-                     "supported with this connector\n");
+            printf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
+                   "supported with this connector\n");
         }
 
         return 0;
@@ -2152,13 +2152,13 @@ test_attribute_io(void)
 
     if (NULL == (write_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute write\n");
+        printf("    couldn't allocate buffer for attribute write\n");
         TEST_ERROR;
     }
 
     if (NULL == (read_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute read\n");
+        printf("    couldn't allocate buffer for attribute read\n");
         TEST_ERROR;
     }
 
@@ -2191,7 +2191,7 @@ test_attribute_io(void)
     for (i = 0; i < data_size / sizeof(int); i++)
         if (write_buf[i] != read_buf[i]) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         } /* end if */
 
@@ -2217,7 +2217,7 @@ test_attribute_io(void)
     for (i = 0; i < data_size / sizeof(int); i++)
         if (write_buf[i] != read_buf[i]) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         } /* end if */
 
@@ -2312,8 +2312,8 @@ test_attribute_io_tconv(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, attribute, or flush aren't supported with this "
-                     "connector\n");
+            printf("    API functions for basic file, attribute, or flush aren't supported with this "
+                   "connector\n");
         }
 
         return 0;
@@ -2350,13 +2350,13 @@ test_attribute_io_tconv(void)
 
     if (NULL == (write_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute write\n");
+        printf("    couldn't allocate buffer for attribute write\n");
         TEST_ERROR;
     }
 
     if (NULL == (read_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute read\n");
+        printf("    couldn't allocate buffer for attribute read\n");
         TEST_ERROR;
     }
 
@@ -2387,7 +2387,7 @@ test_attribute_io_tconv(void)
     for (i = 0; i < data_size / sizeof(int); i++)
         if (write_buf[i] != read_buf[i]) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         } /* end if */
 
@@ -2414,7 +2414,7 @@ test_attribute_io_tconv(void)
     for (i = 0; i < data_size / sizeof(int); i++)
         if (write_buf[i] != read_buf[i]) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         } /* end if */
 
@@ -2516,8 +2516,8 @@ test_attribute_io_compound(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
-                     "supported with this connector\n");
+            printf("    API functions for basic file, dataset, dataset more, attribute, or flush aren't "
+                   "supported with this connector\n");
         }
 
         return 0;
@@ -2579,19 +2579,19 @@ test_attribute_io_compound(void)
 
     if (NULL == (write_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute write\n");
+        printf("    couldn't allocate buffer for attribute write\n");
         TEST_ERROR;
     }
 
     if (NULL == (read_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute read\n");
+        printf("    couldn't allocate buffer for attribute read\n");
         TEST_ERROR;
     }
 
     if (NULL == (fbuf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for attribute read verification\n");
+        printf("    couldn't allocate buffer for attribute read verification\n");
         TEST_ERROR;
     }
 
@@ -2630,12 +2630,12 @@ test_attribute_io_compound(void)
     for (i = 0; i < data_size / sizeof(tattr_cmpd_t); i++) {
         if (read_buf[i].a != fbuf[i].a) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'a'\n");
+            printf("    data verification failed for field 'a'\n");
             goto error;
         } /* end if */
         if (read_buf[i].b != fbuf[i].b) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'b'\n");
+            printf("    data verification failed for field 'b'\n");
             goto error;
         } /* end if */
     }
@@ -2660,12 +2660,12 @@ test_attribute_io_compound(void)
     for (i = 0; i < data_size / sizeof(tattr_cmpd_t); i++) {
         if (read_buf[i].a != fbuf[i].a) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'a'\n");
+            printf("    data verification failed for field 'a'\n");
             goto error;
         } /* end if */
         if (read_buf[i].b != -2) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'b'\n");
+            printf("    data verification failed for field 'b'\n");
             goto error;
         } /* end if */
     }
@@ -2690,19 +2690,19 @@ test_attribute_io_compound(void)
     for (i = 0; i < data_size / sizeof(tattr_cmpd_t); i++) {
         if (read_buf[i].a != -2) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'a'\n");
+            printf("    data verification failed for field 'a'\n");
             goto error;
         } /* end if */
         if (read_buf[i].b != fbuf[i].b) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'b'\n");
+            printf("    data verification failed for field 'b'\n");
             goto error;
         } /* end if */
     }
 
     if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
         H5_FAILED();
-        HDprintf("    MPI_Barrier failed\n");
+        printf("    MPI_Barrier failed\n");
         goto error;
     }
 
@@ -2746,19 +2746,19 @@ test_attribute_io_compound(void)
     for (i = 0; i < data_size / sizeof(tattr_cmpd_t); i++) {
         if (read_buf[i].a != fbuf[i].a) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'a'\n");
+            printf("    data verification failed for field 'a'\n");
             goto error;
         } /* end if */
         if (read_buf[i].b != fbuf[i].b) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'b'\n");
+            printf("    data verification failed for field 'b'\n");
             goto error;
         } /* end if */
     }
 
     if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
         H5_FAILED();
-        HDprintf("    MPI_Barrier failed\n");
+        printf("    MPI_Barrier failed\n");
         goto error;
     }
 
@@ -2802,12 +2802,12 @@ test_attribute_io_compound(void)
     for (i = 0; i < data_size / sizeof(tattr_cmpd_t); i++) {
         if (read_buf[i].a != fbuf[i].a) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'a'\n");
+            printf("    data verification failed for field 'a'\n");
             goto error;
         } /* end if */
         if (read_buf[i].b != fbuf[i].b) {
             H5_FAILED();
-            HDprintf("    data verification failed for field 'b'\n");
+            printf("    data verification failed for field 'b'\n");
             goto error;
         } /* end if */
     }
@@ -2916,8 +2916,8 @@ test_group(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, group, group more or flush aren't "
-                     "supported with this connector\n");
+            printf("    API functions for basic file, group, group more or flush aren't "
+                   "supported with this connector\n");
         }
 
         return 0;
@@ -3098,8 +3098,8 @@ test_link(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, link, hard link, soft link, flush, or creation order "
-                     "aren't supported with this connector\n");
+            printf("    API functions for basic file, link, hard link, soft link, flush, or creation order "
+                   "aren't supported with this connector\n");
         }
 
         return 0;
@@ -3179,7 +3179,7 @@ test_link(void)
 
     if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
         H5_FAILED();
-        HDprintf("    MPI_Barrier failed\n");
+        printf("    MPI_Barrier failed\n");
         goto error;
     }
 
@@ -3218,7 +3218,7 @@ test_link(void)
 
     if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
         H5_FAILED();
-        HDprintf("    MPI_Barrier failed\n");
+        printf("    MPI_Barrier failed\n");
         goto error;
     }
 
@@ -3256,7 +3256,7 @@ test_link(void)
 
     if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
         H5_FAILED();
-        HDprintf("    MPI_Barrier failed\n");
+        printf("    MPI_Barrier failed\n");
         goto error;
     }
 
@@ -3353,8 +3353,8 @@ test_ocopy_orefresh(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file, group, dataset, object more, flush, or refresh "
-                     "aren't supported with this connector\n");
+            printf("    API functions for basic file, group, dataset, object more, flush, or refresh "
+                   "aren't supported with this connector\n");
         }
 
         return 0;
@@ -3423,7 +3423,7 @@ test_ocopy_orefresh(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             H5_FAILED();
-            HDprintf("    MPI_Barrier failed\n");
+            printf("    MPI_Barrier failed\n");
             goto error;
         }
     }
@@ -3508,7 +3508,7 @@ test_file_reopen(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    API functions for basic file or file more aren't supported with this connector\n");
+            printf("    API functions for basic file or file more aren't supported with this connector\n");
         }
 
         return 0;
@@ -3595,17 +3595,17 @@ H5_api_async_test_parallel(void)
     int    nerrors;
 
     if (MAINPROCESS) {
-        HDprintf("**********************************************\n");
-        HDprintf("*                                            *\n");
-        HDprintf("*      API Parallel Async Tests              *\n");
-        HDprintf("*                                            *\n");
-        HDprintf("**********************************************\n\n");
+        printf("**********************************************\n");
+        printf("*                                            *\n");
+        printf("*      API Parallel Async Tests              *\n");
+        printf("*                                            *\n");
+        printf("**********************************************\n\n");
     }
 
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_ASYNC)) {
         if (MAINPROCESS) {
             SKIPPED();
-            HDprintf("    Async APIs aren't supported with this connector\n");
+            printf("    Async APIs aren't supported with this connector\n");
         }
 
         return 0;
@@ -3616,19 +3616,19 @@ H5_api_async_test_parallel(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    MPI_Barrier() failed!\n");
+                printf("    MPI_Barrier() failed!\n");
         }
     }
 
     if (MAINPROCESS) {
-        HDprintf("\n");
-        HDprintf("Cleaning up testing files\n");
+        printf("\n");
+        printf("Cleaning up testing files\n");
     }
 
     cleanup_files();
 
     if (MAINPROCESS) {
-        HDprintf("\n * Re-testing with independent metadata reads *\n");
+        printf("\n * Re-testing with independent metadata reads *\n");
     }
 
     coll_metadata_read = FALSE;
@@ -3638,13 +3638,13 @@ H5_api_async_test_parallel(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    MPI_Barrier() failed!\n");
+                printf("    MPI_Barrier() failed!\n");
         }
     }
 
     if (MAINPROCESS) {
-        HDprintf("\n");
-        HDprintf("Cleaning up testing files\n");
+        printf("\n");
+        printf("Cleaning up testing files\n");
     }
 
     cleanup_files();
@@ -3658,14 +3658,14 @@ int
 H5_api_async_test_parallel(void)
 {
     if (MAINPROCESS) {
-        HDprintf("**********************************************\n");
-        HDprintf("*                                            *\n");
-        HDprintf("*      API Parallel Async Tests              *\n");
-        HDprintf("*                                            *\n");
-        HDprintf("**********************************************\n\n");
+        printf("**********************************************\n");
+        printf("*                                            *\n");
+        printf("*      API Parallel Async Tests              *\n");
+        printf("*                                            *\n");
+        printf("**********************************************\n\n");
     }
 
-    HDprintf("SKIPPED due to no async support in HDF5 library\n");
+    printf("SKIPPED due to no async support in HDF5 library\n");
 
     return 0;
 }
diff --git a/testpar/API/H5_api_attribute_test_parallel.c b/testpar/API/H5_api_attribute_test_parallel.c
index cffbfcd..a941b9a 100644
--- a/testpar/API/H5_api_attribute_test_parallel.c
+++ b/testpar/API/H5_api_attribute_test_parallel.c
@@ -24,11 +24,11 @@ H5_api_attribute_test_parallel(void)
     int    nerrors;
 
     if (MAINPROCESS) {
-        HDprintf("**********************************************\n");
-        HDprintf("*                                            *\n");
-        HDprintf("*        API Parallel Attribute Tests        *\n");
-        HDprintf("*                                            *\n");
-        HDprintf("**********************************************\n\n");
+        printf("**********************************************\n");
+        printf("*                                            *\n");
+        printf("*        API Parallel Attribute Tests        *\n");
+        printf("*                                            *\n");
+        printf("**********************************************\n\n");
     }
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(par_attribute_tests); i++) {
@@ -36,12 +36,12 @@ H5_api_attribute_test_parallel(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    MPI_Barrier() failed!\n");
+                printf("    MPI_Barrier() failed!\n");
         }
     }
 
     if (MAINPROCESS)
-        HDprintf("\n");
+        printf("\n");
 
     return nerrors;
 }
diff --git a/testpar/API/H5_api_dataset_test_parallel.c b/testpar/API/H5_api_dataset_test_parallel.c
index fd02a7f..59e4248 100644
--- a/testpar/API/H5_api_dataset_test_parallel.c
+++ b/testpar/API/H5_api_dataset_test_parallel.c
@@ -115,8 +115,7 @@ test_write_dataset_data_verification(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -127,20 +126,20 @@ test_write_dataset_data_verification(void)
 
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_WRITE_DATA_VERIFY_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -154,7 +153,7 @@ test_write_dataset_data_verification(void)
                               DATASET_WRITE_DATA_VERIFY_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME1);
+        printf("    couldn't create dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME1);
         goto error;
     }
     H5E_BEGIN_TRY
@@ -168,7 +167,7 @@ test_write_dataset_data_verification(void)
                               DATASET_WRITE_DATA_VERIFY_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2);
+        printf("    couldn't create dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2);
         goto error;
     }
     H5E_BEGIN_TRY
@@ -182,7 +181,7 @@ test_write_dataset_data_verification(void)
                               DATASET_WRITE_DATA_VERIFY_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT,
                               H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3);
+        printf("    couldn't create dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3);
         goto error;
     }
     H5E_BEGIN_TRY
@@ -204,7 +203,7 @@ test_write_dataset_data_verification(void)
 
             if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME1);
+                printf("    couldn't open dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME1);
                 PART_ERROR(H5Dwrite_all_read);
             }
 
@@ -236,13 +235,13 @@ test_write_dataset_data_verification(void)
             if (MPI_SUCCESS !=
                 MPI_Allreduce(MPI_IN_PLACE, &op_failed, 1, MPI_C_BOOL, MPI_LAND, MPI_COMM_WORLD)) {
                 H5_FAILED();
-                HDprintf("    couldn't determine if dataset write on rank 0 succeeded\n");
+                printf("    couldn't determine if dataset write on rank 0 succeeded\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if (op_failed == TRUE) {
                 H5_FAILED();
-                HDprintf("    dataset write on rank 0 failed!\n");
+                printf("    dataset write on rank 0 failed!\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
 
@@ -268,73 +267,73 @@ test_write_dataset_data_verification(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
                 PART_ERROR(H5Dwrite_all_read);
             }
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 PART_ERROR(H5Dwrite_all_read);
             }
             if ((group_id =
                      H5Gopen2(container_group, DATASET_WRITE_DATA_VERIFY_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container sub-group '%s'\n",
-                         DATASET_WRITE_DATA_VERIFY_TEST_GROUP_NAME);
+                printf("    couldn't open container sub-group '%s'\n",
+                       DATASET_WRITE_DATA_VERIFY_TEST_GROUP_NAME);
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME1);
+                printf("    couldn't open dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME1);
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if ((fspace_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataset dataspace\n");
+                printf("    couldn't get dataset dataspace\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataspace num points\n");
+                printf("    couldn't get dataspace num points\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if (NULL ==
                 (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_WRITE_DATA_VERIFY_TEST_DTYPE_SIZE))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             if (H5Dread(dset_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                         read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME1);
+                printf("    couldn't read from dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME1);
                 PART_ERROR(H5Dwrite_all_read);
             }
 
             for (i = 0; i < (hsize_t)space_npoints; i++)
                 if (((int *)read_buf)[i] != (int)i) {
                     H5_FAILED();
-                    HDprintf("    H5S_ALL selection data verification failed\n");
+                    printf("    H5S_ALL selection data verification failed\n");
                     PART_ERROR(H5Dwrite_all_read);
                 }
 
@@ -382,7 +381,7 @@ test_write_dataset_data_verification(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -409,19 +408,19 @@ test_write_dataset_data_verification(void)
 
             if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2);
+                printf("    couldn't open dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if ((fspace_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataset dataspace\n");
+                printf("    couldn't get dataset dataspace\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't select hyperslab for dataset write\n");
+                printf("    couldn't select hyperslab for dataset write\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -430,7 +429,7 @@ test_write_dataset_data_verification(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     PART_ERROR(H5Dwrite_hyperslab_read);
                 }
             }
@@ -438,7 +437,7 @@ test_write_dataset_data_verification(void)
             if (H5Dwrite(dset_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_DTYPE, mspace_id, fspace_id,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2);
+                printf("    couldn't write to dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -476,66 +475,66 @@ test_write_dataset_data_verification(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
             if ((group_id =
                      H5Gopen2(container_group, DATASET_WRITE_DATA_VERIFY_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container sub-group '%s'\n",
-                         DATASET_WRITE_DATA_VERIFY_TEST_GROUP_NAME);
+                printf("    couldn't open container sub-group '%s'\n",
+                       DATASET_WRITE_DATA_VERIFY_TEST_GROUP_NAME);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2);
+                printf("    couldn't open dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if ((fspace_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataset dataspace\n");
+                printf("    couldn't get dataset dataspace\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataspace num points\n");
+                printf("    couldn't get dataspace num points\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if (NULL ==
                 (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_WRITE_DATA_VERIFY_TEST_DTYPE_SIZE))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
             if (H5Dread(dset_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                         read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2);
+                printf("    couldn't read from dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2);
                 PART_ERROR(H5Dwrite_hyperslab_read);
             }
 
@@ -547,7 +546,7 @@ test_write_dataset_data_verification(void)
                              read_buf)[j + (i * (data_size / DATASET_WRITE_DATA_VERIFY_TEST_DTYPE_SIZE))] !=
                         (int)i) {
                         H5_FAILED();
-                        HDprintf("    hyperslab selection data verification failed\n");
+                        printf("    hyperslab selection data verification failed\n");
                         PART_ERROR(H5Dwrite_hyperslab_read);
                     }
                 }
@@ -605,7 +604,7 @@ test_write_dataset_data_verification(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -617,7 +616,7 @@ test_write_dataset_data_verification(void)
                                            (data_size / DATASET_WRITE_DATA_VERIFY_TEST_DTYPE_SIZE) *
                                            sizeof(hsize_t)))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for point selection\n");
+                printf("    couldn't allocate buffer for point selection\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -642,20 +641,20 @@ test_write_dataset_data_verification(void)
 
             if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3);
+                printf("    couldn't open dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if ((fspace_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataset dataspace\n");
+                printf("    couldn't get dataset dataspace\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if (H5Sselect_elements(fspace_id, H5S_SELECT_SET,
                                    data_size / DATASET_WRITE_DATA_VERIFY_TEST_DTYPE_SIZE, points) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't select elements in dataspace\n");
+                printf("    couldn't select elements in dataspace\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -664,7 +663,7 @@ test_write_dataset_data_verification(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     PART_ERROR(H5Dwrite_point_sel_read);
                 }
             }
@@ -672,7 +671,7 @@ test_write_dataset_data_verification(void)
             if (H5Dwrite(dset_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_DTYPE, mspace_id, fspace_id,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3);
+                printf("    couldn't write to dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -710,66 +709,66 @@ test_write_dataset_data_verification(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
             if ((group_id =
                      H5Gopen2(container_group, DATASET_WRITE_DATA_VERIFY_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container sub-group '%s'\n",
-                         DATASET_WRITE_DATA_VERIFY_TEST_GROUP_NAME);
+                printf("    couldn't open container sub-group '%s'\n",
+                       DATASET_WRITE_DATA_VERIFY_TEST_GROUP_NAME);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3);
+                printf("    couldn't open dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if ((fspace_id = H5Dget_space(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataset dataspace\n");
+                printf("    couldn't get dataset dataspace\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't get dataspace num points\n");
+                printf("    couldn't get dataspace num points\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if (NULL ==
                 (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_WRITE_DATA_VERIFY_TEST_DTYPE_SIZE))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
             if (H5Dread(dset_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                         read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3);
+                printf("    couldn't read from dataset '%s'\n", DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3);
                 PART_ERROR(H5Dwrite_point_sel_read);
             }
 
@@ -781,7 +780,7 @@ test_write_dataset_data_verification(void)
                              read_buf)[j + (i * (data_size / DATASET_WRITE_DATA_VERIFY_TEST_DTYPE_SIZE))] !=
                         (mpi_size - (int)i)) {
                         H5_FAILED();
-                        HDprintf("    point selection data verification failed\n");
+                        printf("    point selection data verification failed\n");
                         PART_ERROR(H5Dwrite_point_sel_read);
                     }
                 }
@@ -933,8 +932,7 @@ test_write_dataset_independent(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -943,20 +941,20 @@ test_write_dataset_independent(void)
 
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_INDEPENDENT_WRITE_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n", DATASET_INDEPENDENT_WRITE_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n", DATASET_INDEPENDENT_WRITE_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -975,14 +973,14 @@ test_write_dataset_independent(void)
                                DATASET_INDEPENDENT_WRITE_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to create first dataset\n");
+        printf("    failed to create first dataset\n");
         goto error;
     }
     if ((dset_id2 = H5Dcreate2(group_id, DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME2,
                                DATASET_INDEPENDENT_WRITE_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT,
                                H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    failed to create second dataset\n");
+        printf("    failed to create second dataset\n");
         goto error;
     }
 
@@ -992,7 +990,7 @@ test_write_dataset_independent(void)
 
     if (NULL == (write_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         goto error;
     }
 
@@ -1015,7 +1013,7 @@ test_write_dataset_independent(void)
 
     if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -1024,7 +1022,7 @@ test_write_dataset_independent(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -1040,13 +1038,13 @@ test_write_dataset_independent(void)
             if (H5Dwrite(dset_id1, DATASET_INDEPENDENT_WRITE_TEST_DSET_DTYPE, mspace_id, fspace_id,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    even ranks failed to write to dataset 1\n");
+                printf("    even ranks failed to write to dataset 1\n");
                 INDEPENDENT_OP_ERROR(dset_write);
             }
             if (H5Dwrite(dset_id2, DATASET_INDEPENDENT_WRITE_TEST_DSET_DTYPE, mspace_id, fspace_id,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    even ranks failed to write to dataset 2\n");
+                printf("    even ranks failed to write to dataset 2\n");
                 INDEPENDENT_OP_ERROR(dset_write);
             }
         }
@@ -1054,13 +1052,13 @@ test_write_dataset_independent(void)
             if (H5Dwrite(dset_id2, DATASET_INDEPENDENT_WRITE_TEST_DSET_DTYPE, mspace_id, fspace_id,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    odd ranks failed to write to dataset 2\n");
+                printf("    odd ranks failed to write to dataset 2\n");
                 INDEPENDENT_OP_ERROR(dset_write);
             }
             if (H5Dwrite(dset_id1, DATASET_INDEPENDENT_WRITE_TEST_DSET_DTYPE, mspace_id, fspace_id,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    odd ranks failed to write to dataset 1\n");
+                printf("    odd ranks failed to write to dataset 1\n");
                 INDEPENDENT_OP_ERROR(dset_write);
             }
         }
@@ -1086,43 +1084,43 @@ test_write_dataset_independent(void)
      */
     if (H5Gclose(group_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close test's container group\n");
+        printf("    failed to close test's container group\n");
         goto error;
     }
     if (H5Gclose(container_group) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close container group\n");
+        printf("    failed to close container group\n");
         goto error;
     }
     if (H5Fclose(file_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close file for data flushing\n");
+        printf("    failed to close file for data flushing\n");
         goto error;
     }
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_INDEPENDENT_WRITE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n", DATASET_INDEPENDENT_WRITE_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n", DATASET_INDEPENDENT_WRITE_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id1 = H5Dopen2(group_id, DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME1);
+        printf("    couldn't open dataset '%s'\n", DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME1);
         goto error;
     }
     if ((dset_id2 = H5Dopen2(group_id, DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME2);
+        printf("    couldn't open dataset '%s'\n", DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME2);
         goto error;
     }
 
@@ -1131,26 +1129,26 @@ test_write_dataset_independent(void)
      */
     if ((fspace_id = H5Dget_space(dset_id1)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
     if (NULL == (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_INDEPENDENT_WRITE_TEST_DTYPE_SIZE))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
     if (H5Dread(dset_id1, DATASET_INDEPENDENT_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME1);
+        printf("    couldn't read from dataset '%s'\n", DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME1);
         goto error;
     }
 
@@ -1161,7 +1159,7 @@ test_write_dataset_independent(void)
             if (((int *)read_buf)[j + (i * (data_size / DATASET_INDEPENDENT_WRITE_TEST_DTYPE_SIZE))] !=
                 (int)i) {
                 H5_FAILED();
-                HDprintf("    dataset 1 data verification failed\n");
+                printf("    dataset 1 data verification failed\n");
                 goto error;
             }
         }
@@ -1170,7 +1168,7 @@ test_write_dataset_independent(void)
     if (H5Dread(dset_id2, DATASET_INDEPENDENT_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME2);
+        printf("    couldn't read from dataset '%s'\n", DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME2);
         goto error;
     }
 
@@ -1181,7 +1179,7 @@ test_write_dataset_independent(void)
             if (((int *)read_buf)[j + (i * (data_size / DATASET_INDEPENDENT_WRITE_TEST_DTYPE_SIZE))] !=
                 (int)i) {
                 H5_FAILED();
-                HDprintf("    dataset 2 data verification failed\n");
+                printf("    dataset 2 data verification failed\n");
                 goto error;
             }
         }
@@ -1273,8 +1271,7 @@ test_write_dataset_one_proc_0_selection(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -1283,21 +1280,21 @@ test_write_dataset_one_proc_0_selection(void)
 
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_WRITE_ONE_PROC_0_SEL_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_WRITE_ONE_PROC_0_SEL_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_WRITE_ONE_PROC_0_SEL_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -1311,7 +1308,7 @@ test_write_dataset_one_proc_0_selection(void)
                               DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_NAME);
         goto error;
     }
 
@@ -1324,7 +1321,7 @@ test_write_dataset_one_proc_0_selection(void)
         if (!MAINPROCESS) {
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(write_buf_alloc);
             }
 
@@ -1350,7 +1347,7 @@ test_write_dataset_one_proc_0_selection(void)
 
     if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -1362,7 +1359,7 @@ test_write_dataset_one_proc_0_selection(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -1372,7 +1369,7 @@ test_write_dataset_one_proc_0_selection(void)
         if (H5Dwrite(dset_id, DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT,
                      write_buf) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't write to dataset '%s'\n", DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_NAME);
+            printf("    couldn't write to dataset '%s'\n", DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_NAME);
             INDEPENDENT_OP_ERROR(dset_write);
         }
     }
@@ -1412,66 +1409,65 @@ test_write_dataset_one_proc_0_selection(void)
      */
     if (H5Gclose(group_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close test's container group\n");
+        printf("    failed to close test's container group\n");
         goto error;
     }
     if (H5Gclose(container_group) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close container group\n");
+        printf("    failed to close container group\n");
         goto error;
     }
     if (H5Fclose(file_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close file for data flushing\n");
+        printf("    failed to close file for data flushing\n");
         goto error;
     }
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_WRITE_ONE_PROC_0_SEL_TEST_GROUP_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_WRITE_ONE_PROC_0_SEL_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n", DATASET_WRITE_ONE_PROC_0_SEL_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
     if (NULL ==
         (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_WRITE_ONE_PROC_0_SEL_TEST_DTYPE_SIZE))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
     if (H5Dread(dset_id, DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_NAME);
         goto error;
     }
 
@@ -1483,7 +1479,7 @@ test_write_dataset_one_proc_0_selection(void)
                 if (((int *)read_buf)[j + (i * (data_size / DATASET_WRITE_ONE_PROC_0_SEL_TEST_DTYPE_SIZE))] !=
                     (int)i) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     goto error;
                 }
             }
@@ -1573,8 +1569,7 @@ test_write_dataset_one_proc_none_selection(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -1583,21 +1578,21 @@ test_write_dataset_one_proc_none_selection(void)
 
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -1611,7 +1606,7 @@ test_write_dataset_one_proc_none_selection(void)
                               DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
         goto error;
     }
 
@@ -1624,7 +1619,7 @@ test_write_dataset_one_proc_none_selection(void)
         if (!MAINPROCESS) {
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(write_buf_alloc);
             }
 
@@ -1653,14 +1648,14 @@ test_write_dataset_one_proc_none_selection(void)
         if (MAINPROCESS) {
             if (H5Sselect_none(fspace_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set 'none' selection for dataset write\n");
+                printf("    couldn't set 'none' selection for dataset write\n");
                 INDEPENDENT_OP_ERROR(set_space_sel);
             }
         }
         else {
             if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't select hyperslab for dataset write\n");
+                printf("    couldn't select hyperslab for dataset write\n");
                 INDEPENDENT_OP_ERROR(set_space_sel);
             }
         }
@@ -1675,7 +1670,7 @@ test_write_dataset_one_proc_none_selection(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -1685,7 +1680,7 @@ test_write_dataset_one_proc_none_selection(void)
         if (H5Dwrite(dset_id, DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_DTYPE, mspace_id, fspace_id,
                      H5P_DEFAULT, write_buf) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't write to dataset '%s'\n", DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
+            printf("    couldn't write to dataset '%s'\n", DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
             INDEPENDENT_OP_ERROR(dset_write);
         }
     }
@@ -1725,66 +1720,66 @@ test_write_dataset_one_proc_none_selection(void)
      */
     if (H5Gclose(group_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close test's container group\n");
+        printf("    failed to close test's container group\n");
         goto error;
     }
     if (H5Gclose(container_group) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close container group\n");
+        printf("    failed to close container group\n");
         goto error;
     }
     if (H5Fclose(file_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close file for data flushing\n");
+        printf("    failed to close file for data flushing\n");
         goto error;
     }
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_GROUP_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
     if (NULL ==
         (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DTYPE_SIZE))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
     if (H5Dread(dset_id, DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
         goto error;
     }
 
@@ -1797,7 +1792,7 @@ test_write_dataset_one_proc_none_selection(void)
                          read_buf)[j + (i * (data_size / DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DTYPE_SIZE))] !=
                     (int)i) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     goto error;
                 }
             }
@@ -1884,8 +1879,7 @@ test_write_dataset_one_proc_all_selection(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -1894,21 +1888,21 @@ test_write_dataset_one_proc_all_selection(void)
 
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -1922,7 +1916,7 @@ test_write_dataset_one_proc_all_selection(void)
                               DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
         goto error;
     }
 
@@ -1935,7 +1929,7 @@ test_write_dataset_one_proc_all_selection(void)
         if (MAINPROCESS) {
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(write_buf_alloc);
             }
 
@@ -1950,14 +1944,14 @@ test_write_dataset_one_proc_all_selection(void)
         if (MAINPROCESS) {
             if (H5Sselect_all(fspace_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set 'all' selection for dataset write\n");
+                printf("    couldn't set 'all' selection for dataset write\n");
                 INDEPENDENT_OP_ERROR(set_space_sel);
             }
         }
         else {
             if (H5Sselect_none(fspace_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set 'none' selection for dataset write\n");
+                printf("    couldn't set 'none' selection for dataset write\n");
                 INDEPENDENT_OP_ERROR(set_space_sel);
             }
         }
@@ -1972,7 +1966,7 @@ test_write_dataset_one_proc_all_selection(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -1982,7 +1976,7 @@ test_write_dataset_one_proc_all_selection(void)
         if (H5Dwrite(dset_id, DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_DTYPE, mspace_id, fspace_id,
                      H5P_DEFAULT, write_buf) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't write to dataset '%s'\n", DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
+            printf("    couldn't write to dataset '%s'\n", DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
             INDEPENDENT_OP_ERROR(dset_write);
         }
     }
@@ -2022,73 +2016,73 @@ test_write_dataset_one_proc_all_selection(void)
      */
     if (H5Gclose(group_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close test's container group\n");
+        printf("    failed to close test's container group\n");
         goto error;
     }
     if (H5Gclose(container_group) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close container group\n");
+        printf("    failed to close container group\n");
         goto error;
     }
     if (H5Fclose(file_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close file for data flushing\n");
+        printf("    failed to close file for data flushing\n");
         goto error;
     }
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_GROUP_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
     if (NULL ==
         (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DTYPE_SIZE))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
     if (H5Dread(dset_id, DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
         goto error;
     }
 
     for (i = 0; i < data_size / DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DTYPE_SIZE; i++) {
         if (((int *)read_buf)[i] != (int)i) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         }
     }
@@ -2182,8 +2176,7 @@ test_write_dataset_hyper_file_all_mem(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -2192,21 +2185,21 @@ test_write_dataset_hyper_file_all_mem(void)
 
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2220,7 +2213,7 @@ test_write_dataset_hyper_file_all_mem(void)
                               DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -2230,7 +2223,7 @@ test_write_dataset_hyper_file_all_mem(void)
 
     if (NULL == (write_buf = HDmalloc(data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         goto error;
     }
 
@@ -2253,14 +2246,14 @@ test_write_dataset_hyper_file_all_mem(void)
 
     if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
     if (H5Dwrite(dset_id, DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_DTYPE, H5S_ALL, fspace_id, H5P_DEFAULT,
                  write_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't write to dataset '%s'\n", DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_NAME);
+        printf("    couldn't write to dataset '%s'\n", DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -2290,66 +2283,66 @@ test_write_dataset_hyper_file_all_mem(void)
      */
     if (H5Gclose(group_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close test's container group\n");
+        printf("    failed to close test's container group\n");
         goto error;
     }
     if (H5Gclose(container_group) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close container group\n");
+        printf("    failed to close container group\n");
         goto error;
     }
     if (H5Fclose(file_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close file for data flushing\n");
+        printf("    failed to close file for data flushing\n");
         goto error;
     }
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id =
              H5Gopen2(container_group, DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
     if (NULL ==
         (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DTYPE_SIZE))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
     if (H5Dread(dset_id, DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -2360,7 +2353,7 @@ test_write_dataset_hyper_file_all_mem(void)
             if (((int *)read_buf)[j + (i * (data_size / DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DTYPE_SIZE))] !=
                 (int)i) {
                 H5_FAILED();
-                HDprintf("    data verification failed\n");
+                printf("    data verification failed\n");
                 goto error;
             }
         }
@@ -2451,8 +2444,7 @@ test_write_dataset_all_file_hyper_mem(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -2461,21 +2453,21 @@ test_write_dataset_all_file_hyper_mem(void)
 
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2489,7 +2481,7 @@ test_write_dataset_all_file_hyper_mem(void)
                               DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -2507,7 +2499,7 @@ test_write_dataset_all_file_hyper_mem(void)
              */
             if (NULL == (write_buf = HDmalloc(2 * data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(write_buf_alloc);
             }
 
@@ -2538,21 +2530,21 @@ test_write_dataset_all_file_hyper_mem(void)
 
             if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create memory dataspace\n");
+                printf("    couldn't create memory dataspace\n");
                 INDEPENDENT_OP_ERROR(dset_write);
             }
 
             if (H5Sselect_hyperslab(mspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't select hyperslab for dataset write\n");
+                printf("    couldn't select hyperslab for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_write);
             }
 
             if (H5Dwrite(dset_id, DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_DTYPE, mspace_id, H5S_ALL,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n",
+                       DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_write);
             }
         }
@@ -2593,73 +2585,73 @@ test_write_dataset_all_file_hyper_mem(void)
      */
     if (H5Gclose(group_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close test's container group\n");
+        printf("    failed to close test's container group\n");
         goto error;
     }
     if (H5Gclose(container_group) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close container group\n");
+        printf("    failed to close container group\n");
         goto error;
     }
     if (H5Fclose(file_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close file for data flushing\n");
+        printf("    failed to close file for data flushing\n");
         goto error;
     }
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id =
              H5Gopen2(container_group, DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
     if (NULL ==
         (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DTYPE_SIZE))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
     if (H5Dread(dset_id, DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
         goto error;
     }
 
     for (i = 0; i < data_size / DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DTYPE_SIZE; i++) {
         if (((int *)read_buf)[i] != (int)i) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         }
     }
@@ -2760,8 +2752,7 @@ test_write_dataset_all_file_point_mem(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -2770,21 +2761,21 @@ test_write_dataset_all_file_point_mem(void)
 
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_GROUP_NAME, H5P_DEFAULT,
                                H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -2798,7 +2789,7 @@ test_write_dataset_all_file_point_mem(void)
                               DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -2816,7 +2807,7 @@ test_write_dataset_all_file_point_mem(void)
              */
             if (NULL == (write_buf = HDmalloc(2 * data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(write_buf_alloc);
             }
 
@@ -2844,14 +2835,14 @@ test_write_dataset_all_file_point_mem(void)
 
             if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create memory dataspace\n");
+                printf("    couldn't create memory dataspace\n");
                 INDEPENDENT_OP_ERROR(dset_write);
             }
 
             if (NULL == (points = HDmalloc((data_size / DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DTYPE_SIZE) *
                                            sizeof(hsize_t)))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for point selection\n");
+                printf("    couldn't allocate buffer for point selection\n");
                 INDEPENDENT_OP_ERROR(dset_write);
             }
 
@@ -2865,15 +2856,15 @@ test_write_dataset_all_file_point_mem(void)
                                    data_size / DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DTYPE_SIZE,
                                    points) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set point selection for dataset write\n");
+                printf("    couldn't set point selection for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_write);
             }
 
             if (H5Dwrite(dset_id, DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_DTYPE, mspace_id, H5S_ALL,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n",
+                       DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_write);
             }
         }
@@ -2918,73 +2909,73 @@ test_write_dataset_all_file_point_mem(void)
      */
     if (H5Gclose(group_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close test's container group\n");
+        printf("    failed to close test's container group\n");
         goto error;
     }
     if (H5Gclose(container_group) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close container group\n");
+        printf("    failed to close container group\n");
         goto error;
     }
     if (H5Fclose(file_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close file for data flushing\n");
+        printf("    failed to close file for data flushing\n");
         goto error;
     }
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id =
              H5Gopen2(container_group, DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
     if (NULL ==
         (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DTYPE_SIZE))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
     if (H5Dread(dset_id, DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
         goto error;
     }
 
     for (i = 0; i < data_size / DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DTYPE_SIZE; i++) {
         if (((int *)read_buf)[i] != (int)i) {
             H5_FAILED();
-            HDprintf("    data verification failed\n");
+            printf("    data verification failed\n");
             goto error;
         }
     }
@@ -3076,8 +3067,7 @@ test_write_dataset_hyper_file_point_mem(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -3086,21 +3076,21 @@ test_write_dataset_hyper_file_point_mem(void)
 
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -3114,7 +3104,7 @@ test_write_dataset_hyper_file_point_mem(void)
                               DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -3129,7 +3119,7 @@ test_write_dataset_hyper_file_point_mem(void)
      */
     if (NULL == (write_buf = HDmalloc(2 * data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         goto error;
     }
 
@@ -3157,7 +3147,7 @@ test_write_dataset_hyper_file_point_mem(void)
 
     if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset write\n");
+        printf("    couldn't select hyperslab for dataset write\n");
         goto error;
     }
 
@@ -3167,14 +3157,14 @@ test_write_dataset_hyper_file_point_mem(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
 
         if (NULL == (points = HDmalloc((data_size / DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DTYPE_SIZE) *
                                        sizeof(hsize_t)))) {
             H5_FAILED();
-            HDprintf("    couldn't allocate buffer for point selection\n");
+            printf("    couldn't allocate buffer for point selection\n");
             goto error;
         }
 
@@ -3187,7 +3177,7 @@ test_write_dataset_hyper_file_point_mem(void)
         if (H5Sselect_elements(mspace_id, H5S_SELECT_SET,
                                data_size / DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DTYPE_SIZE, points) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set point selection for dataset write\n");
+            printf("    couldn't set point selection for dataset write\n");
             goto error;
         }
     }
@@ -3195,7 +3185,7 @@ test_write_dataset_hyper_file_point_mem(void)
     if (H5Dwrite(dset_id, DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_DTYPE, mspace_id, fspace_id,
                  H5P_DEFAULT, write_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't write to dataset '%s'\n", DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
+        printf("    couldn't write to dataset '%s'\n", DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -3237,66 +3227,66 @@ test_write_dataset_hyper_file_point_mem(void)
      */
     if (H5Gclose(group_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close test's container group\n");
+        printf("    failed to close test's container group\n");
         goto error;
     }
     if (H5Gclose(container_group) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close container group\n");
+        printf("    failed to close container group\n");
         goto error;
     }
     if (H5Fclose(file_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close file for data flushing\n");
+        printf("    failed to close file for data flushing\n");
         goto error;
     }
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME,
                              H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
     if (NULL ==
         (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DTYPE_SIZE))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
     if (H5Dread(dset_id, DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -3308,7 +3298,7 @@ test_write_dataset_hyper_file_point_mem(void)
                      read_buf)[j + (i * (data_size / DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DTYPE_SIZE))] !=
                 (int)i) {
                 H5_FAILED();
-                HDprintf("    data verification failed\n");
+                printf("    data verification failed\n");
                 goto error;
             }
         }
@@ -3397,8 +3387,7 @@ test_write_dataset_point_file_hyper_mem(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -3407,21 +3396,21 @@ test_write_dataset_point_file_hyper_mem(void)
 
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
 
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((group_id = H5Gcreate2(container_group, DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME,
                                H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create container sub-group '%s'\n",
-                 DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME);
+        printf("    couldn't create container sub-group '%s'\n",
+               DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -3435,7 +3424,7 @@ test_write_dataset_point_file_hyper_mem(void)
                               DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                               H5P_DEFAULT, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create dataset '%s'\n", DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
+        printf("    couldn't create dataset '%s'\n", DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -3450,7 +3439,7 @@ test_write_dataset_point_file_hyper_mem(void)
      */
     if (NULL == (write_buf = HDmalloc(2 * data_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset write\n");
+        printf("    couldn't allocate buffer for dataset write\n");
         goto error;
     }
 
@@ -3465,7 +3454,7 @@ test_write_dataset_point_file_hyper_mem(void)
     if (NULL == (points = HDmalloc((data_size / DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DTYPE_SIZE) *
                                    DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_SPACE_RANK * sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for point selection\n");
+        printf("    couldn't allocate buffer for point selection\n");
         goto error;
     }
 
@@ -3487,7 +3476,7 @@ test_write_dataset_point_file_hyper_mem(void)
     if (H5Sselect_elements(fspace_id, H5S_SELECT_SET,
                            data_size / DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DTYPE_SIZE, points) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't set point selection for dataset write\n");
+        printf("    couldn't set point selection for dataset write\n");
         goto error;
     }
 
@@ -3500,13 +3489,13 @@ test_write_dataset_point_file_hyper_mem(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
 
         if (H5Sselect_hyperslab(mspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set hyperslab selection for dataset write\n");
+            printf("    couldn't set hyperslab selection for dataset write\n");
             goto error;
         }
     }
@@ -3514,7 +3503,7 @@ test_write_dataset_point_file_hyper_mem(void)
     if (H5Dwrite(dset_id, DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_DTYPE, mspace_id, fspace_id,
                  H5P_DEFAULT, write_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't write to dataset '%s'\n", DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
+        printf("    couldn't write to dataset '%s'\n", DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -3556,66 +3545,66 @@ test_write_dataset_point_file_hyper_mem(void)
      */
     if (H5Gclose(group_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close test's container group\n");
+        printf("    failed to close test's container group\n");
         goto error;
     }
     if (H5Gclose(container_group) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close container group\n");
+        printf("    failed to close container group\n");
         goto error;
     }
     if (H5Fclose(file_id) < 0) {
         H5_FAILED();
-        HDprintf("    failed to close file for data flushing\n");
+        printf("    failed to close file for data flushing\n");
         goto error;
     }
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME,
                              H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
     if (NULL ==
         (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DTYPE_SIZE))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
     if (H5Dread(dset_id, DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -3627,7 +3616,7 @@ test_write_dataset_point_file_hyper_mem(void)
                      read_buf)[j + (i * (data_size / DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DTYPE_SIZE))] !=
                 (int)i) {
                 H5_FAILED();
-                HDprintf("    data verification failed\n");
+                printf("    data verification failed\n");
                 goto error;
             }
         }
@@ -3718,8 +3707,7 @@ test_read_dataset_one_proc_0_selection(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -3734,27 +3722,27 @@ test_read_dataset_one_proc_0_selection(void)
         if (MAINPROCESS) {
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((group_id = H5Gcreate2(container_group, DATASET_READ_ONE_PROC_0_SEL_TEST_GROUP_NAME,
                                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container sub-group '%s'\n",
-                         DATASET_READ_ONE_PROC_0_SEL_TEST_GROUP_NAME);
+                printf("    couldn't create container sub-group '%s'\n",
+                       DATASET_READ_ONE_PROC_0_SEL_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((fspace_id = H5Screate_simple(DATASET_READ_ONE_PROC_0_SEL_TEST_SPACE_RANK, dims, NULL)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create file dataspace for dataset\n");
+                printf("    failed to create file dataspace for dataset\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -3762,7 +3750,7 @@ test_read_dataset_one_proc_0_selection(void)
                                       DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n", DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n", DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -3772,7 +3760,7 @@ test_read_dataset_one_proc_0_selection(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -3792,7 +3780,7 @@ test_read_dataset_one_proc_0_selection(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     INDEPENDENT_OP_ERROR(dset_create);
                 }
             }
@@ -3800,7 +3788,7 @@ test_read_dataset_one_proc_0_selection(void)
             if (H5Dwrite(dset_id, DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_DTYPE, mspace_id, H5S_ALL,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n", DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n", DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -3838,17 +3826,17 @@ test_read_dataset_one_proc_0_selection(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
         }
@@ -3862,36 +3850,36 @@ test_read_dataset_one_proc_0_selection(void)
         TEST_ERROR;
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_READ_ONE_PROC_0_SEL_TEST_GROUP_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n", DATASET_READ_ONE_PROC_0_SEL_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n", DATASET_READ_ONE_PROC_0_SEL_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
@@ -3903,7 +3891,7 @@ test_read_dataset_one_proc_0_selection(void)
 
             if (NULL == (read_buf = HDmalloc(read_buf_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 INDEPENDENT_OP_ERROR(read_buf_alloc);
             }
         }
@@ -3918,7 +3906,7 @@ test_read_dataset_one_proc_0_selection(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -3939,7 +3927,7 @@ test_read_dataset_one_proc_0_selection(void)
 
     if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset read\n");
+        printf("    couldn't select hyperslab for dataset read\n");
         goto error;
     }
 
@@ -3948,7 +3936,7 @@ test_read_dataset_one_proc_0_selection(void)
         if (H5Dread(dset_id, DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT,
                     read_buf) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't read from dataset '%s'\n", DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_NAME);
+            printf("    couldn't read from dataset '%s'\n", DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_NAME);
             INDEPENDENT_OP_ERROR(dset_read);
         }
     }
@@ -3960,7 +3948,7 @@ test_read_dataset_one_proc_0_selection(void)
             for (i = 0; i < (size_t)space_npoints / (size_t)mpi_size; i++) {
                 if (((int *)read_buf)[i] != mpi_rank) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     INDEPENDENT_OP_ERROR(data_verify);
                 }
             }
@@ -4053,8 +4041,7 @@ test_read_dataset_one_proc_none_selection(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -4069,28 +4056,28 @@ test_read_dataset_one_proc_none_selection(void)
         if (MAINPROCESS) {
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((group_id = H5Gcreate2(container_group, DATASET_READ_ONE_PROC_NONE_SEL_TEST_GROUP_NAME,
                                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container sub-group '%s'\n",
-                         DATASET_READ_ONE_PROC_NONE_SEL_TEST_GROUP_NAME);
+                printf("    couldn't create container sub-group '%s'\n",
+                       DATASET_READ_ONE_PROC_NONE_SEL_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((fspace_id = H5Screate_simple(DATASET_READ_ONE_PROC_NONE_SEL_TEST_SPACE_RANK, dims, NULL)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    failed to create file dataspace for dataset\n");
+                printf("    failed to create file dataspace for dataset\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -4098,7 +4085,7 @@ test_read_dataset_one_proc_none_selection(void)
                                       DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n", DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n", DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -4108,7 +4095,7 @@ test_read_dataset_one_proc_none_selection(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -4128,7 +4115,7 @@ test_read_dataset_one_proc_none_selection(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     INDEPENDENT_OP_ERROR(dset_create);
                 }
             }
@@ -4136,8 +4123,7 @@ test_read_dataset_one_proc_none_selection(void)
             if (H5Dwrite(dset_id, DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_DTYPE, mspace_id, H5S_ALL,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n", DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -4175,17 +4161,17 @@ test_read_dataset_one_proc_none_selection(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
         }
@@ -4199,37 +4185,37 @@ test_read_dataset_one_proc_none_selection(void)
         TEST_ERROR;
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_READ_ONE_PROC_NONE_SEL_TEST_GROUP_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_READ_ONE_PROC_NONE_SEL_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_READ_ONE_PROC_NONE_SEL_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
@@ -4241,7 +4227,7 @@ test_read_dataset_one_proc_none_selection(void)
 
             if (NULL == (read_buf = HDmalloc(read_buf_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 INDEPENDENT_OP_ERROR(read_buf_alloc);
             }
         }
@@ -4256,7 +4242,7 @@ test_read_dataset_one_proc_none_selection(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -4280,14 +4266,14 @@ test_read_dataset_one_proc_none_selection(void)
         if (MAINPROCESS) {
             if (H5Sselect_none(fspace_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set 'none' selection for dataset read\n");
+                printf("    couldn't set 'none' selection for dataset read\n");
                 INDEPENDENT_OP_ERROR(set_space_sel);
             }
         }
         else {
             if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't select hyperslab for dataset read\n");
+                printf("    couldn't select hyperslab for dataset read\n");
                 INDEPENDENT_OP_ERROR(set_space_sel);
             }
         }
@@ -4299,7 +4285,7 @@ test_read_dataset_one_proc_none_selection(void)
         if (H5Dread(dset_id, DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_DTYPE, mspace_id, fspace_id,
                     H5P_DEFAULT, read_buf) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't read from dataset '%s'\n", DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
+            printf("    couldn't read from dataset '%s'\n", DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_NAME);
             INDEPENDENT_OP_ERROR(dset_read);
         }
     }
@@ -4311,7 +4297,7 @@ test_read_dataset_one_proc_none_selection(void)
             for (i = 0; i < (size_t)space_npoints / (size_t)mpi_size; i++) {
                 if (((int *)read_buf)[i] != mpi_rank) {
                     H5_FAILED();
-                    HDprintf("    data verification failed\n");
+                    printf("    data verification failed\n");
                     INDEPENDENT_OP_ERROR(data_verify);
                 }
             }
@@ -4401,8 +4387,7 @@ test_read_dataset_one_proc_all_selection(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -4417,28 +4402,28 @@ test_read_dataset_one_proc_all_selection(void)
         if (MAINPROCESS) {
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((group_id = H5Gcreate2(container_group, DATASET_READ_ONE_PROC_ALL_SEL_TEST_GROUP_NAME,
                                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container sub-group '%s'\n",
-                         DATASET_READ_ONE_PROC_ALL_SEL_TEST_GROUP_NAME);
+                printf("    couldn't create container sub-group '%s'\n",
+                       DATASET_READ_ONE_PROC_ALL_SEL_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((fspace_id = H5Screate_simple(DATASET_READ_ONE_PROC_ALL_SEL_TEST_SPACE_RANK, dims, NULL)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    failed to create file dataspace for dataset\n");
+                printf("    failed to create file dataspace for dataset\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -4446,7 +4431,7 @@ test_read_dataset_one_proc_all_selection(void)
                                       DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n", DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n", DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -4456,7 +4441,7 @@ test_read_dataset_one_proc_all_selection(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -4476,7 +4461,7 @@ test_read_dataset_one_proc_all_selection(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     INDEPENDENT_OP_ERROR(dset_create);
                 }
             }
@@ -4484,8 +4469,7 @@ test_read_dataset_one_proc_all_selection(void)
             if (H5Dwrite(dset_id, DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_DTYPE, mspace_id, H5S_ALL,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n", DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -4523,17 +4507,17 @@ test_read_dataset_one_proc_all_selection(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
         }
@@ -4547,37 +4531,36 @@ test_read_dataset_one_proc_all_selection(void)
         TEST_ERROR;
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_READ_ONE_PROC_ALL_SEL_TEST_GROUP_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_READ_ONE_PROC_ALL_SEL_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n", DATASET_READ_ONE_PROC_ALL_SEL_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
@@ -4588,7 +4571,7 @@ test_read_dataset_one_proc_all_selection(void)
 
             if (NULL == (read_buf = HDmalloc(read_buf_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 INDEPENDENT_OP_ERROR(read_buf_alloc);
             }
         }
@@ -4603,7 +4586,7 @@ test_read_dataset_one_proc_all_selection(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
     }
@@ -4613,14 +4596,14 @@ test_read_dataset_one_proc_all_selection(void)
         if (MAINPROCESS) {
             if (H5Sselect_all(fspace_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set 'all' selection for dataset read\n");
+                printf("    couldn't set 'all' selection for dataset read\n");
                 INDEPENDENT_OP_ERROR(set_space_sel);
             }
         }
         else {
             if (H5Sselect_none(fspace_id) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set 'none' selection for dataset read\n");
+                printf("    couldn't set 'none' selection for dataset read\n");
                 INDEPENDENT_OP_ERROR(set_space_sel);
             }
         }
@@ -4632,7 +4615,7 @@ test_read_dataset_one_proc_all_selection(void)
         if (H5Dread(dset_id, DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT,
                     read_buf) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't read from dataset '%s'\n", DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
+            printf("    couldn't read from dataset '%s'\n", DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_NAME);
             INDEPENDENT_OP_ERROR(dset_read);
         }
     }
@@ -4650,7 +4633,7 @@ test_read_dataset_one_proc_all_selection(void)
 
                     if (((int *)read_buf)[idx] != (int)i) {
                         H5_FAILED();
-                        HDprintf("    data verification failed\n");
+                        printf("    data verification failed\n");
                         INDEPENDENT_OP_ERROR(data_verify);
                     }
                 }
@@ -4756,8 +4739,7 @@ test_read_dataset_all_file_hyper_mem(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -4772,28 +4754,28 @@ test_read_dataset_all_file_hyper_mem(void)
         if (MAINPROCESS) {
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((group_id = H5Gcreate2(container_group, DATASET_READ_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME,
                                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container sub-group '%s'\n",
-                         DATASET_READ_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME);
+                printf("    couldn't create container sub-group '%s'\n",
+                       DATASET_READ_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((fspace_id = H5Screate_simple(DATASET_READ_ALL_FILE_HYPER_MEM_TEST_SPACE_RANK, dims, NULL)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    failed to create file dataspace for dataset\n");
+                printf("    failed to create file dataspace for dataset\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -4801,8 +4783,7 @@ test_read_dataset_all_file_hyper_mem(void)
                                       DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n",
-                         DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n", DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -4812,7 +4793,7 @@ test_read_dataset_all_file_hyper_mem(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -4833,7 +4814,7 @@ test_read_dataset_all_file_hyper_mem(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     INDEPENDENT_OP_ERROR(dset_create);
                 }
             }
@@ -4841,8 +4822,8 @@ test_read_dataset_all_file_hyper_mem(void)
             if (H5Dwrite(dset_id, DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_DTYPE, mspace_id, H5S_ALL,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n",
+                       DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -4880,17 +4861,17 @@ test_read_dataset_all_file_hyper_mem(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
         }
@@ -4904,37 +4885,37 @@ test_read_dataset_all_file_hyper_mem(void)
         TEST_ERROR;
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_READ_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_READ_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_READ_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
@@ -4959,27 +4940,27 @@ test_read_dataset_all_file_hyper_mem(void)
             read_buf_size = (size_t)(2 * space_npoints) * DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DTYPE_SIZE;
             if (NULL == (read_buf = HDcalloc(1, read_buf_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 INDEPENDENT_OP_ERROR(dset_read);
             }
 
             if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create memory dataspace\n");
+                printf("    couldn't create memory dataspace\n");
                 INDEPENDENT_OP_ERROR(dset_read);
             }
 
             if (H5Sselect_hyperslab(mspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't select hyperslab for dataset read\n");
+                printf("    couldn't select hyperslab for dataset read\n");
                 INDEPENDENT_OP_ERROR(dset_read);
             }
 
             if (H5Dread(dset_id, DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_DTYPE, mspace_id, H5S_ALL,
                         H5P_DEFAULT, read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n",
-                         DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n",
+                       DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_read);
             }
 
@@ -4993,14 +4974,14 @@ test_read_dataset_all_file_hyper_mem(void)
                     if (j % 2 == 0) {
                         if (((int *)read_buf)[idx] != (int)i) {
                             H5_FAILED();
-                            HDprintf("    data verification failed\n");
+                            printf("    data verification failed\n");
                             INDEPENDENT_OP_ERROR(dset_read);
                         }
                     }
                     else {
                         if (((int *)read_buf)[idx] != 0) {
                             H5_FAILED();
-                            HDprintf("    data verification failed\n");
+                            printf("    data verification failed\n");
                             INDEPENDENT_OP_ERROR(dset_read);
                         }
                     }
@@ -5106,8 +5087,7 @@ test_read_dataset_all_file_point_mem(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -5122,28 +5102,28 @@ test_read_dataset_all_file_point_mem(void)
         if (MAINPROCESS) {
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((group_id = H5Gcreate2(container_group, DATASET_READ_ALL_FILE_POINT_MEM_TEST_GROUP_NAME,
                                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container sub-group '%s'\n",
-                         DATASET_READ_ALL_FILE_POINT_MEM_TEST_GROUP_NAME);
+                printf("    couldn't create container sub-group '%s'\n",
+                       DATASET_READ_ALL_FILE_POINT_MEM_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((fspace_id = H5Screate_simple(DATASET_READ_ALL_FILE_POINT_MEM_TEST_SPACE_RANK, dims, NULL)) <
                 0) {
                 H5_FAILED();
-                HDprintf("    failed to create file dataspace for dataset\n");
+                printf("    failed to create file dataspace for dataset\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -5151,8 +5131,7 @@ test_read_dataset_all_file_point_mem(void)
                                       DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT,
                                       H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n",
-                         DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n", DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -5162,7 +5141,7 @@ test_read_dataset_all_file_point_mem(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -5183,7 +5162,7 @@ test_read_dataset_all_file_point_mem(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     INDEPENDENT_OP_ERROR(dset_create);
                 }
             }
@@ -5191,8 +5170,8 @@ test_read_dataset_all_file_point_mem(void)
             if (H5Dwrite(dset_id, DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_DTYPE, mspace_id, H5S_ALL,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n",
+                       DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -5230,17 +5209,17 @@ test_read_dataset_all_file_point_mem(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
         }
@@ -5254,37 +5233,37 @@ test_read_dataset_all_file_point_mem(void)
         TEST_ERROR;
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_READ_ALL_FILE_POINT_MEM_TEST_GROUP_NAME, H5P_DEFAULT)) <
         0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_READ_ALL_FILE_POINT_MEM_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_READ_ALL_FILE_POINT_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
@@ -5306,19 +5285,19 @@ test_read_dataset_all_file_point_mem(void)
             read_buf_size = (size_t)(2 * space_npoints) * DATASET_READ_ALL_FILE_POINT_MEM_TEST_DTYPE_SIZE;
             if (NULL == (read_buf = HDcalloc(1, read_buf_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset read\n");
+                printf("    couldn't allocate buffer for dataset read\n");
                 INDEPENDENT_OP_ERROR(dset_read);
             }
 
             if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create memory dataspace\n");
+                printf("    couldn't create memory dataspace\n");
                 INDEPENDENT_OP_ERROR(dset_read);
             }
 
             if (NULL == (points = HDmalloc((size_t)space_npoints * sizeof(hsize_t)))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for point selection\n");
+                printf("    couldn't allocate buffer for point selection\n");
                 INDEPENDENT_OP_ERROR(dset_read);
             }
 
@@ -5330,15 +5309,15 @@ test_read_dataset_all_file_point_mem(void)
 
             if (H5Sselect_elements(mspace_id, H5S_SELECT_SET, (size_t)space_npoints, points) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't set point selection for dataset read\n");
+                printf("    couldn't set point selection for dataset read\n");
                 INDEPENDENT_OP_ERROR(dset_read);
             }
 
             if (H5Dread(dset_id, DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_DTYPE, mspace_id, H5S_ALL,
                         H5P_DEFAULT, read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n",
-                         DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n",
+                       DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_read);
             }
 
@@ -5351,14 +5330,14 @@ test_read_dataset_all_file_point_mem(void)
                     if (j % 2 == 0) {
                         if (((int *)read_buf)[idx] != (int)i) {
                             H5_FAILED();
-                            HDprintf("    data verification failed\n");
+                            printf("    data verification failed\n");
                             INDEPENDENT_OP_ERROR(dset_read);
                         }
                     }
                     else {
                         if (((int *)read_buf)[idx] != 0) {
                             H5_FAILED();
-                            HDprintf("    data verification failed\n");
+                            printf("    data verification failed\n");
                             INDEPENDENT_OP_ERROR(dset_read);
                         }
                     }
@@ -5460,8 +5439,7 @@ test_read_dataset_hyper_file_point_mem(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -5476,28 +5454,28 @@ test_read_dataset_hyper_file_point_mem(void)
         if (MAINPROCESS) {
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((group_id = H5Gcreate2(container_group, DATASET_READ_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME,
                                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container sub-group '%s'\n",
-                         DATASET_READ_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME);
+                printf("    couldn't create container sub-group '%s'\n",
+                       DATASET_READ_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((fspace_id =
                      H5Screate_simple(DATASET_READ_HYPER_FILE_POINT_MEM_TEST_SPACE_RANK, dims, NULL)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create file dataspace for dataset\n");
+                printf("    failed to create file dataspace for dataset\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -5505,8 +5483,8 @@ test_read_dataset_hyper_file_point_mem(void)
                                       DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_DTYPE, fspace_id,
                                       H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n",
-                         DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n",
+                       DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -5516,7 +5494,7 @@ test_read_dataset_hyper_file_point_mem(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -5537,7 +5515,7 @@ test_read_dataset_hyper_file_point_mem(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     INDEPENDENT_OP_ERROR(dset_create);
                 }
             }
@@ -5545,8 +5523,8 @@ test_read_dataset_hyper_file_point_mem(void)
             if (H5Dwrite(dset_id, DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_DTYPE, mspace_id, H5S_ALL,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n",
+                       DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -5584,17 +5562,17 @@ test_read_dataset_hyper_file_point_mem(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
         }
@@ -5608,37 +5586,37 @@ test_read_dataset_hyper_file_point_mem(void)
         TEST_ERROR;
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id =
              H5Gopen2(container_group, DATASET_READ_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_READ_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_READ_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
@@ -5650,7 +5628,7 @@ test_read_dataset_hyper_file_point_mem(void)
     read_buf_size = (2 * (size_t)(space_npoints / mpi_size) * DATASET_READ_ONE_PROC_NONE_SEL_TEST_DTYPE_SIZE);
     if (NULL == (read_buf = HDcalloc(1, read_buf_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
@@ -5670,7 +5648,7 @@ test_read_dataset_hyper_file_point_mem(void)
 
     if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't select hyperslab for dataset read\n");
+        printf("    couldn't select hyperslab for dataset read\n");
         goto error;
     }
 
@@ -5680,13 +5658,13 @@ test_read_dataset_hyper_file_point_mem(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
 
         if (NULL == (points = HDmalloc((size_t)(space_npoints / mpi_size) * sizeof(hsize_t)))) {
             H5_FAILED();
-            HDprintf("    couldn't allocate buffer for point selection\n");
+            printf("    couldn't allocate buffer for point selection\n");
             goto error;
         }
 
@@ -5698,7 +5676,7 @@ test_read_dataset_hyper_file_point_mem(void)
 
         if (H5Sselect_elements(mspace_id, H5S_SELECT_SET, (size_t)(space_npoints / mpi_size), points) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set point selection for dataset read\n");
+            printf("    couldn't set point selection for dataset read\n");
             goto error;
         }
     }
@@ -5706,7 +5684,7 @@ test_read_dataset_hyper_file_point_mem(void)
     if (H5Dread(dset_id, DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -5714,14 +5692,14 @@ test_read_dataset_hyper_file_point_mem(void)
         if (i % 2 == 0) {
             if (((int *)read_buf)[i] != (int)mpi_rank) {
                 H5_FAILED();
-                HDprintf("    data verification failed\n");
+                printf("    data verification failed\n");
                 goto error;
             }
         }
         else {
             if (((int *)read_buf)[i] != 0) {
                 H5_FAILED();
-                HDprintf("    data verification failed\n");
+                printf("    data verification failed\n");
                 goto error;
             }
         }
@@ -5815,8 +5793,7 @@ test_read_dataset_point_file_hyper_mem(void)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         SKIPPED();
-        HDprintf(
-            "    API functions for basic file, group, or dataset aren't supported with this connector\n");
+        printf("    API functions for basic file, group, or dataset aren't supported with this connector\n");
         return 0;
     }
 
@@ -5831,28 +5808,28 @@ test_read_dataset_point_file_hyper_mem(void)
         if (MAINPROCESS) {
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((group_id = H5Gcreate2(container_group, DATASET_READ_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME,
                                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container sub-group '%s'\n",
-                         DATASET_READ_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME);
+                printf("    couldn't create container sub-group '%s'\n",
+                       DATASET_READ_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((fspace_id =
                      H5Screate_simple(DATASET_READ_POINT_FILE_HYPER_MEM_TEST_SPACE_RANK, dims, NULL)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create file dataspace for dataset\n");
+                printf("    failed to create file dataspace for dataset\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -5860,8 +5837,8 @@ test_read_dataset_point_file_hyper_mem(void)
                                       DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_DTYPE, fspace_id,
                                       H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n",
-                         DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n",
+                       DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -5871,7 +5848,7 @@ test_read_dataset_point_file_hyper_mem(void)
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -5892,7 +5869,7 @@ test_read_dataset_point_file_hyper_mem(void)
 
                 if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't create memory dataspace\n");
+                    printf("    couldn't create memory dataspace\n");
                     INDEPENDENT_OP_ERROR(dset_create);
                 }
             }
@@ -5900,8 +5877,8 @@ test_read_dataset_point_file_hyper_mem(void)
             if (H5Dwrite(dset_id, DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_DTYPE, mspace_id, H5S_ALL,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n",
+                       DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -5939,17 +5916,17 @@ test_read_dataset_point_file_hyper_mem(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
         }
@@ -5963,37 +5940,37 @@ test_read_dataset_point_file_hyper_mem(void)
         TEST_ERROR;
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id =
              H5Gopen2(container_group, DATASET_READ_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_READ_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_READ_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id = H5Dopen2(group_id, DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n", DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
     if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataspace num points\n");
+        printf("    couldn't get dataspace num points\n");
         goto error;
     }
 
@@ -6006,7 +5983,7 @@ test_read_dataset_point_file_hyper_mem(void)
         (2 * (size_t)(space_npoints / mpi_size) * DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DTYPE_SIZE);
     if (NULL == (read_buf = HDcalloc(1, read_buf_size))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset read\n");
+        printf("    couldn't allocate buffer for dataset read\n");
         goto error;
     }
 
@@ -6014,7 +5991,7 @@ test_read_dataset_point_file_hyper_mem(void)
                                             DATASET_READ_POINT_FILE_HYPER_MEM_TEST_SPACE_RANK) *
                                    sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for point selection\n");
+        printf("    couldn't allocate buffer for point selection\n");
         goto error;
     }
 
@@ -6035,7 +6012,7 @@ test_read_dataset_point_file_hyper_mem(void)
 
     if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, (size_t)(space_npoints / mpi_size), points) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't set point selection for dataset read\n");
+        printf("    couldn't set point selection for dataset read\n");
         goto error;
     }
 
@@ -6048,13 +6025,13 @@ test_read_dataset_point_file_hyper_mem(void)
 
         if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create memory dataspace\n");
+            printf("    couldn't create memory dataspace\n");
             goto error;
         }
 
         if (H5Sselect_hyperslab(mspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't set hyperslab selection for dataset write\n");
+            printf("    couldn't set hyperslab selection for dataset write\n");
             goto error;
         }
     }
@@ -6062,7 +6039,7 @@ test_read_dataset_point_file_hyper_mem(void)
     if (H5Dread(dset_id, DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT,
                 read_buf) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't read from dataset '%s'\n", DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
+        printf("    couldn't read from dataset '%s'\n", DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_NAME);
         goto error;
     }
 
@@ -6070,14 +6047,14 @@ test_read_dataset_point_file_hyper_mem(void)
         if (i % 2 == 0) {
             if (((int *)read_buf)[i] != (int)mpi_rank) {
                 H5_FAILED();
-                HDprintf("    data verification failed\n");
+                printf("    data verification failed\n");
                 goto error;
             }
         }
         else {
             if (((int *)read_buf)[i] != 0) {
                 H5_FAILED();
-                HDprintf("    data verification failed\n");
+                printf("    data verification failed\n");
                 goto error;
             }
         }
@@ -6183,22 +6160,22 @@ test_write_multi_chunk_dataset_same_shape_read(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or getting property list aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, or getting property list aren't "
+               "supported with this connector\n");
         return 0;
     }
 
     if (NULL ==
         (dims = HDmalloc(DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK * sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset dimensionality\n");
+        printf("    couldn't allocate buffer for dataset dimensionality\n");
         goto error;
     }
 
     if (NULL == (chunk_dims = HDmalloc(DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK *
                                        sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset dimensionality\n");
+        printf("    couldn't allocate buffer for dataset dimensionality\n");
         goto error;
     }
 
@@ -6229,13 +6206,13 @@ test_write_multi_chunk_dataset_same_shape_read(void)
         if (MAINPROCESS) {
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -6243,28 +6220,28 @@ test_write_multi_chunk_dataset_same_shape_read(void)
                      H5Gcreate2(container_group, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME,
                                 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container sub-group '%s'\n",
-                         DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME);
+                printf("    couldn't create container sub-group '%s'\n",
+                       DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((fspace_id = H5Screate_simple(DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK,
                                               dims, NULL)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create file dataspace for dataset\n");
+                printf("    failed to create file dataspace for dataset\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create DCPL\n");
+                printf("    failed to create DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK,
                              chunk_dims) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to set chunking on DCPL\n");
+                printf("    failed to set chunking on DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -6272,8 +6249,8 @@ test_write_multi_chunk_dataset_same_shape_read(void)
                                       DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, fspace_id,
                                       H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n",
-                         DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n",
+                       DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -6282,13 +6259,13 @@ test_write_multi_chunk_dataset_same_shape_read(void)
              */
             if (H5Pclose(dcpl_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close DCPL\n");
+                printf("    failed to close DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve copy of DCPL\n");
+                printf("    failed to retrieve copy of DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -6296,22 +6273,22 @@ test_write_multi_chunk_dataset_same_shape_read(void)
             if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK,
                              retrieved_chunk_dims) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve chunking info\n");
+                printf("    failed to retrieve chunking info\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             for (i = 0; i < DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; i++) {
                 if (chunk_dims[i] != retrieved_chunk_dims[i]) {
                     H5_FAILED();
-                    HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                             "dimensionality\n");
+                    printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                           "dimensionality\n");
                     INDEPENDENT_OP_ERROR(dset_create);
                 }
             }
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -6377,8 +6354,8 @@ test_write_multi_chunk_dataset_same_shape_read(void)
             if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n",
+                       DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -6417,17 +6394,17 @@ test_write_multi_chunk_dataset_same_shape_read(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
         }
@@ -6441,33 +6418,32 @@ test_write_multi_chunk_dataset_same_shape_read(void)
         TEST_ERROR;
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME,
                              H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id =
              H5Dopen2(group_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n",
-                 DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
@@ -6479,7 +6455,7 @@ test_write_multi_chunk_dataset_same_shape_read(void)
 
         if ((mspace_id = H5Screate_simple(2, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to create memory dataspace\n");
+            printf("    failed to create memory dataspace\n");
             goto error;
         }
     }
@@ -6492,18 +6468,18 @@ test_write_multi_chunk_dataset_same_shape_read(void)
      * Each rank reads their respective chunks in the dataset, checking the data for each one.
      */
     if (MAINPROCESS)
-        HDprintf("\n");
+        printf("\n");
     for (i = 0, n_chunks_per_rank = (data_size / (size_t)mpi_size) / chunk_size; i < n_chunks_per_rank; i++) {
         size_t j, k;
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             H5_FAILED();
-            HDprintf("    MPI_Barrier failed\n");
+            printf("    MPI_Barrier failed\n");
             goto error;
         }
 
         if (MAINPROCESS)
-            HDprintf("\r All ranks reading chunk %zu", i);
+            printf("\r All ranks reading chunk %zu", i);
 
         for (j = 0; j < DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; j++) {
             if (j == 0)
@@ -6520,7 +6496,7 @@ test_write_multi_chunk_dataset_same_shape_read(void)
          */
         if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
             H5_FAILED();
-            HDprintf("    failed to set hyperslab selection\n");
+            printf("    failed to set hyperslab selection\n");
             goto error;
         }
 
@@ -6531,8 +6507,8 @@ test_write_multi_chunk_dataset_same_shape_read(void)
         if (H5Dread(dset_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, mspace_id, fspace_id,
                     H5P_DEFAULT, read_buf) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't read from dataset '%s'\n",
-                     DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+            printf("    couldn't read from dataset '%s'\n",
+                   DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME);
             goto error;
         }
 
@@ -6543,7 +6519,7 @@ test_write_multi_chunk_dataset_same_shape_read(void)
                     ((hsize_t)mpi_rank * n_chunks_per_rank); /* Additional value offset for each rank */
                 if (read_buf[j][k] != (int)val) {
                     H5_FAILED();
-                    HDprintf("    data verification failed for chunk %lld\n", (long long)i);
+                    printf("    data verification failed for chunk %lld\n", (long long)i);
                     goto error;
                 }
             }
@@ -6647,22 +6623,22 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or getting property list aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, or getting property list aren't "
+               "supported with this connector\n");
         return 0;
     }
 
     if (NULL ==
         (dims = HDmalloc(DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK * sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset dimensionality\n");
+        printf("    couldn't allocate buffer for dataset dimensionality\n");
         goto error;
     }
 
     if (NULL == (chunk_dims = HDmalloc(DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK *
                                        sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset dimensionality\n");
+        printf("    couldn't allocate buffer for dataset dimensionality\n");
         goto error;
     }
 
@@ -6693,13 +6669,13 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
         if (MAINPROCESS) {
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -6707,28 +6683,28 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
                      H5Gcreate2(container_group, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME,
                                 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container sub-group '%s'\n",
-                         DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME);
+                printf("    couldn't create container sub-group '%s'\n",
+                       DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((fspace_id = H5Screate_simple(DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK,
                                               dims, NULL)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create file dataspace for dataset\n");
+                printf("    failed to create file dataspace for dataset\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create DCPL\n");
+                printf("    failed to create DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK,
                              chunk_dims) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to set chunking on DCPL\n");
+                printf("    failed to set chunking on DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -6736,8 +6712,8 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
                                       DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, fspace_id,
                                       H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n",
-                         DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n",
+                       DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -6746,13 +6722,13 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
              */
             if (H5Pclose(dcpl_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close DCPL\n");
+                printf("    failed to close DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve copy of DCPL\n");
+                printf("    failed to retrieve copy of DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -6760,22 +6736,22 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
             if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK,
                              retrieved_chunk_dims) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve chunking info\n");
+                printf("    failed to retrieve chunking info\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             for (i = 0; i < DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; i++) {
                 if (chunk_dims[i] != retrieved_chunk_dims[i]) {
                     H5_FAILED();
-                    HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                             "dimensionality\n");
+                    printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                           "dimensionality\n");
                     INDEPENDENT_OP_ERROR(dset_create);
                 }
             }
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -6841,8 +6817,8 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
             if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL,
                          H5P_DEFAULT, write_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't write to dataset '%s'\n",
-                         DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+                printf("    couldn't write to dataset '%s'\n",
+                       DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -6881,17 +6857,17 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
         }
@@ -6905,33 +6881,32 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
         TEST_ERROR;
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME,
                              H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME);
         goto error;
     }
 
     if ((dset_id =
              H5Dopen2(group_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open dataset '%s'\n",
-                 DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+        printf("    couldn't open dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
         goto error;
     }
 
     if ((fspace_id = H5Dget_space(dset_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't get dataset dataspace\n");
+        printf("    couldn't get dataset dataspace\n");
         goto error;
     }
 
@@ -6945,7 +6920,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
         if ((mspace_id = H5Screate_simple(DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK,
                                           mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to create memory dataspace\n");
+            printf("    failed to create memory dataspace\n");
             goto error;
         }
     }
@@ -6958,18 +6933,18 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
      * Each rank reads their respective chunks in the dataset, checking the data for each one.
      */
     if (MAINPROCESS)
-        HDprintf("\n");
+        printf("\n");
     for (i = 0, n_chunks_per_rank = (data_size / (size_t)mpi_size) / chunk_size; i < n_chunks_per_rank; i++) {
         size_t j, k;
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             H5_FAILED();
-            HDprintf("    MPI_Barrier failed\n");
+            printf("    MPI_Barrier failed\n");
             goto error;
         }
 
         if (MAINPROCESS)
-            HDprintf("\r All ranks reading chunk %zu", i);
+            printf("\r All ranks reading chunk %zu", i);
 
         for (j = 0; j < DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; j++) {
             if (j == 0)
@@ -6986,7 +6961,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
          */
         if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
             H5_FAILED();
-            HDprintf("    failed to set hyperslab selection\n");
+            printf("    failed to set hyperslab selection\n");
             goto error;
         }
 
@@ -6997,8 +6972,8 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
         if (H5Dread(dset_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, mspace_id, fspace_id,
                     H5P_DEFAULT, read_buf) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't read from dataset '%s'\n",
-                     DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+            printf("    couldn't read from dataset '%s'\n",
+                   DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
             goto error;
         }
 
@@ -7009,7 +6984,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void)
 
                 if (read_buf[j][k] != (int)val) {
                     H5_FAILED();
-                    HDprintf("    data verification failed for chunk %lld\n", (long long)i);
+                    printf("    data verification failed for chunk %lld\n", (long long)i);
                     goto error;
                 }
             }
@@ -7113,22 +7088,22 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or getting property list aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, or getting property list aren't "
+               "supported with this connector\n");
         return 0;
     }
 
     if (NULL == (dims = HDmalloc(DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK *
                                  sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset dimensionality\n");
+        printf("    couldn't allocate buffer for dataset dimensionality\n");
         goto error;
     }
 
     if (NULL == (chunk_dims = HDmalloc(DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK *
                                        sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset dimensionality\n");
+        printf("    couldn't allocate buffer for dataset dimensionality\n");
         goto error;
     }
 
@@ -7159,13 +7134,13 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
         if (MAINPROCESS) {
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -7173,28 +7148,28 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
                                        DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME,
                                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container sub-group '%s'\n",
-                         DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME);
+                printf("    couldn't create container sub-group '%s'\n",
+                       DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((fspace_id = H5Screate_simple(
                      DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK, dims, NULL)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create file dataspace for dataset\n");
+                printf("    failed to create file dataspace for dataset\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create DCPL\n");
+                printf("    failed to create DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK,
                              chunk_dims) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to set chunking on DCPL\n");
+                printf("    failed to set chunking on DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -7202,7 +7177,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
              * all other processes when they open the dataset */
             if (H5Pset_alloc_time(dcpl_id, H5D_ALLOC_TIME_EARLY) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to set allocation time on DCPL\n");
+                printf("    failed to set allocation time on DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -7210,8 +7185,8 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
                                       DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPE,
                                       fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n",
-                         DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n",
+                       DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -7220,13 +7195,13 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
              */
             if (H5Pclose(dcpl_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close DCPL\n");
+                printf("    failed to close DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve copy of DCPL\n");
+                printf("    failed to retrieve copy of DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -7234,22 +7209,22 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
             if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK,
                              retrieved_chunk_dims) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve chunking info\n");
+                printf("    failed to retrieve chunking info\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             for (i = 0; i < DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; i++) {
                 if (chunk_dims[i] != retrieved_chunk_dims[i]) {
                     H5_FAILED();
-                    HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                             "dimensionality\n");
+                    printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                           "dimensionality\n");
                     INDEPENDENT_OP_ERROR(dset_create);
                 }
             }
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -7283,17 +7258,17 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
         }
@@ -7307,19 +7282,19 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
         TEST_ERROR;
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME,
                              H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -7331,7 +7306,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
 
         if ((mspace_id = H5Screate_simple(2, mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to create memory dataspace\n");
+            printf("    failed to create memory dataspace\n");
             goto error;
         }
     }
@@ -7341,13 +7316,13 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
     }
 
     if (MAINPROCESS)
-        HDprintf("\n");
+        printf("\n");
     for (niter = 0; niter < DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_NITERS; niter++) {
         if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME,
                                 H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't open dataset '%s'\n",
-                     DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+            printf("    couldn't open dataset '%s'\n",
+                   DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
             goto error;
         }
 
@@ -7421,8 +7396,8 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
                 if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL,
                              H5S_ALL, H5P_DEFAULT, write_buf) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't write to dataset '%s'\n",
-                             DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+                    printf("    couldn't write to dataset '%s'\n",
+                           DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
                     INDEPENDENT_OP_ERROR(dset_write);
                 }
             }
@@ -7440,21 +7415,21 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             H5_FAILED();
-            HDprintf("    MPI_Barrier failed\n");
+            printf("    MPI_Barrier failed\n");
             goto error;
         }
 
         if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME,
                                 H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't open dataset '%s'\n",
-                     DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+            printf("    couldn't open dataset '%s'\n",
+                   DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
             goto error;
         }
 
         if ((fspace_id = H5Dget_space(dset_id)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't get dataset dataspace\n");
+            printf("    couldn't get dataset dataspace\n");
             goto error;
         }
 
@@ -7466,7 +7441,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
             size_t j, k;
 
             if (MAINPROCESS)
-                HDprintf("\r All ranks reading chunk %zu", i);
+                printf("\r All ranks reading chunk %zu", i);
 
             for (j = 0; j < DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; j++) {
                 if (j == 0)
@@ -7483,7 +7458,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
              */
             if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to set hyperslab selection\n");
+                printf("    failed to set hyperslab selection\n");
                 goto error;
             }
 
@@ -7494,8 +7469,8 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
             if (H5Dread(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, mspace_id,
                         fspace_id, H5P_DEFAULT, read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n",
-                         DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n",
+                       DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME);
                 goto error;
             }
 
@@ -7507,7 +7482,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
                         + niter;
                     if (read_buf[j][k] != (int)val) {
                         H5_FAILED();
-                        HDprintf("    data verification failed for chunk %lld\n", (long long)i);
+                        printf("    data verification failed for chunk %lld\n", (long long)i);
                         goto error;
                     }
                 }
@@ -7533,7 +7508,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             H5_FAILED();
-            HDprintf("    MPI_Barrier failed\n");
+            printf("    MPI_Barrier failed\n");
             goto error;
         }
     }
@@ -7639,22 +7614,22 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) {
         SKIPPED();
-        HDprintf("    API functions for basic file, group, dataset, or getting property list aren't "
-                 "supported with this connector\n");
+        printf("    API functions for basic file, group, dataset, or getting property list aren't "
+               "supported with this connector\n");
         return 0;
     }
 
     if (NULL == (dims = HDmalloc(DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK *
                                  sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset dimensionality\n");
+        printf("    couldn't allocate buffer for dataset dimensionality\n");
         goto error;
     }
 
     if (NULL == (chunk_dims = HDmalloc(DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK *
                                        sizeof(hsize_t)))) {
         H5_FAILED();
-        HDprintf("    couldn't allocate buffer for dataset dimensionality\n");
+        printf("    couldn't allocate buffer for dataset dimensionality\n");
         goto error;
     }
 
@@ -7685,13 +7660,13 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
         if (MAINPROCESS) {
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
+                printf("    couldn't open file '%s'\n", H5_api_test_parallel_filename);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+                printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -7699,28 +7674,28 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
                                        DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME,
                                        H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create container sub-group '%s'\n",
-                         DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME);
+                printf("    couldn't create container sub-group '%s'\n",
+                       DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((fspace_id = H5Screate_simple(
                      DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK, dims, NULL)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create file dataspace for dataset\n");
+                printf("    failed to create file dataspace for dataset\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to create DCPL\n");
+                printf("    failed to create DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK,
                              chunk_dims) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to set chunking on DCPL\n");
+                printf("    failed to set chunking on DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -7728,7 +7703,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
              * all other processes when they open the dataset */
             if (H5Pset_alloc_time(dcpl_id, H5D_ALLOC_TIME_EARLY) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to set allocation time on DCPL\n");
+                printf("    failed to set allocation time on DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -7736,8 +7711,8 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
                                       DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE,
                                       fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't create dataset '%s'\n",
-                         DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+                printf("    couldn't create dataset '%s'\n",
+                       DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -7746,13 +7721,13 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
              */
             if (H5Pclose(dcpl_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close DCPL\n");
+                printf("    failed to close DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve copy of DCPL\n");
+                printf("    failed to retrieve copy of DCPL\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -7760,22 +7735,22 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
             if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK,
                              retrieved_chunk_dims) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to retrieve chunking info\n");
+                printf("    failed to retrieve chunking info\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
             for (i = 0; i < DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; i++) {
                 if (chunk_dims[i] != retrieved_chunk_dims[i]) {
                     H5_FAILED();
-                    HDprintf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
-                             "dimensionality\n");
+                    printf("    chunk dimensionality retrieved from DCPL didn't match originally specified "
+                           "dimensionality\n");
                     INDEPENDENT_OP_ERROR(dset_create);
                 }
             }
 
             if (NULL == (write_buf = HDmalloc(data_size))) {
                 H5_FAILED();
-                HDprintf("    couldn't allocate buffer for dataset write\n");
+                printf("    couldn't allocate buffer for dataset write\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
 
@@ -7809,17 +7784,17 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
              */
             if (H5Gclose(group_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close test's container group\n");
+                printf("    failed to close test's container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Gclose(container_group) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close container group\n");
+                printf("    failed to close container group\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
             if (H5Fclose(file_id) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to close file for data flushing\n");
+                printf("    failed to close file for data flushing\n");
                 INDEPENDENT_OP_ERROR(dset_create);
             }
         }
@@ -7833,19 +7808,19 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
         TEST_ERROR;
     if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
+        printf("    couldn't re-open file '%s'\n", H5_api_test_parallel_filename);
         goto error;
     }
     if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
+        printf("    couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME);
         goto error;
     }
     if ((group_id = H5Gopen2(container_group, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME,
                              H5P_DEFAULT)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't open container sub-group '%s'\n",
-                 DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME);
+        printf("    couldn't open container sub-group '%s'\n",
+               DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME);
         goto error;
     }
 
@@ -7859,7 +7834,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
         if ((mspace_id = H5Screate_simple(DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK,
                                           mdims, NULL)) < 0) {
             H5_FAILED();
-            HDprintf("    failed to create memory dataspace\n");
+            printf("    failed to create memory dataspace\n");
             goto error;
         }
     }
@@ -7869,13 +7844,13 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
     }
 
     if (MAINPROCESS)
-        HDprintf("\n");
+        printf("\n");
     for (niter = 0; niter < DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_NITERS; niter++) {
         if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME,
                                 H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't open dataset '%s'\n",
-                     DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+            printf("    couldn't open dataset '%s'\n",
+                   DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
             goto error;
         }
 
@@ -7949,8 +7924,8 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
                 if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL,
                              H5S_ALL, H5P_DEFAULT, write_buf) < 0) {
                     H5_FAILED();
-                    HDprintf("    couldn't write to dataset '%s'\n",
-                             DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+                    printf("    couldn't write to dataset '%s'\n",
+                           DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
                     INDEPENDENT_OP_ERROR(dset_write);
                 }
             }
@@ -7968,21 +7943,21 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             H5_FAILED();
-            HDprintf("    MPI_Barrier failed\n");
+            printf("    MPI_Barrier failed\n");
             goto error;
         }
 
         if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME,
                                 H5P_DEFAULT)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't open dataset '%s'\n",
-                     DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+            printf("    couldn't open dataset '%s'\n",
+                   DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
             goto error;
         }
 
         if ((fspace_id = H5Dget_space(dset_id)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't get dataset dataspace\n");
+            printf("    couldn't get dataset dataspace\n");
             goto error;
         }
 
@@ -7994,7 +7969,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
             size_t j, k;
 
             if (MAINPROCESS)
-                HDprintf("\r All ranks reading chunk %zu", i);
+                printf("\r All ranks reading chunk %zu", i);
 
             for (j = 0; j < DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; j++) {
                 if (j == 0)
@@ -8011,7 +7986,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
              */
             if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) {
                 H5_FAILED();
-                HDprintf("    failed to set hyperslab selection\n");
+                printf("    failed to set hyperslab selection\n");
                 goto error;
             }
 
@@ -8022,8 +7997,8 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
             if (H5Dread(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, mspace_id,
                         fspace_id, H5P_DEFAULT, read_buf) < 0) {
                 H5_FAILED();
-                HDprintf("    couldn't read from dataset '%s'\n",
-                         DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
+                printf("    couldn't read from dataset '%s'\n",
+                       DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME);
                 goto error;
             }
 
@@ -8035,7 +8010,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
 
                     if (read_buf[j][k] != (int)val) {
                         H5_FAILED();
-                        HDprintf("    data verification failed for chunk %lld\n", (long long)i);
+                        printf("    data verification failed for chunk %lld\n", (long long)i);
                         goto error;
                     }
                 }
@@ -8061,7 +8036,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             H5_FAILED();
-            HDprintf("    MPI_Barrier failed\n");
+            printf("    MPI_Barrier failed\n");
             goto error;
         }
     }
@@ -8126,11 +8101,11 @@ H5_api_dataset_test_parallel(void)
     int    nerrors;
 
     if (MAINPROCESS) {
-        HDprintf("**********************************************\n");
-        HDprintf("*                                            *\n");
-        HDprintf("*         API Parallel Dataset Tests         *\n");
-        HDprintf("*                                            *\n");
-        HDprintf("**********************************************\n\n");
+        printf("**********************************************\n");
+        printf("*                                            *\n");
+        printf("*         API Parallel Dataset Tests         *\n");
+        printf("*                                            *\n");
+        printf("**********************************************\n\n");
     }
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(par_dataset_tests); i++) {
@@ -8138,12 +8113,12 @@ H5_api_dataset_test_parallel(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    MPI_Barrier() failed!\n");
+                printf("    MPI_Barrier() failed!\n");
         }
     }
 
     if (MAINPROCESS)
-        HDprintf("\n");
+        printf("\n");
 
     return nerrors;
 }
diff --git a/testpar/API/H5_api_datatype_test_parallel.c b/testpar/API/H5_api_datatype_test_parallel.c
index 7d090c0..3d00ad9 100644
--- a/testpar/API/H5_api_datatype_test_parallel.c
+++ b/testpar/API/H5_api_datatype_test_parallel.c
@@ -24,11 +24,11 @@ H5_api_datatype_test_parallel(void)
     int    nerrors;
 
     if (MAINPROCESS) {
-        HDprintf("**********************************************\n");
-        HDprintf("*                                            *\n");
-        HDprintf("*        API Parallel Datatype Tests         *\n");
-        HDprintf("*                                            *\n");
-        HDprintf("**********************************************\n\n");
+        printf("**********************************************\n");
+        printf("*                                            *\n");
+        printf("*        API Parallel Datatype Tests         *\n");
+        printf("*                                            *\n");
+        printf("**********************************************\n\n");
     }
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(par_datatype_tests); i++) {
@@ -36,12 +36,12 @@ H5_api_datatype_test_parallel(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    MPI_Barrier() failed!\n");
+                printf("    MPI_Barrier() failed!\n");
         }
     }
 
     if (MAINPROCESS)
-        HDprintf("\n");
+        printf("\n");
 
     return nerrors;
 }
diff --git a/testpar/API/H5_api_file_test_parallel.c b/testpar/API/H5_api_file_test_parallel.c
index 20fb2ba..7a78619 100644
--- a/testpar/API/H5_api_file_test_parallel.c
+++ b/testpar/API/H5_api_file_test_parallel.c
@@ -40,7 +40,7 @@ test_create_file(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file aren't supported with this connector\n");
+        printf("    API functions for basic file aren't supported with this connector\n");
         return 0;
     }
 
@@ -49,7 +49,7 @@ test_create_file(void)
 
     if ((file_id = H5Fcreate(FILE_CREATE_TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0) {
         H5_FAILED();
-        HDprintf("    couldn't create file '%s'\n", FILE_CREATE_TEST_FILENAME);
+        printf("    couldn't create file '%s'\n", FILE_CREATE_TEST_FILENAME);
         goto error;
     }
 
@@ -87,7 +87,7 @@ test_open_file(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file aren't supported with this connector\n");
+        printf("    API functions for basic file aren't supported with this connector\n");
         return 0;
     }
 
@@ -106,7 +106,7 @@ test_open_file(void)
 
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDONLY, fapl_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    unable to open file '%s' in read-only mode\n", H5_api_test_parallel_filename);
+                printf("    unable to open file '%s' in read-only mode\n", H5_api_test_parallel_filename);
                 PART_ERROR(H5Fopen_rdonly);
             }
 
@@ -129,7 +129,7 @@ test_open_file(void)
 
             if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) {
                 H5_FAILED();
-                HDprintf("    unable to open file '%s' in read-write mode\n", H5_api_test_parallel_filename);
+                printf("    unable to open file '%s' in read-write mode\n", H5_api_test_parallel_filename);
                 PART_ERROR(H5Fopen_rdwrite);
             }
 
@@ -201,7 +201,7 @@ test_split_comm_file_access(void)
     /* Make sure the connector supports the API functions being tested */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) {
         SKIPPED();
-        HDprintf("    API functions for basic file aren't supported with this connector\n");
+        printf("    API functions for basic file aren't supported with this connector\n");
         return 0;
     }
 
@@ -210,7 +210,7 @@ test_split_comm_file_access(void)
     is_old = mpi_rank % 2;
     if (MPI_SUCCESS != MPI_Comm_split(MPI_COMM_WORLD, is_old, mpi_rank, &comm)) {
         H5_FAILED();
-        HDprintf("    failed to split communicator!\n");
+        printf("    failed to split communicator!\n");
         goto error;
     }
     MPI_Comm_rank(comm, &newrank);
@@ -237,7 +237,7 @@ test_split_comm_file_access(void)
         /* create the file collectively */
         if ((file_id = H5Fcreate(SPLIT_FILE_COMM_TEST_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0) {
             H5_FAILED();
-            HDprintf("    couldn't create file '%s'\n", SPLIT_FILE_COMM_TEST_FILE_NAME);
+            printf("    couldn't create file '%s'\n", SPLIT_FILE_COMM_TEST_FILE_NAME);
             err_occurred = 1;
             goto access_end;
         }
@@ -245,7 +245,7 @@ test_split_comm_file_access(void)
         /* close the file */
         if (H5Fclose(file_id) < 0) {
             H5_FAILED();
-            HDprintf("    failed to close file '%s'\n", SPLIT_FILE_COMM_TEST_FILE_NAME);
+            printf("    failed to close file '%s'\n", SPLIT_FILE_COMM_TEST_FILE_NAME);
             err_occurred = 1;
             goto access_end;
         }
@@ -253,7 +253,7 @@ test_split_comm_file_access(void)
         /* delete the test file */
         if (H5Fdelete(SPLIT_FILE_COMM_TEST_FILE_NAME, fapl_id) < 0) {
             H5_FAILED();
-            HDprintf("    failed to delete file '%s'\n", SPLIT_FILE_COMM_TEST_FILE_NAME);
+            printf("    failed to delete file '%s'\n", SPLIT_FILE_COMM_TEST_FILE_NAME);
             err_occurred = 1;
             goto access_end;
         }
@@ -269,26 +269,26 @@ access_end:
     /* Get the collective results about whether an error occurred */
     if (MPI_SUCCESS != MPI_Allreduce(MPI_IN_PLACE, &err_occurred, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD)) {
         H5_FAILED();
-        HDprintf("    MPI_Allreduce failed\n");
+        printf("    MPI_Allreduce failed\n");
         goto error;
     }
 
     if (err_occurred) {
         H5_FAILED();
-        HDprintf("    an error occurred on only some ranks during split-communicator file access! - "
-                 "collectively failing\n");
+        printf("    an error occurred on only some ranks during split-communicator file access! - "
+               "collectively failing\n");
         goto error;
     }
 
     if (MPI_SUCCESS != MPI_Comm_free(&comm)) {
         H5_FAILED();
-        HDprintf("    MPI_Comm_free failed\n");
+        printf("    MPI_Comm_free failed\n");
         goto error;
     }
 
     if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
         H5_FAILED();
-        HDprintf("    MPI_Barrier on MPI_COMM_WORLD failed\n");
+        printf("    MPI_Barrier on MPI_COMM_WORLD failed\n");
         goto error;
     }
 
@@ -317,7 +317,7 @@ cleanup_files(void)
 
     if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) {
         if (MAINPROCESS)
-            HDprintf("    failed to create FAPL for deleting test files\n");
+            printf("    failed to create FAPL for deleting test files\n");
         return;
     }
 
@@ -328,7 +328,7 @@ cleanup_files(void)
 
     if (H5Pclose(fapl_id) < 0) {
         if (MAINPROCESS)
-            HDprintf("    failed to close FAPL used for deleting test files\n");
+            printf("    failed to close FAPL used for deleting test files\n");
         return;
     }
 }
@@ -340,11 +340,11 @@ H5_api_file_test_parallel(void)
     int    nerrors;
 
     if (MAINPROCESS) {
-        HDprintf("**********************************************\n");
-        HDprintf("*                                            *\n");
-        HDprintf("*          API Parallel File Tests           *\n");
-        HDprintf("*                                            *\n");
-        HDprintf("**********************************************\n\n");
+        printf("**********************************************\n");
+        printf("*                                            *\n");
+        printf("*          API Parallel File Tests           *\n");
+        printf("*                                            *\n");
+        printf("**********************************************\n\n");
     }
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(par_file_tests); i++) {
@@ -352,13 +352,13 @@ H5_api_file_test_parallel(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    MPI_Barrier() failed!\n");
+                printf("    MPI_Barrier() failed!\n");
         }
     }
 
     if (MAINPROCESS) {
-        HDprintf("\n");
-        HDprintf("Cleaning up testing files\n");
+        printf("\n");
+        printf("Cleaning up testing files\n");
     }
 
     cleanup_files();
diff --git a/testpar/API/H5_api_group_test_parallel.c b/testpar/API/H5_api_group_test_parallel.c
index d6d8f18..b894b74 100644
--- a/testpar/API/H5_api_group_test_parallel.c
+++ b/testpar/API/H5_api_group_test_parallel.c
@@ -24,11 +24,11 @@ H5_api_group_test_parallel(void)
     int    nerrors;
 
     if (MAINPROCESS) {
-        HDprintf("**********************************************\n");
-        HDprintf("*                                            *\n");
-        HDprintf("*          API Parallel Group Tests          *\n");
-        HDprintf("*                                            *\n");
-        HDprintf("**********************************************\n\n");
+        printf("**********************************************\n");
+        printf("*                                            *\n");
+        printf("*          API Parallel Group Tests          *\n");
+        printf("*                                            *\n");
+        printf("**********************************************\n\n");
     }
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(par_group_tests); i++) {
@@ -36,12 +36,12 @@ H5_api_group_test_parallel(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    MPI_Barrier() failed!\n");
+                printf("    MPI_Barrier() failed!\n");
         }
     }
 
     if (MAINPROCESS)
-        HDprintf("\n");
+        printf("\n");
 
     return nerrors;
 }
diff --git a/testpar/API/H5_api_link_test_parallel.c b/testpar/API/H5_api_link_test_parallel.c
index fb865a0..f9999bd 100644
--- a/testpar/API/H5_api_link_test_parallel.c
+++ b/testpar/API/H5_api_link_test_parallel.c
@@ -24,11 +24,11 @@ H5_api_link_test_parallel(void)
     int    nerrors;
 
     if (MAINPROCESS) {
-        HDprintf("**********************************************\n");
-        HDprintf("*                                            *\n");
-        HDprintf("*          API Parallel Link Tests           *\n");
-        HDprintf("*                                            *\n");
-        HDprintf("**********************************************\n\n");
+        printf("**********************************************\n");
+        printf("*                                            *\n");
+        printf("*          API Parallel Link Tests           *\n");
+        printf("*                                            *\n");
+        printf("**********************************************\n\n");
     }
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(par_link_tests); i++) {
@@ -36,12 +36,12 @@ H5_api_link_test_parallel(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    MPI_Barrier() failed!\n");
+                printf("    MPI_Barrier() failed!\n");
         }
     }
 
     if (MAINPROCESS)
-        HDprintf("\n");
+        printf("\n");
 
     return nerrors;
 }
diff --git a/testpar/API/H5_api_misc_test_parallel.c b/testpar/API/H5_api_misc_test_parallel.c
index 0dc85eb..307b3a0 100644
--- a/testpar/API/H5_api_misc_test_parallel.c
+++ b/testpar/API/H5_api_misc_test_parallel.c
@@ -24,11 +24,11 @@ H5_api_misc_test_parallel(void)
     int    nerrors;
 
     if (MAINPROCESS) {
-        HDprintf("**********************************************\n");
-        HDprintf("*                                            *\n");
-        HDprintf("*      API Parallel Miscellaneous Tests      *\n");
-        HDprintf("*                                            *\n");
-        HDprintf("**********************************************\n\n");
+        printf("**********************************************\n");
+        printf("*                                            *\n");
+        printf("*      API Parallel Miscellaneous Tests      *\n");
+        printf("*                                            *\n");
+        printf("**********************************************\n\n");
     }
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(par_misc_tests); i++) {
@@ -36,12 +36,12 @@ H5_api_misc_test_parallel(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    MPI_Barrier() failed!\n");
+                printf("    MPI_Barrier() failed!\n");
         }
     }
 
     if (MAINPROCESS)
-        HDprintf("\n");
+        printf("\n");
 
     return nerrors;
 }
diff --git a/testpar/API/H5_api_object_test_parallel.c b/testpar/API/H5_api_object_test_parallel.c
index a264eb2..d08de7f 100644
--- a/testpar/API/H5_api_object_test_parallel.c
+++ b/testpar/API/H5_api_object_test_parallel.c
@@ -24,11 +24,11 @@ H5_api_object_test_parallel(void)
     int    nerrors;
 
     if (MAINPROCESS) {
-        HDprintf("**********************************************\n");
-        HDprintf("*                                            *\n");
-        HDprintf("*         API Parallel Object Tests          *\n");
-        HDprintf("*                                            *\n");
-        HDprintf("**********************************************\n\n");
+        printf("**********************************************\n");
+        printf("*                                            *\n");
+        printf("*         API Parallel Object Tests          *\n");
+        printf("*                                            *\n");
+        printf("**********************************************\n\n");
     }
 
     for (i = 0, nerrors = 0; i < ARRAY_LENGTH(par_object_tests); i++) {
@@ -36,12 +36,12 @@ H5_api_object_test_parallel(void)
 
         if (MPI_SUCCESS != MPI_Barrier(MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    MPI_Barrier() failed!\n");
+                printf("    MPI_Barrier() failed!\n");
         }
     }
 
     if (MAINPROCESS)
-        HDprintf("\n");
+        printf("\n");
 
     return nerrors;
 }
diff --git a/testpar/API/H5_api_test_parallel.c b/testpar/API/H5_api_test_parallel.c
index ad0fdca..c913746 100644
--- a/testpar/API/H5_api_test_parallel.c
+++ b/testpar/API/H5_api_test_parallel.c
@@ -188,7 +188,7 @@ main(int argc, char **argv)
      * that require that level of threading support in MPI
      */
     if (MPI_SUCCESS != MPI_Init_thread(&argc, &argv, required, &provided)) {
-        HDfprintf(stderr, "MPI_Init_thread failed\n");
+        fprintf(stderr, "MPI_Init_thread failed\n");
         HDexit(EXIT_FAILURE);
     }
 
@@ -197,7 +197,7 @@ main(int argc, char **argv)
 
     if (provided < required) {
         if (MAINPROCESS)
-            HDprintf("** INFO: couldn't initialize with MPI_THREAD_MULTIPLE threading support **\n");
+            printf("** INFO: couldn't initialize with MPI_THREAD_MULTIPLE threading support **\n");
     }
 
     /* Simple argument checking, TODO can improve that later */
@@ -229,7 +229,7 @@ main(int argc, char **argv)
     if (mpi_size > 1) {
         if (MPI_SUCCESS != MPI_Bcast(&seed, 1, MPI_UNSIGNED, 0, MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDfprintf(stderr, "Couldn't broadcast test seed\n");
+                fprintf(stderr, "Couldn't broadcast test seed\n");
             goto error;
         }
     }
@@ -244,7 +244,7 @@ main(int argc, char **argv)
 
     if (NULL == (vol_connector_string = HDgetenv(HDF5_VOL_CONNECTOR))) {
         if (MAINPROCESS)
-            HDprintf("No VOL connector selected; using native VOL connector\n");
+            printf("No VOL connector selected; using native VOL connector\n");
         vol_connector_name = "native";
         vol_connector_info = NULL;
     }
@@ -255,7 +255,7 @@ main(int argc, char **argv)
         {
             if (NULL == (vol_connector_string_copy = HDstrdup(vol_connector_string))) {
                 if (MAINPROCESS)
-                    HDfprintf(stderr, "Unable to copy VOL connector string\n");
+                    fprintf(stderr, "Unable to copy VOL connector string\n");
                 INDEPENDENT_OP_ERROR(copy_connector_string);
             }
         }
@@ -265,7 +265,7 @@ main(int argc, char **argv)
         {
             if (NULL == (token = HDstrtok(vol_connector_string_copy, " "))) {
                 if (MAINPROCESS)
-                    HDfprintf(stderr, "Error while parsing VOL connector string\n");
+                    fprintf(stderr, "Error while parsing VOL connector string\n");
                 INDEPENDENT_OP_ERROR(get_connector_name);
             }
         }
@@ -279,20 +279,20 @@ main(int argc, char **argv)
     }
 
     if (MAINPROCESS) {
-        HDprintf("Running parallel API tests with VOL connector '%s' and info string '%s'\n\n",
-                 vol_connector_name, vol_connector_info ? vol_connector_info : "");
-        HDprintf("Test parameters:\n");
-        HDprintf("  - Test file name: '%s'\n", H5_api_test_parallel_filename);
-        HDprintf("  - Number of MPI ranks: %d\n", mpi_size);
-        HDprintf("  - Test seed: %u\n", seed);
-        HDprintf("\n\n");
+        printf("Running parallel API tests with VOL connector '%s' and info string '%s'\n\n",
+               vol_connector_name, vol_connector_info ? vol_connector_info : "");
+        printf("Test parameters:\n");
+        printf("  - Test file name: '%s'\n", H5_api_test_parallel_filename);
+        printf("  - Number of MPI ranks: %d\n", mpi_size);
+        printf("  - Test seed: %u\n", seed);
+        printf("\n\n");
     }
 
     BEGIN_INDEPENDENT_OP(create_fapl)
     {
         if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, FALSE)) < 0) {
             if (MAINPROCESS)
-                HDfprintf(stderr, "Unable to create FAPL\n");
+                fprintf(stderr, "Unable to create FAPL\n");
             INDEPENDENT_OP_ERROR(create_fapl);
         }
     }
@@ -312,14 +312,14 @@ main(int argc, char **argv)
 
             if ((is_registered = H5VLis_connector_registered_by_name(vol_connector_name)) < 0) {
                 if (MAINPROCESS)
-                    HDfprintf(stderr, "Unable to determine if VOL connector is registered\n");
+                    fprintf(stderr, "Unable to determine if VOL connector is registered\n");
                 INDEPENDENT_OP_ERROR(check_vol_register);
             }
 
             if (!is_registered) {
                 if (MAINPROCESS)
-                    HDfprintf(stderr, "Specified VOL connector '%s' wasn't correctly registered!\n",
-                              vol_connector_name);
+                    fprintf(stderr, "Specified VOL connector '%s' wasn't correctly registered!\n",
+                            vol_connector_name);
                 INDEPENDENT_OP_ERROR(check_vol_register);
             }
             else {
@@ -330,20 +330,20 @@ main(int argc, char **argv)
                  */
                 if (H5Pget_vol_id(fapl_id, &default_con_id) < 0) {
                     if (MAINPROCESS)
-                        HDfprintf(stderr, "Couldn't retrieve ID of VOL connector set on default FAPL\n");
+                        fprintf(stderr, "Couldn't retrieve ID of VOL connector set on default FAPL\n");
                     INDEPENDENT_OP_ERROR(check_vol_register);
                 }
 
                 if ((registered_con_id = H5VLget_connector_id_by_name(vol_connector_name)) < 0) {
                     if (MAINPROCESS)
-                        HDfprintf(stderr, "Couldn't retrieve ID of registered VOL connector\n");
+                        fprintf(stderr, "Couldn't retrieve ID of registered VOL connector\n");
                     INDEPENDENT_OP_ERROR(check_vol_register);
                 }
 
                 if (default_con_id != registered_con_id) {
                     if (MAINPROCESS)
-                        HDfprintf(stderr,
-                                  "VOL connector set on default FAPL didn't match specified VOL connector\n");
+                        fprintf(stderr,
+                                "VOL connector set on default FAPL didn't match specified VOL connector\n");
                     INDEPENDENT_OP_ERROR(check_vol_register);
                 }
             }
@@ -359,7 +359,7 @@ main(int argc, char **argv)
         vol_cap_flags_g = H5VL_CAP_FLAG_NONE;
         if (H5Pget_vol_cap_flags(fapl_id, &vol_cap_flags_g) < 0) {
             if (MAINPROCESS)
-                HDfprintf(stderr, "Unable to retrieve VOL connector capability flags\n");
+                fprintf(stderr, "Unable to retrieve VOL connector capability flags\n");
             INDEPENDENT_OP_ERROR(get_capability_flags);
         }
     }
@@ -373,8 +373,8 @@ main(int argc, char **argv)
     {
         if (MAINPROCESS) {
             if (create_test_container(H5_api_test_parallel_filename, vol_cap_flags_g) < 0) {
-                HDfprintf(stderr, "    failed to create testing container file '%s'\n",
-                          H5_api_test_parallel_filename);
+                fprintf(stderr, "    failed to create testing container file '%s'\n",
+                        H5_api_test_parallel_filename);
                 INDEPENDENT_OP_ERROR(create_test_container);
             }
         }
@@ -385,57 +385,57 @@ main(int argc, char **argv)
     H5_api_test_run();
 
     if (MAINPROCESS)
-        HDprintf("Cleaning up testing files\n");
+        printf("Cleaning up testing files\n");
     H5Fdelete(H5_api_test_parallel_filename, fapl_id);
 
     if (n_tests_run_g > 0) {
         if (MAINPROCESS)
-            HDprintf("The below statistics are minimum values due to the possibility of some ranks failing a "
-                     "test while others pass:\n");
+            printf("The below statistics are minimum values due to the possibility of some ranks failing a "
+                   "test while others pass:\n");
 
         if (MPI_SUCCESS != MPI_Allreduce(MPI_IN_PLACE, &n_tests_passed_g, 1, MPI_UNSIGNED_LONG_LONG, MPI_MIN,
                                          MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    failed to collect consensus about the minimum number of tests that passed -- "
-                         "reporting rank 0's (possibly inaccurate) value\n");
+                printf("    failed to collect consensus about the minimum number of tests that passed -- "
+                       "reporting rank 0's (possibly inaccurate) value\n");
         }
 
         if (MAINPROCESS)
-            HDprintf("%s%zu/%zu (%.2f%%) API tests passed across all ranks with VOL connector '%s'\n",
-                     n_tests_passed_g > 0 ? "At least " : "", n_tests_passed_g, n_tests_run_g,
-                     ((double)n_tests_passed_g / (double)n_tests_run_g * 100.0), vol_connector_name);
+            printf("%s%zu/%zu (%.2f%%) API tests passed across all ranks with VOL connector '%s'\n",
+                   n_tests_passed_g > 0 ? "At least " : "", n_tests_passed_g, n_tests_run_g,
+                   ((double)n_tests_passed_g / (double)n_tests_run_g * 100.0), vol_connector_name);
 
         if (MPI_SUCCESS != MPI_Allreduce(MPI_IN_PLACE, &n_tests_failed_g, 1, MPI_UNSIGNED_LONG_LONG, MPI_MIN,
                                          MPI_COMM_WORLD)) {
             if (MAINPROCESS)
-                HDprintf("    failed to collect consensus about the minimum number of tests that failed -- "
-                         "reporting rank 0's (possibly inaccurate) value\n");
+                printf("    failed to collect consensus about the minimum number of tests that failed -- "
+                       "reporting rank 0's (possibly inaccurate) value\n");
         }
 
         if (MAINPROCESS) {
-            HDprintf("%s%zu/%zu (%.2f%%) API tests did not pass across all ranks with VOL connector '%s'\n",
-                     n_tests_failed_g > 0 ? "At least " : "", n_tests_failed_g, n_tests_run_g,
-                     ((double)n_tests_failed_g / (double)n_tests_run_g * 100.0), vol_connector_name);
+            printf("%s%zu/%zu (%.2f%%) API tests did not pass across all ranks with VOL connector '%s'\n",
+                   n_tests_failed_g > 0 ? "At least " : "", n_tests_failed_g, n_tests_run_g,
+                   ((double)n_tests_failed_g / (double)n_tests_run_g * 100.0), vol_connector_name);
 
-            HDprintf("%zu/%zu (%.2f%%) API tests were skipped with VOL connector '%s'\n", n_tests_skipped_g,
-                     n_tests_run_g, ((double)n_tests_skipped_g / (double)n_tests_run_g * 100.0),
-                     vol_connector_name);
+            printf("%zu/%zu (%.2f%%) API tests were skipped with VOL connector '%s'\n", n_tests_skipped_g,
+                   n_tests_run_g, ((double)n_tests_skipped_g / (double)n_tests_run_g * 100.0),
+                   vol_connector_name);
         }
     }
 
     if (default_con_id >= 0 && H5VLclose(default_con_id) < 0) {
         if (MAINPROCESS)
-            HDfprintf(stderr, "    failed to close VOL connector ID\n");
+            fprintf(stderr, "    failed to close VOL connector ID\n");
     }
 
     if (registered_con_id >= 0 && H5VLclose(registered_con_id) < 0) {
         if (MAINPROCESS)
-            HDfprintf(stderr, "    failed to close VOL connector ID\n");
+            fprintf(stderr, "    failed to close VOL connector ID\n");
     }
 
     if (fapl_id >= 0 && H5Pclose(fapl_id) < 0) {
         if (MAINPROCESS)
-            HDfprintf(stderr, "    failed to close MPI FAPL\n");
+            fprintf(stderr, "    failed to close MPI FAPL\n");
     }
 
     H5close();
diff --git a/testpar/API/H5_api_test_parallel.h b/testpar/API/H5_api_test_parallel.h
index 6df83e8..151a907 100644
--- a/testpar/API/H5_api_test_parallel.h
+++ b/testpar/API/H5_api_test_parallel.h
@@ -162,15 +162,15 @@ extern char H5_api_test_parallel_filename[];
                                                           MPI_LOR, MPI_COMM_WORLD))                          \
     {                                                                                                        \
         if (MAINPROCESS)                                                                                     \
-            HDprintf(                                                                                        \
+            printf(                                                                                          \
                 "    failed to collect consensus about whether non-collective operation was successful\n");  \
         goto error;                                                                                          \
     }                                                                                                        \
                                                                                                              \
     if (ind_op_failed) {                                                                                     \
         if (MAINPROCESS)                                                                                     \
-            HDprintf("    failure detected during non-collective operation - all other ranks will now fail " \
-                     "too\n");                                                                               \
+            printf("    failure detected during non-collective operation - all other ranks will now fail "   \
+                   "too\n");                                                                                 \
         goto error;                                                                                          \
     }                                                                                                        \
     }
diff --git a/testpar/API/t_bigio.c b/testpar/API/t_bigio.c
index 3e18c8f..307f749 100644
--- a/testpar/API/t_bigio.c
+++ b/testpar/API/t_bigio.c
@@ -133,16 +133,16 @@ point_set(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[], s
                     }
 
     if (VERBOSE_MED) {
-        HDprintf("start[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "count[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "stride[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "block[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "total datapoints=%" PRIuHSIZE "\n",
-                 start[0], start[1], count[0], count[1], stride[0], stride[1], block[0], block[1],
-                 block[0] * block[1] * count[0] * count[1]);
+        printf("start[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "count[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "stride[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "block[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "total datapoints=%" PRIuHSIZE "\n",
+               start[0], start[1], count[0], count[1], stride[0], stride[1], block[0], block[1],
+               block[0] * block[1] * count[0] * count[1]);
         k = 0;
         for (i = 0; i < num_points; i++) {
-            HDprintf("(%d, %d)\n", (int)coords[k], (int)coords[k + 1]);
+            printf("(%d, %d)\n", (int)coords[k], (int)coords[k + 1]);
             k += 2;
         }
     }
@@ -158,19 +158,19 @@ dataset_print(hsize_t start[], hsize_t block[], B_DATATYPE *dataset)
     hsize_t     i, j;
 
     /* print the column heading */
-    HDprintf("%-8s", "Cols:");
+    printf("%-8s", "Cols:");
     for (j = 0; j < block[1]; j++) {
-        HDprintf("%3" PRIuHSIZE " ", start[1] + j);
+        printf("%3" PRIuHSIZE " ", start[1] + j);
     }
-    HDprintf("\n");
+    printf("\n");
 
     /* print the slab data */
     for (i = 0; i < block[0]; i++) {
-        HDprintf("Row %2" PRIuHSIZE ": ", i + start[0]);
+        printf("Row %2" PRIuHSIZE ": ", i + start[0]);
         for (j = 0; j < block[1]; j++) {
-            HDprintf("%" PRIuHSIZE " ", *dataptr++);
+            printf("%" PRIuHSIZE " ", *dataptr++);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 }
 
@@ -186,15 +186,15 @@ verify_data(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[],
 
     /* print it if VERBOSE_MED */
     if (VERBOSE_MED) {
-        HDprintf("verify_data dumping:::\n");
-        HDprintf("start(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "count(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "stride(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "block(%" PRIuHSIZE ", %" PRIuHSIZE ")\n",
-                 start[0], start[1], count[0], count[1], stride[0], stride[1], block[0], block[1]);
-        HDprintf("original values:\n");
+        printf("verify_data dumping:::\n");
+        printf("start(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "count(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "stride(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "block(%" PRIuHSIZE ", %" PRIuHSIZE ")\n",
+               start[0], start[1], count[0], count[1], stride[0], stride[1], block[0], block[1]);
+        printf("original values:\n");
         dataset_print(start, block, original);
-        HDprintf("compared values:\n");
+        printf("compared values:\n");
         dataset_print(start, block, dataset);
     }
 
@@ -203,10 +203,10 @@ verify_data(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[],
         for (j = 0; j < block[1]; j++) {
             if (*dataset != *original) {
                 if (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED) {
-                    HDprintf("Dataset Verify failed at [%" PRIuHSIZE "][%" PRIuHSIZE "]"
-                             "(row %" PRIuHSIZE ", col %" PRIuHSIZE "): "
-                             "expect %" PRIuHSIZE ", got %" PRIuHSIZE "\n",
-                             i, j, i + start[0], j + start[1], *(original), *(dataset));
+                    printf("Dataset Verify failed at [%" PRIuHSIZE "][%" PRIuHSIZE "]"
+                           "(row %" PRIuHSIZE ", col %" PRIuHSIZE "): "
+                           "expect %" PRIuHSIZE ", got %" PRIuHSIZE "\n",
+                           i, j, i + start[0], j + start[1], *(original), *(dataset));
                 }
                 dataset++;
                 original++;
@@ -214,9 +214,9 @@ verify_data(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[],
         }
     }
     if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-        HDprintf("[more errors ...]\n");
+        printf("[more errors ...]\n");
     if (vrfyerrs)
-        HDprintf("%d errors found in verify_data\n", vrfyerrs);
+        printf("%d errors found in verify_data\n", vrfyerrs);
     return (vrfyerrs);
 }
 
@@ -314,12 +314,12 @@ ccslab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t
             break;
     }
     if (VERBOSE_MED) {
-        HDprintf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
-                 "datapoints=%lu\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1],
-                 (unsigned long)(block[0] * block[1] * count[0] * count[1]));
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
+               "datapoints=%lu\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1],
+               (unsigned long)(block[0] * block[1] * count[0] * count[1]));
     }
 }
 
@@ -372,20 +372,20 @@ ccdataset_print(hsize_t start[], hsize_t block[], DATATYPE *dataset)
     hsize_t   i, j;
 
     /* print the column heading */
-    HDprintf("Print only the first block of the dataset\n");
-    HDprintf("%-8s", "Cols:");
+    printf("Print only the first block of the dataset\n");
+    printf("%-8s", "Cols:");
     for (j = 0; j < block[1]; j++) {
-        HDprintf("%3lu ", (unsigned long)(start[1] + j));
+        printf("%3lu ", (unsigned long)(start[1] + j));
     }
-    HDprintf("\n");
+    printf("\n");
 
     /* print the slab data */
     for (i = 0; i < block[0]; i++) {
-        HDprintf("Row %2lu: ", (unsigned long)(i + start[0]));
+        printf("Row %2lu: ", (unsigned long)(i + start[0]));
         for (j = 0; j < block[1]; j++) {
-            HDprintf("%03d ", *dataptr++);
+            printf("%03d ", *dataptr++);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 }
 
@@ -402,14 +402,14 @@ ccdataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block
 
     /* print it if VERBOSE_MED */
     if (VERBOSE_MED) {
-        HDprintf("dataset_vrfy dumping:::\n");
-        HDprintf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1]);
-        HDprintf("original values:\n");
+        printf("dataset_vrfy dumping:::\n");
+        printf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1]);
+        printf("original values:\n");
         ccdataset_print(start, block, original);
-        HDprintf("compared values:\n");
+        printf("compared values:\n");
         ccdataset_print(start, block, dataset);
     }
 
@@ -432,8 +432,8 @@ ccdataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block
                     }
                     if (*dataptr != *oriptr) {
                         if (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED) {
-                            HDprintf("Dataset Verify failed at [%lu][%lu]: expect %d, got %d\n",
-                                     (unsigned long)i, (unsigned long)j, *(oriptr), *(dataptr));
+                            printf("Dataset Verify failed at [%lu][%lu]: expect %d, got %d\n",
+                                   (unsigned long)i, (unsigned long)j, *(oriptr), *(dataptr));
                         }
                     }
                 }
@@ -441,9 +441,9 @@ ccdataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block
         }
     }
     if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-        HDprintf("[more errors ...]\n");
+        printf("[more errors ...]\n");
     if (vrfyerrs)
-        HDprintf("%d errors found in ccdataset_vrfy\n", vrfyerrs);
+        printf("%d errors found in ccdataset_vrfy\n", vrfyerrs);
     return (vrfyerrs);
 }
 
@@ -495,7 +495,7 @@ dataset_big_write(void)
 
     /* Each process takes a slabs of rows. */
     if (mpi_rank_g == 0)
-        HDprintf("\nTesting Dataset1 write by ROW\n");
+        printf("\nTesting Dataset1 write by ROW\n");
     /* Create a large dataset */
     dims[0] = bigcount;
     dims[1] = (hsize_t)mpi_size_g;
@@ -556,7 +556,7 @@ dataset_big_write(void)
 
     /* Each process takes a slabs of cols. */
     if (mpi_rank_g == 0)
-        HDprintf("\nTesting Dataset2 write by COL\n");
+        printf("\nTesting Dataset2 write by COL\n");
     /* Create a large dataset */
     dims[0] = bigcount;
     dims[1] = (hsize_t)mpi_size_g;
@@ -617,7 +617,7 @@ dataset_big_write(void)
 
     /* ALL selection */
     if (mpi_rank_g == 0)
-        HDprintf("\nTesting Dataset3 write select ALL proc 0, NONE others\n");
+        printf("\nTesting Dataset3 write select ALL proc 0, NONE others\n");
     /* Create a large dataset */
     dims[0] = bigcount;
     dims[1] = 1;
@@ -678,7 +678,7 @@ dataset_big_write(void)
 
     /* Point selection */
     if (mpi_rank_g == 0)
-        HDprintf("\nTesting Dataset4 write point selection\n");
+        printf("\nTesting Dataset4 write point selection\n");
     /* Create a large dataset */
     dims[0] = bigcount;
     dims[1] = (hsize_t)(mpi_size_g * 4);
@@ -803,7 +803,7 @@ dataset_big_read(void)
     VRFY_G((ret >= 0), "");
 
     if (mpi_rank_g == 0)
-        HDprintf("\nRead Testing Dataset1 by COL\n");
+        printf("\nRead Testing Dataset1 by COL\n");
 
     dataset = H5Dopen2(fid, DATASET1, H5P_DEFAULT);
     VRFY_G((dataset >= 0), "H5Dopen2 succeeded");
@@ -854,7 +854,7 @@ dataset_big_read(void)
     /* verify the read data with original expected data */
     ret = verify_data(start, count, stride, block, rdata, wdata);
     if (ret) {
-        HDfprintf(stderr, "verify failed\n");
+        fprintf(stderr, "verify failed\n");
         exit(1);
     }
 
@@ -866,7 +866,7 @@ dataset_big_read(void)
     VRFY_G((ret >= 0), "H5Dclose1 succeeded");
 
     if (mpi_rank_g == 0)
-        HDprintf("\nRead Testing Dataset2 by ROW\n");
+        printf("\nRead Testing Dataset2 by ROW\n");
     HDmemset(rdata, 0, bigcount * sizeof(B_DATATYPE));
     dataset = H5Dopen2(fid, DATASET2, H5P_DEFAULT);
     VRFY_G((dataset >= 0), "H5Dopen2 succeeded");
@@ -917,7 +917,7 @@ dataset_big_read(void)
     /* verify the read data with original expected data */
     ret = verify_data(start, count, stride, block, rdata, wdata);
     if (ret) {
-        HDfprintf(stderr, "verify failed\n");
+        fprintf(stderr, "verify failed\n");
         exit(1);
     }
 
@@ -929,7 +929,7 @@ dataset_big_read(void)
     VRFY_G((ret >= 0), "H5Dclose1 succeeded");
 
     if (mpi_rank_g == 0)
-        HDprintf("\nRead Testing Dataset3 read select ALL proc 0, NONE others\n");
+        printf("\nRead Testing Dataset3 read select ALL proc 0, NONE others\n");
     HDmemset(rdata, 0, bigcount * sizeof(B_DATATYPE));
     dataset = H5Dopen2(fid, DATASET3, H5P_DEFAULT);
     VRFY_G((dataset >= 0), "H5Dopen2 succeeded");
@@ -982,7 +982,7 @@ dataset_big_read(void)
         /* verify the read data with original expected data */
         ret = verify_data(start, count, stride, block, rdata, wdata);
         if (ret) {
-            HDfprintf(stderr, "verify failed\n");
+            fprintf(stderr, "verify failed\n");
             exit(1);
         }
     }
@@ -995,7 +995,7 @@ dataset_big_read(void)
     VRFY_G((ret >= 0), "H5Dclose1 succeeded");
 
     if (mpi_rank_g == 0)
-        HDprintf("\nRead Testing Dataset4 with Point selection\n");
+        printf("\nRead Testing Dataset4 with Point selection\n");
     dataset = H5Dopen2(fid, DATASET4, H5P_DEFAULT);
     VRFY_G((dataset >= 0), "H5Dopen2 succeeded");
 
@@ -1057,7 +1057,7 @@ dataset_big_read(void)
 
     ret = verify_data(start, count, stride, block, rdata, wdata);
     if (ret) {
-        HDfprintf(stderr, "verify failed\n");
+        fprintf(stderr, "verify failed\n");
         exit(1);
     }
 
@@ -1106,7 +1106,7 @@ static void
 single_rank_independent_io(void)
 {
     if (mpi_rank_g == 0)
-        HDprintf("single_rank_independent_io\n");
+        printf("single_rank_independent_io\n");
 
     if (MAIN_PROCESS) {
         hsize_t  dims[1];
@@ -1162,7 +1162,7 @@ single_rank_independent_io(void)
         /* Verify data */
         for (i = 0; i < dims[0]; i++)
             if (data[i] != (int)(i % (uint64_t)DXFER_BIGCOUNT)) {
-                HDfprintf(stderr, "verify failed\n");
+                fprintf(stderr, "verify failed\n");
                 exit(1);
             }
 
@@ -1269,7 +1269,7 @@ coll_chunk1(void)
 {
     const char *filename = FILENAME[0];
     if (mpi_rank_g == 0)
-        HDprintf("coll_chunk1\n");
+        printf("coll_chunk1\n");
 
     coll_chunktest(filename, 1, BYROW_CONT, API_NONE, HYPER, HYPER, OUT_OF_ORDER);
     coll_chunktest(filename, 1, BYROW_CONT, API_NONE, HYPER, POINT, OUT_OF_ORDER);
@@ -1322,7 +1322,7 @@ coll_chunk2(void)
 {
     const char *filename = FILENAME[0];
     if (mpi_rank_g == 0)
-        HDprintf("coll_chunk2\n");
+        printf("coll_chunk2\n");
 
     coll_chunktest(filename, 1, BYROW_DISCONT, API_NONE, HYPER, HYPER, OUT_OF_ORDER);
     coll_chunktest(filename, 1, BYROW_DISCONT, API_NONE, HYPER, POINT, OUT_OF_ORDER);
@@ -1374,7 +1374,7 @@ coll_chunk3(void)
 {
     const char *filename = FILENAME[0];
     if (mpi_rank_g == 0)
-        HDprintf("coll_chunk3\n");
+        printf("coll_chunk3\n");
 
     coll_chunktest(filename, mpi_size_g, BYROW_CONT, API_NONE, HYPER, HYPER, OUT_OF_ORDER);
     coll_chunktest(filename, mpi_size_g, BYROW_CONT, API_NONE, HYPER, POINT, OUT_OF_ORDER);
@@ -1869,7 +1869,7 @@ main(int argc, char **argv)
      * calls.  By then, MPI calls may not work.
      */
     if (H5dont_atexit() < 0)
-        HDprintf("Failed to turn off atexit processing. Continue.\n");
+        printf("Failed to turn off atexit processing. Continue.\n");
 
     /* set alarm. */
     /* TestAlarmOn(); */
@@ -1879,7 +1879,7 @@ main(int argc, char **argv)
     /* Get the capability flag of the VOL connector being used */
     if (H5Pget_vol_cap_flags(acc_plist, &vol_cap_flags_g) < 0) {
         if (MAIN_PROCESS)
-            HDprintf("Failed to get the capability flag of the VOL connector being used\n");
+            printf("Failed to get the capability flag of the VOL connector being used\n");
 
         MPI_Finalize();
         return 0;
@@ -1891,7 +1891,7 @@ main(int argc, char **argv)
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) ||
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) {
         if (MAIN_PROCESS)
-            HDprintf(
+            printf(
                 "API functions for basic file, dataset basic or more aren't supported with this connector\n");
 
         MPI_Finalize();
diff --git a/testpar/API/t_chunk_alloc.c b/testpar/API/t_chunk_alloc.c
index b5c4468..dde6890 100644
--- a/testpar/API/t_chunk_alloc.c
+++ b/testpar/API/t_chunk_alloc.c
@@ -482,7 +482,7 @@ test_chunk_alloc(void)
 
     filename = (const char *)PARATESTFILE /* GetTestParameters() */;
     if (VERBOSE_MED)
-        HDprintf("Extend Chunked allocation test on file %s\n", filename);
+        printf("Extend Chunked allocation test on file %s\n", filename);
 
     /* Case 1 */
     /* Create chunked dataset without writing anything.*/
diff --git a/testpar/API/t_coll_chunk.c b/testpar/API/t_coll_chunk.c
index 57ee605..eba08f4 100644
--- a/testpar/API/t_coll_chunk.c
+++ b/testpar/API/t_coll_chunk.c
@@ -1283,12 +1283,12 @@ ccslab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t
             break;
     }
     if (VERBOSE_MED) {
-        HDprintf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
-                 "datapoints=%lu\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1],
-                 (unsigned long)(block[0] * block[1] * count[0] * count[1]));
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
+               "datapoints=%lu\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1],
+               (unsigned long)(block[0] * block[1] * count[0] * count[1]));
     }
 }
 
@@ -1341,20 +1341,20 @@ ccdataset_print(hsize_t start[], hsize_t block[], DATATYPE *dataset)
     hsize_t   i, j;
 
     /* print the column heading */
-    HDprintf("Print only the first block of the dataset\n");
-    HDprintf("%-8s", "Cols:");
+    printf("Print only the first block of the dataset\n");
+    printf("%-8s", "Cols:");
     for (j = 0; j < block[1]; j++) {
-        HDprintf("%3lu ", (unsigned long)(start[1] + j));
+        printf("%3lu ", (unsigned long)(start[1] + j));
     }
-    HDprintf("\n");
+    printf("\n");
 
     /* print the slab data */
     for (i = 0; i < block[0]; i++) {
-        HDprintf("Row %2lu: ", (unsigned long)(i + start[0]));
+        printf("Row %2lu: ", (unsigned long)(i + start[0]));
         for (j = 0; j < block[1]; j++) {
-            HDprintf("%03d ", *dataptr++);
+            printf("%03d ", *dataptr++);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 }
 
@@ -1371,14 +1371,14 @@ ccdataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block
 
     /* print it if VERBOSE_MED */
     if (VERBOSE_MED) {
-        HDprintf("dataset_vrfy dumping:::\n");
-        HDprintf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1]);
-        HDprintf("original values:\n");
+        printf("dataset_vrfy dumping:::\n");
+        printf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1]);
+        printf("original values:\n");
         ccdataset_print(start, block, original);
-        HDprintf("compared values:\n");
+        printf("compared values:\n");
         ccdataset_print(start, block, dataset);
     }
 
@@ -1401,8 +1401,8 @@ ccdataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block
                     }
                     if (*dataptr != *oriptr) {
                         if (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED) {
-                            HDprintf("Dataset Verify failed at [%lu][%lu]: expect %d, got %d\n",
-                                     (unsigned long)i, (unsigned long)j, *(oriptr), *(dataptr));
+                            printf("Dataset Verify failed at [%lu][%lu]: expect %d, got %d\n",
+                                   (unsigned long)i, (unsigned long)j, *(oriptr), *(dataptr));
                         }
                     }
                 }
@@ -1410,8 +1410,8 @@ ccdataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block
         }
     }
     if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-        HDprintf("[more errors ...]\n");
+        printf("[more errors ...]\n");
     if (vrfyerrs)
-        HDprintf("%d errors found in ccdataset_vrfy\n", vrfyerrs);
+        printf("%d errors found in ccdataset_vrfy\n", vrfyerrs);
     return (vrfyerrs);
 }
diff --git a/testpar/API/t_dset.c b/testpar/API/t_dset.c
index 0bc88c1..3b7443e 100644
--- a/testpar/API/t_dset.c
+++ b/testpar/API/t_dset.c
@@ -57,7 +57,7 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = (hsize_t)mpi_rank * block[0];
             start[1]  = 0;
             if (VERBOSE_MED)
-                HDprintf("slab_set BYROW\n");
+                printf("slab_set BYROW\n");
             break;
         case BYCOL:
             /* Each process takes a block of columns. */
@@ -70,7 +70,7 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = 0;
             start[1]  = (hsize_t)mpi_rank * block[1];
             if (VERBOSE_MED)
-                HDprintf("slab_set BYCOL\n");
+                printf("slab_set BYCOL\n");
             break;
         case ZROW:
             /* Similar to BYROW except process 0 gets 0 row */
@@ -83,7 +83,7 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = (mpi_rank ? (hsize_t)mpi_rank * block[0] : 0);
             start[1]  = 0;
             if (VERBOSE_MED)
-                HDprintf("slab_set ZROW\n");
+                printf("slab_set ZROW\n");
             break;
         case ZCOL:
             /* Similar to BYCOL except process 0 gets 0 column */
@@ -96,11 +96,11 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = 0;
             start[1]  = (mpi_rank ? (hsize_t)mpi_rank * block[1] : 0);
             if (VERBOSE_MED)
-                HDprintf("slab_set ZCOL\n");
+                printf("slab_set ZCOL\n");
             break;
         default:
             /* Unknown mode.  Set it to cover the whole dataset. */
-            HDprintf("unknown slab_set mode (%d)\n", mode);
+            printf("unknown slab_set mode (%d)\n", mode);
             block[0]  = (hsize_t)dim0;
             block[1]  = (hsize_t)dim1;
             stride[0] = block[0];
@@ -110,16 +110,16 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = 0;
             start[1]  = 0;
             if (VERBOSE_MED)
-                HDprintf("slab_set wholeset\n");
+                printf("slab_set wholeset\n");
             break;
     }
     if (VERBOSE_MED) {
-        HDprintf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
-                 "datapoints=%lu\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1],
-                 (unsigned long)(block[0] * block[1] * count[0] * count[1]));
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
+               "datapoints=%lu\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1],
+               (unsigned long)(block[0] * block[1] * count[0] * count[1]));
     }
 }
 
@@ -156,15 +156,15 @@ point_set(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[], s
                     }
 
     if (VERBOSE_MED) {
-        HDprintf("start[]=(%lu, %lu), count[]=(%lu, %lu), stride[]=(%lu, %lu), block[]=(%lu, %lu), total "
-                 "datapoints=%lu\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1],
-                 (unsigned long)(block[0] * block[1] * count[0] * count[1]));
+        printf("start[]=(%lu, %lu), count[]=(%lu, %lu), stride[]=(%lu, %lu), block[]=(%lu, %lu), total "
+               "datapoints=%lu\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1],
+               (unsigned long)(block[0] * block[1] * count[0] * count[1]));
         k = 0;
         for (i = 0; i < num_points; i++) {
-            HDprintf("(%d, %d)\n", (int)coords[k], (int)coords[k + 1]);
+            printf("(%d, %d)\n", (int)coords[k], (int)coords[k + 1]);
             k += 2;
         }
     }
@@ -199,19 +199,19 @@ dataset_print(hsize_t start[], hsize_t block[], DATATYPE *dataset)
     hsize_t   i, j;
 
     /* print the column heading */
-    HDprintf("%-8s", "Cols:");
+    printf("%-8s", "Cols:");
     for (j = 0; j < block[1]; j++) {
-        HDprintf("%3lu ", (unsigned long)(start[1] + j));
+        printf("%3lu ", (unsigned long)(start[1] + j));
     }
-    HDprintf("\n");
+    printf("\n");
 
     /* print the slab data */
     for (i = 0; i < block[0]; i++) {
-        HDprintf("Row %2lu: ", (unsigned long)(i + start[0]));
+        printf("Row %2lu: ", (unsigned long)(i + start[0]));
         for (j = 0; j < block[1]; j++) {
-            HDprintf("%03d ", *dataptr++);
+            printf("%03d ", *dataptr++);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 }
 
@@ -227,14 +227,14 @@ dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[]
 
     /* print it if VERBOSE_MED */
     if (VERBOSE_MED) {
-        HDprintf("dataset_vrfy dumping:::\n");
-        HDprintf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1]);
-        HDprintf("original values:\n");
+        printf("dataset_vrfy dumping:::\n");
+        printf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1]);
+        printf("original values:\n");
         dataset_print(start, block, original);
-        HDprintf("compared values:\n");
+        printf("compared values:\n");
         dataset_print(start, block, dataset);
     }
 
@@ -243,9 +243,9 @@ dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[]
         for (j = 0; j < block[1]; j++) {
             if (*dataset != *original) {
                 if (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED) {
-                    HDprintf("Dataset Verify failed at [%lu][%lu](row %lu, col %lu): expect %d, got %d\n",
-                             (unsigned long)i, (unsigned long)j, (unsigned long)(i + start[0]),
-                             (unsigned long)(j + start[1]), *(original), *(dataset));
+                    printf("Dataset Verify failed at [%lu][%lu](row %lu, col %lu): expect %d, got %d\n",
+                           (unsigned long)i, (unsigned long)j, (unsigned long)(i + start[0]),
+                           (unsigned long)(j + start[1]), *(original), *(dataset));
                 }
                 dataset++;
                 original++;
@@ -253,9 +253,9 @@ dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[]
         }
     }
     if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-        HDprintf("[more errors ...]\n");
+        printf("[more errors ...]\n");
     if (vrfyerrs)
-        HDprintf("%d errors found in dataset_vrfy\n", vrfyerrs);
+        printf("%d errors found in dataset_vrfy\n", vrfyerrs);
     return (vrfyerrs);
 }
 
@@ -296,7 +296,7 @@ dataset_writeInd(void)
 
     filename = PARATESTFILE /* GetTestParameters() */;
     if (VERBOSE_MED)
-        HDprintf("Independent write test on file %s\n", filename);
+        printf("Independent write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -384,7 +384,7 @@ dataset_writeInd(void)
 
     /* setup dimensions again to write with zero rows for process 0 */
     if (VERBOSE_MED)
-        HDprintf("writeInd by some with zero row\n");
+        printf("writeInd by some with zero row\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZROW);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -447,7 +447,7 @@ dataset_readInd(void)
 
     filename = PARATESTFILE /* GetTestParameters() */;
     if (VERBOSE_MED)
-        HDprintf("Independent read test on file %s\n", filename);
+        printf("Independent read test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -590,7 +590,7 @@ dataset_writeAll(void)
 
     filename = PARATESTFILE /* GetTestParameters() */;
     if (VERBOSE_MED)
-        HDprintf("Collective write test on file %s\n", filename);
+        printf("Collective write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -722,7 +722,7 @@ dataset_writeAll(void)
 
     /* setup dimensions again to writeAll with zero rows for process 0 */
     if (VERBOSE_MED)
-        HDprintf("writeAll by some with zero row\n");
+        printf("writeAll by some with zero row\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZROW);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -787,7 +787,7 @@ dataset_writeAll(void)
 
     /* setup dimensions again to writeAll with zero columns for process 0 */
     if (VERBOSE_MED)
-        HDprintf("writeAll by some with zero col\n");
+        printf("writeAll by some with zero col\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZCOL);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -1119,7 +1119,7 @@ dataset_readAll(void)
 
     filename = PARATESTFILE /* GetTestParameters() */;
     if (VERBOSE_MED)
-        HDprintf("Collective read test on file %s\n", filename);
+        printf("Collective read test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -1229,7 +1229,7 @@ dataset_readAll(void)
 
     /* setup dimensions again to readAll with zero columns for process 0 */
     if (VERBOSE_MED)
-        HDprintf("readAll by some with zero col\n");
+        printf("readAll by some with zero col\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZCOL);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -1296,7 +1296,7 @@ dataset_readAll(void)
 
     /* setup dimensions again to readAll with zero rows for process 0 */
     if (VERBOSE_MED)
-        HDprintf("readAll by some with zero row\n");
+        printf("readAll by some with zero row\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZROW);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -1546,7 +1546,7 @@ extend_writeInd(void)
 
     filename = PARATESTFILE /* GetTestParameters() */;
     if (VERBOSE_MED)
-        HDprintf("Extend independent write test on file %s\n", filename);
+        printf("Extend independent write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -1611,7 +1611,7 @@ extend_writeInd(void)
 
     /* set up dataset storage chunk sizes and creation property list */
     if (VERBOSE_MED)
-        HDprintf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
+        printf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
     dataset_pl = H5Pcreate(H5P_DATASET_CREATE);
     VRFY((dataset_pl >= 0), "H5Pcreate succeeded");
     ret = H5Pset_chunk(dataset_pl, RANK, chunk_dims);
@@ -1774,7 +1774,7 @@ extend_writeInd2(void)
 
     filename = PARATESTFILE /* GetTestParameters() */;
     if (VERBOSE_MED)
-        HDprintf("Extend independent write test #2 on file %s\n", filename);
+        printf("Extend independent write test #2 on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -1844,8 +1844,8 @@ extend_writeInd2(void)
     if (VERBOSE_MED) {
         MESG("writing at offset zero: ");
         for (i = 0; i < (int)orig_size; i++)
-            HDprintf("%s%d", i ? ", " : "", written[i]);
-        HDprintf("\n");
+            printf("%s%d", i ? ", " : "", written[i]);
+        printf("\n");
     }
     ret = H5Dwrite(dataset, H5T_NATIVE_INT, ms, fs, H5P_DEFAULT, written);
     VRFY((ret >= 0), "H5Dwrite succeeded");
@@ -1857,15 +1857,15 @@ extend_writeInd2(void)
     VRFY((ret >= 0), "H5Dread succeeded");
     for (i = 0; i < (int)orig_size; i++)
         if (written[i] != retrieved[i]) {
-            HDprintf("Line #%d: written!=retrieved: written[%d]=%d, retrieved[%d]=%d\n", __LINE__, i,
-                     written[i], i, retrieved[i]);
+            printf("Line #%d: written!=retrieved: written[%d]=%d, retrieved[%d]=%d\n", __LINE__, i,
+                   written[i], i, retrieved[i]);
             nerrors++;
         }
     if (VERBOSE_MED) {
         MESG("read at offset zero: ");
         for (i = 0; i < (int)orig_size; i++)
-            HDprintf("%s%d", i ? ", " : "", retrieved[i]);
-        HDprintf("\n");
+            printf("%s%d", i ? ", " : "", retrieved[i]);
+        printf("\n");
     }
 
     /* -------------------------
@@ -1887,8 +1887,8 @@ extend_writeInd2(void)
     if (VERBOSE_MED) {
         MESG("writing at offset 10: ");
         for (i = 0; i < (int)orig_size; i++)
-            HDprintf("%s%d", i ? ", " : "", written[i]);
-        HDprintf("\n");
+            printf("%s%d", i ? ", " : "", written[i]);
+        printf("\n");
     }
     ret = H5Sselect_hyperslab(fs, H5S_SELECT_SET, &orig_size, NULL, &one, &orig_size);
     VRFY((ret >= 0), "H5Sselect_hyperslab succeeded");
@@ -1902,15 +1902,15 @@ extend_writeInd2(void)
     VRFY((ret >= 0), "H5Dread succeeded");
     for (i = 0; i < (int)orig_size; i++)
         if (written[i] != retrieved[i]) {
-            HDprintf("Line #%d: written!=retrieved: written[%d]=%d, retrieved[%d]=%d\n", __LINE__, i,
-                     written[i], i, retrieved[i]);
+            printf("Line #%d: written!=retrieved: written[%d]=%d, retrieved[%d]=%d\n", __LINE__, i,
+                   written[i], i, retrieved[i]);
             nerrors++;
         }
     if (VERBOSE_MED) {
         MESG("read at offset 10: ");
         for (i = 0; i < (int)orig_size; i++)
-            HDprintf("%s%d", i ? ", " : "", retrieved[i]);
-        HDprintf("\n");
+            printf("%s%d", i ? ", " : "", retrieved[i]);
+        printf("\n");
     }
 
     /* Close dataset collectively */
@@ -1949,7 +1949,7 @@ extend_readInd(void)
 
     filename = PARATESTFILE /* GetTestParameters() */;
     if (VERBOSE_MED)
-        HDprintf("Extend independent read test on file %s\n", filename);
+        printf("Extend independent read test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -2143,7 +2143,7 @@ extend_writeAll(void)
 
     filename = PARATESTFILE /* GetTestParameters() */;
     if (VERBOSE_MED)
-        HDprintf("Extend independent write test on file %s\n", filename);
+        printf("Extend independent write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -2208,7 +2208,7 @@ extend_writeAll(void)
 
     /* set up dataset storage chunk sizes and creation property list */
     if (VERBOSE_MED)
-        HDprintf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
+        printf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
     dataset_pl = H5Pcreate(H5P_DATASET_CREATE);
     VRFY((dataset_pl >= 0), "H5Pcreate succeeded");
     ret = H5Pset_chunk(dataset_pl, RANK, chunk_dims);
@@ -2393,7 +2393,7 @@ extend_readAll(void)
 
     filename = PARATESTFILE /* GetTestParameters() */;
     if (VERBOSE_MED)
-        HDprintf("Extend independent read test on file %s\n", filename);
+        printf("Extend independent read test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -2596,7 +2596,7 @@ compress_readAll(void)
 
     filename = PARATESTFILE /* GetTestParameters() */;
     if (VERBOSE_MED)
-        HDprintf("Collective chunked dataset read test on file %s\n", filename);
+        printf("Collective chunked dataset read test on file %s\n", filename);
 
     /* Retrieve MPI parameters */
     MPI_Comm_size(comm, &mpi_size);
@@ -2727,8 +2727,8 @@ compress_readAll(void)
             /* Verify data read */
             for (u = 0; u < dim; u++)
                 if (data_orig[u] != data_read[u]) {
-                    HDprintf("Line #%d: written!=retrieved: data_orig[%u]=%d, data_read[%u]=%d\n", __LINE__,
-                             (unsigned)u, data_orig[u], (unsigned)u, data_read[u]);
+                    printf("Line #%d: written!=retrieved: data_orig[%u]=%d, data_read[%u]=%d\n", __LINE__,
+                           (unsigned)u, data_orig[u], (unsigned)u, data_read[u]);
                     nerrors++;
                 }
 
@@ -2799,7 +2799,7 @@ none_selection_chunk(void)
 
     filename = PARATESTFILE /* GetTestParameters() */;
     if (VERBOSE_MED)
-        HDprintf("Extend independent write test on file %s\n", filename);
+        printf("Extend independent write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -2841,7 +2841,7 @@ none_selection_chunk(void)
 
     /* set up dataset storage chunk sizes and creation property list */
     if (VERBOSE_MED)
-        HDprintf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
+        printf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
     dataset_pl = H5Pcreate(H5P_DATASET_CREATE);
     VRFY((dataset_pl >= 0), "H5Pcreate succeeded");
     ret = H5Pset_chunk(dataset_pl, RANK, chunk_dims);
@@ -3418,8 +3418,8 @@ test_actual_io_mode(int selection_mode)
         VRFY((actual_io_mode_write == actual_io_mode_expected), message);
     }
     else {
-        HDfprintf(stderr, "%s %d -> (%d,%d)\n", test_name, mpi_rank, actual_chunk_opt_mode_write,
-                  actual_io_mode_write);
+        fprintf(stderr, "%s %d -> (%d,%d)\n", test_name, mpi_rank, actual_chunk_opt_mode_write,
+                actual_io_mode_write);
     }
 
     /* To test that the property is successfully reset to the default, we perform some
@@ -3517,7 +3517,7 @@ actual_io_mode_tests(void)
         if (mpi_size > 2)
             test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_MIX);
         else
-            HDfprintf(stdout, "Multi Chunk Mixed test requires 3 processes minimum\n");
+            fprintf(stdout, "Multi Chunk Mixed test requires 3 processes minimum\n");
 
         test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_MIX_DISAGREE);
 
@@ -3946,11 +3946,11 @@ dataset_atomicity(void)
     dim1     = 32;
     filename = PARATESTFILE /* GetTestParameters() */;
     if (facc_type != FACC_MPIO) {
-        HDprintf("Atomicity tests will not work without the MPIO VFD\n");
+        printf("Atomicity tests will not work without the MPIO VFD\n");
         return;
     }
     if (VERBOSE_MED)
-        HDprintf("atomic writes to file %s\n", filename);
+        printf("atomic writes to file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -4095,9 +4095,9 @@ dataset_atomicity(void)
         j = 0;
         k = 0;
         for (i = 0; i < dim0; i++) {
-            HDprintf("\n");
+            printf("\n");
             for (j = 0; j < dim1; j++)
-                HDprintf("%d ", read_buf[k++]);
+                printf("%d ", read_buf[k++]);
         }
     }
 
@@ -4111,8 +4111,8 @@ dataset_atomicity(void)
              "Atomicity Test Failed Process %d: Value read should be 0 or 5\n");
         for (i = 1; i < buf_size; i++) {
             if (read_buf[i] != compare) {
-                HDprintf("Atomicity Test Failed Process %d: read_buf[%d] is %d, should be %d\n", mpi_rank, i,
-                         read_buf[i], compare);
+                printf("Atomicity Test Failed Process %d: read_buf[%d] is %d, should be %d\n", mpi_rank, i,
+                       read_buf[i], compare);
                 nerrors++;
             }
         }
@@ -4195,11 +4195,11 @@ dataset_atomicity(void)
             j = 0;
             k = 0;
             for (i = 0; i < dim0; i++) {
-                HDprintf("\n");
+                printf("\n");
                 for (j = 0; j < dim1; j++)
-                    HDprintf("%d ", read_buf[k++]);
+                    printf("%d ", read_buf[k++]);
             }
-            HDprintf("\n");
+            printf("\n");
         }
     }
 
@@ -4231,8 +4231,8 @@ dataset_atomicity(void)
                     continue;
                 }
                 else if (compare != read_buf[k]) {
-                    HDprintf("Atomicity Test Failed Process %d: read_buf[%d] is %d, should be %d\n", mpi_rank,
-                             k, read_buf[k], compare);
+                    printf("Atomicity Test Failed Process %d: read_buf[%d] is %d, should be %d\n", mpi_rank,
+                           k, read_buf[k], compare);
                     nerrors++;
                 }
                 k++;
diff --git a/testpar/API/t_file.c b/testpar/API/t_file.c
index 1a80dfe..f296c8a 100644
--- a/testpar/API/t_file.c
+++ b/testpar/API/t_file.c
@@ -71,7 +71,7 @@ test_split_comm_access(void)
 
     filename = (const char *)PARATESTFILE /* GetTestParameters()*/;
     if (VERBOSE_MED)
-        HDprintf("Split Communicator access test on file %s\n", filename);
+        printf("Split Communicator access test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -151,7 +151,7 @@ test_page_buffer_access(void)
     filename = (const char *)GetTestParameters();
 
     if (VERBOSE_MED)
-        HDprintf("Page Buffer Usage in Parallel %s\n", filename);
+        printf("Page Buffer Usage in Parallel %s\n", filename);
 
     fapl = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     VRFY((fapl >= 0), "create_faccess_plist succeeded");
diff --git a/testpar/API/t_filter_read.c b/testpar/API/t_filter_read.c
index 64b69b2..0ea7040 100644
--- a/testpar/API/t_filter_read.c
+++ b/testpar/API/t_filter_read.c
@@ -196,12 +196,11 @@ filter_read_internal(const char *filename, hid_t dcpl, hsize_t *dset_size)
     for (i = 0; i < hs_size[0]; i++) {
         for (j = 0; j < hs_size[1]; j++) {
             if (points[i * size[1] + (size_t)hs_offset[1] + j] != check[i * hs_size[1] + j]) {
-                HDfprintf(stderr, "    Read different values than written.\n");
-                HDfprintf(stderr, "    At index %lu,%lu\n", (unsigned long)(i),
-                          (unsigned long)(hs_offset[1] + j));
-                HDfprintf(stderr, "    At original: %d\n",
-                          (int)points[i * size[1] + (size_t)hs_offset[1] + j]);
-                HDfprintf(stderr, "    At returned: %d\n", (int)check[i * hs_size[1] + j]);
+                fprintf(stderr, "    Read different values than written.\n");
+                fprintf(stderr, "    At index %lu,%lu\n", (unsigned long)(i),
+                        (unsigned long)(hs_offset[1] + j));
+                fprintf(stderr, "    At original: %d\n", (int)points[i * size[1] + (size_t)hs_offset[1] + j]);
+                fprintf(stderr, "    At returned: %d\n", (int)check[i * hs_size[1] + j]);
                 VRFY(FALSE, "");
             }
         }
@@ -285,7 +284,7 @@ test_filter_read(void)
     filename = PARATESTFILE /* GetTestParameters() */;
 
     if (VERBOSE_MED)
-        HDprintf("Parallel reading of dataset written with filters %s\n", filename);
+        printf("Parallel reading of dataset written with filters %s\n", filename);
 
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
diff --git a/testpar/API/t_mdset.c b/testpar/API/t_mdset.c
index 47e4b9c..ccca9d2 100644
--- a/testpar/API/t_mdset.c
+++ b/testpar/API/t_mdset.c
@@ -225,7 +225,7 @@ multiple_dset_write(void)
         H5Dclose(dataset);
 #ifdef BARRIER_CHECKS
         if (!((n + 1) % 10)) {
-            HDprintf("created %d datasets\n", n + 1);
+            printf("created %d datasets\n", n + 1);
             MPI_Barrier(MPI_COMM_WORLD);
         }
 #endif /* BARRIER_CHECKS */
@@ -366,8 +366,8 @@ compact_dataset(void)
         for (j = 0; j < size; j++)
             if (!H5_DBL_ABS_EQUAL(inme[(i * size) + j], outme[(i * size) + j]))
                 if (err_num++ < MAX_ERR_REPORT || VERBOSE_MED)
-                    HDprintf("Dataset Verify failed at [%d][%d]: expect %f, got %f\n", i, j,
-                             outme[(i * size) + j], inme[(i * size) + j]);
+                    printf("Dataset Verify failed at [%d][%d]: expect %f, got %f\n", i, j,
+                           outme[(i * size) + j], inme[(i * size) + j]);
 
     H5Pclose(plist);
     H5Pclose(dxpl);
@@ -755,13 +755,13 @@ dataset_fillvalue(void)
                     for (l = 0; l < (int)dset_dims[3]; l++, trdata++)
                         if (*trdata != 0)
                             if (err_num++ < MAX_ERR_REPORT || VERBOSE_MED)
-                                HDprintf(
+                                printf(
                                     "Rank %d: Dataset Verify failed at [%d][%d][%d][%d]: expect 0, got %d\n",
                                     mpi_rank, i, j, k, l, *trdata);
         if (err_num > MAX_ERR_REPORT && !VERBOSE_MED)
-            HDprintf("Rank %d: [more errors ...]\n", mpi_rank);
+            printf("Rank %d: [more errors ...]\n", mpi_rank);
         if (err_num) {
-            HDprintf("Rank %d: %d errors found in check_value\n", mpi_rank, err_num);
+            printf("Rank %d: %d errors found in check_value\n", mpi_rank, err_num);
             nerrors++;
         }
     }
@@ -847,19 +847,19 @@ dataset_fillvalue(void)
                         if (i < mpi_size) {
                             if (*twdata != *trdata)
                                 if (err_num++ < MAX_ERR_REPORT || VERBOSE_MED)
-                                    HDprintf("Dataset Verify failed at [%d][%d][%d][%d]: expect %d, got %d\n",
-                                             i, j, k, l, *twdata, *trdata);
+                                    printf("Dataset Verify failed at [%d][%d][%d][%d]: expect %d, got %d\n",
+                                           i, j, k, l, *twdata, *trdata);
                         } /* end if */
                         else {
                             if (*trdata != 0)
                                 if (err_num++ < MAX_ERR_REPORT || VERBOSE_MED)
-                                    HDprintf("Dataset Verify failed at [%d][%d][%d][%d]: expect 0, got %d\n",
-                                             i, j, k, l, *trdata);
+                                    printf("Dataset Verify failed at [%d][%d][%d][%d]: expect 0, got %d\n", i,
+                                           j, k, l, *trdata);
                         } /* end else */
         if (err_num > MAX_ERR_REPORT && !VERBOSE_MED)
-            HDprintf("[more errors ...]\n");
+            printf("[more errors ...]\n");
         if (err_num) {
-            HDprintf("%d errors found in check_value\n", err_num);
+            printf("%d errors found in check_value\n", err_num);
             nerrors++;
         }
     }
@@ -998,7 +998,7 @@ collective_group_write(void)
 
 #ifdef BARRIER_CHECKS
         if (!((m + 1) % 10)) {
-            HDprintf("created %d groups\n", m + 1);
+            printf("created %d groups\n", m + 1);
             MPI_Barrier(MPI_COMM_WORLD);
         }
 #endif /* BARRIER_CHECKS */
@@ -1225,7 +1225,7 @@ multiple_group_write(void)
 
 #ifdef BARRIER_CHECKS
         if (!((m + 1) % 10)) {
-            HDprintf("created %d groups\n", m + 1);
+            printf("created %d groups\n", m + 1);
             MPI_Barrier(MPI_COMM_WORLD);
         }
 #endif /* BARRIER_CHECKS */
@@ -1300,7 +1300,7 @@ create_group_recursive(hid_t memspace, hid_t filespace, hid_t gid, int counter)
 
 #ifdef BARRIER_CHECKS
     if (!((counter + 1) % 10)) {
-        HDprintf("created %dth child groups\n", counter + 1);
+        printf("created %dth child groups\n", counter + 1);
         MPI_Barrier(MPI_COMM_WORLD);
     }
 #endif /* BARRIER_CHECKS */
@@ -1578,14 +1578,14 @@ check_value(DATATYPE *indata, DATATYPE *outdata, int size)
         for (j = chunk_origin[1]; j < (chunk_origin[1] + chunk_dims[1]); j++) {
             if (*indata != *outdata)
                 if (err_num++ < MAX_ERR_REPORT || VERBOSE_MED)
-                    HDprintf("Dataset Verify failed at [%lu][%lu](row %lu, col%lu): expect %d, got %d\n",
-                             (unsigned long)i, (unsigned long)j, (unsigned long)i, (unsigned long)j, *outdata,
-                             *indata);
+                    printf("Dataset Verify failed at [%lu][%lu](row %lu, col%lu): expect %d, got %d\n",
+                           (unsigned long)i, (unsigned long)j, (unsigned long)i, (unsigned long)j, *outdata,
+                           *indata);
         }
     if (err_num > MAX_ERR_REPORT && !VERBOSE_MED)
-        HDprintf("[more errors ...]\n");
+        printf("[more errors ...]\n");
     if (err_num)
-        HDprintf("%d errors found in check_value\n", err_num);
+        printf("%d errors found in check_value\n", err_num);
     return err_num;
 }
 
@@ -1697,7 +1697,7 @@ io_mode_confusion(void)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Setting up property list.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Setting up property list.\n", mpi_rank, fcn_name);
 
     plist_id = H5Pcreate(H5P_FILE_ACCESS);
     VRFY((plist_id != -1), "H5Pcreate() failed");
@@ -1710,7 +1710,7 @@ io_mode_confusion(void)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Creating new file.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Creating new file.\n", mpi_rank, fcn_name);
 
     file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, plist_id);
     VRFY((file_id >= 0), "H5Fcreate() failed");
@@ -1723,7 +1723,7 @@ io_mode_confusion(void)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Creating the dataspace for the dataset.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Creating the dataspace for the dataset.\n", mpi_rank, fcn_name);
 
     dimsf[0]  = N;
     filespace = H5Screate_simple(rank, dimsf, NULL);
@@ -1734,7 +1734,7 @@ io_mode_confusion(void)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Creating the dataset, and closing filespace.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Creating the dataset, and closing filespace.\n", mpi_rank, fcn_name);
 
     dset_id =
         H5Dcreate2(file_id, dataset_name, H5T_NATIVE_INT, filespace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -1744,33 +1744,33 @@ io_mode_confusion(void)
     VRFY((status >= 0), "H5Sclose() failed");
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling H5Screate_simple().\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling H5Screate_simple().\n", mpi_rank, fcn_name);
 
     memspace = H5Screate_simple(rank, dimsf, NULL);
     VRFY((memspace >= 0), "H5Screate_simple() failed.");
 
     if (mpi_rank == 0) {
         if (verbose)
-            HDfprintf(stdout, "%0d:%s: Calling H5Sselect_all(memspace).\n", mpi_rank, fcn_name);
+            fprintf(stdout, "%0d:%s: Calling H5Sselect_all(memspace).\n", mpi_rank, fcn_name);
 
         status = H5Sselect_all(memspace);
         VRFY((status >= 0), "H5Sselect_all() failed");
     }
     else {
         if (verbose)
-            HDfprintf(stdout, "%0d:%s: Calling H5Sselect_none(memspace).\n", mpi_rank, fcn_name);
+            fprintf(stdout, "%0d:%s: Calling H5Sselect_none(memspace).\n", mpi_rank, fcn_name);
 
         status = H5Sselect_none(memspace);
         VRFY((status >= 0), "H5Sselect_none() failed");
     }
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling MPI_Barrier().\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling MPI_Barrier().\n", mpi_rank, fcn_name);
 
     MPI_Barrier(MPI_COMM_WORLD);
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling H5Dget_space().\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling H5Dget_space().\n", mpi_rank, fcn_name);
 
     filespace = H5Dget_space(dset_id);
     VRFY((filespace >= 0), "H5Dget_space() failed");
@@ -1778,32 +1778,32 @@ io_mode_confusion(void)
     /* select all */
     if (mpi_rank == 0) {
         if (verbose)
-            HDfprintf(stdout, "%0d:%s: Calling H5Sselect_elements() -- set up hang?\n", mpi_rank, fcn_name);
+            fprintf(stdout, "%0d:%s: Calling H5Sselect_elements() -- set up hang?\n", mpi_rank, fcn_name);
 
         status = H5Sselect_elements(filespace, H5S_SELECT_SET, N, (const hsize_t *)&coord);
         VRFY((status >= 0), "H5Sselect_elements() failed");
     }
     else { /* select nothing */
         if (verbose)
-            HDfprintf(stdout, "%0d:%s: Calling H5Sselect_none().\n", mpi_rank, fcn_name);
+            fprintf(stdout, "%0d:%s: Calling H5Sselect_none().\n", mpi_rank, fcn_name);
 
         status = H5Sselect_none(filespace);
         VRFY((status >= 0), "H5Sselect_none() failed");
     }
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling MPI_Barrier().\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling MPI_Barrier().\n", mpi_rank, fcn_name);
 
     MPI_Barrier(MPI_COMM_WORLD);
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling H5Pcreate().\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling H5Pcreate().\n", mpi_rank, fcn_name);
 
     plist_id = H5Pcreate(H5P_DATASET_XFER);
     VRFY((plist_id != -1), "H5Pcreate() failed");
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling H5Pset_dxpl_mpio().\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling H5Pset_dxpl_mpio().\n", mpi_rank, fcn_name);
 
     status = H5Pset_dxpl_mpio(plist_id, H5FD_MPIO_COLLECTIVE);
     VRFY((status >= 0), "H5Pset_dxpl_mpio() failed");
@@ -1813,12 +1813,12 @@ io_mode_confusion(void)
     }
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling H5Dwrite() -- hang here?.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling H5Dwrite() -- hang here?.\n", mpi_rank, fcn_name);
 
     status = H5Dwrite(dset_id, H5T_NATIVE_INT, memspace, filespace, plist_id, data);
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Returned from H5Dwrite(), status=%d.\n", mpi_rank, fcn_name, status);
+        fprintf(stdout, "%0d:%s: Returned from H5Dwrite(), status=%d.\n", mpi_rank, fcn_name, status);
     VRFY((status >= 0), "H5Dwrite() failed");
 
     /*
@@ -1826,7 +1826,7 @@ io_mode_confusion(void)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Cleaning up from test.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Cleaning up from test.\n", mpi_rank, fcn_name);
 
     status = H5Dclose(dset_id);
     VRFY((status >= 0), "H5Dclose() failed");
@@ -1844,7 +1844,7 @@ io_mode_confusion(void)
     VRFY((status >= 0), "H5Fclose() failed");
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
 
     return;
 
@@ -1975,7 +1975,7 @@ rr_obj_hdr_flush_confusion(void)
 
     MPI_Comm_free(&comm);
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
 
     return;
 
@@ -2048,7 +2048,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Setting up property list.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Setting up property list.\n", mpi_rank, fcn_name);
 
     fapl_id = H5Pcreate(H5P_FILE_ACCESS);
     VRFY((fapl_id != -1), "H5Pcreate(H5P_FILE_ACCESS) failed");
@@ -2061,7 +2061,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Creating new file \"%s\".\n", mpi_rank, fcn_name, filename);
+        fprintf(stdout, "%0d:%s: Creating new file \"%s\".\n", mpi_rank, fcn_name, filename);
 
     file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
     VRFY((file_id >= 0), "H5Fcreate() failed");
@@ -2074,7 +2074,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Creating the datasets.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Creating the datasets.\n", mpi_rank, fcn_name);
 
     disk_size[0] = (hsize_t)(LOCAL_DATA_SIZE * mpi_size);
     mem_size[0]  = (hsize_t)(LOCAL_DATA_SIZE);
@@ -2095,7 +2095,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Setting up dxpl.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Setting up dxpl.\n", mpi_rank, fcn_name);
 
     dxpl_id = H5Pcreate(H5P_DATASET_XFER);
     VRFY((dxpl_id != -1), "H5Pcreate(H5P_DATASET_XFER) failed.\n");
@@ -2108,7 +2108,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Writing datasets.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Writing datasets.\n", mpi_rank, fcn_name);
 
     disk_count[0] = (hsize_t)(LOCAL_DATA_SIZE);
     disk_start[0] = (hsize_t)(LOCAL_DATA_SIZE * mpi_rank);
@@ -2137,7 +2137,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: closing dataspaces.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: closing dataspaces.\n", mpi_rank, fcn_name);
 
     for (i = 0; i < NUM_DATA_SETS; i++) {
         err = H5Sclose(disk_space[i]);
@@ -2153,7 +2153,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
     err = H5Fflush(file_id, H5F_SCOPE_GLOBAL);
     VRFY((err >= 0), "H5Fflush(1) failed.\n");
 
@@ -2167,7 +2167,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: writing attributes.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: writing attributes.\n", mpi_rank, fcn_name);
 
     att_size[0] = (hsize_t)(LOCAL_DATA_SIZE);
     for (j = 0; j < LOCAL_DATA_SIZE; j++) {
@@ -2192,7 +2192,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: closing attr ids and spaces .\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: closing attr ids and spaces .\n", mpi_rank, fcn_name);
 
     for (i = 0; i < NUM_DATA_SETS; i++) {
         err = H5Sclose(att_space[i]);
@@ -2208,7 +2208,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
     err = H5Fflush(file_id, H5F_SCOPE_GLOBAL);
     VRFY((err >= 0), "H5Fflush(2) failed.\n");
 
@@ -2222,7 +2222,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: writing large attributes.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: writing large attributes.\n", mpi_rank, fcn_name);
 
     lg_att_size[0] = (hsize_t)(LARGE_ATTR_SIZE);
 
@@ -2256,7 +2256,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
     err = H5Fflush(file_id, H5F_SCOPE_GLOBAL);
     VRFY((err >= 0), "H5Fflush(3) failed.\n");
 
@@ -2270,7 +2270,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: writing different large attributes.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: writing different large attributes.\n", mpi_rank, fcn_name);
 
     for (j = 0; j < LARGE_ATTR_SIZE; j++) {
         lg_att[j] = (double)(j + 2);
@@ -2290,7 +2290,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      * flush the metadata cache again
      */
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
     err = H5Fflush(file_id, H5F_SCOPE_GLOBAL);
     VRFY((err >= 0), "H5Fflush(3) failed.\n");
 
@@ -2306,7 +2306,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: closing large attr ids and spaces .\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: closing large attr ids and spaces .\n", mpi_rank, fcn_name);
 
     for (i = 0; i < NUM_DATA_SETS; i++) {
 
@@ -2321,7 +2321,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: closing datasets .\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: closing datasets .\n", mpi_rank, fcn_name);
 
     for (i = 0; i < NUM_DATA_SETS; i++) {
         err = H5Dclose(dataset[i]);
@@ -2333,7 +2333,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: closing dxpl .\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: closing dxpl .\n", mpi_rank, fcn_name);
 
     err = H5Pclose(dxpl_id);
     VRFY((err >= 0), "H5Pclose(dxpl_id) failed.\n");
@@ -2343,7 +2343,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: closing file.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: closing file.\n", mpi_rank, fcn_name);
 
     err = H5Fclose(file_id);
     VRFY((err >= 0), "H5Fclose(1) failed");
@@ -2360,7 +2360,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
     VRFY((MPI_SUCCESS == mrc), "Reader_check failed");
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
 
     return;
 
@@ -2439,7 +2439,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
              */
 
             if (verbose)
-                HDfprintf(stdout, "%0d:%s: Setting up property list.\n", mpi_rank, fcn_name);
+                fprintf(stdout, "%0d:%s: Setting up property list.\n", mpi_rank, fcn_name);
 
             fapl_id = H5Pcreate(H5P_FILE_ACCESS);
             VRFY((fapl_id != -1), "H5Pcreate(H5P_FILE_ACCESS) failed");
@@ -2451,7 +2451,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
              */
 
             if (verbose)
-                HDfprintf(stdout, "%0d:%s: Re-open file \"%s\".\n", mpi_rank, fcn_name, filename);
+                fprintf(stdout, "%0d:%s: Re-open file \"%s\".\n", mpi_rank, fcn_name, filename);
 
             file_id = H5Fopen(filename, H5F_ACC_RDONLY, fapl_id);
             VRFY((file_id >= 0), "H5Fopen() failed");
@@ -2465,7 +2465,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                  *=====================================================*/
 
                 if (verbose)
-                    HDfprintf(stdout, "%0d:%s: opening the datasets.\n", mpi_rank, fcn_name);
+                    fprintf(stdout, "%0d:%s: opening the datasets.\n", mpi_rank, fcn_name);
 
                 for (i = 0; i < NUM_DATA_SETS; i++) {
                     dataset[i] = -1;
@@ -2483,7 +2483,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                  */
 
                 if (verbose)
-                    HDfprintf(stdout, "%0d:%s: Setting up dxpl.\n", mpi_rank, fcn_name);
+                    fprintf(stdout, "%0d:%s: Setting up dxpl.\n", mpi_rank, fcn_name);
 
                 dxpl_id = H5Pcreate(H5P_DATASET_XFER);
                 VRFY((dxpl_id != -1), "H5Pcreate(H5P_DATASET_XFER) failed.\n");
@@ -2495,7 +2495,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                  */
 
                 if (verbose)
-                    HDfprintf(stdout, "%0d:%s: Reading datasets.\n", mpi_rank, fcn_name);
+                    fprintf(stdout, "%0d:%s: Reading datasets.\n", mpi_rank, fcn_name);
 
                 disk_count[0] = (hsize_t)(LOCAL_DATA_SIZE);
                 disk_start[0] = (hsize_t)(LOCAL_DATA_SIZE * mpi_rank);
@@ -2525,10 +2525,10 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                     /* compare read data with expected data */
                     for (j = 0; j < LOCAL_DATA_SIZE; j++)
                         if (!H5_DBL_ABS_EQUAL(data_read[j], data[j])) {
-                            HDfprintf(stdout,
-                                      "%0d:%s: Reading datasets value failed in "
-                                      "Dataset %d, at position %d: expect %f, got %f.\n",
-                                      mpi_rank, fcn_name, i, j, data[j], data_read[j]);
+                            fprintf(stdout,
+                                    "%0d:%s: Reading datasets value failed in "
+                                    "Dataset %d, at position %d: expect %f, got %f.\n",
+                                    mpi_rank, fcn_name, i, j, data[j], data_read[j]);
                             nerrors++;
                         }
                     for (j = 0; j < LOCAL_DATA_SIZE; j++)
@@ -2540,7 +2540,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                  */
 
                 if (verbose)
-                    HDfprintf(stdout, "%0d:%s: closing dataspaces.\n", mpi_rank, fcn_name);
+                    fprintf(stdout, "%0d:%s: closing dataspaces.\n", mpi_rank, fcn_name);
 
                 for (i = 0; i < NUM_DATA_SETS; i++) {
                     err = H5Sclose(disk_space[i]);
@@ -2560,7 +2560,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
 
             if (steps >= 2) {
                 if (verbose)
-                    HDfprintf(stdout, "%0d:%s: reading attributes.\n", mpi_rank, fcn_name);
+                    fprintf(stdout, "%0d:%s: reading attributes.\n", mpi_rank, fcn_name);
 
                 for (j = 0; j < LOCAL_DATA_SIZE; j++) {
                     att[j] = (double)(j + 1);
@@ -2576,8 +2576,8 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                     tri_err = H5Tequal(att_type, H5T_NATIVE_DOUBLE);
                     VRFY((tri_err >= 0), "H5Tequal failed.\n");
                     if (tri_err == 0) {
-                        HDfprintf(stdout, "%0d:%s: Mismatched Attribute type of Dataset %d.\n", mpi_rank,
-                                  fcn_name, i);
+                        fprintf(stdout, "%0d:%s: Mismatched Attribute type of Dataset %d.\n", mpi_rank,
+                                fcn_name, i);
                         nerrors++;
                     }
                     else {
@@ -2587,10 +2587,10 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                         /* compare read attribute data with expected data */
                         for (j = 0; j < LOCAL_DATA_SIZE; j++)
                             if (!H5_DBL_ABS_EQUAL(att_read[j], att[j])) {
-                                HDfprintf(stdout,
-                                          "%0d:%s: Mismatched attribute data read in Dataset %d, at position "
-                                          "%d: expect %f, got %f.\n",
-                                          mpi_rank, fcn_name, i, j, att[j], att_read[j]);
+                                fprintf(stdout,
+                                        "%0d:%s: Mismatched attribute data read in Dataset %d, at position "
+                                        "%d: expect %f, got %f.\n",
+                                        mpi_rank, fcn_name, i, j, att[j], att_read[j]);
                                 nerrors++;
                             }
                         for (j = 0; j < LOCAL_DATA_SIZE; j++) {
@@ -2613,7 +2613,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
 
             if (steps >= 3) {
                 if (verbose)
-                    HDfprintf(stdout, "%0d:%s: reading large attributes.\n", mpi_rank, fcn_name);
+                    fprintf(stdout, "%0d:%s: reading large attributes.\n", mpi_rank, fcn_name);
 
                 for (j = 0; j < LARGE_ATTR_SIZE; j++) {
                     lg_att[j] = (steps == 3) ? (double)(j + 1) : (double)(j + 2);
@@ -2627,8 +2627,8 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                     tri_err = H5Tequal(lg_att_type[i], H5T_NATIVE_DOUBLE);
                     VRFY((tri_err >= 0), "H5Tequal failed.\n");
                     if (tri_err == 0) {
-                        HDfprintf(stdout, "%0d:%s: Mismatched Large attribute type of Dataset %d.\n",
-                                  mpi_rank, fcn_name, i);
+                        fprintf(stdout, "%0d:%s: Mismatched Large attribute type of Dataset %d.\n", mpi_rank,
+                                fcn_name, i);
                         nerrors++;
                     }
                     else {
@@ -2638,10 +2638,10 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                         /* compare read attribute data with expected data */
                         for (j = 0; j < LARGE_ATTR_SIZE; j++)
                             if (!H5_DBL_ABS_EQUAL(lg_att_read[j], lg_att[j])) {
-                                HDfprintf(stdout,
-                                          "%0d:%s: Mismatched large attribute data read in Dataset %d, at "
-                                          "position %d: expect %f, got %f.\n",
-                                          mpi_rank, fcn_name, i, j, lg_att[j], lg_att_read[j]);
+                                fprintf(stdout,
+                                        "%0d:%s: Mismatched large attribute data read in Dataset %d, at "
+                                        "position %d: expect %f, got %f.\n",
+                                        mpi_rank, fcn_name, i, j, lg_att[j], lg_att_read[j]);
                                 nerrors++;
                             }
                         for (j = 0; j < LARGE_ATTR_SIZE; j++) {
@@ -2675,7 +2675,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
              */
 
             if (verbose)
-                HDfprintf(stdout, "%0d:%s: closing datasets again.\n", mpi_rank, fcn_name);
+                fprintf(stdout, "%0d:%s: closing datasets again.\n", mpi_rank, fcn_name);
 
             for (i = 0; i < NUM_DATA_SETS; i++) {
                 if (dataset[i] >= 0) {
@@ -2689,7 +2689,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
              */
 
             if (verbose)
-                HDfprintf(stdout, "%0d:%s: closing dxpl .\n", mpi_rank, fcn_name);
+                fprintf(stdout, "%0d:%s: closing dxpl .\n", mpi_rank, fcn_name);
 
             err = H5Pclose(dxpl_id);
             VRFY((err >= 0), "H5Pclose(dxpl_id) failed.\n");
@@ -2698,7 +2698,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
              * Close the file
              */
             if (verbose)
-                HDfprintf(stdout, "%0d:%s: closing file again.\n", mpi_rank, fcn_name);
+                fprintf(stdout, "%0d:%s: closing file again.\n", mpi_rank, fcn_name);
             err = H5Fclose(file_id);
             VRFY((err >= 0), "H5Fclose(1) failed");
 
@@ -2707,7 +2707,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
     } /* end while(1) */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
 
     return;
 } /* rr_obj_hdr_flush_confusion_reader() */
diff --git a/testpar/API/t_ph5basic.c b/testpar/API/t_ph5basic.c
index 1639aff..f35d906 100644
--- a/testpar/API/t_ph5basic.c
+++ b/testpar/API/t_ph5basic.c
@@ -47,13 +47,13 @@ test_fapl_mpio_dup(void)
     int      nkeys, nkeys_tmp;
 
     if (VERBOSE_MED)
-        HDprintf("Verify fapl_mpio duplicates communicator and INFO objects\n");
+        printf("Verify fapl_mpio duplicates communicator and INFO objects\n");
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
     if (VERBOSE_MED)
-        HDprintf("rank/size of MPI_COMM_WORLD are %d/%d\n", mpi_rank, mpi_size);
+        printf("rank/size of MPI_COMM_WORLD are %d/%d\n", mpi_rank, mpi_size);
 
     /* Create a new communicator that has the same processes as MPI_COMM_WORLD.
      * Use MPI_Comm_split because it is simpler than MPI_Comm_create
@@ -63,7 +63,7 @@ test_fapl_mpio_dup(void)
     MPI_Comm_size(comm, &mpi_size_old);
     MPI_Comm_rank(comm, &mpi_rank_old);
     if (VERBOSE_MED)
-        HDprintf("rank/size of comm are %d/%d\n", mpi_rank_old, mpi_size_old);
+        printf("rank/size of comm are %d/%d\n", mpi_rank_old, mpi_size_old);
 
     /* create a new INFO object with some trivial information. */
     mrc = MPI_Info_create(&info);
@@ -102,7 +102,7 @@ test_fapl_mpio_dup(void)
     MPI_Comm_size(comm_tmp, &mpi_size_tmp);
     MPI_Comm_rank(comm_tmp, &mpi_rank_tmp);
     if (VERBOSE_MED)
-        HDprintf("After H5Pget_fapl_mpio: rank/size of comm are %d/%d\n", mpi_rank_tmp, mpi_size_tmp);
+        printf("After H5Pget_fapl_mpio: rank/size of comm are %d/%d\n", mpi_rank_tmp, mpi_size_tmp);
     VRFY((mpi_size_tmp == mpi_size), "MPI_Comm_size");
     VRFY((mpi_rank_tmp == mpi_rank), "MPI_Comm_rank");
     if (MPI_INFO_NULL != info_tmp) {
@@ -151,7 +151,7 @@ test_fapl_mpio_dup(void)
     MPI_Comm_size(comm_tmp, &mpi_size_tmp);
     MPI_Comm_rank(comm_tmp, &mpi_rank_tmp);
     if (VERBOSE_MED)
-        HDprintf("After second H5Pget_fapl_mpio: rank/size of comm are %d/%d\n", mpi_rank_tmp, mpi_size_tmp);
+        printf("After second H5Pget_fapl_mpio: rank/size of comm are %d/%d\n", mpi_rank_tmp, mpi_size_tmp);
     VRFY((mpi_size_tmp == mpi_size), "MPI_Comm_size");
     VRFY((mpi_rank_tmp == mpi_rank), "MPI_Comm_rank");
     if (MPI_INFO_NULL != info_tmp) {
@@ -172,7 +172,7 @@ test_fapl_mpio_dup(void)
     MPI_Comm_size(comm_tmp, &mpi_size_tmp);
     MPI_Comm_rank(comm_tmp, &mpi_rank_tmp);
     if (VERBOSE_MED)
-        HDprintf("After Property list closed: rank/size of comm are %d/%d\n", mpi_rank_tmp, mpi_size_tmp);
+        printf("After Property list closed: rank/size of comm are %d/%d\n", mpi_rank_tmp, mpi_size_tmp);
     if (MPI_INFO_NULL != info_tmp) {
         mrc = MPI_Info_get_nkeys(info_tmp, &nkeys_tmp);
         VRFY((mrc == MPI_SUCCESS), "MPI_Info_get_nkeys");
diff --git a/testpar/API/t_prop.c b/testpar/API/t_prop.c
index 3659501..3065404 100644
--- a/testpar/API/t_prop.c
+++ b/testpar/API/t_prop.c
@@ -152,7 +152,7 @@ test_plist_ed(void)
     herr_t ret; /* Generic return value */
 
     if (VERBOSE_MED)
-        HDprintf("Encode/Decode DCPLs\n");
+        printf("Encode/Decode DCPLs\n");
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -480,7 +480,7 @@ external_links(void)
     char        link_path[50];
 
     if (VERBOSE_MED)
-        HDprintf("Check external links\n");
+        printf("Check external links\n");
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
diff --git a/testpar/API/t_pshutdown.c b/testpar/API/t_pshutdown.c
index 48a8005..269e6dd 100644
--- a/testpar/API/t_pshutdown.c
+++ b/testpar/API/t_pshutdown.c
@@ -70,7 +70,7 @@ main(int argc, char **argv)
         !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         if (MAINPROCESS) {
             puts("SKIPPED");
-            HDprintf(
+            printf(
                 "    API functions for basic file, group, or dataset aren't supported with this connector\n");
             fflush(stdout);
         }
diff --git a/testpar/API/t_shapesame.c b/testpar/API/t_shapesame.c
index 32980f4..cb323e0 100644
--- a/testpar/API/t_shapesame.c
+++ b/testpar/API/t_shapesame.c
@@ -256,16 +256,16 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker
 #if CONTIG_HS_DR_PIO_TEST__SETUP__DEBUG
     if (MAINPROCESS) {
 
-        HDfprintf(stdout, "%d: test num = %d.\n", tv_ptr->mpi_rank, tv_ptr->test_num);
-        HDfprintf(stdout, "%d: mpi_size = %d.\n", tv_ptr->mpi_rank, tv_ptr->mpi_size);
-        HDfprintf(stdout, "%d: small/large rank = %d/%d, use_collective_io = %d.\n", tv_ptr->mpi_rank,
-                  tv_ptr->small_rank, tv_ptr->large_rank, (int)use_collective_io);
-        HDfprintf(stdout, "%d: edge_size = %d, chunk_edge_size = %d.\n", tv_ptr->mpi_rank, tv_ptr->edge_size,
-                  tv_ptr->chunk_edge_size);
-        HDfprintf(stdout, "%d: checker_edge_size = %d.\n", tv_ptr->mpi_rank, tv_ptr->checker_edge_size);
-        HDfprintf(stdout, "%d: small_ds_size = %d, large_ds_size = %d.\n", tv_ptr->mpi_rank,
-                  (int)(tv_ptr->small_ds_size), (int)(tv_ptr->large_ds_size));
-        HDfprintf(stdout, "%d: filename = %s.\n", tv_ptr->mpi_rank, filename);
+        fprintf(stdout, "%d: test num = %d.\n", tv_ptr->mpi_rank, tv_ptr->test_num);
+        fprintf(stdout, "%d: mpi_size = %d.\n", tv_ptr->mpi_rank, tv_ptr->mpi_size);
+        fprintf(stdout, "%d: small/large rank = %d/%d, use_collective_io = %d.\n", tv_ptr->mpi_rank,
+                tv_ptr->small_rank, tv_ptr->large_rank, (int)use_collective_io);
+        fprintf(stdout, "%d: edge_size = %d, chunk_edge_size = %d.\n", tv_ptr->mpi_rank, tv_ptr->edge_size,
+                tv_ptr->chunk_edge_size);
+        fprintf(stdout, "%d: checker_edge_size = %d.\n", tv_ptr->mpi_rank, tv_ptr->checker_edge_size);
+        fprintf(stdout, "%d: small_ds_size = %d, large_ds_size = %d.\n", tv_ptr->mpi_rank,
+                (int)(tv_ptr->small_ds_size), (int)(tv_ptr->large_ds_size));
+        fprintf(stdout, "%d: filename = %s.\n", tv_ptr->mpi_rank, filename);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__SETUP__DEBUG */
     /* ----------------------------------------
@@ -747,7 +747,7 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
     HDmemset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size);
 
 #if CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG
-    HDfprintf(stdout, "%s reading slices from big cube on disk into small cube slice.\n", fcnName);
+    fprintf(stdout, "%s reading slices from big cube on disk into small cube slice.\n", fcnName);
 #endif /* CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
 
     /* in serial versions of this test, we loop through all the dimensions
@@ -834,12 +834,12 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
 
                     /* Read selection from disk */
 #if CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
-                              (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
-                              (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
-                    HDfprintf(stdout, "%s slice/file extent dims = %d/%d.\n", fcnName,
-                              H5Sget_simple_extent_ndims(tv_ptr->small_ds_slice_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
+                            (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
+                            (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
+                    fprintf(stdout, "%s slice/file extent dims = %d/%d.\n", fcnName,
+                            H5Sget_simple_extent_ndims(tv_ptr->small_ds_slice_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
 #endif /* CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
                     ret =
                         H5Dread(tv_ptr->large_dataset, H5T_NATIVE_UINT32, tv_ptr->small_ds_slice_sid,
@@ -955,7 +955,7 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
     VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid_0, set) succeeded");
 
 #if CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG
-    HDfprintf(stdout, "%s reading slices of on disk small data set into slices of big data set.\n", fcnName);
+    fprintf(stdout, "%s reading slices of on disk small data set into slices of big data set.\n", fcnName);
 #endif /* CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG */
 
     /* zero out the in memory large ds */
@@ -1065,12 +1065,12 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
 
                     /* Read selection from disk */
 #if CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
-                              (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
-                              (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->mem_large_ds_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_0));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
+                            (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
+                            (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->mem_large_ds_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_0));
 #endif /* CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG */
                     ret = H5Dread(tv_ptr->small_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_large_ds_sid,
                                   tv_ptr->file_small_ds_sid_0, tv_ptr->xfer_plist, tv_ptr->large_ds_buf_1);
@@ -1233,7 +1233,7 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
     HDmemset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size);
 
 #if CONTIG_HS_DR_PIO_TEST__M2D_L2S__DEBUG
-    HDfprintf(stdout, "%s writing slices from big ds to slices of small ds on disk.\n", fcnName);
+    fprintf(stdout, "%s writing slices from big ds to slices of small ds on disk.\n", fcnName);
 #endif /* CONTIG_HS_DR_PIO_TEST__M2D_L2S__DEBUG */
 
     /* in serial versions of this test, we loop through all the dimensions
@@ -1334,12 +1334,12 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
                     /* write the slice from the in memory large data set to the
                      * slice of the on disk small dataset. */
 #if CONTIG_HS_DR_PIO_TEST__M2D_L2S__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
-                              (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
-                              (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->mem_large_ds_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_0));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
+                            (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
+                            (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->mem_large_ds_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_0));
 #endif /* CONTIG_HS_DR_PIO_TEST__M2D_L2S__DEBUG */
                     ret = H5Dwrite(tv_ptr->small_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_large_ds_sid,
                                    tv_ptr->file_small_ds_sid_0, tv_ptr->xfer_plist, tv_ptr->large_ds_buf_0);
@@ -1508,7 +1508,7 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
     HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size);
 
 #if CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG
-    HDfprintf(stdout, "%s writing process slices of small ds to slices of large ds on disk.\n", fcnName);
+    fprintf(stdout, "%s writing process slices of small ds to slices of large ds on disk.\n", fcnName);
 #endif /* CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG */
 
     if (PAR_SS_DR_MAX_RANK - tv_ptr->large_rank == 0) {
@@ -1569,12 +1569,12 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                     tv_ptr->start[3] = (hsize_t)l;
                     tv_ptr->start[4] = 0;
 
-                    HDfprintf(stdout, "%s:%d: skipping test with start = %d %d %d %d %d.\n", fcnName,
-                              (int)(tv_ptr->mpi_rank), (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]),
-                              (int)(tv_ptr->start[2]), (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->mem_small_ds_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
+                    fprintf(stdout, "%s:%d: skipping test with start = %d %d %d %d %d.\n", fcnName,
+                            (int)(tv_ptr->mpi_rank), (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]),
+                            (int)(tv_ptr->start[2]), (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->mem_small_ds_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
 #endif /* CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG */
                 }
                 else { /* run the test */
@@ -1620,12 +1620,12 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                      * target slice of the disk data set
                      */
 #if CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
-                              (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
-                              (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->mem_small_ds_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
+                            (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
+                            (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->mem_small_ds_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
 #endif /* CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG */
                     ret = H5Dwrite(tv_ptr->large_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_small_ds_sid,
                                    tv_ptr->file_large_ds_sid_0, tv_ptr->xfer_plist, tv_ptr->small_ds_buf_0);
@@ -1797,8 +1797,8 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: small rank = %d, large rank = %d.\n", test_num, small_rank, large_rank);
-        HDfprintf(stdout, "test %d: Initialization complete.\n", test_num);
+        fprintf(stdout, "test %d: small rank = %d, large rank = %d.\n", test_num, small_rank, large_rank);
+        fprintf(stdout, "test %d: Initialization complete.\n", test_num);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
 
@@ -1813,7 +1813,7 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: running contig_hs_dr_pio_test__d2m_l2s.\n", test_num);
+        fprintf(stdout, "test %d: running contig_hs_dr_pio_test__d2m_l2s.\n", test_num);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
     contig_hs_dr_pio_test__d2m_l2s(tv_ptr);
@@ -1825,7 +1825,7 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: running contig_hs_dr_pio_test__d2m_s2l.\n", test_num);
+        fprintf(stdout, "test %d: running contig_hs_dr_pio_test__d2m_s2l.\n", test_num);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
     contig_hs_dr_pio_test__d2m_s2l(tv_ptr);
@@ -1843,7 +1843,7 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: running contig_hs_dr_pio_test__m2d_l2s.\n", test_num);
+        fprintf(stdout, "test %d: running contig_hs_dr_pio_test__m2d_l2s.\n", test_num);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
     contig_hs_dr_pio_test__m2d_l2s(tv_ptr);
@@ -1858,16 +1858,16 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: running contig_hs_dr_pio_test__m2d_s2l.\n", test_num);
+        fprintf(stdout, "test %d: running contig_hs_dr_pio_test__m2d_s2l.\n", test_num);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
     contig_hs_dr_pio_test__m2d_s2l(tv_ptr);
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: Subtests complete -- tests run/skipped/total = %lld/%lld/%lld.\n",
-                  test_num, (long long)(tv_ptr->tests_run), (long long)(tv_ptr->tests_skipped),
-                  (long long)(tv_ptr->total_tests));
+        fprintf(stdout, "test %d: Subtests complete -- tests run/skipped/total = %lld/%lld/%lld.\n", test_num,
+                (long long)(tv_ptr->tests_run), (long long)(tv_ptr->tests_skipped),
+                (long long)(tv_ptr->total_tests));
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
 
@@ -1875,7 +1875,7 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: Takedown complete.\n", test_num);
+        fprintf(stdout, "test %d: Takedown complete.\n", test_num);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
 
@@ -2009,8 +2009,8 @@ contig_hs_dr_pio_test(ShapeSameTestMethods sstest_type)
             } /* end of switch(sstest_type) */
 #if CONTIG_HS_DR_PIO_TEST__DEBUG
             if ((MAINPROCESS) && (tests_skipped > 0)) {
-                HDfprintf(stdout, "    run/skipped/total = %lld/%lld/%lld.\n", tests_run, tests_skipped,
-                          total_tests);
+                fprintf(stdout, "    run/skipped/total = %lld/%lld/%lld.\n", tests_run, tests_skipped,
+                        total_tests);
             }
 #endif /* CONTIG_HS_DR_PIO_TEST__DEBUG */
         }
@@ -2018,11 +2018,11 @@ contig_hs_dr_pio_test(ShapeSameTestMethods sstest_type)
 
     if (MAINPROCESS) {
         if (tests_skipped > 0) {
-            HDfprintf(stdout, "    %" PRId64 " of %" PRId64 " subtests skipped to expedite testing.\n",
-                      tests_skipped, total_tests);
+            fprintf(stdout, "    %" PRId64 " of %" PRId64 " subtests skipped to expedite testing.\n",
+                    tests_skipped, total_tests);
         }
         else
-            HDprintf("\n");
+            printf("\n");
     }
 
     return;
@@ -2092,10 +2092,10 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons
     assert(n_cube_offset <= sel_offset);
 
 #if CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG
-    HDfprintf(stdout, "%s:%d: edge_size/checker_edge_size = %d/%d\n", fcnName, mpi_rank, edge_size,
-              checker_edge_size);
-    HDfprintf(stdout, "%s:%d: sel_rank/sel_offset = %d/%d.\n", fcnName, mpi_rank, sel_rank, sel_offset);
-    HDfprintf(stdout, "%s:%d: tgt_rank/n_cube_offset = %d/%d.\n", fcnName, mpi_rank, tgt_rank, n_cube_offset);
+    fprintf(stdout, "%s:%d: edge_size/checker_edge_size = %d/%d\n", fcnName, mpi_rank, edge_size,
+            checker_edge_size);
+    fprintf(stdout, "%s:%d: sel_rank/sel_offset = %d/%d.\n", fcnName, mpi_rank, sel_rank, sel_offset);
+    fprintf(stdout, "%s:%d: tgt_rank/n_cube_offset = %d/%d.\n", fcnName, mpi_rank, tgt_rank, n_cube_offset);
 #endif /* CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
     /* First, compute the base count (which assumes start == 0
@@ -2242,25 +2242,25 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons
                         if (((i + j + k + l + m) % 2) == 0) {
 
 #if CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG
-                            HDfprintf(stdout, "%s%d: *** first_selection = %d ***\n", fcnName, mpi_rank,
-                                      (int)first_selection);
-                            HDfprintf(stdout, "%s:%d: i/j/k/l/m = %d/%d/%d/%d/%d\n", fcnName, mpi_rank, i, j,
-                                      k, l, m);
-                            HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                      (int)start[0], (int)start[1], (int)start[2], (int)start[3],
-                                      (int)start[4]);
-                            HDfprintf(stdout, "%s:%d: stride = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                      (int)stride[0], (int)stride[1], (int)stride[2], (int)stride[3],
-                                      (int)stride[4]);
-                            HDfprintf(stdout, "%s:%d: count = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                      (int)count[0], (int)count[1], (int)count[2], (int)count[3],
-                                      (int)count[4]);
-                            HDfprintf(stdout, "%s:%d: block = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                      (int)block[0], (int)block[1], (int)block[2], (int)block[3],
-                                      (int)block[4]);
-                            HDfprintf(stdout, "%s:%d: n-cube extent dims = %d.\n", fcnName, mpi_rank,
-                                      H5Sget_simple_extent_ndims(tgt_sid));
-                            HDfprintf(stdout, "%s:%d: selection rank = %d.\n", fcnName, mpi_rank, sel_rank);
+                            fprintf(stdout, "%s%d: *** first_selection = %d ***\n", fcnName, mpi_rank,
+                                    (int)first_selection);
+                            fprintf(stdout, "%s:%d: i/j/k/l/m = %d/%d/%d/%d/%d\n", fcnName, mpi_rank, i, j, k,
+                                    l, m);
+                            fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                    (int)start[0], (int)start[1], (int)start[2], (int)start[3],
+                                    (int)start[4]);
+                            fprintf(stdout, "%s:%d: stride = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                    (int)stride[0], (int)stride[1], (int)stride[2], (int)stride[3],
+                                    (int)stride[4]);
+                            fprintf(stdout, "%s:%d: count = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                    (int)count[0], (int)count[1], (int)count[2], (int)count[3],
+                                    (int)count[4]);
+                            fprintf(stdout, "%s:%d: block = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                    (int)block[0], (int)block[1], (int)block[2], (int)block[3],
+                                    (int)block[4]);
+                            fprintf(stdout, "%s:%d: n-cube extent dims = %d.\n", fcnName, mpi_rank,
+                                    H5Sget_simple_extent_ndims(tgt_sid));
+                            fprintf(stdout, "%s:%d: selection rank = %d.\n", fcnName, mpi_rank, sel_rank);
 #endif
 
                             if (first_selection) {
@@ -2304,8 +2304,8 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons
     } while ((i <= 1) && (0 >= sel_offset));
 
 #if CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG
-    HDfprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
-              (int)H5Sget_select_npoints(tgt_sid));
+    fprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
+            (int)H5Sget_select_npoints(tgt_sid));
 #endif /* CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
     /* Clip the selection back to the dataspace proper. */
@@ -2323,9 +2323,9 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons
     VRFY((ret != FAIL), "H5Sselect_hyperslab(AND) succeeded");
 
 #if CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG
-    HDfprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
-              (int)H5Sget_select_npoints(tgt_sid));
-    HDfprintf(stdout, "%s%d: done.\n", fcnName, mpi_rank);
+    fprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
+            (int)H5Sget_select_npoints(tgt_sid));
+    fprintf(stdout, "%s%d: done.\n", fcnName, mpi_rank);
 #endif /* CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
     return;
@@ -2420,12 +2420,12 @@ ckrbrd_hs_dr_pio_test__verify_data(uint32_t *buf_ptr, const int rank, const int
     int mpi_rank;
 
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
-    HDfprintf(stdout, "%s mpi_rank = %d.\n", fcnName, mpi_rank);
-    HDfprintf(stdout, "%s rank = %d.\n", fcnName, rank);
-    HDfprintf(stdout, "%s edge_size = %d.\n", fcnName, edge_size);
-    HDfprintf(stdout, "%s checker_edge_size = %d.\n", fcnName, checker_edge_size);
-    HDfprintf(stdout, "%s first_expected_val = %d.\n", fcnName, (int)first_expected_val);
-    HDfprintf(stdout, "%s starts_in_checker = %d.\n", fcnName, (int)buf_starts_in_checker);
+    fprintf(stdout, "%s mpi_rank = %d.\n", fcnName, mpi_rank);
+    fprintf(stdout, "%s rank = %d.\n", fcnName, rank);
+    fprintf(stdout, "%s edge_size = %d.\n", fcnName, edge_size);
+    fprintf(stdout, "%s checker_edge_size = %d.\n", fcnName, checker_edge_size);
+    fprintf(stdout, "%s first_expected_val = %d.\n", fcnName, (int)first_expected_val);
+    fprintf(stdout, "%s starts_in_checker = %d.\n", fcnName, (int)buf_starts_in_checker);
 }
 #endif
 
@@ -2475,12 +2475,12 @@ do {
                 m = 0;
                 z = 0;
 #if CKRBRD_HS_DR_PIO_TEST__VERIFY_DATA__DEBUG
-                HDfprintf(stdout, "%d, %d, %d, %d, %d:", i, j, k, l, m);
+                fprintf(stdout, "%d, %d, %d, %d, %d:", i, j, k, l, m);
 #endif
                 in_checker = start_in_checker[3];
                 do {
 #if CKRBRD_HS_DR_PIO_TEST__VERIFY_DATA__DEBUG
-                    HDfprintf(stdout, " %d", (int)(*val_ptr));
+                    fprintf(stdout, " %d", (int)(*val_ptr));
 #endif
                     if (z >= checker_edge_size) {
 
@@ -2513,7 +2513,7 @@ do {
 
                 } while ((rank >= (test_max_rank - 4)) && (m < edge_size));
 #if CKRBRD_HS_DR_PIO_TEST__VERIFY_DATA__DEBUG
-                HDfprintf(stdout, "\n");
+                fprintf(stdout, "\n");
 #endif
                 l++;
                 y++;
@@ -2599,13 +2599,13 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
     HDmemset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size);
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG
-    HDfprintf(stdout, "%s:%d: initial small_ds_slice_buf = ", fcnName, tv_ptr->mpi_rank);
+    fprintf(stdout, "%s:%d: initial small_ds_slice_buf = ", fcnName, tv_ptr->mpi_rank);
     ptr_0 = tv_ptr->small_ds_slice_buf;
     for (i = 0; i < (int)(tv_ptr->small_ds_slice_size); i++) {
-        HDfprintf(stdout, "%d ", (int)(*ptr_0));
+        fprintf(stdout, "%d ", (int)(*ptr_0));
         ptr_0++;
     }
-    HDfprintf(stdout, "\n");
+    fprintf(stdout, "\n");
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
 
     /* set up start, stride, count, and block -- note that we will
@@ -2627,8 +2627,8 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
     }
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG
-    HDfprintf(stdout, "%s:%d: reading slice from big ds on disk into small ds slice.\n", fcnName,
-              tv_ptr->mpi_rank);
+    fprintf(stdout, "%s:%d: reading slice from big ds on disk into small ds slice.\n", fcnName,
+            tv_ptr->mpi_rank);
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
     /* in serial versions of this test, we loop through all the dimensions
      * of the large data set.  However, in the parallel version, each
@@ -2720,12 +2720,12 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
 
                     /* Read selection from disk */
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
-                              tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
-                              tv_ptr->start[4]);
-                    HDfprintf(stdout, "%s slice/file extent dims = %d/%d.\n", fcnName,
-                              H5Sget_simple_extent_ndims(tv_ptr->small_ds_slice_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
+                            tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
+                            tv_ptr->start[4]);
+                    fprintf(stdout, "%s slice/file extent dims = %d/%d.\n", fcnName,
+                            H5Sget_simple_extent_ndims(tv_ptr->small_ds_slice_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
 
                     ret =
@@ -2734,7 +2734,7 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
                     VRFY((ret >= 0), "H5Dread() slice from large ds succeeded.");
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG
-                    HDfprintf(stdout, "%s:%d: H5Dread() returns.\n", fcnName, tv_ptr->mpi_rank);
+                    fprintf(stdout, "%s:%d: H5Dread() returns.\n", fcnName, tv_ptr->mpi_rank);
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
 
                     /* verify that expected data is retrieved */
@@ -2826,7 +2826,7 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                                        sel_start);
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG
-    HDfprintf(stdout, "%s reading slices of on disk small data set into slices of big data set.\n", fcnName);
+    fprintf(stdout, "%s reading slices of on disk small data set into slices of big data set.\n", fcnName);
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG */
 
     /* zero out the buffer we will be reading into */
@@ -2944,12 +2944,12 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
 
                     /* Read selection from disk */
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
-                              tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
-                              tv_ptr->start[4]);
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->large_ds_slice_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_0));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
+                            tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
+                            tv_ptr->start[4]);
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->large_ds_slice_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_0));
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG */
                     ret = H5Dread(tv_ptr->small_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_large_ds_sid,
                                   tv_ptr->file_small_ds_sid_0, tv_ptr->xfer_plist, tv_ptr->large_ds_buf_1);
@@ -2972,21 +2972,21 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                     {
                         int m, n;
 
-                        HDfprintf(stdout, "%s:%d: expected_value = %d.\n", fcnName, tv_ptr->mpi_rank,
-                                  expected_value);
-                        HDfprintf(stdout, "%s:%d: start/stop index = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                                  start_index, stop_index);
+                        fprintf(stdout, "%s:%d: expected_value = %d.\n", fcnName, tv_ptr->mpi_rank,
+                                expected_value);
+                        fprintf(stdout, "%s:%d: start/stop index = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                                start_index, stop_index);
                         n = 0;
                         for (m = 0; (unsigned)m < tv_ptr->large_ds_size; m++) {
-                            HDfprintf(stdout, "%d ", (int)(*ptr_1));
+                            fprintf(stdout, "%d ", (int)(*ptr_1));
                             ptr_1++;
                             n++;
                             if (n >= tv_ptr->edge_size) {
-                                HDfprintf(stdout, "\n");
+                                fprintf(stdout, "\n");
                                 n = 0;
                             }
                         }
-                        HDfprintf(stdout, "\n");
+                        fprintf(stdout, "\n");
                         ptr_1 = tv_ptr->large_ds_buf_1;
                     }
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG */
@@ -3159,9 +3159,9 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
     HDmemset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size);
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG
-    HDfprintf(stdout,
-              "%s writing checker boards selections of slices from big ds to slices of small ds on disk.\n",
-              fcnName);
+    fprintf(stdout,
+            "%s writing checker boards selections of slices from big ds to slices of small ds on disk.\n",
+            fcnName);
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG */
 
     /* in serial versions of this test, we loop through all the dimensions
@@ -3271,12 +3271,12 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
                      * dataset.
                      */
 #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
-                              tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
-                              tv_ptr->start[4]);
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->mem_large_ds_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_1));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
+                            tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
+                            tv_ptr->start[4]);
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->mem_large_ds_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_1));
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG */
                     ret = H5Dwrite(tv_ptr->small_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_large_ds_sid,
                                    tv_ptr->file_small_ds_sid_1, tv_ptr->xfer_plist, tv_ptr->large_ds_buf_0);
@@ -3458,10 +3458,10 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
     HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size);
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_S2L__DEBUG
-    HDfprintf(stdout,
-              "%s writing process checkerboard selections of slices of small ds to process slices of large "
-              "ds on disk.\n",
-              fcnName);
+    fprintf(stdout,
+            "%s writing process checkerboard selections of slices of small ds to process slices of large "
+            "ds on disk.\n",
+            fcnName);
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__M2D_S2L__DEBUG */
 
     if (PAR_SS_DR_MAX_RANK - tv_ptr->large_rank == 0) {
@@ -3563,12 +3563,12 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                      * target slice of the disk data set
                      */
 #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_S2L__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
-                              tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
-                              tv_ptr->start[4]);
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->mem_small_ds_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_1));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
+                            tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
+                            tv_ptr->start[4]);
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->mem_small_ds_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_1));
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__M2D_S2L__DEBUG */
                     ret = H5Dwrite(tv_ptr->large_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_small_ds_sid,
                                    tv_ptr->file_large_ds_sid_1, tv_ptr->xfer_plist, tv_ptr->small_ds_buf_0);
@@ -3743,8 +3743,8 @@ ckrbrd_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: small rank = %d, large rank = %d.\n", test_num, small_rank, large_rank);
-        HDfprintf(stdout, "test %d: Initialization complete.\n", test_num);
+        fprintf(stdout, "test %d: small rank = %d, large rank = %d.\n", test_num, small_rank, large_rank);
+        fprintf(stdout, "test %d: Initialization complete.\n", test_num);
     }
 #endif /* CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
 
@@ -3795,9 +3795,9 @@ ckrbrd_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: Subtests complete -- tests run/skipped/total = %lld/%lld/%lld.\n",
-                  test_num, (long long)(tv_ptr->tests_run), (long long)(tv_ptr->tests_skipped),
-                  (long long)(tv_ptr->total_tests));
+        fprintf(stdout, "test %d: Subtests complete -- tests run/skipped/total = %lld/%lld/%lld.\n", test_num,
+                (long long)(tv_ptr->tests_run), (long long)(tv_ptr->tests_skipped),
+                (long long)(tv_ptr->total_tests));
     }
 #endif /* CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
 
@@ -3805,7 +3805,7 @@ ckrbrd_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: Takedown complete.\n", test_num);
+        fprintf(stdout, "test %d: Takedown complete.\n", test_num);
     }
 #endif /* CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
 
@@ -3945,8 +3945,8 @@ ckrbrd_hs_dr_pio_test(ShapeSameTestMethods sstest_type)
             } /* end of switch(sstest_type) */
 #if CONTIG_HS_DR_PIO_TEST__DEBUG
             if ((MAINPROCESS) && (tests_skipped > 0)) {
-                HDfprintf(stdout, "     run/skipped/total = %" PRId64 "/%" PRId64 "/%" PRId64 ".\n",
-                          tests_run, tests_skipped, total_tests);
+                fprintf(stdout, "     run/skipped/total = %" PRId64 "/%" PRId64 "/%" PRId64 ".\n", tests_run,
+                        tests_skipped, total_tests);
             }
 #endif /* CONTIG_HS_DR_PIO_TEST__DEBUG */
         }
@@ -3954,11 +3954,11 @@ ckrbrd_hs_dr_pio_test(ShapeSameTestMethods sstest_type)
 
     if (MAINPROCESS) {
         if (tests_skipped > 0) {
-            HDfprintf(stdout, "     %" PRId64 " of %" PRId64 " subtests skipped to expedite testing.\n",
-                      tests_skipped, total_tests);
+            fprintf(stdout, "     %" PRId64 " of %" PRId64 " subtests skipped to expedite testing.\n",
+                    tests_skipped, total_tests);
         }
         else
-            HDprintf("\n");
+            printf("\n");
     }
 
     return;
@@ -4019,10 +4019,9 @@ pause_proc(void)
     if (MAINPROCESS)
         while ((HDstat(greenlight, &statbuf) == -1) && loops < maxloop) {
             if (!loops++) {
-                HDprintf("Proc %d (%*s, %d): to debug, attach %d\n", mpi_rank, mpi_namelen, mpi_name, pid,
-                         pid);
+                printf("Proc %d (%*s, %d): to debug, attach %d\n", mpi_rank, mpi_namelen, mpi_name, pid, pid);
             }
-            HDprintf("waiting(%ds) for file %s ...\n", time_int, greenlight);
+            printf("waiting(%ds) for file %s ...\n", time_int, greenlight);
             fflush(stdout);
             HDsleep(time_int);
         }
@@ -4046,20 +4045,20 @@ MPI_Init(int *argc, char ***argv)
 static void
 usage(void)
 {
-    HDprintf("    [-r] [-w] [-m<n_datasets>] [-n<n_groups>] "
-             "[-o] [-f <prefix>] [-d <dim0> <dim1>]\n");
-    HDprintf("\t-m<n_datasets>"
-             "\tset number of datasets for the multiple dataset test\n");
-    HDprintf("\t-n<n_groups>"
-             "\tset number of groups for the multiple group test\n");
+    printf("    [-r] [-w] [-m<n_datasets>] [-n<n_groups>] "
+           "[-o] [-f <prefix>] [-d <dim0> <dim1>]\n");
+    printf("\t-m<n_datasets>"
+           "\tset number of datasets for the multiple dataset test\n");
+    printf("\t-n<n_groups>"
+           "\tset number of groups for the multiple group test\n");
 #if 0
-    HDprintf("\t-f <prefix>\tfilename prefix\n");
+    printf("\t-f <prefix>\tfilename prefix\n");
 #endif
-    HDprintf("\t-2\t\tuse Split-file together with MPIO\n");
-    HDprintf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n", ROW_FACTOR,
-             COL_FACTOR);
-    HDprintf("\t-c <dim0> <dim1>\tdataset chunk dimensions. Defaults (dim0/10,dim1/10)\n");
-    HDprintf("\n");
+    printf("\t-2\t\tuse Split-file together with MPIO\n");
+    printf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n", ROW_FACTOR,
+           COL_FACTOR);
+    printf("\t-c <dim0> <dim1>\tdataset chunk dimensions. Defaults (dim0/10,dim1/10)\n");
+    printf("\n");
 }
 
 /*
@@ -4142,7 +4141,7 @@ parse_options(int argc, char **argv)
                 case 'h': /* print help message--return with nerrors set */
                     return (1);
                 default:
-                    HDprintf("Illegal option(%s)\n", *argv);
+                    printf("Illegal option(%s)\n", *argv);
                     nerrors++;
                     return (1);
             }
@@ -4151,12 +4150,12 @@ parse_options(int argc, char **argv)
 
     /* check validity of dimension and chunk sizes */
     if (dim0 <= 0 || dim1 <= 0) {
-        HDprintf("Illegal dim sizes (%d, %d)\n", dim0, dim1);
+        printf("Illegal dim sizes (%d, %d)\n", dim0, dim1);
         nerrors++;
         return (1);
     }
     if (chunkdim0 <= 0 || chunkdim1 <= 0) {
-        HDprintf("Illegal chunkdim sizes (%d, %d)\n", chunkdim0, chunkdim1);
+        printf("Illegal chunkdim sizes (%d, %d)\n", chunkdim0, chunkdim1);
         nerrors++;
         return (1);
     }
@@ -4164,7 +4163,7 @@ parse_options(int argc, char **argv)
     /* Make sure datasets can be divided into equal portions by the processes */
     if ((dim0 % mpi_size) || (dim1 % mpi_size)) {
         if (MAINPROCESS)
-            HDprintf("dim0(%d) and dim1(%d) must be multiples of processes(%d)\n", dim0, dim1, mpi_size);
+            printf("dim0(%d) and dim1(%d) must be multiples of processes(%d)\n", dim0, dim1, mpi_size);
         nerrors++;
         return (1);
     }
@@ -4179,15 +4178,15 @@ parse_options(int argc, char **argv)
             strncpy(filenames[i], FILENAME[i], PATH_MAX);
 #if 0 /* no support for VFDs right now */
             if (h5_fixname(FILENAME[i], fapl, filenames[i], PATH_MAX) == NULL) {
-                HDprintf("h5_fixname failed\n");
+                printf("h5_fixname failed\n");
                 nerrors++;
                 return (1);
             }
 #endif
         if (MAINPROCESS) {
-            HDprintf("Test filenames are:\n");
+            printf("Test filenames are:\n");
             for (i = 0; i < n; i++)
-                HDprintf("    %s\n", filenames[i]);
+                printf("    %s\n", filenames[i]);
         }
     }
 
@@ -4322,10 +4321,10 @@ main(int argc, char **argv)
     dim1 = COL_FACTOR * mpi_size;
 
     if (MAINPROCESS) {
-        HDprintf("===================================\n");
-        HDprintf("Shape Same Tests Start\n");
-        HDprintf("    express_test = %d.\n", EXPRESS_MODE /* GetTestExpress() */);
-        HDprintf("===================================\n");
+        printf("===================================\n");
+        printf("Shape Same Tests Start\n");
+        printf("    express_test = %d.\n", EXPRESS_MODE /* GetTestExpress() */);
+        printf("===================================\n");
     }
 
     /* Attempt to turn off atexit post processing so that in case errors
@@ -4335,7 +4334,7 @@ main(int argc, char **argv)
      */
     if (H5dont_atexit() < 0) {
         if (MAINPROCESS)
-            HDprintf("%d: Failed to turn off atexit processing. Continue.\n", mpi_rank);
+            printf("%d: Failed to turn off atexit processing. Continue.\n", mpi_rank);
     };
     H5open();
     /* h5_show_hostname(); */
@@ -4345,7 +4344,7 @@ main(int argc, char **argv)
     /* Get the capability flag of the VOL connector being used */
     if (H5Pget_vol_cap_flags(fapl, &vol_cap_flags_g) < 0) {
         if (MAINPROCESS)
-            HDprintf("Failed to get the capability flag of the VOL connector being used\n");
+            printf("Failed to get the capability flag of the VOL connector being used\n");
 
         MPI_Finalize();
         return 0;
@@ -4356,7 +4355,7 @@ main(int argc, char **argv)
      */
     if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) {
         if (MAINPROCESS)
-            HDprintf("API functions for basic file and dataset aren't supported with this connector\n");
+            printf("API functions for basic file and dataset aren't supported with this connector\n");
 
         MPI_Finalize();
         return 0;
@@ -4366,7 +4365,7 @@ main(int argc, char **argv)
     HDmemset(filenames, 0, sizeof(filenames));
     for (int i = 0; i < NFILENAME; i++) {
         if (NULL == (filenames[i] = HDmalloc(PATH_MAX))) {
-            HDprintf("couldn't allocate filename array\n");
+            printf("couldn't allocate filename array\n");
             MPI_Abort(MPI_COMM_WORLD, -1);
         }
     }
@@ -4381,9 +4380,9 @@ main(int argc, char **argv)
     }
 
     if (dxfer_coll_type == DXFER_INDEPENDENT_IO && MAINPROCESS) {
-        HDprintf("===================================\n"
-                 "   Using Independent I/O with file set view to replace collective I/O \n"
-                 "===================================\n");
+        printf("===================================\n"
+               "   Using Independent I/O with file set view to replace collective I/O \n"
+               "===================================\n");
     }
 
     /* Shape Same tests using contiguous hyperslab */
@@ -4486,12 +4485,12 @@ main(int argc, char **argv)
     }
 
     if (MAINPROCESS) { /* only process 0 reports */
-        HDprintf("===================================\n");
+        printf("===================================\n");
         if (nerrors)
-            HDprintf("***Shape Same tests detected %d errors***\n", nerrors);
+            printf("***Shape Same tests detected %d errors***\n", nerrors);
         else
-            HDprintf("Shape Same tests finished successfully\n");
-        HDprintf("===================================\n");
+            printf("Shape Same tests finished successfully\n");
+        printf("===================================\n");
     }
 
 #if 0
diff --git a/testpar/API/t_span_tree.c b/testpar/API/t_span_tree.c
index e3148a6..d806e12 100644
--- a/testpar/API/t_span_tree.c
+++ b/testpar/API/t_span_tree.c
@@ -1033,8 +1033,8 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 
 #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: dims/checker_edge_size = %d %d %d %d %d / %d\n", fcnName, mpi_rank,
-                  (int)dims[0], (int)dims[1], (int)dims[2], (int)dims[3], (int)dims[4], checker_edge_size);
+        fprintf(stdout, "%s:%d: dims/checker_edge_size = %d %d %d %d %d / %d\n", fcnName, mpi_rank,
+                (int)dims[0], (int)dims[1], (int)dims[2], (int)dims[3], (int)dims[4], checker_edge_size);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
@@ -1056,8 +1056,8 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 
 #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: sel_rank/sel_offset = %d/%d.\n", fcnName, mpi_rank, sel_rank, sel_offset);
-        HDfprintf(stdout, "%s:%d: tgt_rank/ds_offset = %d/%d.\n", fcnName, mpi_rank, tgt_rank, ds_offset);
+        fprintf(stdout, "%s:%d: sel_rank/sel_offset = %d/%d.\n", fcnName, mpi_rank, sel_rank, sel_offset);
+        fprintf(stdout, "%s:%d: tgt_rank/ds_offset = %d/%d.\n", fcnName, mpi_rank, tgt_rank, ds_offset);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
@@ -1091,8 +1091,8 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 
 #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: base_count/offset_count = %d/%d.\n", fcnName, mpi_rank, base_count,
-                  offset_count);
+        fprintf(stdout, "%s:%d: base_count/offset_count = %d/%d.\n", fcnName, mpi_rank, base_count,
+                offset_count);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
@@ -1215,26 +1215,25 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG
                             if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
 
-                                HDfprintf(stdout, "%s%d: *** first_selection = %d ***\n", fcnName, mpi_rank,
-                                          (int)first_selection);
-                                HDfprintf(stdout, "%s:%d: i/j/k/l/m = %d/%d/%d/%d/%d\n", fcnName, mpi_rank, i,
-                                          j, k, l, m);
-                                HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                          (int)start[0], (int)start[1], (int)start[2], (int)start[3],
-                                          (int)start[4]);
-                                HDfprintf(stdout, "%s:%d: stride = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                          (int)stride[0], (int)stride[1], (int)stride[2], (int)stride[3],
-                                          (int)stride[4]);
-                                HDfprintf(stdout, "%s:%d: count = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                          (int)count[0], (int)count[1], (int)count[2], (int)count[3],
-                                          (int)count[4]);
-                                HDfprintf(stdout, "%s:%d: block = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                          (int)block[0], (int)block[1], (int)block[2], (int)block[3],
-                                          (int)block[4]);
-                                HDfprintf(stdout, "%s:%d: n-cube extent dims = %d.\n", fcnName, mpi_rank,
-                                          H5Sget_simple_extent_ndims(tgt_sid));
-                                HDfprintf(stdout, "%s:%d: selection rank = %d.\n", fcnName, mpi_rank,
-                                          sel_rank);
+                                fprintf(stdout, "%s%d: *** first_selection = %d ***\n", fcnName, mpi_rank,
+                                        (int)first_selection);
+                                fprintf(stdout, "%s:%d: i/j/k/l/m = %d/%d/%d/%d/%d\n", fcnName, mpi_rank, i,
+                                        j, k, l, m);
+                                fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                        (int)start[0], (int)start[1], (int)start[2], (int)start[3],
+                                        (int)start[4]);
+                                fprintf(stdout, "%s:%d: stride = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                        (int)stride[0], (int)stride[1], (int)stride[2], (int)stride[3],
+                                        (int)stride[4]);
+                                fprintf(stdout, "%s:%d: count = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                        (int)count[0], (int)count[1], (int)count[2], (int)count[3],
+                                        (int)count[4]);
+                                fprintf(stdout, "%s:%d: block = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                        (int)block[0], (int)block[1], (int)block[2], (int)block[3],
+                                        (int)block[4]);
+                                fprintf(stdout, "%s:%d: n-cube extent dims = %d.\n", fcnName, mpi_rank,
+                                        H5Sget_simple_extent_ndims(tgt_sid));
+                                fprintf(stdout, "%s:%d: selection rank = %d.\n", fcnName, mpi_rank, sel_rank);
                             }
 #endif
 
@@ -1280,8 +1279,8 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 
 #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
-                  (int)H5Sget_select_npoints(tgt_sid));
+        fprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
+                (int)H5Sget_select_npoints(tgt_sid));
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
@@ -1301,9 +1300,9 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 
 #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
-                  (int)H5Sget_select_npoints(tgt_sid));
-        HDfprintf(stdout, "%s%d: done.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
+                (int)H5Sget_select_npoints(tgt_sid));
+        fprintf(stdout, "%s%d: done.\n", fcnName, mpi_rank);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
@@ -1399,12 +1398,12 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr,
 
 #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s mpi_rank = %d.\n", fcnName, mpi_rank);
-        HDfprintf(stdout, "%s rank = %d.\n", fcnName, rank);
-        HDfprintf(stdout, "%s edge_size = %d.\n", fcnName, edge_size);
-        HDfprintf(stdout, "%s checker_edge_size = %d.\n", fcnName, checker_edge_size);
-        HDfprintf(stdout, "%s first_expected_val = %d.\n", fcnName, (int)first_expected_val);
-        HDfprintf(stdout, "%s starts_in_checker = %d.\n", fcnName, (int)buf_starts_in_checker);
+        fprintf(stdout, "%s mpi_rank = %d.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s rank = %d.\n", fcnName, rank);
+        fprintf(stdout, "%s edge_size = %d.\n", fcnName, edge_size);
+        fprintf(stdout, "%s checker_edge_size = %d.\n", fcnName, checker_edge_size);
+        fprintf(stdout, "%s first_expected_val = %d.\n", fcnName, (int)first_expected_val);
+        fprintf(stdout, "%s starts_in_checker = %d.\n", fcnName, (int)buf_starts_in_checker);
     }
 #endif
 
@@ -1455,14 +1454,14 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr,
                     z = 0;
 #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG
                     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-                        HDfprintf(stdout, "%d, %d, %d, %d, %d:", i, j, k, l, m);
+                        fprintf(stdout, "%d, %d, %d, %d, %d:", i, j, k, l, m);
                     }
 #endif
                     in_checker = start_in_checker[3];
                     do {
 #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG
                         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-                            HDfprintf(stdout, " %d", (int)(*val_ptr));
+                            fprintf(stdout, " %d", (int)(*val_ptr));
                         }
 #endif
                         if (z >= checker_edge_size) {
@@ -1497,7 +1496,7 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr,
                     } while ((rank >= (test_max_rank - 4)) && (m < edge_size));
 #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG
                     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-                        HDfprintf(stdout, "\n");
+                        fprintf(stdout, "\n");
                     }
 #endif
                     l++;
@@ -1605,8 +1604,8 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: chunk_edge_size = %d.\n", fcnName, mpi_rank, (int)chunk_edge_size);
-        HDfprintf(stdout, "%s:%d: use_collective_io = %d.\n", fcnName, mpi_rank, (int)use_collective_io);
+        fprintf(stdout, "%s:%d: chunk_edge_size = %d.\n", fcnName, mpi_rank, (int)chunk_edge_size);
+        fprintf(stdout, "%s:%d: use_collective_io = %d.\n", fcnName, mpi_rank, (int)use_collective_io);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1618,10 +1617,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
     large_ds_slice_size = (size_t)(10 * 10 * 10 * 10);
 
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: small ds size / slice size = %d / %d.\n", fcnName, mpi_rank,
-                  (int)small_ds_size, (int)small_ds_slice_size);
-        HDfprintf(stdout, "%s:%d: large ds size / slice size = %d / %d.\n", fcnName, mpi_rank,
-                  (int)large_ds_size, (int)large_ds_slice_size);
+        fprintf(stdout, "%s:%d: small ds size / slice size = %d / %d.\n", fcnName, mpi_rank,
+                (int)small_ds_size, (int)small_ds_slice_size);
+        fprintf(stdout, "%s:%d: large ds size / slice size = %d / %d.\n", fcnName, mpi_rank,
+                (int)large_ds_size, (int)large_ds_slice_size);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1701,10 +1700,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: small_dims[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)small_dims[0],
-                  (int)small_dims[1], (int)small_dims[2], (int)small_dims[3], (int)small_dims[4]);
-        HDfprintf(stdout, "%s:%d: large_dims[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)large_dims[0],
-                  (int)large_dims[1], (int)large_dims[2], (int)large_dims[3], (int)large_dims[4]);
+        fprintf(stdout, "%s:%d: small_dims[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)small_dims[0],
+                (int)small_dims[1], (int)small_dims[2], (int)small_dims[3], (int)small_dims[4]);
+        fprintf(stdout, "%s:%d: large_dims[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)large_dims[0],
+                (int)large_dims[1], (int)large_dims[2], (int)large_dims[3], (int)large_dims[4]);
     }
 #endif
 
@@ -1760,9 +1759,9 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-            HDfprintf(stdout, "%s:%d: small chunk dims[] = %d %d %d %d %d\n", fcnName, mpi_rank,
-                      (int)small_chunk_dims[0], (int)small_chunk_dims[1], (int)small_chunk_dims[2],
-                      (int)small_chunk_dims[3], (int)small_chunk_dims[4]);
+            fprintf(stdout, "%s:%d: small chunk dims[] = %d %d %d %d %d\n", fcnName, mpi_rank,
+                    (int)small_chunk_dims[0], (int)small_chunk_dims[1], (int)small_chunk_dims[2],
+                    (int)small_chunk_dims[3], (int)small_chunk_dims[4]);
         }
 #endif
 
@@ -1781,9 +1780,9 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-            HDfprintf(stdout, "%s:%d: large chunk dims[] = %d %d %d %d %d\n", fcnName, mpi_rank,
-                      (int)large_chunk_dims[0], (int)large_chunk_dims[1], (int)large_chunk_dims[2],
-                      (int)large_chunk_dims[3], (int)large_chunk_dims[4]);
+            fprintf(stdout, "%s:%d: large chunk dims[] = %d %d %d %d %d\n", fcnName, mpi_rank,
+                    (int)large_chunk_dims[0], (int)large_chunk_dims[1], (int)large_chunk_dims[2],
+                    (int)large_chunk_dims[3], (int)large_chunk_dims[4]);
         }
 #endif
 
@@ -1809,8 +1808,8 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: small/large ds id = %d / %d.\n", fcnName, mpi_rank, (int)small_dataset,
-                  (int)large_dataset);
+        fprintf(stdout, "%s:%d: small/large ds id = %d / %d.\n", fcnName, mpi_rank, (int)small_dataset,
+                (int)large_dataset);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1842,15 +1841,15 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: settings for small data set initialization.\n", fcnName, mpi_rank);
-        HDfprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0],
-                  (int)start[1], (int)start[2], (int)start[3], (int)start[4]);
-        HDfprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
-                  (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
-        HDfprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0],
-                  (int)count[1], (int)count[2], (int)count[3], (int)count[4]);
-        HDfprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0],
-                  (int)block[1], (int)block[2], (int)block[3], (int)block[4]);
+        fprintf(stdout, "%s:%d: settings for small data set initialization.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0], (int)start[1],
+                (int)start[2], (int)start[3], (int)start[4]);
+        fprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
+                (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
+        fprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0], (int)count[1],
+                (int)count[2], (int)count[3], (int)count[4]);
+        fprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0], (int)block[1],
+                (int)block[2], (int)block[3], (int)block[4]);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1867,15 +1866,15 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-            HDfprintf(stdout, "%s:%d: added settings for main process.\n", fcnName, mpi_rank);
-            HDfprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0],
-                      (int)start[1], (int)start[2], (int)start[3], (int)start[4]);
-            HDfprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
-                      (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
-            HDfprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0],
-                      (int)count[1], (int)count[2], (int)count[3], (int)count[4]);
-            HDfprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0],
-                      (int)block[1], (int)block[2], (int)block[3], (int)block[4]);
+            fprintf(stdout, "%s:%d: added settings for main process.\n", fcnName, mpi_rank);
+            fprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0],
+                    (int)start[1], (int)start[2], (int)start[3], (int)start[4]);
+            fprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
+                    (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
+            fprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0],
+                    (int)count[1], (int)count[2], (int)count[3], (int)count[4]);
+            fprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0],
+                    (int)block[1], (int)block[2], (int)block[3], (int)block[4]);
         }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1895,7 +1894,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
     /* write the initial value of the small data set to file */
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: writing init value of small ds to file.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s:%d: writing init value of small ds to file.\n", fcnName, mpi_rank);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
     ret = H5Dwrite(small_dataset, dset_type, mem_small_ds_sid, file_small_ds_sid, xfer_plist, small_ds_buf_0);
@@ -1953,15 +1952,15 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: settings for large data set initialization.\n", fcnName, mpi_rank);
-        HDfprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0],
-                  (int)start[1], (int)start[2], (int)start[3], (int)start[4]);
-        HDfprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
-                  (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
-        HDfprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0],
-                  (int)count[1], (int)count[2], (int)count[3], (int)count[4]);
-        HDfprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0],
-                  (int)block[1], (int)block[2], (int)block[3], (int)block[4]);
+        fprintf(stdout, "%s:%d: settings for large data set initialization.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0], (int)start[1],
+                (int)start[2], (int)start[3], (int)start[4]);
+        fprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
+                (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
+        fprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0], (int)count[1],
+                (int)count[2], (int)count[3], (int)count[4]);
+        fprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0], (int)block[1],
+                (int)block[2], (int)block[3], (int)block[4]);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1973,10 +1972,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s%d: H5Sget_select_npoints(mem_large_ds_sid) = %d.\n", fcnName, mpi_rank,
-                  (int)H5Sget_select_npoints(mem_large_ds_sid));
-        HDfprintf(stdout, "%s%d: H5Sget_select_npoints(file_large_ds_sid) = %d.\n", fcnName, mpi_rank,
-                  (int)H5Sget_select_npoints(file_large_ds_sid));
+        fprintf(stdout, "%s%d: H5Sget_select_npoints(mem_large_ds_sid) = %d.\n", fcnName, mpi_rank,
+                (int)H5Sget_select_npoints(mem_large_ds_sid));
+        fprintf(stdout, "%s%d: H5Sget_select_npoints(file_large_ds_sid) = %d.\n", fcnName, mpi_rank,
+                (int)H5Sget_select_npoints(file_large_ds_sid));
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1986,15 +1985,15 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-            HDfprintf(stdout, "%s:%d: added settings for main process.\n", fcnName, mpi_rank);
-            HDfprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0],
-                      (int)start[1], (int)start[2], (int)start[3], (int)start[4]);
-            HDfprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
-                      (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
-            HDfprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0],
-                      (int)count[1], (int)count[2], (int)count[3], (int)count[4]);
-            HDfprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0],
-                      (int)block[1], (int)block[2], (int)block[3], (int)block[4]);
+            fprintf(stdout, "%s:%d: added settings for main process.\n", fcnName, mpi_rank);
+            fprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0],
+                    (int)start[1], (int)start[2], (int)start[3], (int)start[4]);
+            fprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
+                    (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
+            fprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0],
+                    (int)count[1], (int)count[2], (int)count[3], (int)count[4]);
+            fprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0],
+                    (int)block[1], (int)block[2], (int)block[3], (int)block[4]);
         }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -2006,10 +2005,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-            HDfprintf(stdout, "%s%d: H5Sget_select_npoints(mem_large_ds_sid) = %d.\n", fcnName, mpi_rank,
-                      (int)H5Sget_select_npoints(mem_large_ds_sid));
-            HDfprintf(stdout, "%s%d: H5Sget_select_npoints(file_large_ds_sid) = %d.\n", fcnName, mpi_rank,
-                      (int)H5Sget_select_npoints(file_large_ds_sid));
+            fprintf(stdout, "%s%d: H5Sget_select_npoints(mem_large_ds_sid) = %d.\n", fcnName, mpi_rank,
+                    (int)H5Sget_select_npoints(mem_large_ds_sid));
+            fprintf(stdout, "%s%d: H5Sget_select_npoints(file_large_ds_sid) = %d.\n", fcnName, mpi_rank,
+                    (int)H5Sget_select_npoints(file_large_ds_sid));
         }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
     }
@@ -2035,12 +2034,12 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
 
         rank = H5Sget_simple_extent_dims(mem_large_ds_sid, dims, max_dims);
-        HDfprintf(stdout, "%s:%d: mem_large_ds_sid dims[%d] = %d %d %d %d %d\n", fcnName, mpi_rank, rank,
-                  (int)dims[0], (int)dims[1], (int)dims[2], (int)dims[3], (int)dims[4]);
+        fprintf(stdout, "%s:%d: mem_large_ds_sid dims[%d] = %d %d %d %d %d\n", fcnName, mpi_rank, rank,
+                (int)dims[0], (int)dims[1], (int)dims[2], (int)dims[3], (int)dims[4]);
 
         rank = H5Sget_simple_extent_dims(file_large_ds_sid, dims, max_dims);
-        HDfprintf(stdout, "%s:%d: file_large_ds_sid dims[%d] = %d %d %d %d %d\n", fcnName, mpi_rank, rank,
-                  (int)dims[0], (int)dims[1], (int)dims[2], (int)dims[3], (int)dims[4]);
+        fprintf(stdout, "%s:%d: file_large_ds_sid dims[%d] = %d %d %d %d %d\n", fcnName, mpi_rank, rank,
+                (int)dims[0], (int)dims[1], (int)dims[2], (int)dims[3], (int)dims[4]);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -2053,10 +2052,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
     /* write the initial value of the large data set to file */
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: writing init value of large ds to file.\n", fcnName, mpi_rank);
-        HDfprintf(stdout, "%s:%d: large_dataset = %d.\n", fcnName, mpi_rank, (int)large_dataset);
-        HDfprintf(stdout, "%s:%d: mem_large_ds_sid = %d, file_large_ds_sid = %d.\n", fcnName, mpi_rank,
-                  (int)mem_large_ds_sid, (int)file_large_ds_sid);
+        fprintf(stdout, "%s:%d: writing init value of large ds to file.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s:%d: large_dataset = %d.\n", fcnName, mpi_rank, (int)large_dataset);
+        fprintf(stdout, "%s:%d: mem_large_ds_sid = %d, file_large_ds_sid = %d.\n", fcnName, mpi_rank,
+                (int)mem_large_ds_sid, (int)file_large_ds_sid);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -2145,7 +2144,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: H5Dread() returns.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s:%d: H5Dread() returns.\n", fcnName, mpi_rank);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -2242,7 +2241,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: H5Dread() returns.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s:%d: H5Dread() returns.\n", fcnName, mpi_rank);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -2300,8 +2299,8 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG
             if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-                HDfprintf(stdout, "%s:%d: unexpected value at index %d: %d.\n", fcnName, mpi_rank, (int)i,
-                          (int)(*ptr_1));
+                fprintf(stdout, "%s:%d: unexpected value at index %d: %d.\n", fcnName, mpi_rank, (int)i,
+                        (int)(*ptr_1));
             }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG */
 
diff --git a/testpar/API/testphdf5.c b/testpar/API/testphdf5.c
index ec5dae2..6d34e1d 100644
--- a/testpar/API/testphdf5.c
+++ b/testpar/API/testphdf5.c
@@ -80,10 +80,9 @@ pause_proc(void)
     if (MAINPROCESS)
         while ((HDstat(greenlight, &statbuf) == -1) && loops < maxloop) {
             if (!loops++) {
-                HDprintf("Proc %d (%*s, %d): to debug, attach %d\n", mpi_rank, mpi_namelen, mpi_name, pid,
-                         pid);
+                printf("Proc %d (%*s, %d): to debug, attach %d\n", mpi_rank, mpi_namelen, mpi_name, pid, pid);
             }
-            HDprintf("waiting(%ds) for file %s ...\n", time_int, greenlight);
+            printf("waiting(%ds) for file %s ...\n", time_int, greenlight);
             HDfflush(stdout);
             HDsleep(time_int);
         }
@@ -107,20 +106,20 @@ MPI_Init(int *argc, char ***argv)
 static void
 usage(void)
 {
-    HDprintf("    [-r] [-w] [-m<n_datasets>] [-n<n_groups>] "
-             "[-o] [-f <prefix>] [-d <dim0> <dim1>]\n");
-    HDprintf("\t-m<n_datasets>"
-             "\tset number of datasets for the multiple dataset test\n");
-    HDprintf("\t-n<n_groups>"
-             "\tset number of groups for the multiple group test\n");
+    printf("    [-r] [-w] [-m<n_datasets>] [-n<n_groups>] "
+           "[-o] [-f <prefix>] [-d <dim0> <dim1>]\n");
+    printf("\t-m<n_datasets>"
+           "\tset number of datasets for the multiple dataset test\n");
+    printf("\t-n<n_groups>"
+           "\tset number of groups for the multiple group test\n");
 #if 0
-    HDprintf("\t-f <prefix>\tfilename prefix\n");
+    printf("\t-f <prefix>\tfilename prefix\n");
 #endif
-    HDprintf("\t-2\t\tuse Split-file together with MPIO\n");
-    HDprintf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n", ROW_FACTOR,
-             COL_FACTOR);
-    HDprintf("\t-c <dim0> <dim1>\tdataset chunk dimensions. Defaults (dim0/10,dim1/10)\n");
-    HDprintf("\n");
+    printf("\t-2\t\tuse Split-file together with MPIO\n");
+    printf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n", ROW_FACTOR,
+           COL_FACTOR);
+    printf("\t-c <dim0> <dim1>\tdataset chunk dimensions. Defaults (dim0/10,dim1/10)\n");
+    printf("\n");
 }
 
 /*
@@ -203,7 +202,7 @@ parse_options(int argc, char **argv)
                 case 'h': /* print help message--return with nerrors set */
                     return (1);
                 default:
-                    HDprintf("Illegal option(%s)\n", *argv);
+                    printf("Illegal option(%s)\n", *argv);
                     nerrors++;
                     return (1);
             }
@@ -212,12 +211,12 @@ parse_options(int argc, char **argv)
 
     /* check validity of dimension and chunk sizes */
     if (dim0 <= 0 || dim1 <= 0) {
-        HDprintf("Illegal dim sizes (%d, %d)\n", dim0, dim1);
+        printf("Illegal dim sizes (%d, %d)\n", dim0, dim1);
         nerrors++;
         return (1);
     }
     if (chunkdim0 <= 0 || chunkdim1 <= 0) {
-        HDprintf("Illegal chunkdim sizes (%d, %d)\n", chunkdim0, chunkdim1);
+        printf("Illegal chunkdim sizes (%d, %d)\n", chunkdim0, chunkdim1);
         nerrors++;
         return (1);
     }
@@ -225,7 +224,7 @@ parse_options(int argc, char **argv)
     /* Make sure datasets can be divided into equal portions by the processes */
     if ((dim0 % mpi_size) || (dim1 % mpi_size)) {
         if (MAINPROCESS)
-            HDprintf("dim0(%d) and dim1(%d) must be multiples of processes(%d)\n", dim0, dim1, mpi_size);
+            printf("dim0(%d) and dim1(%d) must be multiples of processes(%d)\n", dim0, dim1, mpi_size);
         nerrors++;
         return (1);
     }
@@ -240,15 +239,15 @@ parse_options(int argc, char **argv)
             strncpy(filenames[i], FILENAME[i], PATH_MAX);
 #if 0 /* no support for VFDs right now */
             if (h5_fixname(FILENAME[i], fapl, filenames[i], PATH_MAX) == NULL) {
-                HDprintf("h5_fixname failed\n");
+                printf("h5_fixname failed\n");
                 nerrors++;
                 return (1);
             }
 #endif
         if (MAINPROCESS) {
-            HDprintf("Test filenames are:\n");
+            printf("Test filenames are:\n");
             for (i = 0; i < n; i++)
-                HDprintf("    %s\n", filenames[i]);
+                printf("    %s\n", filenames[i]);
         }
     }
 
@@ -335,9 +334,9 @@ main(int argc, char **argv)
     dim1 = COL_FACTOR * mpi_size;
 
     if (MAINPROCESS) {
-        HDprintf("===================================\n");
-        HDprintf("PHDF5 TESTS START\n");
-        HDprintf("===================================\n");
+        printf("===================================\n");
+        printf("PHDF5 TESTS START\n");
+        printf("===================================\n");
     }
 
     /* Attempt to turn off atexit post processing so that in case errors
@@ -346,7 +345,7 @@ main(int argc, char **argv)
      * calls.  By then, MPI calls may not work.
      */
     if (H5dont_atexit() < 0) {
-        HDprintf("Failed to turn off atexit processing. Continue.\n");
+        printf("Failed to turn off atexit processing. Continue.\n");
     };
     H5open();
     /* h5_show_hostname(); */
@@ -355,7 +354,7 @@ main(int argc, char **argv)
     HDmemset(filenames, 0, sizeof(filenames));
     for (int i = 0; i < NFILENAME; i++) {
         if (NULL == (filenames[i] = HDmalloc(PATH_MAX))) {
-            HDprintf("couldn't allocate filename array\n");
+            printf("couldn't allocate filename array\n");
             MPI_Abort(MPI_COMM_WORLD, -1);
         }
     }
@@ -585,7 +584,7 @@ main(int argc, char **argv)
     AddTest("bigdset", big_dataset, NULL,
             "big dataset test", PARATESTFILE);
 #else
-    HDprintf("big dataset test will be skipped on Windows (JIRA HDDFV-8064)\n");
+    printf("big dataset test will be skipped on Windows (JIRA HDDFV-8064)\n");
 #endif
 #endif
 
@@ -644,9 +643,9 @@ main(int argc, char **argv)
     coll_chunk4();
 
     if ((mpi_size < 3) && MAINPROCESS) {
-        HDprintf("Collective chunk IO optimization APIs ");
-        HDprintf("needs at least 3 processes to participate\n");
-        HDprintf("Collective chunk IO API tests will be skipped \n");
+        printf("Collective chunk IO optimization APIs ");
+        printf("needs at least 3 processes to participate\n");
+        printf("Collective chunk IO API tests will be skipped \n");
     }
 
 #if 0
@@ -783,8 +782,8 @@ main(int argc, char **argv)
     io_mode_confusion();
 
     if ((mpi_size < 3) && MAINPROCESS) {
-        HDprintf("rr_obj_hdr_flush_confusion test needs at least 3 processes.\n");
-        HDprintf("rr_obj_hdr_flush_confusion test will be skipped \n");
+        printf("rr_obj_hdr_flush_confusion test needs at least 3 processes.\n");
+        printf("rr_obj_hdr_flush_confusion test will be skipped \n");
     }
 
     if (mpi_size > 2) {
@@ -863,8 +862,8 @@ main(int argc, char **argv)
     test_plist_ed();
 
     if ((mpi_size < 2) && MAINPROCESS) {
-        HDprintf("File Image Ops daisy chain test needs at least 2 processes.\n");
-        HDprintf("File Image Ops daisy chain test will be skipped \n");
+        printf("File Image Ops daisy chain test needs at least 2 processes.\n");
+        printf("File Image Ops daisy chain test will be skipped \n");
     }
 
 #if 0
@@ -881,11 +880,11 @@ main(int argc, char **argv)
     }
 
     if ((mpi_size < 2) && MAINPROCESS) {
-        HDprintf("Atomicity tests need at least 2 processes to participate\n");
-        HDprintf("8 is more recommended.. Atomicity tests will be skipped \n");
+        printf("Atomicity tests need at least 2 processes to participate\n");
+        printf("8 is more recommended.. Atomicity tests will be skipped \n");
     }
     else if (facc_type != FACC_MPIO && MAINPROCESS) {
-        HDprintf("Atomicity tests will not work with a non MPIO VFD\n");
+        printf("Atomicity tests will not work with a non MPIO VFD\n");
     }
     else if (mpi_size >= 2 && facc_type == FACC_MPIO) {
 #if 0
@@ -946,9 +945,9 @@ main(int argc, char **argv)
     /* TestParseCmdLine(argc, argv); */
 
     if (dxfer_coll_type == DXFER_INDEPENDENT_IO && MAINPROCESS) {
-        HDprintf("===================================\n"
-                 "   Using Independent I/O with file set view to replace collective I/O \n"
-                 "===================================\n");
+        printf("===================================\n"
+               "   Using Independent I/O with file set view to replace collective I/O \n"
+               "===================================\n");
     }
 
     /* Perform requested testing */
@@ -978,12 +977,12 @@ main(int argc, char **argv)
     }
 
     if (MAINPROCESS) { /* only process 0 reports */
-        HDprintf("===================================\n");
+        printf("===================================\n");
         if (nerrors)
-            HDprintf("***PHDF5 tests detected %d errors***\n", nerrors);
+            printf("***PHDF5 tests detected %d errors***\n", nerrors);
         else
-            HDprintf("PHDF5 tests finished successfully\n");
-        HDprintf("===================================\n");
+            printf("PHDF5 tests finished successfully\n");
+        printf("===================================\n");
     }
 
 #if 0
diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c
index 74080c6..d3422e0 100644
--- a/testpar/t_2Gio.c
+++ b/testpar/t_2Gio.c
@@ -96,18 +96,18 @@ MPI_Comm    test_comm = MPI_COMM_WORLD;
 static void
 usage(void)
 {
-    HDprintf("    [-r] [-w] [-m<n_datasets>] [-n<n_groups>] "
-             "[-o] [-f <prefix>] [-d <dim0> <dim1>]\n");
-    HDprintf("\t-m<n_datasets>"
-             "\tset number of datasets for the multiple dataset test\n");
-    HDprintf("\t-n<n_groups>"
-             "\tset number of groups for the multiple group test\n");
-    HDprintf("\t-f <prefix>\tfilename prefix\n");
-    HDprintf("\t-2\t\tuse Split-file together with MPIO\n");
-    HDprintf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n", BIG_X_FACTOR,
-             BIG_Y_FACTOR);
-    HDprintf("\t-c <dim0> <dim1>\tdataset chunk dimensions. Defaults (dim0/10,dim1/10)\n");
-    HDprintf("\n");
+    printf("    [-r] [-w] [-m<n_datasets>] [-n<n_groups>] "
+           "[-o] [-f <prefix>] [-d <dim0> <dim1>]\n");
+    printf("\t-m<n_datasets>"
+           "\tset number of datasets for the multiple dataset test\n");
+    printf("\t-n<n_groups>"
+           "\tset number of groups for the multiple group test\n");
+    printf("\t-f <prefix>\tfilename prefix\n");
+    printf("\t-2\t\tuse Split-file together with MPIO\n");
+    printf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n", BIG_X_FACTOR,
+           BIG_Y_FACTOR);
+    printf("\t-c <dim0> <dim1>\tdataset chunk dimensions. Defaults (dim0/10,dim1/10)\n");
+    printf("\n");
 }
 
 /*
@@ -189,7 +189,7 @@ parse_options(int argc, char **argv)
                 case 'h': /* print help message--return with nerrors set */
                     return (1);
                 default:
-                    HDprintf("Illegal option(%s)\n", *argv);
+                    printf("Illegal option(%s)\n", *argv);
                     nerrors++;
                     return (1);
             }
@@ -198,12 +198,12 @@ parse_options(int argc, char **argv)
 
     /* check validity of dimension and chunk sizes */
     if (dim0 <= 0 || dim1 <= 0) {
-        HDprintf("Illegal dim sizes (%d, %d)\n", dim0, dim1);
+        printf("Illegal dim sizes (%d, %d)\n", dim0, dim1);
         nerrors++;
         return (1);
     }
     if (chunkdim0 <= 0 || chunkdim1 <= 0) {
-        HDprintf("Illegal chunkdim sizes (%d, %d)\n", chunkdim0, chunkdim1);
+        printf("Illegal chunkdim sizes (%d, %d)\n", chunkdim0, chunkdim1);
         nerrors++;
         return (1);
     }
@@ -211,7 +211,7 @@ parse_options(int argc, char **argv)
     /* Make sure datasets can be divided into equal portions by the processes */
     if ((dim0 % mpi_size) || (dim1 % mpi_size)) {
         if (MAINPROCESS)
-            HDprintf("dim0(%d) and dim1(%d) must be multiples of processes(%d)\n", dim0, dim1, mpi_size);
+            printf("dim0(%d) and dim1(%d) must be multiples of processes(%d)\n", dim0, dim1, mpi_size);
         nerrors++;
         return (1);
     }
@@ -224,15 +224,15 @@ parse_options(int argc, char **argv)
 
         for (i = 0; i < n; i++)
             if (h5_fixname(FILENAME[i], fapl, filenames[i], PATH_MAX) == NULL) {
-                HDprintf("h5_fixname failed\n");
+                printf("h5_fixname failed\n");
                 nerrors++;
                 return (1);
             }
 
         if (MAINPROCESS) {
-            HDprintf("Test filenames are:\n");
+            printf("Test filenames are:\n");
             for (i = 0; i < n; i++)
-                HDprintf("    %s\n", filenames[i]);
+                printf("    %s\n", filenames[i]);
         }
     }
 
@@ -317,7 +317,7 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = (hsize_t)mpi_rank * block[0];
             start[1]  = 0;
             if (VERBOSE_MED)
-                HDprintf("slab_set BYROW\n");
+                printf("slab_set BYROW\n");
             break;
         case BYCOL:
             /* Each process takes a block of columns. */
@@ -330,7 +330,7 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = 0;
             start[1]  = (hsize_t)mpi_rank * block[1];
             if (VERBOSE_MED)
-                HDprintf("slab_set BYCOL\n");
+                printf("slab_set BYCOL\n");
             break;
         case ZROW:
             /* Similar to BYROW except process 0 gets 0 row */
@@ -343,7 +343,7 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = (hsize_t)(mpi_rank ? (hsize_t)mpi_rank * block[0] : 0);
             start[1]  = 0;
             if (VERBOSE_MED)
-                HDprintf("slab_set ZROW\n");
+                printf("slab_set ZROW\n");
             break;
         case ZCOL:
             /* Similar to BYCOL except process 0 gets 0 column */
@@ -356,11 +356,11 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = 0;
             start[1]  = (hsize_t)(mpi_rank ? (hsize_t)mpi_rank * block[1] : 0);
             if (VERBOSE_MED)
-                HDprintf("slab_set ZCOL\n");
+                printf("slab_set ZCOL\n");
             break;
         default:
             /* Unknown mode.  Set it to cover the whole dataset. */
-            HDprintf("unknown slab_set mode (%d)\n", mode);
+            printf("unknown slab_set mode (%d)\n", mode);
             block[0]  = (hsize_t)dim0;
             block[1]  = (hsize_t)dim1;
             stride[0] = block[0];
@@ -370,16 +370,16 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = 0;
             start[1]  = 0;
             if (VERBOSE_MED)
-                HDprintf("slab_set wholeset\n");
+                printf("slab_set wholeset\n");
             break;
     }
     if (VERBOSE_MED) {
-        HDprintf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
-                 "datapoints=%lu\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1],
-                 (unsigned long)(block[0] * block[1] * count[0] * count[1]));
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
+               "datapoints=%lu\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1],
+               (unsigned long)(block[0] * block[1] * count[0] * count[1]));
     }
 }
 
@@ -417,15 +417,15 @@ point_set(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[], s
                     }
 
     if (VERBOSE_MED) {
-        HDprintf("start[]=(%lu, %lu), count[]=(%lu, %lu), stride[]=(%lu, %lu), block[]=(%lu, %lu), total "
-                 "datapoints=%lu\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1],
-                 (unsigned long)(block[0] * block[1] * count[0] * count[1]));
+        printf("start[]=(%lu, %lu), count[]=(%lu, %lu), stride[]=(%lu, %lu), block[]=(%lu, %lu), total "
+               "datapoints=%lu\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1],
+               (unsigned long)(block[0] * block[1] * count[0] * count[1]));
         k = 0;
         for (i = 0; i < num_points; i++) {
-            HDprintf("(%d, %d)\n", (int)coords[k], (int)coords[k + 1]);
+            printf("(%d, %d)\n", (int)coords[k], (int)coords[k + 1]);
             k += 2;
         }
     }
@@ -460,19 +460,19 @@ dataset_print(hsize_t start[], hsize_t block[], DATATYPE *dataset)
     hsize_t   i, j;
 
     /* print the column heading */
-    HDprintf("%-8s", "Cols:");
+    printf("%-8s", "Cols:");
     for (j = 0; j < block[1]; j++) {
-        HDprintf("%3lu ", (unsigned long)(start[1] + j));
+        printf("%3lu ", (unsigned long)(start[1] + j));
     }
-    HDprintf("\n");
+    printf("\n");
 
     /* print the slab data */
     for (i = 0; i < block[0]; i++) {
-        HDprintf("Row %2lu: ", (unsigned long)(i + start[0]));
+        printf("Row %2lu: ", (unsigned long)(i + start[0]));
         for (j = 0; j < block[1]; j++) {
-            HDprintf("%03d ", *dataptr++);
+            printf("%03d ", *dataptr++);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 }
 
@@ -488,14 +488,14 @@ dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[]
 
     /* print it if VERBOSE_MED */
     if (VERBOSE_MED) {
-        HDprintf("dataset_vrfy dumping:::\n");
-        HDprintf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1]);
-        HDprintf("original values:\n");
+        printf("dataset_vrfy dumping:::\n");
+        printf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1]);
+        printf("original values:\n");
         dataset_print(start, block, original);
-        HDprintf("compared values:\n");
+        printf("compared values:\n");
         dataset_print(start, block, dataset);
     }
 
@@ -504,9 +504,9 @@ dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[]
         for (j = 0; j < block[1]; j++) {
             if (*dataset != *original) {
                 if (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED) {
-                    HDprintf("Dataset Verify failed at [%lu][%lu](row %lu, col %lu): expect %d, got %d\n",
-                             (unsigned long)i, (unsigned long)j, (unsigned long)(i + start[0]),
-                             (unsigned long)(j + start[1]), *(original), *(dataset));
+                    printf("Dataset Verify failed at [%lu][%lu](row %lu, col %lu): expect %d, got %d\n",
+                           (unsigned long)i, (unsigned long)j, (unsigned long)(i + start[0]),
+                           (unsigned long)(j + start[1]), *(original), *(dataset));
                 }
                 dataset++;
                 original++;
@@ -514,9 +514,9 @@ dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[]
         }
     }
     if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-        HDprintf("[more errors ...]\n");
+        printf("[more errors ...]\n");
     if (vrfyerrs)
-        HDprintf("%d errors found in dataset_vrfy\n", vrfyerrs);
+        printf("%d errors found in dataset_vrfy\n", vrfyerrs);
     return (vrfyerrs);
 }
 
@@ -577,9 +577,9 @@ MpioTest2G(MPI_Comm comm)
     MPI_Comm_rank(comm, &mpi_rank);
 
     if (mpi_rank == 0) {
-        HDprintf("Using %d process on dataset shape "
-                 "[%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE "]\n",
-                 mpi_size, shape[0], shape[1], shape[2]);
+        printf("Using %d process on dataset shape "
+               "[%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE "]\n",
+               mpi_size, shape[0], shape[1], shape[2]);
     }
 
     /*
@@ -606,7 +606,7 @@ MpioTest2G(MPI_Comm comm)
         tot_size_bytes *= shape[i];
     }
     if (mpi_rank == 0) {
-        HDprintf("Dataset of %zu bytes\n", tot_size_bytes);
+        printf("Dataset of %zu bytes\n", tot_size_bytes);
     }
     filespace = H5Screate_simple(3, shape, NULL);
     VRFY((filespace >= 0), "H5Screate_simple succeeded");
@@ -681,7 +681,7 @@ MpioTest2G(MPI_Comm comm)
     H5Fclose(file_id);
 
     free(data);
-    HDprintf("Proc %d - MpioTest2G test succeeded\n", mpi_rank);
+    printf("Proc %d - MpioTest2G test succeeded\n", mpi_rank);
 
     if (mpi_rank == 0)
         HDremove(FILENAME[1]);
@@ -729,7 +729,7 @@ dataset_writeInd(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Independent write test on file %s\n", filename);
+        printf("Independent write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(test_comm, &mpi_size);
@@ -806,7 +806,7 @@ dataset_writeInd(void)
 
     /* setup dimensions again to write with zero rows for process 0 */
     if (VERBOSE_MED)
-        HDprintf("writeInd by some with zero row\n");
+        printf("writeInd by some with zero row\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZROW);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -869,7 +869,7 @@ dataset_readInd(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Independent read test on file %s\n", filename);
+        printf("Independent read test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(test_comm, &mpi_size);
@@ -1002,7 +1002,7 @@ dataset_writeAll(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Collective write test on file %s\n", filename);
+        printf("Collective write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(test_comm, &mpi_size);
@@ -1121,7 +1121,7 @@ dataset_writeAll(void)
 
     /* setup dimensions again to writeAll with zero rows for process 0 */
     if (VERBOSE_MED)
-        HDprintf("writeAll by some with zero row\n");
+        printf("writeAll by some with zero row\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZROW);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -1186,7 +1186,7 @@ dataset_writeAll(void)
 
     /* setup dimensions again to writeAll with zero columns for process 0 */
     if (VERBOSE_MED)
-        HDprintf("writeAll by some with zero col\n");
+        printf("writeAll by some with zero col\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZCOL);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -1518,7 +1518,7 @@ dataset_readAll(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Collective read test on file %s\n", filename);
+        printf("Collective read test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(test_comm, &mpi_size);
@@ -1615,7 +1615,7 @@ dataset_readAll(void)
 
     /* setup dimensions again to readAll with zero columns for process 0 */
     if (VERBOSE_MED)
-        HDprintf("readAll by some with zero col\n");
+        printf("readAll by some with zero col\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZCOL);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -1682,7 +1682,7 @@ dataset_readAll(void)
 
     /* setup dimensions again to readAll with zero rows for process 0 */
     if (VERBOSE_MED)
-        HDprintf("readAll by some with zero row\n");
+        printf("readAll by some with zero row\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZROW);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -1932,7 +1932,7 @@ extend_writeInd(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend independent write test on file %s\n", filename);
+        printf("Extend independent write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(test_comm, &mpi_size);
@@ -1984,7 +1984,7 @@ extend_writeInd(void)
 
     /* set up dataset storage chunk sizes and creation property list */
     if (VERBOSE_MED)
-        HDprintf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
+        printf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
     dataset_pl = H5Pcreate(H5P_DATASET_CREATE);
     VRFY((dataset_pl >= 0), "H5Pcreate succeeded");
     ret = H5Pset_chunk(dataset_pl, MAX_RANK, chunk_dims);
@@ -2148,7 +2148,7 @@ extend_writeInd2(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend independent write test #2 on file %s\n", filename);
+        printf("Extend independent write test #2 on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(test_comm, &mpi_size);
@@ -2205,8 +2205,8 @@ extend_writeInd2(void)
     if (VERBOSE_MED) {
         MESG("writing at offset zero: ");
         for (i = 0; i < (int)orig_size; i++)
-            HDprintf("%s%d", i ? ", " : "", written[i]);
-        HDprintf("\n");
+            printf("%s%d", i ? ", " : "", written[i]);
+        printf("\n");
     }
     ret = H5Dwrite(dataset, H5T_NATIVE_INT, ms, fs, H5P_DEFAULT, written);
     VRFY((ret >= 0), "H5Dwrite succeeded");
@@ -2218,15 +2218,15 @@ extend_writeInd2(void)
     VRFY((ret >= 0), "H5Dread succeeded");
     for (i = 0; i < (int)orig_size; i++)
         if (written[i] != retrieved[i]) {
-            HDprintf("Line #%d: written!=retrieved: written[%d]=%d, retrieved[%d]=%d\n", __LINE__, i,
-                     written[i], i, retrieved[i]);
+            printf("Line #%d: written!=retrieved: written[%d]=%d, retrieved[%d]=%d\n", __LINE__, i,
+                   written[i], i, retrieved[i]);
             nerrors++;
         }
     if (VERBOSE_MED) {
         MESG("read at offset zero: ");
         for (i = 0; i < (int)orig_size; i++)
-            HDprintf("%s%d", i ? ", " : "", retrieved[i]);
-        HDprintf("\n");
+            printf("%s%d", i ? ", " : "", retrieved[i]);
+        printf("\n");
     }
 
     /* -------------------------
@@ -2248,8 +2248,8 @@ extend_writeInd2(void)
     if (VERBOSE_MED) {
         MESG("writing at offset 10: ");
         for (i = 0; i < (int)orig_size; i++)
-            HDprintf("%s%d", i ? ", " : "", written[i]);
-        HDprintf("\n");
+            printf("%s%d", i ? ", " : "", written[i]);
+        printf("\n");
     }
     ret = H5Sselect_hyperslab(fs, H5S_SELECT_SET, &orig_size, NULL, &one, &orig_size);
     VRFY((ret >= 0), "H5Sselect_hyperslab succeeded");
@@ -2263,15 +2263,15 @@ extend_writeInd2(void)
     VRFY((ret >= 0), "H5Dread succeeded");
     for (i = 0; i < (int)orig_size; i++)
         if (written[i] != retrieved[i]) {
-            HDprintf("Line #%d: written!=retrieved: written[%d]=%d, retrieved[%d]=%d\n", __LINE__, i,
-                     written[i], i, retrieved[i]);
+            printf("Line #%d: written!=retrieved: written[%d]=%d, retrieved[%d]=%d\n", __LINE__, i,
+                   written[i], i, retrieved[i]);
             nerrors++;
         }
     if (VERBOSE_MED) {
         MESG("read at offset 10: ");
         for (i = 0; i < (int)orig_size; i++)
-            HDprintf("%s%d", i ? ", " : "", retrieved[i]);
-        HDprintf("\n");
+            printf("%s%d", i ? ", " : "", retrieved[i]);
+        printf("\n");
     }
 
     /* Close dataset collectively */
@@ -2310,7 +2310,7 @@ extend_readInd(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend independent read test on file %s\n", filename);
+        printf("Extend independent read test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(test_comm, &mpi_size);
@@ -2492,7 +2492,7 @@ extend_writeAll(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend independent write test on file %s\n", filename);
+        printf("Extend independent write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(test_comm, &mpi_size);
@@ -2544,7 +2544,7 @@ extend_writeAll(void)
 
     /* set up dataset storage chunk sizes and creation property list */
     if (VERBOSE_MED)
-        HDprintf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
+        printf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
     dataset_pl = H5Pcreate(H5P_DATASET_CREATE);
     VRFY((dataset_pl >= 0), "H5Pcreate succeeded");
     ret = H5Pset_chunk(dataset_pl, MAX_RANK, chunk_dims);
@@ -2730,7 +2730,7 @@ extend_readAll(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend independent read test on file %s\n", filename);
+        printf("Extend independent read test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(test_comm, &mpi_size);
@@ -2921,7 +2921,7 @@ compress_readAll(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Collective chunked dataset read test on file %s\n", filename);
+        printf("Collective chunked dataset read test on file %s\n", filename);
 
     /* Retrieve MPI parameters */
     MPI_Comm_size(comm, &mpi_size);
@@ -3041,8 +3041,8 @@ compress_readAll(void)
             /* Verify data read */
             for (u = 0; u < dim; u++)
                 if (data_orig[u] != data_read[u]) {
-                    HDprintf("Line #%d: written!=retrieved: data_orig[%u]=%d, data_read[%u]=%d\n", __LINE__,
-                             (unsigned)u, data_orig[u], (unsigned)u, data_read[u]);
+                    printf("Line #%d: written!=retrieved: data_orig[%u]=%d, data_read[%u]=%d\n", __LINE__,
+                           (unsigned)u, data_orig[u], (unsigned)u, data_read[u]);
                     nerrors++;
                 }
 
@@ -3113,7 +3113,7 @@ none_selection_chunk(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend independent write test on file %s\n", filename);
+        printf("Extend independent write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(test_comm, &mpi_size);
@@ -3144,7 +3144,7 @@ none_selection_chunk(void)
 
     /* set up dataset storage chunk sizes and creation property list */
     if (VERBOSE_MED)
-        HDprintf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
+        printf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
     dataset_pl = H5Pcreate(H5P_DATASET_CREATE);
     VRFY((dataset_pl >= 0), "H5Pcreate succeeded");
     ret = H5Pset_chunk(dataset_pl, MAX_RANK, chunk_dims);
@@ -3710,8 +3710,8 @@ test_actual_io_mode(int selection_mode)
         VRFY((actual_io_mode_write == actual_io_mode_expected), message);
     }
     else {
-        HDfprintf(stderr, "%s %d -> (%d,%d)\n", test_name, mpi_rank, actual_chunk_opt_mode_write,
-                  actual_io_mode_write);
+        fprintf(stderr, "%s %d -> (%d,%d)\n", test_name, mpi_rank, actual_chunk_opt_mode_write,
+                actual_io_mode_write);
     }
 
     /* To test that the property is successfully reset to the default, we perform some
@@ -3798,7 +3798,7 @@ actual_io_mode_tests(void)
     if (mpi_size > 2)
         test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_MIX);
     else
-        HDfprintf(stdout, "Multi Chunk Mixed test requires 3 processes minimum\n");
+        fprintf(stdout, "Multi Chunk Mixed test requires 3 processes minimum\n");
 
     test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_MIX_DISAGREE);
 
@@ -4260,11 +4260,11 @@ dataset_atomicity(void)
     dim1     = 32;
     filename = GetTestParameters();
     if (facc_type != FACC_MPIO) {
-        HDprintf("Atomicity tests will not work without the MPIO VFD\n");
+        printf("Atomicity tests will not work without the MPIO VFD\n");
         return;
     }
     if (VERBOSE_MED)
-        HDprintf("atomic writes to file %s\n", filename);
+        printf("atomic writes to file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(test_comm, &mpi_size);
@@ -4394,9 +4394,9 @@ dataset_atomicity(void)
         j = 0;
         k = 0;
         for (i = 0; i < dim0; i++) {
-            HDprintf("\n");
+            printf("\n");
             for (j = 0; j < dim1; j++)
-                HDprintf("%d ", read_buf[k++]);
+                printf("%d ", read_buf[k++]);
         }
     }
 
@@ -4410,8 +4410,8 @@ dataset_atomicity(void)
              "Atomicity Test Failed Process %d: Value read should be 0 or 5\n");
         for (i = 1; i < buf_size; i++) {
             if (read_buf[i] != compare) {
-                HDprintf("Atomicity Test Failed Process %d: read_buf[%d] is %d, should be %d\n", mpi_rank, i,
-                         read_buf[i], compare);
+                printf("Atomicity Test Failed Process %d: read_buf[%d] is %d, should be %d\n", mpi_rank, i,
+                       read_buf[i], compare);
                 nerrors++;
             }
         }
@@ -4494,11 +4494,11 @@ dataset_atomicity(void)
             j = 0;
             k = 0;
             for (i = 0; i < dim0; i++) {
-                HDprintf("\n");
+                printf("\n");
                 for (j = 0; j < dim1; j++)
-                    HDprintf("%d ", read_buf[k++]);
+                    printf("%d ", read_buf[k++]);
             }
-            HDprintf("\n");
+            printf("\n");
         }
     }
 
@@ -4531,8 +4531,8 @@ dataset_atomicity(void)
                     continue;
                 }
                 else if (compare != read_buf[k]) {
-                    HDprintf("Atomicity Test Failed Process %d: read_buf[%d] is %d, should be %d\n", mpi_rank,
-                             k, read_buf[k], compare);
+                    printf("Atomicity Test Failed Process %d: read_buf[%d] is %d, should be %d\n", mpi_rank,
+                           k, read_buf[k], compare);
                     nerrors++;
                 }
                 k++;
@@ -4645,22 +4645,22 @@ main(int argc, char **argv)
     dim2 = BIG_Z_FACTOR;
 
     if (MAINPROCESS) {
-        HDprintf("===================================\n");
-        HDprintf("2 GByte IO TESTS START\n");
-        HDprintf("2 MPI ranks will run the tests...\n");
-        HDprintf("===================================\n");
+        printf("===================================\n");
+        printf("2 GByte IO TESTS START\n");
+        printf("2 MPI ranks will run the tests...\n");
+        printf("===================================\n");
         h5_show_hostname();
     }
 
     if (H5dont_atexit() < 0) {
-        HDprintf("Failed to turn off atexit processing. Continue.\n");
+        printf("Failed to turn off atexit processing. Continue.\n");
     };
     H5open();
 
     HDmemset(filenames, 0, sizeof(filenames));
     for (int i = 0; i < NFILENAME; i++) {
         if (NULL == (filenames[i] = HDmalloc(PATH_MAX))) {
-            HDprintf("couldn't allocate filename array\n");
+            printf("couldn't allocate filename array\n");
             MPI_Abort(MPI_COMM_WORLD, -1);
         }
     }
@@ -4675,7 +4675,7 @@ main(int argc, char **argv)
         if (mpi_rank >= 2)
             rank_color = 1;
         if (MPI_Comm_split(test_comm, rank_color, mpi_rank, &test_comm) != MPI_SUCCESS) {
-            HDprintf("MPI returned an error. Exiting\n");
+            printf("MPI returned an error. Exiting\n");
         }
     }
 
diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c
index bca52b1..1130e5d 100644
--- a/testpar/t_bigio.c
+++ b/testpar/t_bigio.c
@@ -130,16 +130,16 @@ point_set(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[], s
                     }
 
     if (VERBOSE_MED) {
-        HDprintf("start[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "count[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "stride[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "block[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "total datapoints=%" PRIuHSIZE "\n",
-                 start[0], start[1], count[0], count[1], stride[0], stride[1], block[0], block[1],
-                 block[0] * block[1] * count[0] * count[1]);
+        printf("start[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "count[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "stride[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "block[]=(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "total datapoints=%" PRIuHSIZE "\n",
+               start[0], start[1], count[0], count[1], stride[0], stride[1], block[0], block[1],
+               block[0] * block[1] * count[0] * count[1]);
         k = 0;
         for (i = 0; i < num_points; i++) {
-            HDprintf("(%d, %d)\n", (int)coords[k], (int)coords[k + 1]);
+            printf("(%d, %d)\n", (int)coords[k], (int)coords[k + 1]);
             k += 2;
         }
     }
@@ -155,19 +155,19 @@ dataset_print(hsize_t start[], hsize_t block[], B_DATATYPE *dataset)
     hsize_t     i, j;
 
     /* print the column heading */
-    HDprintf("%-8s", "Cols:");
+    printf("%-8s", "Cols:");
     for (j = 0; j < block[1]; j++) {
-        HDprintf("%3" PRIuHSIZE " ", start[1] + j);
+        printf("%3" PRIuHSIZE " ", start[1] + j);
     }
-    HDprintf("\n");
+    printf("\n");
 
     /* print the slab data */
     for (i = 0; i < block[0]; i++) {
-        HDprintf("Row %2" PRIuHSIZE ": ", i + start[0]);
+        printf("Row %2" PRIuHSIZE ": ", i + start[0]);
         for (j = 0; j < block[1]; j++) {
-            HDprintf("%" PRIuHSIZE " ", *dataptr++);
+            printf("%" PRIuHSIZE " ", *dataptr++);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 }
 
@@ -183,15 +183,15 @@ verify_data(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[],
 
     /* print it if VERBOSE_MED */
     if (VERBOSE_MED) {
-        HDprintf("verify_data dumping:::\n");
-        HDprintf("start(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "count(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "stride(%" PRIuHSIZE ", %" PRIuHSIZE "), "
-                 "block(%" PRIuHSIZE ", %" PRIuHSIZE ")\n",
-                 start[0], start[1], count[0], count[1], stride[0], stride[1], block[0], block[1]);
-        HDprintf("original values:\n");
+        printf("verify_data dumping:::\n");
+        printf("start(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "count(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "stride(%" PRIuHSIZE ", %" PRIuHSIZE "), "
+               "block(%" PRIuHSIZE ", %" PRIuHSIZE ")\n",
+               start[0], start[1], count[0], count[1], stride[0], stride[1], block[0], block[1]);
+        printf("original values:\n");
         dataset_print(start, block, original);
-        HDprintf("compared values:\n");
+        printf("compared values:\n");
         dataset_print(start, block, dataset);
     }
 
@@ -200,10 +200,10 @@ verify_data(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[],
         for (j = 0; j < block[1]; j++) {
             if (*dataset != *original) {
                 if (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED) {
-                    HDprintf("Dataset Verify failed at [%" PRIuHSIZE "][%" PRIuHSIZE "]"
-                             "(row %" PRIuHSIZE ", col %" PRIuHSIZE "): "
-                             "expect %" PRIuHSIZE ", got %" PRIuHSIZE "\n",
-                             i, j, i + start[0], j + start[1], *(original), *(dataset));
+                    printf("Dataset Verify failed at [%" PRIuHSIZE "][%" PRIuHSIZE "]"
+                           "(row %" PRIuHSIZE ", col %" PRIuHSIZE "): "
+                           "expect %" PRIuHSIZE ", got %" PRIuHSIZE "\n",
+                           i, j, i + start[0], j + start[1], *(original), *(dataset));
                 }
                 dataset++;
                 original++;
@@ -211,9 +211,9 @@ verify_data(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[],
         }
     }
     if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-        HDprintf("[more errors ...]\n");
+        printf("[more errors ...]\n");
     if (vrfyerrs)
-        HDprintf("%d errors found in verify_data\n", vrfyerrs);
+        printf("%d errors found in verify_data\n", vrfyerrs);
     return (vrfyerrs);
 }
 
@@ -311,12 +311,12 @@ ccslab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t
             break;
     }
     if (VERBOSE_MED) {
-        HDprintf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
-                 "datapoints=%lu\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1],
-                 (unsigned long)(block[0] * block[1] * count[0] * count[1]));
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
+               "datapoints=%lu\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1],
+               (unsigned long)(block[0] * block[1] * count[0] * count[1]));
     }
 }
 
@@ -369,20 +369,20 @@ ccdataset_print(hsize_t start[], hsize_t block[], DATATYPE *dataset)
     hsize_t   i, j;
 
     /* print the column heading */
-    HDprintf("Print only the first block of the dataset\n");
-    HDprintf("%-8s", "Cols:");
+    printf("Print only the first block of the dataset\n");
+    printf("%-8s", "Cols:");
     for (j = 0; j < block[1]; j++) {
-        HDprintf("%3lu ", (unsigned long)(start[1] + j));
+        printf("%3lu ", (unsigned long)(start[1] + j));
     }
-    HDprintf("\n");
+    printf("\n");
 
     /* print the slab data */
     for (i = 0; i < block[0]; i++) {
-        HDprintf("Row %2lu: ", (unsigned long)(i + start[0]));
+        printf("Row %2lu: ", (unsigned long)(i + start[0]));
         for (j = 0; j < block[1]; j++) {
-            HDprintf("%03d ", *dataptr++);
+            printf("%03d ", *dataptr++);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 }
 
@@ -399,14 +399,14 @@ ccdataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block
 
     /* print it if VERBOSE_MED */
     if (VERBOSE_MED) {
-        HDprintf("dataset_vrfy dumping:::\n");
-        HDprintf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1]);
-        HDprintf("original values:\n");
+        printf("dataset_vrfy dumping:::\n");
+        printf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1]);
+        printf("original values:\n");
         ccdataset_print(start, block, original);
-        HDprintf("compared values:\n");
+        printf("compared values:\n");
         ccdataset_print(start, block, dataset);
     }
 
@@ -429,8 +429,8 @@ ccdataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block
                     }
                     if (*dataptr != *oriptr) {
                         if (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED) {
-                            HDprintf("Dataset Verify failed at [%lu][%lu]: expect %d, got %d\n",
-                                     (unsigned long)i, (unsigned long)j, *(oriptr), *(dataptr));
+                            printf("Dataset Verify failed at [%lu][%lu]: expect %d, got %d\n",
+                                   (unsigned long)i, (unsigned long)j, *(oriptr), *(dataptr));
                         }
                     }
                 }
@@ -438,9 +438,9 @@ ccdataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block
         }
     }
     if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-        HDprintf("[more errors ...]\n");
+        printf("[more errors ...]\n");
     if (vrfyerrs)
-        HDprintf("%d errors found in ccdataset_vrfy\n", vrfyerrs);
+        printf("%d errors found in ccdataset_vrfy\n", vrfyerrs);
     return (vrfyerrs);
 }
 
@@ -492,7 +492,7 @@ dataset_big_write(void)
 
     /* Each process takes a slabs of rows. */
     if (mpi_rank_g == 0)
-        HDprintf("\nTesting Dataset1 write by ROW\n");
+        printf("\nTesting Dataset1 write by ROW\n");
     /* Create a large dataset */
     dims[0] = bigcount;
     dims[1] = (hsize_t)mpi_size_g;
@@ -553,7 +553,7 @@ dataset_big_write(void)
 
     /* Each process takes a slabs of cols. */
     if (mpi_rank_g == 0)
-        HDprintf("\nTesting Dataset2 write by COL\n");
+        printf("\nTesting Dataset2 write by COL\n");
     /* Create a large dataset */
     dims[0] = bigcount;
     dims[1] = (hsize_t)mpi_size_g;
@@ -614,7 +614,7 @@ dataset_big_write(void)
 
     /* ALL selection */
     if (mpi_rank_g == 0)
-        HDprintf("\nTesting Dataset3 write select ALL proc 0, NONE others\n");
+        printf("\nTesting Dataset3 write select ALL proc 0, NONE others\n");
     /* Create a large dataset */
     dims[0] = bigcount;
     dims[1] = 1;
@@ -675,7 +675,7 @@ dataset_big_write(void)
 
     /* Point selection */
     if (mpi_rank_g == 0)
-        HDprintf("\nTesting Dataset4 write point selection\n");
+        printf("\nTesting Dataset4 write point selection\n");
     /* Create a large dataset */
     dims[0] = bigcount;
     dims[1] = (hsize_t)(mpi_size_g * 4);
@@ -800,7 +800,7 @@ dataset_big_read(void)
     VRFY_G((ret >= 0), "");
 
     if (mpi_rank_g == 0)
-        HDprintf("\nRead Testing Dataset1 by COL\n");
+        printf("\nRead Testing Dataset1 by COL\n");
 
     dataset = H5Dopen2(fid, DATASET1, H5P_DEFAULT);
     VRFY_G((dataset >= 0), "H5Dopen2 succeeded");
@@ -851,7 +851,7 @@ dataset_big_read(void)
     /* verify the read data with original expected data */
     ret = verify_data(start, count, stride, block, rdata, wdata);
     if (ret) {
-        HDfprintf(stderr, "verify failed\n");
+        fprintf(stderr, "verify failed\n");
         exit(1);
     }
 
@@ -863,7 +863,7 @@ dataset_big_read(void)
     VRFY_G((ret >= 0), "H5Dclose1 succeeded");
 
     if (mpi_rank_g == 0)
-        HDprintf("\nRead Testing Dataset2 by ROW\n");
+        printf("\nRead Testing Dataset2 by ROW\n");
     HDmemset(rdata, 0, bigcount * sizeof(B_DATATYPE));
     dataset = H5Dopen2(fid, DATASET2, H5P_DEFAULT);
     VRFY_G((dataset >= 0), "H5Dopen2 succeeded");
@@ -914,7 +914,7 @@ dataset_big_read(void)
     /* verify the read data with original expected data */
     ret = verify_data(start, count, stride, block, rdata, wdata);
     if (ret) {
-        HDfprintf(stderr, "verify failed\n");
+        fprintf(stderr, "verify failed\n");
         exit(1);
     }
 
@@ -926,7 +926,7 @@ dataset_big_read(void)
     VRFY_G((ret >= 0), "H5Dclose1 succeeded");
 
     if (mpi_rank_g == 0)
-        HDprintf("\nRead Testing Dataset3 read select ALL proc 0, NONE others\n");
+        printf("\nRead Testing Dataset3 read select ALL proc 0, NONE others\n");
     HDmemset(rdata, 0, bigcount * sizeof(B_DATATYPE));
     dataset = H5Dopen2(fid, DATASET3, H5P_DEFAULT);
     VRFY_G((dataset >= 0), "H5Dopen2 succeeded");
@@ -979,7 +979,7 @@ dataset_big_read(void)
         /* verify the read data with original expected data */
         ret = verify_data(start, count, stride, block, rdata, wdata);
         if (ret) {
-            HDfprintf(stderr, "verify failed\n");
+            fprintf(stderr, "verify failed\n");
             exit(1);
         }
     }
@@ -992,7 +992,7 @@ dataset_big_read(void)
     VRFY_G((ret >= 0), "H5Dclose1 succeeded");
 
     if (mpi_rank_g == 0)
-        HDprintf("\nRead Testing Dataset4 with Point selection\n");
+        printf("\nRead Testing Dataset4 with Point selection\n");
     dataset = H5Dopen2(fid, DATASET4, H5P_DEFAULT);
     VRFY_G((dataset >= 0), "H5Dopen2 succeeded");
 
@@ -1054,7 +1054,7 @@ dataset_big_read(void)
 
     ret = verify_data(start, count, stride, block, rdata, wdata);
     if (ret) {
-        HDfprintf(stderr, "verify failed\n");
+        fprintf(stderr, "verify failed\n");
         exit(1);
     }
 
@@ -1103,7 +1103,7 @@ static void
 single_rank_independent_io(void)
 {
     if (mpi_rank_g == 0)
-        HDprintf("\nSingle Rank Independent I/O\n");
+        printf("\nSingle Rank Independent I/O\n");
 
     if (MAIN_PROCESS) {
         hsize_t  dims[1];
@@ -1159,7 +1159,7 @@ single_rank_independent_io(void)
         /* Verify data */
         for (i = 0; i < dims[0]; i++)
             if (data[i] != (int)(i % (uint64_t)DXFER_BIGCOUNT)) {
-                HDfprintf(stderr, "verify failed\n");
+                fprintf(stderr, "verify failed\n");
                 exit(1);
             }
 
@@ -1266,7 +1266,7 @@ coll_chunk1(void)
 {
     const char *filename = FILENAME[0];
     if (mpi_rank_g == 0)
-        HDprintf("\nCollective chunk I/O Test #1\n");
+        printf("\nCollective chunk I/O Test #1\n");
 
     coll_chunktest(filename, 1, BYROW_CONT, API_NONE, HYPER, HYPER, OUT_OF_ORDER);
     coll_chunktest(filename, 1, BYROW_CONT, API_NONE, HYPER, POINT, OUT_OF_ORDER);
@@ -1317,7 +1317,7 @@ coll_chunk2(void)
 {
     const char *filename = FILENAME[0];
     if (mpi_rank_g == 0)
-        HDprintf("\nCollective chunk I/O Test #2\n");
+        printf("\nCollective chunk I/O Test #2\n");
 
     coll_chunktest(filename, 1, BYROW_DISCONT, API_NONE, HYPER, HYPER, OUT_OF_ORDER);
     coll_chunktest(filename, 1, BYROW_DISCONT, API_NONE, HYPER, POINT, OUT_OF_ORDER);
@@ -1369,7 +1369,7 @@ coll_chunk3(void)
 {
     const char *filename = FILENAME[0];
     if (mpi_rank_g == 0)
-        HDprintf("\nCollective chunk I/O Test #3\n");
+        printf("\nCollective chunk I/O Test #3\n");
 
     coll_chunktest(filename, mpi_size_g, BYROW_CONT, API_NONE, HYPER, HYPER, OUT_OF_ORDER);
     coll_chunktest(filename, mpi_size_g, BYROW_CONT, API_NONE, HYPER, POINT, OUT_OF_ORDER);
@@ -1874,7 +1874,7 @@ main(int argc, char **argv)
      * calls.  By then, MPI calls may not work.
      */
     if (H5dont_atexit() < 0)
-        HDprintf("Failed to turn off atexit processing. Continue.\n");
+        printf("Failed to turn off atexit processing. Continue.\n");
 
     /* set alarm. */
     TestAlarmOn();
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index a9486a4..63e086c 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -480,12 +480,12 @@ static hbool_t trace_file_check(int metadata_write_strategy);
 static void
 print_stats(void)
 {
-    HDfprintf(stdout, "%d: datum clears / pinned clears / destroys = %ld / %ld / %ld\n", world_mpi_rank,
-              datum_clears, datum_pinned_clears, datum_destroys);
-    HDfprintf(stdout, "%d: datum flushes / pinned flushes / loads  = %ld / %ld / %ld\n", world_mpi_rank,
-              datum_flushes, datum_pinned_flushes, datum_loads);
-    HDfprintf(stdout, "%d: pins: global / global dirty / local = %ld / %ld / %ld\n", world_mpi_rank,
-              global_pins, global_dirty_pins, local_pins);
+    fprintf(stdout, "%d: datum clears / pinned clears / destroys = %ld / %ld / %ld\n", world_mpi_rank,
+            datum_clears, datum_pinned_clears, datum_destroys);
+    fprintf(stdout, "%d: datum flushes / pinned flushes / loads  = %ld / %ld / %ld\n", world_mpi_rank,
+            datum_flushes, datum_pinned_flushes, datum_loads);
+    fprintf(stdout, "%d: pins: global / global dirty / local = %ld / %ld / %ld\n", world_mpi_rank,
+            global_pins, global_dirty_pins, local_pins);
     HDfflush(stdout);
 
     return;
@@ -560,8 +560,8 @@ set_up_file_communicator(void)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: MPI_Comm_group() failed with error %d.\n", world_mpi_rank, __func__,
-                          mpi_result);
+                fprintf(stdout, "%d:%s: MPI_Comm_group() failed with error %d.\n", world_mpi_rank, __func__,
+                        mpi_result);
             }
         }
     }
@@ -577,8 +577,8 @@ set_up_file_communicator(void)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: MPI_Group_excl() failed with error %d.\n", world_mpi_rank, __func__,
-                          mpi_result);
+                fprintf(stdout, "%d:%s: MPI_Group_excl() failed with error %d.\n", world_mpi_rank, __func__,
+                        mpi_result);
             }
         }
     }
@@ -592,8 +592,8 @@ set_up_file_communicator(void)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: MPI_Comm_create() failed with error %d.\n", world_mpi_rank,
-                          __func__, mpi_result);
+                fprintf(stdout, "%d:%s: MPI_Comm_create() failed with error %d.\n", world_mpi_rank, __func__,
+                        mpi_result);
             }
         }
         else {
@@ -605,8 +605,7 @@ set_up_file_communicator(void)
                     nerrors++;
                     success = FALSE;
                     if (verbose) {
-                        HDfprintf(stdout, "%d:%s: file_mpi_comm == MPI_COMM_NULL.\n", world_mpi_rank,
-                                  __func__);
+                        fprintf(stdout, "%d:%s: file_mpi_comm == MPI_COMM_NULL.\n", world_mpi_rank, __func__);
                     }
                 }
             }
@@ -619,8 +618,7 @@ set_up_file_communicator(void)
                     nerrors++;
                     success = FALSE;
                     if (verbose) {
-                        HDfprintf(stdout, "%d:%s: file_mpi_comm != MPI_COMM_NULL.\n", world_mpi_rank,
-                                  __func__);
+                        fprintf(stdout, "%d:%s: file_mpi_comm != MPI_COMM_NULL.\n", world_mpi_rank, __func__);
                     }
                 }
             }
@@ -636,8 +634,8 @@ set_up_file_communicator(void)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: MPI_Comm_size() failed with error %d.\n", world_mpi_rank, __func__,
-                          mpi_result);
+                fprintf(stdout, "%d:%s: MPI_Comm_size() failed with error %d.\n", world_mpi_rank, __func__,
+                        mpi_result);
             }
         }
     }
@@ -651,8 +649,8 @@ set_up_file_communicator(void)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: MPI_Comm_rank() failed with error %d.\n", world_mpi_rank, __func__,
-                          mpi_result);
+                fprintf(stdout, "%d:%s: MPI_Comm_rank() failed with error %d.\n", world_mpi_rank, __func__,
+                        mpi_result);
             }
         }
     }
@@ -823,7 +821,7 @@ do_express_test(void)
         nerrors++;
         max_express_test = -1;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: MPI_Allreduce() failed.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: MPI_Allreduce() failed.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -871,7 +869,7 @@ do_sync(void)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -882,7 +880,7 @@ do_sync(void)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
             }
         }
         else if ((mssg.req != SYNC_ACK_CODE) || (mssg.src != world_server_mpi_rank) ||
@@ -890,7 +888,7 @@ do_sync(void)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: Bad data in sync ack.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: Bad data in sync ack.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -927,7 +925,7 @@ get_max_nerrors(void)
         nerrors++;
         max_nerrors = -1;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: MPI_Allreduce() failed.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: MPI_Allreduce() failed.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -970,7 +968,7 @@ recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: bad param(s) on entry.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: bad param(s) on entry.\n", world_mpi_rank, __func__);
         }
     }
     else {
@@ -987,7 +985,7 @@ recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: MPI_Recv() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: MPI_Recv() failed.\n", world_mpi_rank, __func__);
             }
         }
         else if (mssg_ptr->magic != MSSG_MAGIC) {
@@ -995,7 +993,7 @@ recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: invalid magic.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: invalid magic.\n", world_mpi_rank, __func__);
             }
         }
         else if (mssg_ptr->src != status.MPI_SOURCE) {
@@ -1003,7 +1001,7 @@ recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: mssg_ptr->src != status.MPI_SOURCE.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: mssg_ptr->src != status.MPI_SOURCE.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -1043,7 +1041,7 @@ send_mssg(struct mssg_t *mssg_ptr, hbool_t add_req_to_tag)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: Invalid mssg on entry.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: Invalid mssg on entry.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -1063,7 +1061,7 @@ send_mssg(struct mssg_t *mssg_ptr, hbool_t add_req_to_tag)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: MPI_Send() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: MPI_Send() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -1114,7 +1112,7 @@ setup_derived_types(void)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: MPI_Get_address() call failed.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: MPI_Get_address() call failed.\n", world_mpi_rank, __func__);
         }
     }
     else {
@@ -1134,7 +1132,7 @@ setup_derived_types(void)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: MPI_Type_create_struct() call failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: MPI_Type_create_struct() call failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -1148,7 +1146,7 @@ setup_derived_types(void)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: MPI_Type_commit() call failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: MPI_Type_commit() call failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -1187,7 +1185,7 @@ takedown_derived_types(void)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: MPI_Type_free() call failed.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: MPI_Type_free() call failed.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -1240,8 +1238,8 @@ reset_server_counters(void)
         success = FALSE;
         nerrors++;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: actual/total reads mismatch (%ld/%d).\n", world_mpi_rank, __func__,
-                      actual_total_reads, total_reads);
+            fprintf(stdout, "%d:%s: actual/total reads mismatch (%ld/%d).\n", world_mpi_rank, __func__,
+                    actual_total_reads, total_reads);
         }
     }
 
@@ -1250,8 +1248,8 @@ reset_server_counters(void)
         success = FALSE;
         nerrors++;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: actual/total writes mismatch (%ld/%d).\n", world_mpi_rank, __func__,
-                      actual_total_writes, total_writes);
+            fprintf(stdout, "%d:%s: actual/total writes mismatch (%ld/%d).\n", world_mpi_rank, __func__,
+                    actual_total_writes, total_writes);
         }
     }
 
@@ -1293,7 +1291,7 @@ server_main(void)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: This isn't the server process?!?!?\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: This isn't the server process?!?!?\n", world_mpi_rank, __func__);
         }
     }
 
@@ -1310,7 +1308,7 @@ server_main(void)
                 case WRITE_REQ_ACK_CODE:
                     success = FALSE;
                     if (verbose)
-                        HDfprintf(stdout, "%s: Received write ack?!?.\n", __func__);
+                        fprintf(stdout, "%s: Received write ack?!?.\n", __func__);
                     break;
 
                 case READ_REQ_CODE:
@@ -1320,7 +1318,7 @@ server_main(void)
                 case READ_REQ_REPLY_CODE:
                     success = FALSE;
                     if (verbose)
-                        HDfprintf(stdout, "%s: Received read req reply?!?.\n", __func__);
+                        fprintf(stdout, "%s: Received read req reply?!?.\n", __func__);
                     break;
 
                 case SYNC_REQ_CODE:
@@ -1330,7 +1328,7 @@ server_main(void)
                 case SYNC_ACK_CODE:
                     success = FALSE;
                     if (verbose)
-                        HDfprintf(stdout, "%s: Received sync ack?!?.\n", __func__);
+                        fprintf(stdout, "%s: Received sync ack?!?.\n", __func__);
                     break;
 
                 case REQ_TTL_WRITES_CODE:
@@ -1340,7 +1338,7 @@ server_main(void)
                 case REQ_TTL_WRITES_RPLY_CODE:
                     success = FALSE;
                     if (verbose)
-                        HDfprintf(stdout, "%s: Received total writes reply?!?.\n", __func__);
+                        fprintf(stdout, "%s: Received total writes reply?!?.\n", __func__);
                     break;
 
                 case REQ_TTL_READS_CODE:
@@ -1350,7 +1348,7 @@ server_main(void)
                 case REQ_TTL_READS_RPLY_CODE:
                     success = FALSE;
                     if (verbose)
-                        HDfprintf(stdout, "%s: Received total reads reply?!?.\n", __func__);
+                        fprintf(stdout, "%s: Received total reads reply?!?.\n", __func__);
                     break;
 
                 case REQ_ENTRY_WRITES_CODE:
@@ -1360,7 +1358,7 @@ server_main(void)
                 case REQ_ENTRY_WRITES_RPLY_CODE:
                     success = FALSE;
                     if (verbose)
-                        HDfprintf(stdout, "%s: Received entry writes reply?!?.\n", __func__);
+                        fprintf(stdout, "%s: Received entry writes reply?!?.\n", __func__);
                     break;
 
                 case REQ_ENTRY_READS_CODE:
@@ -1370,7 +1368,7 @@ server_main(void)
                 case REQ_ENTRY_READS_RPLY_CODE:
                     success = FALSE;
                     if (verbose)
-                        HDfprintf(stdout, "%s: Received entry reads reply?!?.\n", __func__);
+                        fprintf(stdout, "%s: Received entry reads reply?!?.\n", __func__);
                     break;
 
                 case REQ_RW_COUNT_RESET_CODE:
@@ -1380,7 +1378,7 @@ server_main(void)
                 case REQ_RW_COUNT_RESET_RPLY_CODE:
                     success = FALSE;
                     if (verbose)
-                        HDfprintf(stdout, "%s: Received RW count reset reply?!?.\n", __func__);
+                        fprintf(stdout, "%s: Received RW count reset reply?!?.\n", __func__);
                     break;
 
                 case DONE_REQ_CODE:
@@ -1393,7 +1391,7 @@ server_main(void)
                     nerrors++;
                     success = FALSE;
                     if (verbose)
-                        HDfprintf(stdout, "%d:%s: Unknown request code.\n", world_mpi_rank, __func__);
+                        fprintf(stdout, "%d:%s: Unknown request code.\n", world_mpi_rank, __func__);
                     break;
             }
         }
@@ -1435,7 +1433,7 @@ serve_read_request(struct mssg_t *mssg_ptr)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -1449,8 +1447,8 @@ serve_read_request(struct mssg_t *mssg_ptr)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: addr lookup failed for %" PRIuHADDR ".\n", world_mpi_rank, __func__,
-                          target_addr);
+                fprintf(stdout, "%d:%s: addr lookup failed for %" PRIuHADDR ".\n", world_mpi_rank, __func__,
+                        target_addr);
             }
         }
         else if (data[target_index].len != mssg_ptr->len) {
@@ -1458,8 +1456,8 @@ serve_read_request(struct mssg_t *mssg_ptr)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: data[i].len = %zu != mssg->len = %d.\n", world_mpi_rank, __func__,
-                          data[target_index].len, mssg_ptr->len);
+                fprintf(stdout, "%d:%s: data[i].len = %zu != mssg->len = %d.\n", world_mpi_rank, __func__,
+                        data[target_index].len, mssg_ptr->len);
             }
         }
         else if (!(data[target_index].valid)) {
@@ -1467,11 +1465,10 @@ serve_read_request(struct mssg_t *mssg_ptr)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout,
-                          "%d:%s: proc %d read invalid entry. "
-                          "idx/base_addr = %d/%" PRIuHADDR ".\n",
-                          world_mpi_rank, __func__, mssg_ptr->src, target_index,
-                          data[target_index].base_addr);
+                fprintf(stdout,
+                        "%d:%s: proc %d read invalid entry. "
+                        "idx/base_addr = %d/%" PRIuHADDR ".\n",
+                        world_mpi_rank, __func__, mssg_ptr->src, target_index, data[target_index].base_addr);
             }
         }
         else {
@@ -1502,15 +1499,15 @@ serve_read_request(struct mssg_t *mssg_ptr)
 
         if (success) {
 
-            HDfprintf(stdout, "%d read 0x%llx. len = %d. ver = %d.\n", (int)(mssg_ptr->src),
-                      (long long)(data[target_index].base_addr), (int)(data[target_index].len),
-                      (int)(data[target_index].ver));
+            fprintf(stdout, "%d read 0x%llx. len = %d. ver = %d.\n", (int)(mssg_ptr->src),
+                    (long long)(data[target_index].base_addr), (int)(data[target_index].len),
+                    (int)(data[target_index].ver));
         }
         else {
 
-            HDfprintf(stdout, "%d read 0x%llx FAILED. len = %d. ver = %d.\n", (int)(mssg_ptr->src),
-                      (long long)(data[target_index].base_addr), (int)(data[target_index].len),
-                      (int)(data[target_index].ver));
+            fprintf(stdout, "%d read 0x%llx FAILED. len = %d. ver = %d.\n", (int)(mssg_ptr->src),
+                    (long long)(data[target_index].base_addr), (int)(data[target_index].len),
+                    (int)(data[target_index].ver));
         }
     }
 
@@ -1551,7 +1548,7 @@ serve_sync_request(struct mssg_t *mssg_ptr)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -1578,11 +1575,11 @@ serve_sync_request(struct mssg_t *mssg_ptr)
 
         if (success) {
 
-            HDfprintf(stdout, "%d sync.\n", (int)(mssg_ptr->src));
+            fprintf(stdout, "%d sync.\n", (int)(mssg_ptr->src));
         }
         else {
 
-            HDfprintf(stdout, "%d sync FAILED.\n", (int)(mssg_ptr->src));
+            fprintf(stdout, "%d sync FAILED.\n", (int)(mssg_ptr->src));
         }
     }
 
@@ -1625,7 +1622,7 @@ serve_write_request(struct mssg_t *mssg_ptr)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -1639,8 +1636,8 @@ serve_write_request(struct mssg_t *mssg_ptr)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: addr lookup failed for %" PRIuHADDR ".\n", world_mpi_rank, __func__,
-                          target_addr);
+                fprintf(stdout, "%d:%s: addr lookup failed for %" PRIuHADDR ".\n", world_mpi_rank, __func__,
+                        target_addr);
             }
         }
         else if (data[target_index].len != mssg_ptr->len) {
@@ -1648,8 +1645,8 @@ serve_write_request(struct mssg_t *mssg_ptr)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: data[i].len = %zu != mssg->len = %d.\n", world_mpi_rank, __func__,
-                          data[target_index].len, mssg_ptr->len);
+                fprintf(stdout, "%d:%s: data[i].len = %zu != mssg->len = %d.\n", world_mpi_rank, __func__,
+                        data[target_index].len, mssg_ptr->len);
             }
         }
     }
@@ -1664,8 +1661,8 @@ serve_write_request(struct mssg_t *mssg_ptr)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: new ver = %d <= old ver = %d.\n", world_mpi_rank, __func__,
-                          new_ver_num, data[target_index].ver);
+                fprintf(stdout, "%d:%s: new ver = %d <= old ver = %d.\n", world_mpi_rank, __func__,
+                        new_ver_num, data[target_index].ver);
             }
         }
     }
@@ -1703,15 +1700,15 @@ serve_write_request(struct mssg_t *mssg_ptr)
 
         if (success) {
 
-            HDfprintf(stdout, "%d write 0x%llx. len = %d. ver = %d.\n", (int)(mssg_ptr->src),
-                      (long long)(data[target_index].base_addr), (int)(data[target_index].len),
-                      (int)(data[target_index].ver));
+            fprintf(stdout, "%d write 0x%llx. len = %d. ver = %d.\n", (int)(mssg_ptr->src),
+                    (long long)(data[target_index].base_addr), (int)(data[target_index].len),
+                    (int)(data[target_index].ver));
         }
         else {
 
-            HDfprintf(stdout, "%d write 0x%llx FAILED. len = %d. ver = %d.\n", (int)(mssg_ptr->src),
-                      (long long)(data[target_index].base_addr), (int)(data[target_index].len),
-                      (int)(data[target_index].ver));
+            fprintf(stdout, "%d write 0x%llx FAILED. len = %d. ver = %d.\n", (int)(mssg_ptr->src),
+                    (long long)(data[target_index].base_addr), (int)(data[target_index].len),
+                    (int)(data[target_index].ver));
         }
     }
 
@@ -1750,7 +1747,7 @@ serve_total_writes_request(struct mssg_t *mssg_ptr)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -1777,11 +1774,11 @@ serve_total_writes_request(struct mssg_t *mssg_ptr)
 
         if (success) {
 
-            HDfprintf(stdout, "%d request total writes %d.\n", (int)(mssg_ptr->src), total_writes);
+            fprintf(stdout, "%d request total writes %d.\n", (int)(mssg_ptr->src), total_writes);
         }
         else {
 
-            HDfprintf(stdout, "%d request total writes %d -- FAILED.\n", (int)(mssg_ptr->src), total_writes);
+            fprintf(stdout, "%d request total writes %d -- FAILED.\n", (int)(mssg_ptr->src), total_writes);
         }
     }
 
@@ -1820,7 +1817,7 @@ serve_total_reads_request(struct mssg_t *mssg_ptr)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -1847,11 +1844,11 @@ serve_total_reads_request(struct mssg_t *mssg_ptr)
 
         if (success) {
 
-            HDfprintf(stdout, "%d request total reads %d.\n", (int)(mssg_ptr->src), total_reads);
+            fprintf(stdout, "%d request total reads %d.\n", (int)(mssg_ptr->src), total_reads);
         }
         else {
 
-            HDfprintf(stdout, "%d request total reads %d -- FAILED.\n", (int)(mssg_ptr->src), total_reads);
+            fprintf(stdout, "%d request total reads %d -- FAILED.\n", (int)(mssg_ptr->src), total_reads);
         }
     }
 
@@ -1892,7 +1889,7 @@ serve_entry_writes_request(struct mssg_t *mssg_ptr)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -1906,8 +1903,8 @@ serve_entry_writes_request(struct mssg_t *mssg_ptr)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: addr lookup failed for %" PRIuHADDR ".\n", world_mpi_rank, __func__,
-                          target_addr);
+                fprintf(stdout, "%d:%s: addr lookup failed for %" PRIuHADDR ".\n", world_mpi_rank, __func__,
+                        target_addr);
             }
         }
         else {
@@ -1934,13 +1931,13 @@ serve_entry_writes_request(struct mssg_t *mssg_ptr)
 
         if (success) {
 
-            HDfprintf(stdout, "%d request entry 0x%llx writes = %ld.\n", (int)(mssg_ptr->src),
-                      (long long)(data[target_index].base_addr), (long)(data[target_index].writes));
+            fprintf(stdout, "%d request entry 0x%llx writes = %ld.\n", (int)(mssg_ptr->src),
+                    (long long)(data[target_index].base_addr), (long)(data[target_index].writes));
         }
         else {
 
-            HDfprintf(stdout, "%d request entry 0x%llx writes = %ld FAILED.\n", (int)(mssg_ptr->src),
-                      (long long)(data[target_index].base_addr), (long)(data[target_index].writes));
+            fprintf(stdout, "%d request entry 0x%llx writes = %ld FAILED.\n", (int)(mssg_ptr->src),
+                    (long long)(data[target_index].base_addr), (long)(data[target_index].writes));
         }
     }
 
@@ -1981,7 +1978,7 @@ serve_entry_reads_request(struct mssg_t *mssg_ptr)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -1995,8 +1992,8 @@ serve_entry_reads_request(struct mssg_t *mssg_ptr)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: addr lookup failed for %" PRIuHADDR ".\n", world_mpi_rank, __func__,
-                          target_addr);
+                fprintf(stdout, "%d:%s: addr lookup failed for %" PRIuHADDR ".\n", world_mpi_rank, __func__,
+                        target_addr);
             }
         }
         else {
@@ -2023,13 +2020,13 @@ serve_entry_reads_request(struct mssg_t *mssg_ptr)
 
         if (success) {
 
-            HDfprintf(stdout, "%d request entry 0x%llx reads = %ld.\n", (int)(mssg_ptr->src),
-                      (long long)(data[target_index].base_addr), (long)(data[target_index].reads));
+            fprintf(stdout, "%d request entry 0x%llx reads = %ld.\n", (int)(mssg_ptr->src),
+                    (long long)(data[target_index].base_addr), (long)(data[target_index].reads));
         }
         else {
 
-            HDfprintf(stdout, "%d request entry 0x%llx reads = %ld FAILED.\n", (int)(mssg_ptr->src),
-                      (long long)(data[target_index].base_addr), (long)(data[target_index].reads));
+            fprintf(stdout, "%d request entry 0x%llx reads = %ld FAILED.\n", (int)(mssg_ptr->src),
+                    (long long)(data[target_index].base_addr), (long)(data[target_index].reads));
         }
     }
 
@@ -2067,7 +2064,7 @@ serve_rw_count_reset_request(struct mssg_t *mssg_ptr)
         nerrors++;
         success = FALSE;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -2099,11 +2096,11 @@ serve_rw_count_reset_request(struct mssg_t *mssg_ptr)
 
         if (success) {
 
-            HDfprintf(stdout, "%d request R/W counter reset.\n", (int)(mssg_ptr->src));
+            fprintf(stdout, "%d request R/W counter reset.\n", (int)(mssg_ptr->src));
         }
         else {
 
-            HDfprintf(stdout, "%d request R/w counter reset FAILED.\n", (int)(mssg_ptr->src));
+            fprintf(stdout, "%d request R/w counter reset FAILED.\n", (int)(mssg_ptr->src));
         }
     }
 
@@ -2151,8 +2148,8 @@ datum_get_initial_load_size(void *udata_ptr, size_t *image_len_ptr)
 
     if (callbacks_verbose) {
 
-        HDfprintf(stdout, "%d: get_initial_load_size() idx = %d, addr = %ld, len = %d.\n", world_mpi_rank,
-                  idx, (long)addr, (int)entry_ptr->local_len);
+        fprintf(stdout, "%d: get_initial_load_size() idx = %d, addr = %ld, len = %d.\n", world_mpi_rank, idx,
+                (long)addr, (int)entry_ptr->local_len);
         fflush(stdout);
     }
 
@@ -2201,8 +2198,8 @@ datum_deserialize(const void H5_ATTR_NDEBUG_UNUSED *image_ptr, H5_ATTR_UNUSED si
 
     if (callbacks_verbose) {
 
-        HDfprintf(stdout, "%d: deserialize() idx = %d, addr = %ld, len = %d, is_dirty = %d.\n",
-                  world_mpi_rank, idx, (long)addr, (int)len, (int)(entry_ptr->header.is_dirty));
+        fprintf(stdout, "%d: deserialize() idx = %d, addr = %ld, len = %d, is_dirty = %d.\n", world_mpi_rank,
+                idx, (long)addr, (int)len, (int)(entry_ptr->header.is_dirty));
         fflush(stdout);
     }
 
@@ -2253,8 +2250,8 @@ datum_image_len(const void *thing, size_t *image_len)
     assert(entry_ptr->local_len <= entry_ptr->len);
 
     if (callbacks_verbose) {
-        HDfprintf(stdout, "%d: image_len() idx = %d, addr = %ld, len = %d.\n", world_mpi_rank, idx,
-                  (long)(entry_ptr->base_addr), (int)(entry_ptr->local_len));
+        fprintf(stdout, "%d: image_len() idx = %d, addr = %ld, len = %d.\n", world_mpi_rank, idx,
+                (long)(entry_ptr->base_addr), (int)(entry_ptr->local_len));
         fflush(stdout);
     }
 
@@ -2310,8 +2307,8 @@ datum_serialize(const H5F_t *f, void H5_ATTR_NDEBUG_UNUSED *image_ptr, size_t le
 
     if (callbacks_verbose) {
 
-        HDfprintf(stdout, "%d: serialize() idx = %d, addr = %ld, len = %d.\n", world_mpi_rank, idx,
-                  (long)entry_ptr->header.addr, (int)len);
+        fprintf(stdout, "%d: serialize() idx = %d, addr = %ld, len = %d.\n", world_mpi_rank, idx,
+                (long)entry_ptr->header.addr, (int)len);
         fflush(stdout);
     }
 
@@ -2368,8 +2365,8 @@ datum_notify(H5C_notify_action_t action, void *thing)
 
     if (callbacks_verbose) {
 
-        HDfprintf(stdout, "%d: notify() action = %d, idx = %d, addr = %ld.\n", world_mpi_rank, (int)action,
-                  idx, (long)entry_ptr->header.addr);
+        fprintf(stdout, "%d: notify() action = %d, idx = %d, addr = %ld.\n", world_mpi_rank, (int)action, idx,
+                (long)entry_ptr->header.addr);
         fflush(stdout);
     }
 
@@ -2386,8 +2383,8 @@ datum_notify(H5C_notify_action_t action, void *thing)
         case H5AC_NOTIFY_ACTION_AFTER_INSERT:
             if (callbacks_verbose) {
 
-                HDfprintf(stdout, "%d: notify() action = insert, idx = %d, addr = %ld.\n", world_mpi_rank,
-                          idx, (long)entry_ptr->header.addr);
+                fprintf(stdout, "%d: notify() action = insert, idx = %d, addr = %ld.\n", world_mpi_rank, idx,
+                        (long)entry_ptr->header.addr);
                 fflush(stdout);
             }
             /* do nothing */
@@ -2396,8 +2393,8 @@ datum_notify(H5C_notify_action_t action, void *thing)
         case H5AC_NOTIFY_ACTION_AFTER_LOAD:
             if (callbacks_verbose) {
 
-                HDfprintf(stdout, "%d: notify() action = load, idx = %d, addr = %ld.\n", world_mpi_rank, idx,
-                          (long)entry_ptr->header.addr);
+                fprintf(stdout, "%d: notify() action = load, idx = %d, addr = %ld.\n", world_mpi_rank, idx,
+                        (long)entry_ptr->header.addr);
                 fflush(stdout);
             }
 
@@ -2417,7 +2414,7 @@ datum_notify(H5C_notify_action_t action, void *thing)
                 nerrors++;
                 ret_value = FAIL;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
                 }
             }
 
@@ -2428,7 +2425,7 @@ datum_notify(H5C_notify_action_t action, void *thing)
                     nerrors++;
                     ret_value = FAIL;
                     if (verbose) {
-                        HDfprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
+                        fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
                     }
                 }
             }
@@ -2443,41 +2440,41 @@ datum_notify(H5C_notify_action_t action, void *thing)
                     nerrors++;
                     ret_value = FAIL;
                     if (verbose) {
-                        HDfprintf(stdout, "%d:%s: Bad data in read req reply.\n", world_mpi_rank, __func__);
+                        fprintf(stdout, "%d:%s: Bad data in read req reply.\n", world_mpi_rank, __func__);
                     }
 
 #if 0  /* This has been useful debugging code -- keep it for now. */
                 if ( mssg.req != READ_REQ_REPLY_CODE ) {
 
-                HDfprintf(stdout,
+                fprintf(stdout,
                                   "%d:%s: mssg.req != READ_REQ_REPLY_CODE.\n",
                     world_mpi_rank, __func__);
-                HDfprintf(stdout, "%d:%s: mssg.req = %d.\n",
+                fprintf(stdout, "%d:%s: mssg.req = %d.\n",
                     world_mpi_rank, __func__, (int)(mssg.req));
                 }
 
                 if ( mssg.src != world_server_mpi_rank ) {
 
-                HDfprintf(stdout,
+                fprintf(stdout,
                                  "%d:%s: mssg.src != world_server_mpi_rank.\n",
                     world_mpi_rank, __func__);
                 }
 
                 if ( mssg.dest != world_mpi_rank ) {
 
-                HDfprintf(stdout,
+                fprintf(stdout,
                                   "%d:%s: mssg.dest != world_mpi_rank.\n",
                     world_mpi_rank, __func__);
                     }
 
                 if ( mssg.base_addr != entry_ptr->base_addr ) {
 
-                HDfprintf(stdout,
+                fprintf(stdout,
                 "%d:%s: mssg.base_addr != entry_ptr->base_addr.\n",
                 world_mpi_rank, __func__);
-                HDfprintf(stdout, "%d:%s: mssg.base_addr = %" PRIuHADDR ".\n",
+                fprintf(stdout, "%d:%s: mssg.base_addr = %" PRIuHADDR ".\n",
                     world_mpi_rank, __func__, mssg.base_addr);
-                HDfprintf(stdout,
+                fprintf(stdout,
                     "%d:%s: entry_ptr->base_addr = %" PRIuHADDR ".\n",
                     world_mpi_rank, __func__,
                                    entry_ptr->base_addr);
@@ -2485,23 +2482,23 @@ datum_notify(H5C_notify_action_t action, void *thing)
 
                 if ( mssg.len != entry_ptr->len ) {
 
-                HDfprintf(stdout,
+                fprintf(stdout,
                                   "%d:%s: mssg.len != entry_ptr->len.\n",
                     world_mpi_rank, __func__);
-                HDfprintf(stdout, "%d:%s: mssg.len = %" PRIuHADDR ".\n",
+                fprintf(stdout, "%d:%s: mssg.len = %" PRIuHADDR ".\n",
                     world_mpi_rank, __func__, mssg.len);
                     }
 
                 if ( mssg.ver < entry_ptr->ver ) {
 
-                HDfprintf(stdout,
+                fprintf(stdout,
                                   "%d:%s: mssg.ver < entry_ptr->ver.\n",
                     world_mpi_rank, __func__);
                     }
 
                 if ( mssg.magic != MSSG_MAGIC ) {
 
-                HDfprintf(stdout, "%d:%s: mssg.magic != MSSG_MAGIC.\n",
+                fprintf(stdout, "%d:%s: mssg.magic != MSSG_MAGIC.\n",
                     world_mpi_rank, __func__);
                      }
 #endif /* JRM */
@@ -2518,8 +2515,8 @@ datum_notify(H5C_notify_action_t action, void *thing)
         case H5C_NOTIFY_ACTION_AFTER_FLUSH:
             if (callbacks_verbose) {
 
-                HDfprintf(stdout, "%d: notify() action = flush, idx = %d, addr = %ld.\n", world_mpi_rank, idx,
-                          (long)entry_ptr->header.addr);
+                fprintf(stdout, "%d: notify() action = flush, idx = %d, addr = %ld.\n", world_mpi_rank, idx,
+                        (long)entry_ptr->header.addr);
                 fflush(stdout);
             }
 
@@ -2533,8 +2530,8 @@ datum_notify(H5C_notify_action_t action, void *thing)
                 (aux_ptr->metadata_write_strategy == H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY)) {
 
                 ret_value = FAIL;
-                HDfprintf(stdout, "%d:%s: Flushed dirty entry from non-zero file process.", world_mpi_rank,
-                          __func__);
+                fprintf(stdout, "%d:%s: Flushed dirty entry from non-zero file process.", world_mpi_rank,
+                        __func__);
             }
 
             if (ret_value == SUCCEED) {
@@ -2561,7 +2558,7 @@ datum_notify(H5C_notify_action_t action, void *thing)
                         nerrors++;
                         ret_value = FAIL;
                         if (verbose) {
-                            HDfprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
+                            fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
                         }
                     }
                     else {
@@ -2580,7 +2577,7 @@ datum_notify(H5C_notify_action_t action, void *thing)
                     nerrors++;
                     ret_value = FAIL;
                     if (verbose) {
-                        HDfprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
+                        fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
                     }
                 }
                 else if ((mssg.req != WRITE_REQ_ACK_CODE) || (mssg.src != world_server_mpi_rank) ||
@@ -2591,7 +2588,7 @@ datum_notify(H5C_notify_action_t action, void *thing)
                     nerrors++;
                     ret_value = FAIL;
                     if (verbose) {
-                        HDfprintf(stdout, "%d:%s: Bad data in write req ack.\n", world_mpi_rank, __func__);
+                        fprintf(stdout, "%d:%s: Bad data in write req ack.\n", world_mpi_rank, __func__);
                     }
                 }
             }
@@ -2610,8 +2607,8 @@ datum_notify(H5C_notify_action_t action, void *thing)
         case H5AC_NOTIFY_ACTION_BEFORE_EVICT:
             if (callbacks_verbose) {
 
-                HDfprintf(stdout, "%d: notify() action = evict, idx = %d, addr = %ld.\n", world_mpi_rank, idx,
-                          (long)entry_ptr->header.addr);
+                fprintf(stdout, "%d: notify() action = evict, idx = %d, addr = %ld.\n", world_mpi_rank, idx,
+                        (long)entry_ptr->header.addr);
                 fflush(stdout);
             }
 
@@ -2621,8 +2618,8 @@ datum_notify(H5C_notify_action_t action, void *thing)
         case H5AC_NOTIFY_ACTION_ENTRY_DIRTIED:
             if (callbacks_verbose) {
 
-                HDfprintf(stdout, "%d: notify() action = entry dirty, idx = %d, addr = %ld.\n",
-                          world_mpi_rank, idx, (long)entry_ptr->header.addr);
+                fprintf(stdout, "%d: notify() action = entry dirty, idx = %d, addr = %ld.\n", world_mpi_rank,
+                        idx, (long)entry_ptr->header.addr);
                 fflush(stdout);
             }
 
@@ -2632,8 +2629,8 @@ datum_notify(H5C_notify_action_t action, void *thing)
         case H5AC_NOTIFY_ACTION_ENTRY_CLEANED:
             if (callbacks_verbose) {
 
-                HDfprintf(stdout, "%d: notify() action = entry clean, idx = %d, addr = %ld.\n",
-                          world_mpi_rank, idx, (long)entry_ptr->header.addr);
+                fprintf(stdout, "%d: notify() action = entry clean, idx = %d, addr = %ld.\n", world_mpi_rank,
+                        idx, (long)entry_ptr->header.addr);
                 fflush(stdout);
             }
 
@@ -2652,8 +2649,8 @@ datum_notify(H5C_notify_action_t action, void *thing)
         case H5AC_NOTIFY_ACTION_CHILD_DIRTIED:
             if (callbacks_verbose) {
 
-                HDfprintf(stdout, "%d: notify() action = child entry dirty, idx = %d, addr = %ld.\n",
-                          world_mpi_rank, idx, (long)entry_ptr->header.addr);
+                fprintf(stdout, "%d: notify() action = child entry dirty, idx = %d, addr = %ld.\n",
+                        world_mpi_rank, idx, (long)entry_ptr->header.addr);
                 fflush(stdout);
             }
 
@@ -2663,8 +2660,8 @@ datum_notify(H5C_notify_action_t action, void *thing)
         case H5AC_NOTIFY_ACTION_CHILD_CLEANED:
             if (callbacks_verbose) {
 
-                HDfprintf(stdout, "%d: notify() action = child entry clean, idx = %d, addr = %ld.\n",
-                          world_mpi_rank, idx, (long)entry_ptr->header.addr);
+                fprintf(stdout, "%d: notify() action = child entry clean, idx = %d, addr = %ld.\n",
+                        world_mpi_rank, idx, (long)entry_ptr->header.addr);
                 fflush(stdout);
             }
 
@@ -2674,8 +2671,8 @@ datum_notify(H5C_notify_action_t action, void *thing)
         case H5AC_NOTIFY_ACTION_CHILD_UNSERIALIZED:
             if (callbacks_verbose) {
 
-                HDfprintf(stdout, "%d: notify() action = child entry unserialized, idx = %d, addr = %ld.\n",
-                          world_mpi_rank, idx, (long)entry_ptr->header.addr);
+                fprintf(stdout, "%d: notify() action = child entry unserialized, idx = %d, addr = %ld.\n",
+                        world_mpi_rank, idx, (long)entry_ptr->header.addr);
                 fflush(stdout);
             }
 
@@ -2685,8 +2682,8 @@ datum_notify(H5C_notify_action_t action, void *thing)
         case H5AC_NOTIFY_ACTION_CHILD_SERIALIZED:
             if (callbacks_verbose) {
 
-                HDfprintf(stdout, "%d: notify() action = child entry serialized, idx = %d, addr = %ld.\n",
-                          world_mpi_rank, idx, (long)entry_ptr->header.addr);
+                fprintf(stdout, "%d: notify() action = child entry serialized, idx = %d, addr = %ld.\n",
+                        world_mpi_rank, idx, (long)entry_ptr->header.addr);
                 fflush(stdout);
             }
 
@@ -2697,7 +2694,7 @@ datum_notify(H5C_notify_action_t action, void *thing)
             nerrors++;
             ret_value = FAIL;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: Unknown notify action.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: Unknown notify action.\n", world_mpi_rank, __func__);
             }
             break;
     }
@@ -2741,8 +2738,8 @@ datum_free_icr(void *thing)
 
     if (callbacks_verbose) {
 
-        HDfprintf(stdout, "%d: free_icr() idx = %d, dirty = %d.\n", world_mpi_rank, idx,
-                  (int)(entry_ptr->dirty));
+        fprintf(stdout, "%d: free_icr() idx = %d, dirty = %d.\n", world_mpi_rank, idx,
+                (int)(entry_ptr->dirty));
         fflush(stdout);
     }
 
@@ -2804,7 +2801,7 @@ expunge_entry(H5F_t *file_ptr, int32_t idx)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: Error in H5AC_expunge_entry().\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: Error in H5AC_expunge_entry().\n", world_mpi_rank, __func__);
             }
         }
 
@@ -2818,14 +2815,14 @@ expunge_entry(H5F_t *file_ptr, int32_t idx)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: Error in H5C_get_entry_status().\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: Error in H5C_get_entry_status().\n", world_mpi_rank, __func__);
             }
         }
         else if (in_cache) {
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: Expunged entry still in cache?!?\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: Expunged entry still in cache?!?\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -2879,7 +2876,7 @@ insert_entry(H5C_t *cache_ptr, H5F_t *file_ptr, int32_t idx, unsigned int flags)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: Error in H5AC_insert_entry().\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: Error in H5AC_insert_entry().\n", world_mpi_rank, __func__);
             }
         }
 
@@ -2899,8 +2896,8 @@ insert_entry(H5C_t *cache_ptr, H5F_t *file_ptr, int32_t idx, unsigned int flags)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: data[%d].header.is_dirty = %d.\n", world_mpi_rank, __func__,
-                              idx, (int)(data[idx].header.is_dirty));
+                    fprintf(stdout, "%d:%s: data[%d].header.is_dirty = %d.\n", world_mpi_rank, __func__, idx,
+                            (int)(data[idx].header.is_dirty));
                 }
             }
         }
@@ -3234,7 +3231,7 @@ lock_entry(H5F_t *file_ptr, int32_t idx)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: error in H5AC_protect().\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: error in H5AC_protect().\n", world_mpi_rank, __func__);
             }
         }
         else {
@@ -3287,7 +3284,7 @@ mark_entry_dirty(int32_t idx)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: error in H5AC_mark_entry_dirty().\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: error in H5AC_mark_entry_dirty().\n", world_mpi_rank, __func__);
             }
         }
         else if (!(entry_ptr->locked)) {
@@ -3398,7 +3395,7 @@ pin_protected_entry(int32_t idx, hbool_t global)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: Error in H5AC_pin_protected entry().\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: Error in H5AC_pin_protected entry().\n", world_mpi_rank, __func__);
             }
         }
 
@@ -3502,7 +3499,7 @@ move_entry(H5F_t *file_ptr, int32_t old_idx, int32_t new_idx)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: H5AC_move_entry() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: H5AC_move_entry() failed.\n", world_mpi_rank, __func__);
             }
         }
         else {
@@ -3525,8 +3522,8 @@ move_entry(H5F_t *file_ptr, int32_t old_idx, int32_t new_idx)
 
                     nerrors++;
                     if (verbose) {
-                        HDfprintf(stdout, "%d:%s: data[%d].header.is_dirty = %d.\n", world_mpi_rank, __func__,
-                                  new_idx, (int)(data[new_idx].header.is_dirty));
+                        fprintf(stdout, "%d:%s: data[%d].header.is_dirty = %d.\n", world_mpi_rank, __func__,
+                                new_idx, (int)(data[new_idx].header.is_dirty));
                     }
                 }
             }
@@ -3577,7 +3574,7 @@ reset_server_counts(void)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -3589,7 +3586,7 @@ reset_server_counts(void)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
             }
         }
         else if ((mssg.req != REQ_RW_COUNT_RESET_RPLY_CODE) || (mssg.src != world_server_mpi_rank) ||
@@ -3599,8 +3596,8 @@ reset_server_counts(void)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: Bad data in req r/w counter reset reply.\n", world_mpi_rank,
-                          __func__);
+                fprintf(stdout, "%d:%s: Bad data in req r/w counter reset reply.\n", world_mpi_rank,
+                        __func__);
             }
         }
     }
@@ -3651,7 +3648,7 @@ resize_entry(int32_t idx, size_t new_size)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: H5AC_resize_entry() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: H5AC_resize_entry() failed.\n", world_mpi_rank, __func__);
             }
         }
         else {
@@ -3716,13 +3713,13 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
     if (fid < 0) {
         nerrors++;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: H5Fcreate() failed.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: H5Fcreate() failed.\n", world_mpi_rank, __func__);
         }
     }
     else if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) {
         nerrors++;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
         }
     }
     else {
@@ -3732,7 +3729,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
     if (file_ptr == NULL) {
         nerrors++;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: Can't get file_ptr.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: Can't get file_ptr.\n", world_mpi_rank, __func__);
         }
     }
     else {
@@ -3742,7 +3739,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
     if (cache_ptr == NULL) {
         nerrors++;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: Can't get cache_ptr.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: Can't get cache_ptr.\n", world_mpi_rank, __func__);
         }
     }
     else {
@@ -3760,8 +3757,8 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
 
         if (H5AC_get_cache_auto_resize_config(cache_ptr, &config) != SUCCEED) {
 
-            HDfprintf(stdout, "%d:%s: H5AC_get_cache_auto_resize_config(1) failed.\n", world_mpi_rank,
-                      __func__);
+            fprintf(stdout, "%d:%s: H5AC_get_cache_auto_resize_config(1) failed.\n", world_mpi_rank,
+                    __func__);
         }
         else {
 
@@ -3770,12 +3767,12 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
 
             if (H5AC_set_cache_auto_resize_config(cache_ptr, &config) != SUCCEED) {
 
-                HDfprintf(stdout, "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n", world_mpi_rank,
-                          __func__);
+                fprintf(stdout, "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n", world_mpi_rank,
+                        __func__);
             }
             else if (enable_rpt_fcn) {
 
-                HDfprintf(stdout, "%d:%s: rpt_fcn enabled.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: rpt_fcn enabled.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -3791,15 +3788,15 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: cache_ptr->aux_ptr == NULL.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: cache_ptr->aux_ptr == NULL.\n", world_mpi_rank, __func__);
             }
         }
         else if (((H5AC_aux_t *)(cache_ptr->aux_ptr))->metadata_write_strategy != metadata_write_strategy) {
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: bad cache_ptr->aux_ptr->metadata_write_strategy\n", world_mpi_rank,
-                          __func__);
+                fprintf(stdout, "%d:%s: bad cache_ptr->aux_ptr->metadata_write_strategy\n", world_mpi_rank,
+                        __func__);
             }
         }
     }
@@ -3814,8 +3811,8 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
 
         if (H5AC_get_cache_auto_resize_config(cache_ptr, &test_config) != SUCCEED) {
 
-            HDfprintf(stdout, "%d:%s: H5AC_get_cache_auto_resize_config(2) failed.\n", world_mpi_rank,
-                      __func__);
+            fprintf(stdout, "%d:%s: H5AC_get_cache_auto_resize_config(2) failed.\n", world_mpi_rank,
+                    __func__);
         }
         else if (test_config.metadata_write_strategy != metadata_write_strategy) {
 
@@ -3823,7 +3820,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
 
             if (verbose) {
 
-                HDfprintf(stdout, "%d:%s: unexpected metadata_write_strategy.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: unexpected metadata_write_strategy.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -3843,7 +3840,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
             nerrors++;
 
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: H5MF_alloc() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: H5MF_alloc() failed.\n", world_mpi_rank, __func__);
             }
         }
         else if (actual_base_addr > BASE_ADDR) {
@@ -3856,7 +3853,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
             nerrors++;
 
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: actual_base_addr > BASE_ADDR.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: actual_base_addr > BASE_ADDR.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -3867,7 +3864,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
         if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) {
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: second H5Fflush() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: second H5Fflush() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -3880,7 +3877,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: H5C_set_write_done_callback failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: H5C_set_write_done_callback failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -3893,8 +3890,8 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: H5AC__set_sync_point_done_callback failed.\n", world_mpi_rank,
-                          __func__);
+                fprintf(stdout, "%d:%s: H5AC__set_sync_point_done_callback failed.\n", world_mpi_rank,
+                        __func__);
             }
         }
     }
@@ -3950,7 +3947,7 @@ verify_writes(unsigned num_writes, haddr_t *written_entries_tbl)
             proceed = FALSE;
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: barrier 1 failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: barrier 1 failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -3973,7 +3970,7 @@ verify_writes(unsigned num_writes, haddr_t *written_entries_tbl)
             proceed = FALSE;
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: barrier 2 failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: barrier 2 failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -3988,11 +3985,11 @@ verify_writes(unsigned num_writes, haddr_t *written_entries_tbl)
 
         if (proceed) {
 
-            HDfprintf(stdout, "%d:%s: verified %u writes.\n", world_mpi_rank, __func__, num_writes);
+            fprintf(stdout, "%d:%s: verified %u writes.\n", world_mpi_rank, __func__, num_writes);
         }
         else {
 
-            HDfprintf(stdout, "%d:%s: FAILED to verify %u writes.\n", world_mpi_rank, __func__, num_writes);
+            fprintf(stdout, "%d:%s: FAILED to verify %u writes.\n", world_mpi_rank, __func__, num_writes);
         }
     }
 
@@ -4009,7 +4006,7 @@ verify_writes(unsigned num_writes, haddr_t *written_entries_tbl)
             proceed = FALSE;
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: barrier 3 failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: barrier 3 failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -4047,7 +4044,7 @@ setup_rand(void)
         assert(world_mpi_rank < world_mpi_size);
 
         seed = predefined_seeds[world_mpi_rank];
-        HDfprintf(stdout, "%d:%s: predefined_seed = %d.\n", world_mpi_rank, __func__, seed);
+        fprintf(stdout, "%d:%s: predefined_seed = %d.\n", world_mpi_rank, __func__, seed);
         fflush(stdout);
         HDsrand(seed);
     }
@@ -4057,13 +4054,13 @@ setup_rand(void)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: gettimeofday() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: gettimeofday() failed.\n", world_mpi_rank, __func__);
             }
         }
         else {
             seed = (unsigned)tv.tv_usec;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: seed = %d.\n", world_mpi_rank, __func__, seed);
+                fprintf(stdout, "%d:%s: seed = %d.\n", world_mpi_rank, __func__, seed);
                 fflush(stdout);
             }
             HDsrand(seed);
@@ -4103,7 +4100,7 @@ take_down_cache(hid_t fid, H5C_t *cache_ptr)
         success = FALSE;
         nerrors++;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -4119,8 +4116,8 @@ take_down_cache(hid_t fid, H5C_t *cache_ptr)
             success = FALSE;
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: H5AC__set_sync_point_done_callback failed.\n", world_mpi_rank,
-                          __func__);
+                fprintf(stdout, "%d:%s: H5AC__set_sync_point_done_callback failed.\n", world_mpi_rank,
+                        __func__);
             }
         }
     }
@@ -4131,7 +4128,7 @@ take_down_cache(hid_t fid, H5C_t *cache_ptr)
         success = FALSE;
         nerrors++;
         if (verbose) {
-            HDfprintf(stdout, "%d:%s: H5Fclose() failed.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: H5Fclose() failed.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -4147,7 +4144,7 @@ take_down_cache(hid_t fid, H5C_t *cache_ptr)
                 success = FALSE;
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: HDremove() failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: HDremove() failed.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -4209,7 +4206,7 @@ verify_entry_reads(haddr_t addr, int expected_entry_reads)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -4221,7 +4218,7 @@ verify_entry_reads(haddr_t addr, int expected_entry_reads)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -4235,7 +4232,7 @@ verify_entry_reads(haddr_t addr, int expected_entry_reads)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: Bad data in req entry reads reply.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: Bad data in req entry reads reply.\n", world_mpi_rank, __func__);
             }
         }
         else {
@@ -4251,8 +4248,8 @@ verify_entry_reads(haddr_t addr, int expected_entry_reads)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: rep/exp entry 0x%" PRIxHADDR " reads mismatch (%d/%d).\n",
-                          world_mpi_rank, __func__, addr, reported_entry_reads, expected_entry_reads);
+                fprintf(stdout, "%d:%s: rep/exp entry 0x%" PRIxHADDR " reads mismatch (%d/%d).\n",
+                        world_mpi_rank, __func__, addr, reported_entry_reads, expected_entry_reads);
             }
         }
     }
@@ -4306,7 +4303,7 @@ verify_entry_writes(haddr_t addr, int expected_entry_writes)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -4318,7 +4315,7 @@ verify_entry_writes(haddr_t addr, int expected_entry_writes)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -4332,7 +4329,7 @@ verify_entry_writes(haddr_t addr, int expected_entry_writes)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: Bad data in req entry writes reply.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: Bad data in req entry writes reply.\n", world_mpi_rank, __func__);
             }
         }
         else {
@@ -4348,8 +4345,8 @@ verify_entry_writes(haddr_t addr, int expected_entry_writes)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: rep/exp entry 0x%llx writes mismatch (%d/%d).\n", world_mpi_rank,
-                          __func__, (long long)addr, reported_entry_writes, expected_entry_writes);
+                fprintf(stdout, "%d:%s: rep/exp entry 0x%llx writes mismatch (%d/%d).\n", world_mpi_rank,
+                        __func__, (long long)addr, reported_entry_writes, expected_entry_writes);
             }
         }
     }
@@ -4402,7 +4399,7 @@ verify_total_reads(int expected_total_reads)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -4414,7 +4411,7 @@ verify_total_reads(int expected_total_reads)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
             }
         }
         else if ((mssg.req != REQ_TTL_READS_RPLY_CODE) || (mssg.src != world_server_mpi_rank) ||
@@ -4424,7 +4421,7 @@ verify_total_reads(int expected_total_reads)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: Bad data in req total reads reply.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: Bad data in req total reads reply.\n", world_mpi_rank, __func__);
             }
         }
         else {
@@ -4440,8 +4437,8 @@ verify_total_reads(int expected_total_reads)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: reported/expected total reads mismatch (%ld/%d).\n", world_mpi_rank,
-                          __func__, reported_total_reads, expected_total_reads);
+                fprintf(stdout, "%d:%s: reported/expected total reads mismatch (%ld/%d).\n", world_mpi_rank,
+                        __func__, reported_total_reads, expected_total_reads);
             }
         }
     }
@@ -4494,7 +4491,7 @@ verify_total_writes(unsigned expected_total_writes)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -4506,7 +4503,7 @@ verify_total_writes(unsigned expected_total_writes)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
             }
         }
         else if ((mssg.req != REQ_TTL_WRITES_RPLY_CODE) || (mssg.src != world_server_mpi_rank) ||
@@ -4516,7 +4513,7 @@ verify_total_writes(unsigned expected_total_writes)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: Bad data in req total reads reply.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: Bad data in req total reads reply.\n", world_mpi_rank, __func__);
             }
         }
         else {
@@ -4532,8 +4529,8 @@ verify_total_writes(unsigned expected_total_writes)
             nerrors++;
             success = FALSE;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: reported/expected total writes mismatch (%u/%u).\n", world_mpi_rank,
-                          __func__, reported_total_writes, expected_total_writes);
+                fprintf(stdout, "%d:%s: reported/expected total writes mismatch (%u/%u).\n", world_mpi_rank,
+                        __func__, reported_total_writes, expected_total_writes);
             }
         }
     }
@@ -4590,7 +4587,7 @@ unlock_entry(H5F_t *file_ptr, int32_t idx, unsigned int flags)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: error in H5AC_unprotect().\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: error in H5AC_unprotect().\n", world_mpi_rank, __func__);
             }
         }
         else {
@@ -4669,7 +4666,7 @@ unpin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty, hbool_t
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: error in H5AC_unpin_entry().\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: error in H5AC_unpin_entry().\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -4730,7 +4727,7 @@ server_smoke_check(void)
             /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -4751,7 +4748,7 @@ server_smoke_check(void)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: send_mssg() failed on write.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: send_mssg() failed on write.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -4766,7 +4763,7 @@ server_smoke_check(void)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -4782,7 +4779,7 @@ server_smoke_check(void)
                 success = FALSE;
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: Bad data in write req ack.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: Bad data in write req ack.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -4797,7 +4794,7 @@ server_smoke_check(void)
             success = FALSE;
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: barrier 1 failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: barrier 1 failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -4829,7 +4826,7 @@ server_smoke_check(void)
             nerrors++;
             if (verbose) {
 
-                HDfprintf(stdout, "%d:%s: barrier 2 failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: barrier 2 failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -4852,7 +4849,7 @@ server_smoke_check(void)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: send_mssg() failed on write.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: send_mssg() failed on write.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -4866,7 +4863,7 @@ server_smoke_check(void)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -4882,7 +4879,7 @@ server_smoke_check(void)
                 success = FALSE;
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: Bad data in read req reply.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: Bad data in read req reply.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -4893,7 +4890,7 @@ server_smoke_check(void)
             success = FALSE;
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: barrier 3 failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: barrier 3 failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -4924,7 +4921,7 @@ server_smoke_check(void)
             nerrors++;
             if (verbose) {
 
-                HDfprintf(stdout, "%d:%s: barrier 4 failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: barrier 4 failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -4940,7 +4937,7 @@ server_smoke_check(void)
             nerrors++;
             if (verbose) {
 
-                HDfprintf(stdout, "%d:%s: barrier 5 failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: barrier 5 failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -4971,7 +4968,7 @@ server_smoke_check(void)
             nerrors++;
             if (verbose) {
 
-                HDfprintf(stdout, "%d:%s: barrier 6 failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: barrier 6 failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -4994,7 +4991,7 @@ server_smoke_check(void)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -5077,7 +5074,7 @@ smoke_check_1(int metadata_write_strategy)
             /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -5089,7 +5086,7 @@ smoke_check_1(int metadata_write_strategy)
             fid       = -1;
             cache_ptr = NULL;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -5122,7 +5119,7 @@ smoke_check_1(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -5155,7 +5152,7 @@ smoke_check_1(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -5241,7 +5238,7 @@ smoke_check_2(int metadata_write_strategy)
             /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -5253,7 +5250,7 @@ smoke_check_2(int metadata_write_strategy)
             fid       = -1;
             cache_ptr = NULL;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -5320,7 +5317,7 @@ smoke_check_2(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -5353,7 +5350,7 @@ smoke_check_2(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -5446,7 +5443,7 @@ smoke_check_3(int metadata_write_strategy)
             /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -5458,7 +5455,7 @@ smoke_check_3(int metadata_write_strategy)
             fid       = -1;
             cache_ptr = NULL;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -5512,7 +5509,7 @@ smoke_check_3(int metadata_write_strategy)
         if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) {
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -5605,7 +5602,7 @@ smoke_check_3(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -5638,7 +5635,7 @@ smoke_check_3(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -5731,7 +5728,7 @@ smoke_check_4(int metadata_write_strategy)
             /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -5743,7 +5740,7 @@ smoke_check_4(int metadata_write_strategy)
             fid       = -1;
             cache_ptr = NULL;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -5809,7 +5806,7 @@ smoke_check_4(int metadata_write_strategy)
         if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) {
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -5889,7 +5886,7 @@ smoke_check_4(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -5922,7 +5919,7 @@ smoke_check_4(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -6006,7 +6003,7 @@ smoke_check_5(int metadata_write_strategy)
             /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -6019,7 +6016,7 @@ smoke_check_5(int metadata_write_strategy)
             fid       = -1;
             cache_ptr = NULL;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -6031,7 +6028,7 @@ smoke_check_5(int metadata_write_strategy)
         if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) {
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -6081,7 +6078,7 @@ smoke_check_5(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -6114,7 +6111,7 @@ smoke_check_5(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -6291,7 +6288,7 @@ trace_file_check(int metadata_write_strategy)
             /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose)
-                HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
         }
     }
     else {
@@ -6303,7 +6300,7 @@ trace_file_check(int metadata_write_strategy)
             fid       = -1;
             cache_ptr = NULL;
             if (verbose)
-                HDfprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
         }
 
         if (nerrors == 0) {
@@ -6312,8 +6309,8 @@ trace_file_check(int metadata_write_strategy)
 
             if (H5AC_get_cache_auto_resize_config(cache_ptr, &config) != SUCCEED) {
                 nerrors++;
-                HDfprintf(stdout, "%d:%s: H5AC_get_cache_auto_resize_config() failed.\n", world_mpi_rank,
-                          __func__);
+                fprintf(stdout, "%d:%s: H5AC_get_cache_auto_resize_config() failed.\n", world_mpi_rank,
+                        __func__);
             }
             else {
                 config.open_trace_file = TRUE;
@@ -6321,8 +6318,8 @@ trace_file_check(int metadata_write_strategy)
 
                 if (H5AC_set_cache_auto_resize_config(cache_ptr, &config) != SUCCEED) {
                     nerrors++;
-                    HDfprintf(stdout, "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n", world_mpi_rank,
-                              __func__);
+                    fprintf(stdout, "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n", world_mpi_rank,
+                            __func__);
                 }
             }
         } /* end if */
@@ -6357,7 +6354,7 @@ trace_file_check(int metadata_write_strategy)
         if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) {
             nerrors++;
             if (verbose)
-                HDfprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
         }
 
         if (nerrors == 0) {
@@ -6365,8 +6362,8 @@ trace_file_check(int metadata_write_strategy)
 
             if (H5AC_get_cache_auto_resize_config(cache_ptr, &config) != SUCCEED) {
                 nerrors++;
-                HDfprintf(stdout, "%d:%s: H5AC_get_cache_auto_resize_config() failed.\n", world_mpi_rank,
-                          __func__);
+                fprintf(stdout, "%d:%s: H5AC_get_cache_auto_resize_config() failed.\n", world_mpi_rank,
+                        __func__);
             }
             else {
                 config.open_trace_file    = FALSE;
@@ -6375,8 +6372,8 @@ trace_file_check(int metadata_write_strategy)
 
                 if (H5AC_set_cache_auto_resize_config(cache_ptr, &config) != SUCCEED) {
                     nerrors++;
-                    HDfprintf(stdout, "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n", world_mpi_rank,
-                              __func__);
+                    fprintf(stdout, "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n", world_mpi_rank,
+                            __func__);
                 }
             }
         } /* end if */
@@ -6386,7 +6383,7 @@ trace_file_check(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose)
-                    HDfprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
             }
         } /* end if */
 
@@ -6416,7 +6413,7 @@ trace_file_check(int metadata_write_strategy)
             if (!success) {
                 nerrors++;
                 if (verbose)
-                    HDfprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
             }
         } /* end if */
 
@@ -6427,7 +6424,7 @@ trace_file_check(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose)
-                    HDfprintf(stdout, "%d:%s: HDfopen failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: HDfopen failed.\n", world_mpi_rank, __func__);
             }
         } /* end if */
 
@@ -6455,22 +6452,22 @@ trace_file_check(int metadata_write_strategy)
                     /* One ran out before the other - BADNESS */
                     nerrors++;
                     if (verbose) {
-                        HDfprintf(stdout, "%d:%s: Unexpected data in trace file line %d.\n", world_mpi_rank,
-                                  __func__, i);
+                        fprintf(stdout, "%d:%s: Unexpected data in trace file line %d.\n", world_mpi_rank,
+                                __func__, i);
                         if (expected_line_len == 0) {
-                            HDfprintf(stdout, "%d:%s: expected = \"%s\" %zu\n", world_mpi_rank, __func__,
-                                      "<EMPTY>", expected_line_len);
-                            HDfprintf(stdout, "%d:%s: actual   = \"%s\" %zu\n", world_mpi_rank, __func__,
-                                      buffer, actual_line_len);
+                            fprintf(stdout, "%d:%s: expected = \"%s\" %zu\n", world_mpi_rank, __func__,
+                                    "<EMPTY>", expected_line_len);
+                            fprintf(stdout, "%d:%s: actual   = \"%s\" %zu\n", world_mpi_rank, __func__,
+                                    buffer, actual_line_len);
                         }
                         if (actual_line_len == 0) {
-                            HDfprintf(stdout, "%d:%s: expected = \"%s\" %zu\n", world_mpi_rank, __func__,
-                                      (*expected_output)[i], expected_line_len);
-                            HDfprintf(stdout, "%d:%s: actual   = \"%s\" %zu\n", world_mpi_rank, __func__,
-                                      "<EMPTY>", actual_line_len);
+                            fprintf(stdout, "%d:%s: expected = \"%s\" %zu\n", world_mpi_rank, __func__,
+                                    (*expected_output)[i], expected_line_len);
+                            fprintf(stdout, "%d:%s: actual   = \"%s\" %zu\n", world_mpi_rank, __func__,
+                                    "<EMPTY>", actual_line_len);
                         }
                     }
-                    HDfprintf(stdout, "BADNESS BADNESS BADNESS\n");
+                    fprintf(stdout, "BADNESS BADNESS BADNESS\n");
                 }
             }
             /* We directly compare the header line (line 0) */
@@ -6480,12 +6477,12 @@ trace_file_check(int metadata_write_strategy)
 
                     nerrors++;
                     if (verbose) {
-                        HDfprintf(stdout, "%d:%s: Unexpected data in trace file line %d.\n", world_mpi_rank,
-                                  __func__, i);
-                        HDfprintf(stdout, "%d:%s: expected = \"%s\" %zu\n", world_mpi_rank, __func__,
-                                  (*expected_output)[i], expected_line_len);
-                        HDfprintf(stdout, "%d:%s: actual   = \"%s\" %zu\n", world_mpi_rank, __func__, buffer,
-                                  actual_line_len);
+                        fprintf(stdout, "%d:%s: Unexpected data in trace file line %d.\n", world_mpi_rank,
+                                __func__, i);
+                        fprintf(stdout, "%d:%s: expected = \"%s\" %zu\n", world_mpi_rank, __func__,
+                                (*expected_output)[i], expected_line_len);
+                        fprintf(stdout, "%d:%s: actual   = \"%s\" %zu\n", world_mpi_rank, __func__, buffer,
+                                actual_line_len);
                     }
                 }
             }
@@ -6501,11 +6498,11 @@ trace_file_check(int metadata_write_strategy)
 
                     nerrors++;
                     if (verbose) {
-                        HDfprintf(stdout, "%d:%s: Unexpected data in trace file line %d.\n", world_mpi_rank,
-                                  __func__, i);
-                        HDfprintf(stdout, "%d:%s: expected = \"%s\"\n", world_mpi_rank, __func__,
-                                  (*expected_output)[i]);
-                        HDfprintf(stdout, "%d:%s: actual   = \"%s\"\n", world_mpi_rank, __func__, tok);
+                        fprintf(stdout, "%d:%s: Unexpected data in trace file line %d.\n", world_mpi_rank,
+                                __func__, i);
+                        fprintf(stdout, "%d:%s: expected = \"%s\"\n", world_mpi_rank, __func__,
+                                (*expected_output)[i]);
+                        fprintf(stdout, "%d:%s: actual   = \"%s\"\n", world_mpi_rank, __func__, tok);
                     }
                 }
             } /* end else */
@@ -6598,7 +6595,7 @@ smoke_check_6(int metadata_write_strategy)
             /* some error occurred in the server -- report failure */
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: server_main() failed.\n", world_mpi_rank, __func__);
             }
         }
     }
@@ -6612,7 +6609,7 @@ smoke_check_6(int metadata_write_strategy)
             fid       = -1;
             cache_ptr = NULL;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: setup_cache_for_test() failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -6632,8 +6629,8 @@ smoke_check_6(int metadata_write_strategy)
             if (TRUE != entry_ptr->header.coll_access) {
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: Entry inserted not marked as collective.\n", world_mpi_rank,
-                              __func__);
+                    fprintf(stdout, "%d:%s: Entry inserted not marked as collective.\n", world_mpi_rank,
+                            __func__);
                 }
             }
 
@@ -6657,8 +6654,8 @@ smoke_check_6(int metadata_write_strategy)
             if (FALSE != entry_ptr->header.coll_access) {
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: Entry inserted independently marked as collective.\n",
-                              world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: Entry inserted independently marked as collective.\n",
+                            world_mpi_rank, __func__);
                 }
             }
 
@@ -6672,7 +6669,7 @@ smoke_check_6(int metadata_write_strategy)
         if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) {
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__);
             }
         }
 
@@ -6689,8 +6686,8 @@ smoke_check_6(int metadata_write_strategy)
             if (TRUE != entry_ptr->header.coll_access) {
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: Entry protected not marked as collective.\n", world_mpi_rank,
-                              __func__);
+                    fprintf(stdout, "%d:%s: Entry protected not marked as collective.\n", world_mpi_rank,
+                            __func__);
                 }
             }
 
@@ -6713,8 +6710,8 @@ smoke_check_6(int metadata_write_strategy)
             if (FALSE != entry_ptr->header.coll_access) {
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: Entry inserted independently marked as collective.\n",
-                              world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: Entry inserted independently marked as collective.\n",
+                            world_mpi_rank, __func__);
                 }
             }
 
@@ -6734,7 +6731,7 @@ smoke_check_6(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: take_down_cache() failed.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -6767,7 +6764,7 @@ smoke_check_6(int metadata_write_strategy)
 
                 nerrors++;
                 if (verbose) {
-                    HDfprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
+                    fprintf(stdout, "%d:%s: send_mssg() failed on done.\n", world_mpi_rank, __func__);
                 }
             }
         }
@@ -6832,7 +6829,7 @@ main(int argc, char **argv)
      * calls.  By then, MPI calls may not work.
      */
     if (H5dont_atexit() < 0)
-        HDprintf("%d:Failed to turn off atexit processing. Continue.\n", mpi_rank);
+        printf("%d:Failed to turn off atexit processing. Continue.\n", mpi_rank);
 
     H5open();
 
@@ -6843,32 +6840,32 @@ main(int argc, char **argv)
         virt_num_data_entries = STD_VIRT_NUM_DATA_ENTRIES;
 
     if (MAINPROCESS) {
-        HDprintf("===================================\n");
-        HDprintf("Parallel metadata cache tests\n");
-        HDprintf("    mpi_size     = %d\n", mpi_size);
-        HDprintf("    express_test = %d\n", express_test);
-        HDprintf("===================================\n");
+        printf("===================================\n");
+        printf("Parallel metadata cache tests\n");
+        printf("    mpi_size     = %d\n", mpi_size);
+        printf("    express_test = %d\n", express_test);
+        printf("===================================\n");
     }
 
     if (mpi_size < 3) {
         if (MAINPROCESS)
-            HDprintf("    Need at least 3 processes.  Exiting.\n");
+            printf("    Need at least 3 processes.  Exiting.\n");
         goto finish;
     }
 
     if (NULL == (data = HDmalloc(NUM_DATA_ENTRIES * sizeof(*data)))) {
-        HDprintf("    Couldn't allocate data array.  Exiting.\n");
+        printf("    Couldn't allocate data array.  Exiting.\n");
         MPI_Abort(MPI_COMM_WORLD, -1);
     }
     if (NULL == (data_index = HDmalloc(NUM_DATA_ENTRIES * sizeof(*data_index)))) {
-        HDprintf("    Couldn't allocate data index array.  Exiting.\n");
+        printf("    Couldn't allocate data index array.  Exiting.\n");
         MPI_Abort(MPI_COMM_WORLD, -1);
     }
 
     HDmemset(filenames, 0, sizeof(filenames));
     for (int i = 0; i < NFILENAME; i++) {
         if (NULL == (filenames[i] = HDmalloc(PATH_MAX))) {
-            HDprintf("couldn't allocate filename array\n");
+            printf("couldn't allocate filename array\n");
             MPI_Abort(MPI_COMM_WORLD, -1);
         }
     }
@@ -6888,13 +6885,13 @@ main(int argc, char **argv)
     if (FAIL == (fapl = H5Pcreate(H5P_FILE_ACCESS))) {
         nerrors++;
         if (verbose)
-            HDfprintf(stdout, "%d:%s: H5Pcreate() failed 1.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: H5Pcreate() failed 1.\n", world_mpi_rank, __func__);
     }
 
     if (H5Pset_fapl_mpio(fapl, world_mpi_comm, MPI_INFO_NULL) < 0) {
         nerrors++;
         if (verbose)
-            HDfprintf(stdout, "%d:%s: H5Pset_fapl_mpio() failed 1.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: H5Pset_fapl_mpio() failed 1.\n", world_mpi_rank, __func__);
     }
 
     /* fix the file names */
@@ -6902,7 +6899,7 @@ main(int argc, char **argv)
         if (h5_fixname(FILENAME[u], fapl, filenames[u], PATH_MAX) == NULL) {
             nerrors++;
             if (verbose)
-                HDfprintf(stdout, "%d:%s: h5_fixname() failed.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: h5_fixname() failed.\n", world_mpi_rank, __func__);
             break;
         }
     }
@@ -6911,7 +6908,7 @@ main(int argc, char **argv)
     if (H5Pclose(fapl) < 0) {
         nerrors++;
         if (verbose)
-            HDfprintf(stdout, "%d:%s: H5Pclose() failed.\n", world_mpi_rank, __func__);
+            fprintf(stdout, "%d:%s: H5Pclose() failed.\n", world_mpi_rank, __func__);
     }
 
     /* now create the fapl again, excluding the server process. */
@@ -6921,13 +6918,13 @@ main(int argc, char **argv)
         if (FAIL == (fapl = H5Pcreate(H5P_FILE_ACCESS))) {
             nerrors++;
             if (verbose)
-                HDfprintf(stdout, "%d:%s: H5Pcreate() failed 2.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: H5Pcreate() failed 2.\n", world_mpi_rank, __func__);
         }
 
         if (H5Pset_fapl_mpio(fapl, file_mpi_comm, MPI_INFO_NULL) < 0) {
             nerrors++;
             if (verbose)
-                HDfprintf(stdout, "%d:%s: H5Pset_fapl_mpio() failed 2.\n", world_mpi_rank, __func__);
+                fprintf(stdout, "%d:%s: H5Pset_fapl_mpio() failed 2.\n", world_mpi_rank, __func__);
         }
     }
 
@@ -6938,7 +6935,7 @@ main(int argc, char **argv)
 
         /* errors in setup -- no point in continuing */
         if (world_mpi_rank == 0)
-            HDfprintf(stdout, "Errors in test initialization.  Exiting.\n");
+            fprintf(stdout, "Errors in test initialization.  Exiting.\n");
         goto finish;
     }
 
@@ -6972,8 +6969,8 @@ main(int argc, char **argv)
 
             nerrors++;
             if (verbose) {
-                HDfprintf(stdout, "%d:%s: H5Pset_all_coll_metadata_ops() failed 1.\n", world_mpi_rank,
-                          __func__);
+                fprintf(stdout, "%d:%s: H5Pset_all_coll_metadata_ops() failed 1.\n", world_mpi_rank,
+                        __func__);
             }
         }
     }
@@ -7002,14 +6999,14 @@ finish:
 
     MPI_Barrier(MPI_COMM_WORLD);
     if (MAINPROCESS) { /* only process 0 reports */
-        HDprintf("===================================\n");
+        printf("===================================\n");
         if (nerrors || failures) {
-            HDprintf("***metadata cache tests detected %d failures***\n", nerrors + failures);
+            printf("***metadata cache tests detected %d failures***\n", nerrors + failures);
         }
         else {
-            HDprintf("metadata cache tests finished with no failures\n");
+            printf("metadata cache tests finished with no failures\n");
         }
-        HDprintf("===================================\n");
+        printf("===================================\n");
     }
 
     takedown_derived_types();
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index fc1724f..96b5b7a 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -146,7 +146,7 @@ construct_test_file(int test_file_index)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -161,7 +161,7 @@ construct_test_file(int test_file_index)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a HDF5 file with the cache image FAPL entry.
      *
@@ -192,7 +192,7 @@ construct_test_file(int test_file_index)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create a data set in the file. */
 
@@ -213,7 +213,7 @@ construct_test_file(int test_file_index)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -227,7 +227,7 @@ construct_test_file(int test_file_index)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     while ((pass) && (max_dset < MAX_NUM_DSETS)) {
 
@@ -259,7 +259,7 @@ construct_test_file(int test_file_index)
         }
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L1 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp, max_dset, pass);
+            fprintf(stdout, "%s:L1 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp, max_dset, pass);
 
         /* 5) Create a data set in the file. */
 
@@ -280,7 +280,7 @@ construct_test_file(int test_file_index)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L2 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 1, max_dset, pass);
+            fprintf(stdout, "%s:L2 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 1, max_dset, pass);
 
         /* 6) Close the file. */
 
@@ -294,7 +294,7 @@ construct_test_file(int test_file_index)
         }
 
         if (show_progress)
-            HDfprintf(stdout, "%s:L3 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 2, max_dset, pass);
+            fprintf(stdout, "%s:L3 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 2, max_dset, pass);
     } /* end while */
     cp += 3;
 
@@ -326,7 +326,7 @@ construct_test_file(int test_file_index)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Open and close all data sets.
      *
@@ -350,7 +350,7 @@ construct_test_file(int test_file_index)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Close the file. */
 
@@ -412,7 +412,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset)
     hsize_t     chunk_size[2];
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     assert(0 <= min_dset);
     assert(min_dset <= max_dset);
@@ -493,7 +493,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* create the mem space to be used to read and write chunks */
     if (pass) {
@@ -510,7 +510,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* select in memory hyperslab */
     if (pass) {
@@ -529,7 +529,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* initialize all datasets on a round robin basis */
     i = 0;
@@ -576,7 +576,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* read data from data sets and validate it */
     i = 0;
@@ -625,11 +625,11 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset)
 
                                 if (verbose) {
 
-                                    HDfprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l,
-                                              data_chunk[k][l],
-                                              ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l));
-                                    HDfprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k,
-                                              l);
+                                    fprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l,
+                                            data_chunk[k][l],
+                                            ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l));
+                                    fprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k,
+                                            l);
                                 }
                             }
                         }
@@ -642,7 +642,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset)
 
                         if (verbose) {
 
-                            HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m);
+                            fprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m);
                         }
                     }
                 }
@@ -654,7 +654,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* close the file spaces */
     i = min_dset;
@@ -729,18 +729,18 @@ delete_data_sets(hid_t file_id, int min_dset, int max_dset)
     int cp = 0;
     int i;
 
-    if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+    if ( show_progress ) fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     assert(0 <= min_dset);
     assert(min_dset <= max_dset);
     assert(max_dset < MAX_NUM_DSETS);
 
-    if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+    if ( show_progress ) fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* first, verify the contents of the target dataset(s) */
     verify_data_sets(file_id, min_dset, max_dset);
 
-    if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+    if ( show_progress ) fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* now delete the target datasets */
     if ( pass ) {
@@ -761,7 +761,7 @@ delete_data_sets(hid_t file_id, int min_dset, int max_dset)
         }
     }
 
-    if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+    if ( show_progress ) fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     return;
 
@@ -852,12 +852,12 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
         }
         else if (verbose) {
 
-            HDfprintf(stdout, "%s: HDF file name = \"%s\".\n", fcn_name, hdf_file_name);
+            fprintf(stdout, "%s: HDF file name = \"%s\".\n", fcn_name, hdf_file_name);
         }
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* create a file access property list. */
     if (pass) {
@@ -872,7 +872,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* call H5Pset_libver_bounds() on the fapl_id */
     if (pass) {
@@ -885,7 +885,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* get metadata cache image config -- verify that it is the default */
     if (pass) {
@@ -909,7 +909,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* set metadata cache image fapl entry if indicated */
     if ((pass) && (set_mdci_fapl)) {
@@ -929,7 +929,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the persistent free space manager if indicated */
     if ((pass) && (config_fsm)) {
@@ -961,7 +961,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the page buffer if indicated */
     if ((pass) && (enable_page_buffer)) {
@@ -974,7 +974,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if ((pass) && (l_facc_type == FACC_MPIO)) {
 
@@ -987,7 +987,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if ((pass) && (l_facc_type == FACC_MPIO)) {
 
@@ -999,7 +999,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if ((pass) && (l_facc_type == FACC_MPIO)) {
 
@@ -1011,7 +1011,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if ((pass) && (l_facc_type == FACC_MPIO)) {
 
@@ -1036,7 +1036,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* open the file */
     if (pass) {
@@ -1076,14 +1076,14 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
                 failure_mssg = "Can't get file_ptr.";
 
                 if (verbose) {
-                    HDfprintf(stdout, "%s: Can't get file_ptr.\n", fcn_name);
+                    fprintf(stdout, "%s: Can't get file_ptr.\n", fcn_name);
                 }
             }
         }
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* get a pointer to the files internal data structure and then
      * to the cache structure
@@ -1102,7 +1102,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* verify expected page buffer status.  At present, page buffering
      * must be disabled in parallel -- hopefully this will change in the
@@ -1124,7 +1124,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* verify expected metadata cache status */
 
@@ -1143,7 +1143,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -1186,7 +1186,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if ((pass) && (set_mdci_fapl)) {
 
@@ -1200,7 +1200,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -1240,7 +1240,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -1250,10 +1250,10 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
     }
 
     if (show_progress) {
-        HDfprintf(stdout, "%s: cp = %d, pass = %d -- exiting.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d -- exiting.\n", fcn_name, cp++, pass);
 
         if (!pass)
-            HDfprintf(stdout, "%s: failure_mssg = %s\n", fcn_name, failure_mssg);
+            fprintf(stdout, "%s: failure_mssg = %s\n", fcn_name, failure_mssg);
     }
 
     return;
@@ -1308,8 +1308,8 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
     HDsnprintf(dset_name, sizeof(dset_name), "/dset%03d", dset_num);
 
     if (show_progress) {
-        HDfprintf(stdout, "%s: dset name = \"%s\".\n", fcn_name, dset_name);
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: dset name = \"%s\".\n", fcn_name, dset_name);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
     }
 
     if (pass) {
@@ -1328,7 +1328,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* set the dataset creation plist to specify that the raw data is
      * to be partitioned into 1X10X10 element chunks.
@@ -1346,7 +1346,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -1362,7 +1362,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* create the dataset */
     if (pass) {
@@ -1378,7 +1378,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* get the file space ID */
     if (pass) {
@@ -1393,7 +1393,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* create the mem space to be used to read and write chunks */
     if (pass) {
@@ -1411,7 +1411,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* select in memory hyperslab */
     if (pass) {
@@ -1432,7 +1432,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the DXPL for collective I/O */
     if (pass) {
@@ -1447,7 +1447,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -1459,7 +1459,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* initialize the dataset with collective writes */
     i = 0;
@@ -1468,7 +1468,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
         while ((pass) && (j < DSET_SIZE)) {
 
             if (show_progress)
-                HDfprintf(stdout, "%s: cp = %d.0, pass = %d.\n", fcn_name, cp, pass);
+                fprintf(stdout, "%s: cp = %d.0, pass = %d.\n", fcn_name, cp, pass);
 
             /* initialize the slab */
             for (k = 0; k < CHUNK_SIZE; k++) {
@@ -1479,7 +1479,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
             }
 
             if (show_progress)
-                HDfprintf(stdout, "%s: cp = %d.1, pass = %d.\n", fcn_name, cp, pass);
+                fprintf(stdout, "%s: cp = %d.1, pass = %d.\n", fcn_name, cp, pass);
 
             /* select on disk hyperslab */
             offset[0] = (hsize_t)mpi_rank; /* offset of hyperslab in file */
@@ -1497,7 +1497,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
             }
 
             if (show_progress)
-                HDfprintf(stdout, "%s: cp = %d.2, pass = %d.\n", fcn_name, cp, pass);
+                fprintf(stdout, "%s: cp = %d.2, pass = %d.\n", fcn_name, cp, pass);
 
             /* write the chunk to file */
             status = H5Dwrite(dset_id, H5T_NATIVE_INT, memspace_id, filespace_id, dxpl_id, data_chunk);
@@ -1509,7 +1509,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
             }
 
             if (show_progress)
-                HDfprintf(stdout, "%s: cp = %d.3, pass = %d.\n", fcn_name, cp, pass);
+                fprintf(stdout, "%s: cp = %d.3, pass = %d.\n", fcn_name, cp, pass);
 
             j += CHUNK_SIZE;
         }
@@ -1519,7 +1519,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
 
     cp++;
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* read data from data sets and validate it */
     i = 0;
@@ -1567,12 +1567,12 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
 
                             if (verbose) {
 
-                                HDfprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l,
-                                          data_chunk[0][k][l],
-                                          ((DSET_SIZE * DSET_SIZE * mpi_rank) + (DSET_SIZE * (i + k)) + j +
-                                           l + dset_num));
-                                HDfprintf(stdout, "dset_num = %d, i = %d, j = %d, k = %d, l = %d\n", dset_num,
-                                          i, j, k, l);
+                                fprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l,
+                                        data_chunk[0][k][l],
+                                        ((DSET_SIZE * DSET_SIZE * mpi_rank) + (DSET_SIZE * (i + k)) + j + l +
+                                         dset_num));
+                                fprintf(stdout, "dset_num = %d, i = %d, j = %d, k = %d, l = %d\n", dset_num,
+                                        i, j, k, l);
                             }
                         }
                     }
@@ -1585,7 +1585,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
 
                     if (verbose) {
 
-                        HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, dset_num);
+                        fprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, dset_num);
                     }
                 }
             }
@@ -1595,7 +1595,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* close the data space */
     if ((pass) && (H5Sclose(dataspace_id) < 0)) {
@@ -1640,7 +1640,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     return;
 
@@ -1677,8 +1677,8 @@ par_delete_dataset(int dset_num, hid_t file_id, int mpi_rank)
     HDsnprintf(dset_name, sizeof(dset_name), "/dset%03d", dset_num);
 
     if (show_progress) {
-        HDfprintf(stdout, "%s: dset name = \"%s\".\n", fcn_name, dset_name);
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: dset name = \"%s\".\n", fcn_name, dset_name);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
     }
 
     /* verify the target dataset */
@@ -1688,7 +1688,7 @@ par_delete_dataset(int dset_num, hid_t file_id, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* delete the target dataset */
     if (pass) {
@@ -1701,7 +1701,7 @@ par_delete_dataset(int dset_num, hid_t file_id, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     return;
 
@@ -1739,8 +1739,8 @@ par_insert_cache_image(int file_name_idx, int mpi_rank, int mpi_size)
         if (mpi_rank == 0) { /* insert cache image in supplied test file */
 
             if (!serial_insert_cache_image(file_name_idx, mpi_size)) {
-                HDfprintf(stderr, "\n\nCache image insertion failed.\n");
-                HDfprintf(stderr, "  failure mssg = \"%s\"\n", failure_mssg);
+                fprintf(stderr, "\n\nCache image insertion failed.\n");
+                fprintf(stderr, "  failure mssg = \"%s\"\n", failure_mssg);
                 HDexit(EXIT_FAILURE);
             }
         }
@@ -1802,8 +1802,8 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
     HDsnprintf(dset_name, sizeof(dset_name), "/dset%03d", dset_num);
 
     if (show_progress) {
-        HDfprintf(stdout, "%s: dset name = \"%s\".\n", fcn_name, dset_name);
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: dset name = \"%s\".\n", fcn_name, dset_name);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
     }
 
     if (pass) {
@@ -1832,7 +1832,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* create the mem space to be used to read */
     if (pass) {
@@ -1850,7 +1850,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* select in memory hyperslab */
     if (pass) {
@@ -1871,7 +1871,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the DXPL for collective I/O */
     if (pass) {
@@ -1886,7 +1886,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -1898,7 +1898,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* read data from data sets and validate it */
     i = 0;
@@ -1946,12 +1946,12 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
 
                             if (verbose) {
 
-                                HDfprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l,
-                                          data_chunk[0][k][l],
-                                          ((DSET_SIZE * DSET_SIZE * mpi_rank) + (DSET_SIZE * (i + k)) + j +
-                                           l + dset_num));
-                                HDfprintf(stdout, "dset_num = %d, i = %d, j = %d, k = %d, l = %d\n", dset_num,
-                                          i, j, k, l);
+                                fprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l,
+                                        data_chunk[0][k][l],
+                                        ((DSET_SIZE * DSET_SIZE * mpi_rank) + (DSET_SIZE * (i + k)) + j + l +
+                                         dset_num));
+                                fprintf(stdout, "dset_num = %d, i = %d, j = %d, k = %d, l = %d\n", dset_num,
+                                        i, j, k, l);
                             }
                         }
                     }
@@ -1964,7 +1964,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
 
                     if (verbose) {
 
-                        HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, dset_num);
+                        fprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, dset_num);
                     }
                 }
             }
@@ -1974,7 +1974,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* close the file space */
     if ((pass) && (H5Sclose(filespace_id) < 0)) {
@@ -2005,7 +2005,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     return;
 
@@ -2048,7 +2048,7 @@ serial_insert_cache_image(int file_name_idx, int mpi_size)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) setup the file name */
     if (pass) {
@@ -2058,12 +2058,12 @@ serial_insert_cache_image(int file_name_idx, int mpi_size)
         if (h5_fixname(FILENAMES[file_name_idx], H5P_DEFAULT, filename, sizeof(filename)) == NULL) {
 
             pass = FALSE;
-            HDfprintf(stdout, "h5_fixname() failed.\n");
+            fprintf(stdout, "h5_fixname() failed.\n");
         }
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Open the PHDF5 file with the cache image FAPL entry.
      */
@@ -2090,7 +2090,7 @@ serial_insert_cache_image(int file_name_idx, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Validate contents of the file */
 
@@ -2102,7 +2102,7 @@ serial_insert_cache_image(int file_name_idx, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Close the file */
 
@@ -2116,7 +2116,7 @@ serial_insert_cache_image(int file_name_idx, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     return pass;
 
@@ -2162,8 +2162,8 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size)
     HDsnprintf(dset_name, sizeof(dset_name), "/dset%03d", dset_num);
 
     if (show_progress) {
-        HDfprintf(stdout, "%s: dset name = \"%s\".\n", fcn_name, dset_name);
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: dset name = \"%s\".\n", fcn_name, dset_name);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
     }
 
     if (pass) {
@@ -2192,7 +2192,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* create the mem space to be used to read */
     if (pass) {
@@ -2210,7 +2210,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* select in memory hyperslab */
     if (pass) {
@@ -2231,7 +2231,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* read data from data sets and validate it */
     i = 0;
@@ -2283,13 +2283,12 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size)
 
                                 if (verbose) {
 
-                                    HDfprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", j, k,
-                                              data_chunk[0][j][k],
-                                              ((DSET_SIZE * DSET_SIZE * i) + (DSET_SIZE * (j + l)) + k + m +
-                                               dset_num));
-                                    HDfprintf(stdout,
-                                              "dset_num = %d, i = %d, j = %d, k = %d, l = %d, m = %d\n",
-                                              dset_num, i, j, k, l, m);
+                                    fprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", j, k,
+                                            data_chunk[0][j][k],
+                                            ((DSET_SIZE * DSET_SIZE * i) + (DSET_SIZE * (j + l)) + k + m +
+                                             dset_num));
+                                    fprintf(stdout, "dset_num = %d, i = %d, j = %d, k = %d, l = %d, m = %d\n",
+                                            dset_num, i, j, k, l, m);
                                 }
                             }
                         }
@@ -2302,7 +2301,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size)
 
                         if (verbose) {
 
-                            HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", j, k, dset_num);
+                            fprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", j, k, dset_num);
                         }
                     }
                 }
@@ -2314,7 +2313,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* close the file space */
     if ((pass) && (H5Sclose(filespace_id) < 0)) {
@@ -2338,7 +2337,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     return;
 
@@ -2388,7 +2387,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset)
     hsize_t     offset[2];
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     assert(0 <= min_dset);
     assert(min_dset <= max_dset);
@@ -2431,7 +2430,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* create the mem space to be used to read and write chunks */
     if (pass) {
@@ -2448,7 +2447,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* select in memory hyperslab */
     if (pass) {
@@ -2467,7 +2466,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* read data from data sets and validate it */
     i = 0;
@@ -2516,11 +2515,11 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset)
 
                                 if (verbose) {
 
-                                    HDfprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l,
-                                              data_chunk[k][l],
-                                              ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l));
-                                    HDfprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k,
-                                              l);
+                                    fprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l,
+                                            data_chunk[k][l],
+                                            ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l));
+                                    fprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k,
+                                            l);
                                 }
                             }
                         }
@@ -2533,7 +2532,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset)
 
                         if (verbose) {
 
-                            HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m);
+                            fprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m);
                         }
                     }
                 }
@@ -2545,7 +2544,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
+        fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
     /* close the file spaces */
     i = min_dset;
@@ -2660,7 +2659,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -2673,7 +2672,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file created at the beginning of this test.
      *
@@ -2702,7 +2701,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Verify that the file contains the expected data.
      *
@@ -2731,7 +2730,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
         /* Verify that all other processes receive the cache image block
          * from process 0.
@@ -2752,7 +2751,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -2766,7 +2765,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Open the file, and verify that it doesn't contain a cache image. */
 
@@ -2792,7 +2791,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Verify that the file contains the expected data. */
 
@@ -2824,7 +2823,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -2838,7 +2837,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank)
             H5_FAILED();
 
             if (show_progress) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -2923,7 +2922,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank)
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -2936,7 +2935,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file created at the beginning of this test.
      *
@@ -2970,7 +2969,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Verify that the file contains the expected data.
      *
@@ -2998,7 +2997,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
         /* Verify that all other processes receive the cache image block
          * from process 0.
@@ -3019,7 +3018,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Close the file. */
 
@@ -3033,7 +3032,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Open the file, and verify that it doesn't contain a cache image. */
 
@@ -3059,7 +3058,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Verify that the file contains the expected data. */
 
@@ -3091,7 +3090,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Delete the file. */
 
@@ -3119,7 +3118,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank)
             H5_FAILED();
 
             if (show_progress) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -3175,7 +3174,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -3190,7 +3189,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Create a PHDF5 file without the cache image FAPL entry.
      *
@@ -3219,7 +3218,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Create datasets in the file */
 
@@ -3231,7 +3230,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Verify the datasets in the file */
 
@@ -3254,7 +3253,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5 Insert a cache image into the file */
 
@@ -3264,7 +3263,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Open the file R/O */
 
@@ -3290,7 +3289,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Verify the datasets in the file backwards
      *
@@ -3308,7 +3307,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
         /* Verify that only process 0 reads the cache image. */
 #if H5C_COLLECT_CACHE_STATS
@@ -3324,7 +3323,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
         /* Verify that all other processes receive the cache image block
          * from process 0.
@@ -3345,7 +3344,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Close the file */
 
@@ -3359,7 +3358,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Open the file */
 
@@ -3385,7 +3384,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Verify the datasets in the file
      *
@@ -3403,7 +3402,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
         /* Verify that only process 0 reads the cache image. */
 #if H5C_COLLECT_CACHE_STATS
@@ -3419,7 +3418,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
         /* Verify that all other processes receive the cache image block
          * from process 0.
@@ -3440,7 +3439,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 11) Delete the datasets in the file */
 
@@ -3452,7 +3451,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 12) Close the file */
 
@@ -3466,7 +3465,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 13) Get the size of the file.  Verify that it is less
      *     than 20 KB.  Without deletions and persistent free
@@ -3492,7 +3491,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 14) Delete the file */
 
@@ -3509,7 +3508,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
     }
 
     if ((mpi_rank == 0) && (show_progress))
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -3522,7 +3521,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size)
 
             H5_FAILED();
 
-            HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+            fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
         }
     }
 
@@ -3573,46 +3572,46 @@ main(int argc, char **argv)
      * calls.  By then, MPI calls may not work.
      */
     if (H5dont_atexit() < 0)
-        HDprintf("%d:Failed to turn off atexit processing. Continue.\n", mpi_rank);
+        printf("%d:Failed to turn off atexit processing. Continue.\n", mpi_rank);
 
     H5open();
 
     if (mpi_rank == 0) {
-        HDprintf("===================================\n");
-        HDprintf("Parallel metadata cache image tests\n");
-        HDprintf("        mpi_size     = %d\n", mpi_size);
-        HDprintf("===================================\n");
+        printf("===================================\n");
+        printf("Parallel metadata cache image tests\n");
+        printf("        mpi_size     = %d\n", mpi_size);
+        printf("===================================\n");
     }
 
     if (mpi_size < 2) {
         if (mpi_rank == 0)
-            HDprintf("    Need at least 2 processes.  Exiting.\n");
+            printf("    Need at least 2 processes.  Exiting.\n");
         goto finish;
     }
 
     if (mpi_rank == 0) { /* create test files */
         int i;
 
-        HDfprintf(stdout, "Constructing test files: \n");
+        fprintf(stdout, "Constructing test files: \n");
         HDfflush(stdout);
 
         i = 0;
         while ((FILENAMES[i] != NULL) && (i < TEST_FILES_TO_CONSTRUCT)) {
-            HDfprintf(stdout, "   writing %s ... ", FILENAMES[i]);
+            fprintf(stdout, "   writing %s ... ", FILENAMES[i]);
             HDfflush(stdout);
             construct_test_file(i);
 
             if (pass) {
-                HDprintf("done.\n");
+                printf("done.\n");
                 HDfflush(stdout);
             }
             else {
-                HDprintf("failed.\n");
+                printf("failed.\n");
                 HDexit(EXIT_FAILURE);
             }
             i++;
         }
-        HDfprintf(stdout, "Test file construction complete.\n");
+        fprintf(stdout, "Test file construction complete.\n");
     }
 
     /* can't start test until test files exist */
@@ -3632,12 +3631,12 @@ finish:
     MPI_Barrier(MPI_COMM_WORLD);
 
     if (mpi_rank == 0) { /* only process 0 reports */
-        HDprintf("===================================\n");
+        printf("===================================\n");
         if (nerrs > 0)
-            HDprintf("***metadata cache image tests detected %d failures***\n", nerrs);
+            printf("***metadata cache image tests detected %d failures***\n", nerrs);
         else
-            HDprintf("metadata cache image tests finished with no failures\n");
-        HDprintf("===================================\n");
+            printf("metadata cache image tests finished with no failures\n");
+        printf("===================================\n");
     }
 
     /* close HDF5 library */
diff --git a/testpar/t_chunk_alloc.c b/testpar/t_chunk_alloc.c
index 2e49a6d..e7303e4 100644
--- a/testpar/t_chunk_alloc.c
+++ b/testpar/t_chunk_alloc.c
@@ -455,7 +455,7 @@ test_chunk_alloc(void)
 
     filename = (const char *)GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend Chunked allocation test on file %s\n", filename);
+        printf("Extend Chunked allocation test on file %s\n", filename);
 
     /* Case 1 */
     /* Create chunked dataset without writing anything.*/
diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c
index 6636ffa..1a483f4 100644
--- a/testpar/t_coll_chunk.c
+++ b/testpar/t_coll_chunk.c
@@ -1098,12 +1098,12 @@ ccslab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t
             break;
     }
     if (VERBOSE_MED) {
-        HDprintf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
-                 "datapoints=%lu\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1],
-                 (unsigned long)(block[0] * block[1] * count[0] * count[1]));
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
+               "datapoints=%lu\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1],
+               (unsigned long)(block[0] * block[1] * count[0] * count[1]));
     }
 }
 
@@ -1156,20 +1156,20 @@ ccdataset_print(hsize_t start[], hsize_t block[], DATATYPE *dataset)
     hsize_t   i, j;
 
     /* print the column heading */
-    HDprintf("Print only the first block of the dataset\n");
-    HDprintf("%-8s", "Cols:");
+    printf("Print only the first block of the dataset\n");
+    printf("%-8s", "Cols:");
     for (j = 0; j < block[1]; j++) {
-        HDprintf("%3lu ", (unsigned long)(start[1] + j));
+        printf("%3lu ", (unsigned long)(start[1] + j));
     }
-    HDprintf("\n");
+    printf("\n");
 
     /* print the slab data */
     for (i = 0; i < block[0]; i++) {
-        HDprintf("Row %2lu: ", (unsigned long)(i + start[0]));
+        printf("Row %2lu: ", (unsigned long)(i + start[0]));
         for (j = 0; j < block[1]; j++) {
-            HDprintf("%03d ", *dataptr++);
+            printf("%03d ", *dataptr++);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 }
 
@@ -1186,14 +1186,14 @@ ccdataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block
 
     /* print it if VERBOSE_MED */
     if (VERBOSE_MED) {
-        HDprintf("dataset_vrfy dumping:::\n");
-        HDprintf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1]);
-        HDprintf("original values:\n");
+        printf("dataset_vrfy dumping:::\n");
+        printf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1]);
+        printf("original values:\n");
         ccdataset_print(start, block, original);
-        HDprintf("compared values:\n");
+        printf("compared values:\n");
         ccdataset_print(start, block, dataset);
     }
 
@@ -1216,8 +1216,8 @@ ccdataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block
                     }
                     if (*dataptr != *oriptr) {
                         if (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED) {
-                            HDprintf("Dataset Verify failed at [%lu][%lu]: expect %d, got %d\n",
-                                     (unsigned long)i, (unsigned long)j, *(oriptr), *(dataptr));
+                            printf("Dataset Verify failed at [%lu][%lu]: expect %d, got %d\n",
+                                   (unsigned long)i, (unsigned long)j, *(oriptr), *(dataptr));
                         }
                     }
                 }
@@ -1225,8 +1225,8 @@ ccdataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block
         }
     }
     if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-        HDprintf("[more errors ...]\n");
+        printf("[more errors ...]\n");
     if (vrfyerrs)
-        HDprintf("%d errors found in ccdataset_vrfy\n", vrfyerrs);
+        printf("%d errors found in ccdataset_vrfy\n", vrfyerrs);
     return (vrfyerrs);
 }
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index acabbb0..9ed753e 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -56,7 +56,7 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = (hsize_t)mpi_rank * block[0];
             start[1]  = 0;
             if (VERBOSE_MED)
-                HDprintf("slab_set BYROW\n");
+                printf("slab_set BYROW\n");
             break;
         case BYCOL:
             /* Each process takes a block of columns. */
@@ -69,7 +69,7 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = 0;
             start[1]  = (hsize_t)mpi_rank * block[1];
             if (VERBOSE_MED)
-                HDprintf("slab_set BYCOL\n");
+                printf("slab_set BYCOL\n");
             break;
         case ZROW:
             /* Similar to BYROW except process 0 gets 0 row */
@@ -82,7 +82,7 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = (mpi_rank ? (hsize_t)mpi_rank * block[0] : 0);
             start[1]  = 0;
             if (VERBOSE_MED)
-                HDprintf("slab_set ZROW\n");
+                printf("slab_set ZROW\n");
             break;
         case ZCOL:
             /* Similar to BYCOL except process 0 gets 0 column */
@@ -95,11 +95,11 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = 0;
             start[1]  = (mpi_rank ? (hsize_t)mpi_rank * block[1] : 0);
             if (VERBOSE_MED)
-                HDprintf("slab_set ZCOL\n");
+                printf("slab_set ZCOL\n");
             break;
         default:
             /* Unknown mode.  Set it to cover the whole dataset. */
-            HDprintf("unknown slab_set mode (%d)\n", mode);
+            printf("unknown slab_set mode (%d)\n", mode);
             block[0]  = (hsize_t)dim0;
             block[1]  = (hsize_t)dim1;
             stride[0] = block[0];
@@ -109,16 +109,16 @@ slab_set(int mpi_rank, int mpi_size, hsize_t start[], hsize_t count[], hsize_t s
             start[0]  = 0;
             start[1]  = 0;
             if (VERBOSE_MED)
-                HDprintf("slab_set wholeset\n");
+                printf("slab_set wholeset\n");
             break;
     }
     if (VERBOSE_MED) {
-        HDprintf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
-                 "datapoints=%lu\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1],
-                 (unsigned long)(block[0] * block[1] * count[0] * count[1]));
+        printf("start[]=(%lu,%lu), count[]=(%lu,%lu), stride[]=(%lu,%lu), block[]=(%lu,%lu), total "
+               "datapoints=%lu\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1],
+               (unsigned long)(block[0] * block[1] * count[0] * count[1]));
     }
 }
 
@@ -155,15 +155,15 @@ point_set(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[], s
                     }
 
     if (VERBOSE_MED) {
-        HDprintf("start[]=(%lu, %lu), count[]=(%lu, %lu), stride[]=(%lu, %lu), block[]=(%lu, %lu), total "
-                 "datapoints=%lu\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1],
-                 (unsigned long)(block[0] * block[1] * count[0] * count[1]));
+        printf("start[]=(%lu, %lu), count[]=(%lu, %lu), stride[]=(%lu, %lu), block[]=(%lu, %lu), total "
+               "datapoints=%lu\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1],
+               (unsigned long)(block[0] * block[1] * count[0] * count[1]));
         k = 0;
         for (i = 0; i < num_points; i++) {
-            HDprintf("(%d, %d)\n", (int)coords[k], (int)coords[k + 1]);
+            printf("(%d, %d)\n", (int)coords[k], (int)coords[k + 1]);
             k += 2;
         }
     }
@@ -198,19 +198,19 @@ dataset_print(hsize_t start[], hsize_t block[], DATATYPE *dataset)
     hsize_t   i, j;
 
     /* print the column heading */
-    HDprintf("%-8s", "Cols:");
+    printf("%-8s", "Cols:");
     for (j = 0; j < block[1]; j++) {
-        HDprintf("%3lu ", (unsigned long)(start[1] + j));
+        printf("%3lu ", (unsigned long)(start[1] + j));
     }
-    HDprintf("\n");
+    printf("\n");
 
     /* print the slab data */
     for (i = 0; i < block[0]; i++) {
-        HDprintf("Row %2lu: ", (unsigned long)(i + start[0]));
+        printf("Row %2lu: ", (unsigned long)(i + start[0]));
         for (j = 0; j < block[1]; j++) {
-            HDprintf("%03d ", *dataptr++);
+            printf("%03d ", *dataptr++);
         }
-        HDprintf("\n");
+        printf("\n");
     }
 }
 
@@ -226,14 +226,14 @@ dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[]
 
     /* print it if VERBOSE_MED */
     if (VERBOSE_MED) {
-        HDprintf("dataset_vrfy dumping:::\n");
-        HDprintf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
-                 (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
-                 (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
-                 (unsigned long)block[0], (unsigned long)block[1]);
-        HDprintf("original values:\n");
+        printf("dataset_vrfy dumping:::\n");
+        printf("start(%lu, %lu), count(%lu, %lu), stride(%lu, %lu), block(%lu, %lu)\n",
+               (unsigned long)start[0], (unsigned long)start[1], (unsigned long)count[0],
+               (unsigned long)count[1], (unsigned long)stride[0], (unsigned long)stride[1],
+               (unsigned long)block[0], (unsigned long)block[1]);
+        printf("original values:\n");
         dataset_print(start, block, original);
-        HDprintf("compared values:\n");
+        printf("compared values:\n");
         dataset_print(start, block, dataset);
     }
 
@@ -242,9 +242,9 @@ dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[]
         for (j = 0; j < block[1]; j++) {
             if (*dataset != *original) {
                 if (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED) {
-                    HDprintf("Dataset Verify failed at [%lu][%lu](row %lu, col %lu): expect %d, got %d\n",
-                             (unsigned long)i, (unsigned long)j, (unsigned long)(i + start[0]),
-                             (unsigned long)(j + start[1]), *(original), *(dataset));
+                    printf("Dataset Verify failed at [%lu][%lu](row %lu, col %lu): expect %d, got %d\n",
+                           (unsigned long)i, (unsigned long)j, (unsigned long)(i + start[0]),
+                           (unsigned long)(j + start[1]), *(original), *(dataset));
                 }
                 dataset++;
                 original++;
@@ -252,9 +252,9 @@ dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[]
         }
     }
     if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-        HDprintf("[more errors ...]\n");
+        printf("[more errors ...]\n");
     if (vrfyerrs)
-        HDprintf("%d errors found in dataset_vrfy\n", vrfyerrs);
+        printf("%d errors found in dataset_vrfy\n", vrfyerrs);
     return (vrfyerrs);
 }
 
@@ -295,7 +295,7 @@ dataset_writeInd(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Independent write test on file %s\n", filename);
+        printf("Independent write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -370,7 +370,7 @@ dataset_writeInd(void)
 
     /* setup dimensions again to write with zero rows for process 0 */
     if (VERBOSE_MED)
-        HDprintf("writeInd by some with zero row\n");
+        printf("writeInd by some with zero row\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZROW);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -433,7 +433,7 @@ dataset_readInd(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Independent read test on file %s\n", filename);
+        printf("Independent read test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -563,7 +563,7 @@ dataset_writeAll(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Collective write test on file %s\n", filename);
+        printf("Collective write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -682,7 +682,7 @@ dataset_writeAll(void)
 
     /* setup dimensions again to writeAll with zero rows for process 0 */
     if (VERBOSE_MED)
-        HDprintf("writeAll by some with zero row\n");
+        printf("writeAll by some with zero row\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZROW);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -747,7 +747,7 @@ dataset_writeAll(void)
 
     /* setup dimensions again to writeAll with zero columns for process 0 */
     if (VERBOSE_MED)
-        HDprintf("writeAll by some with zero col\n");
+        printf("writeAll by some with zero col\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZCOL);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -1079,7 +1079,7 @@ dataset_readAll(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Collective read test on file %s\n", filename);
+        printf("Collective read test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -1176,7 +1176,7 @@ dataset_readAll(void)
 
     /* setup dimensions again to readAll with zero columns for process 0 */
     if (VERBOSE_MED)
-        HDprintf("readAll by some with zero col\n");
+        printf("readAll by some with zero col\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZCOL);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -1243,7 +1243,7 @@ dataset_readAll(void)
 
     /* setup dimensions again to readAll with zero rows for process 0 */
     if (VERBOSE_MED)
-        HDprintf("readAll by some with zero row\n");
+        printf("readAll by some with zero row\n");
     slab_set(mpi_rank, mpi_size, start, count, stride, block, ZROW);
     ret = H5Sselect_hyperslab(file_dataspace, H5S_SELECT_SET, start, stride, count, block);
     VRFY((ret >= 0), "H5Sset_hyperslab succeeded");
@@ -1493,7 +1493,7 @@ extend_writeInd(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend independent write test on file %s\n", filename);
+        printf("Extend independent write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -1545,7 +1545,7 @@ extend_writeInd(void)
 
     /* set up dataset storage chunk sizes and creation property list */
     if (VERBOSE_MED)
-        HDprintf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
+        printf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
     dataset_pl = H5Pcreate(H5P_DATASET_CREATE);
     VRFY((dataset_pl >= 0), "H5Pcreate succeeded");
     ret = H5Pset_chunk(dataset_pl, RANK, chunk_dims);
@@ -1708,7 +1708,7 @@ extend_writeInd2(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend independent write test #2 on file %s\n", filename);
+        printf("Extend independent write test #2 on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -1765,8 +1765,8 @@ extend_writeInd2(void)
     if (VERBOSE_MED) {
         MESG("writing at offset zero: ");
         for (i = 0; i < (int)orig_size; i++)
-            HDprintf("%s%d", i ? ", " : "", written[i]);
-        HDprintf("\n");
+            printf("%s%d", i ? ", " : "", written[i]);
+        printf("\n");
     }
     ret = H5Dwrite(dataset, H5T_NATIVE_INT, ms, fs, H5P_DEFAULT, written);
     VRFY((ret >= 0), "H5Dwrite succeeded");
@@ -1778,15 +1778,15 @@ extend_writeInd2(void)
     VRFY((ret >= 0), "H5Dread succeeded");
     for (i = 0; i < (int)orig_size; i++)
         if (written[i] != retrieved[i]) {
-            HDprintf("Line #%d: written!=retrieved: written[%d]=%d, retrieved[%d]=%d\n", __LINE__, i,
-                     written[i], i, retrieved[i]);
+            printf("Line #%d: written!=retrieved: written[%d]=%d, retrieved[%d]=%d\n", __LINE__, i,
+                   written[i], i, retrieved[i]);
             nerrors++;
         }
     if (VERBOSE_MED) {
         MESG("read at offset zero: ");
         for (i = 0; i < (int)orig_size; i++)
-            HDprintf("%s%d", i ? ", " : "", retrieved[i]);
-        HDprintf("\n");
+            printf("%s%d", i ? ", " : "", retrieved[i]);
+        printf("\n");
     }
 
     /* -------------------------
@@ -1809,8 +1809,8 @@ extend_writeInd2(void)
     if (VERBOSE_MED) {
         MESG("writing at offset 10: ");
         for (i = 0; i < (int)orig_size; i++)
-            HDprintf("%s%d", i ? ", " : "", written[i]);
-        HDprintf("\n");
+            printf("%s%d", i ? ", " : "", written[i]);
+        printf("\n");
     }
     ret = H5Sselect_hyperslab(fs, H5S_SELECT_SET, &orig_size, NULL, &one, &orig_size);
     VRFY((ret >= 0), "H5Sselect_hyperslab succeeded");
@@ -1824,15 +1824,15 @@ extend_writeInd2(void)
     VRFY((ret >= 0), "H5Dread succeeded");
     for (i = 0; i < (int)orig_size; i++)
         if (written[i] != retrieved[i]) {
-            HDprintf("Line #%d: written!=retrieved: written[%d]=%d, retrieved[%d]=%d\n", __LINE__, i,
-                     written[i], i, retrieved[i]);
+            printf("Line #%d: written!=retrieved: written[%d]=%d, retrieved[%d]=%d\n", __LINE__, i,
+                   written[i], i, retrieved[i]);
             nerrors++;
         }
     if (VERBOSE_MED) {
         MESG("read at offset 10: ");
         for (i = 0; i < (int)orig_size; i++)
-            HDprintf("%s%d", i ? ", " : "", retrieved[i]);
-        HDprintf("\n");
+            printf("%s%d", i ? ", " : "", retrieved[i]);
+        printf("\n");
     }
 
     /* Close dataset collectively */
@@ -1871,7 +1871,7 @@ extend_readInd(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend independent read test on file %s\n", filename);
+        printf("Extend independent read test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -2052,7 +2052,7 @@ extend_writeAll(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend independent write test on file %s\n", filename);
+        printf("Extend independent write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -2104,7 +2104,7 @@ extend_writeAll(void)
 
     /* set up dataset storage chunk sizes and creation property list */
     if (VERBOSE_MED)
-        HDprintf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
+        printf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
     dataset_pl = H5Pcreate(H5P_DATASET_CREATE);
     VRFY((dataset_pl >= 0), "H5Pcreate succeeded");
     ret = H5Pset_chunk(dataset_pl, RANK, chunk_dims);
@@ -2289,7 +2289,7 @@ extend_readAll(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend independent read test on file %s\n", filename);
+        printf("Extend independent read test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -2479,7 +2479,7 @@ compress_readAll(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Collective chunked dataset read test on file %s\n", filename);
+        printf("Collective chunked dataset read test on file %s\n", filename);
 
     /* Retrieve MPI parameters */
     MPI_Comm_size(comm, &mpi_size);
@@ -2599,8 +2599,8 @@ compress_readAll(void)
             /* Verify data read */
             for (u = 0; u < dim; u++)
                 if (data_orig[u] != data_read[u]) {
-                    HDprintf("Line #%d: written!=retrieved: data_orig[%u]=%d, data_read[%u]=%d\n", __LINE__,
-                             (unsigned)u, data_orig[u], (unsigned)u, data_read[u]);
+                    printf("Line #%d: written!=retrieved: data_orig[%u]=%d, data_read[%u]=%d\n", __LINE__,
+                           (unsigned)u, data_orig[u], (unsigned)u, data_read[u]);
                     nerrors++;
                 }
 
@@ -2671,7 +2671,7 @@ none_selection_chunk(void)
 
     filename = GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Extend independent write test on file %s\n", filename);
+        printf("Extend independent write test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -2702,7 +2702,7 @@ none_selection_chunk(void)
 
     /* set up dataset storage chunk sizes and creation property list */
     if (VERBOSE_MED)
-        HDprintf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
+        printf("chunks[]=%lu,%lu\n", (unsigned long)chunk_dims[0], (unsigned long)chunk_dims[1]);
     dataset_pl = H5Pcreate(H5P_DATASET_CREATE);
     VRFY((dataset_pl >= 0), "H5Pcreate succeeded");
     ret = H5Pset_chunk(dataset_pl, RANK, chunk_dims);
@@ -3268,8 +3268,8 @@ test_actual_io_mode(int selection_mode)
         VRFY((actual_io_mode_write == actual_io_mode_expected), message);
     }
     else {
-        HDfprintf(stderr, "%s %d -> (%d,%d)\n", test_name, mpi_rank, actual_chunk_opt_mode_write,
-                  actual_io_mode_write);
+        fprintf(stderr, "%s %d -> (%d,%d)\n", test_name, mpi_rank, actual_chunk_opt_mode_write,
+                actual_io_mode_write);
     }
 
     /* To test that the property is successfully reset to the default, we perform some
@@ -3381,7 +3381,7 @@ actual_io_mode_tests(void)
         if (mpi_size > 2)
             test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_MIX);
         else
-            HDfprintf(stdout, "Multi Chunk Mixed test requires 3 processes minimum\n");
+            fprintf(stdout, "Multi Chunk Mixed test requires 3 processes minimum\n");
 
         test_actual_io_mode(TEST_ACTUAL_IO_MULTI_CHUNK_MIX_DISAGREE);
 
@@ -3849,11 +3849,11 @@ dataset_atomicity(void)
     dim1     = 32;
     filename = GetTestParameters();
     if (facc_type != FACC_MPIO) {
-        HDprintf("Atomicity tests will not work without the MPIO VFD\n");
+        printf("Atomicity tests will not work without the MPIO VFD\n");
         return;
     }
     if (VERBOSE_MED)
-        HDprintf("atomic writes to file %s\n", filename);
+        printf("atomic writes to file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -3985,9 +3985,9 @@ dataset_atomicity(void)
         j = 0;
         k = 0;
         for (i = 0; i < dim0; i++) {
-            HDprintf("\n");
+            printf("\n");
             for (j = 0; j < dim1; j++)
-                HDprintf("%d ", read_buf[k++]);
+                printf("%d ", read_buf[k++]);
         }
     }
 
@@ -4001,8 +4001,8 @@ dataset_atomicity(void)
              "Atomicity Test Failed Process %d: Value read should be 0 or 5\n");
         for (i = 1; i < buf_size; i++) {
             if (read_buf[i] != compare) {
-                HDprintf("Atomicity Test Failed Process %d: read_buf[%d] is %d, should be %d\n", mpi_rank, i,
-                         read_buf[i], compare);
+                printf("Atomicity Test Failed Process %d: read_buf[%d] is %d, should be %d\n", mpi_rank, i,
+                       read_buf[i], compare);
                 nerrors++;
             }
         }
@@ -4085,11 +4085,11 @@ dataset_atomicity(void)
             j = 0;
             k = 0;
             for (i = 0; i < dim0; i++) {
-                HDprintf("\n");
+                printf("\n");
                 for (j = 0; j < dim1; j++)
-                    HDprintf("%d ", read_buf[k++]);
+                    printf("%d ", read_buf[k++]);
             }
-            HDprintf("\n");
+            printf("\n");
         }
     }
 
@@ -4123,8 +4123,8 @@ dataset_atomicity(void)
                     continue;
                 }
                 else if (compare != read_buf[k]) {
-                    HDprintf("Atomicity Test Failed Process %d: read_buf[%d] is %d, should be %d\n", mpi_rank,
-                             k, read_buf[k], compare);
+                    printf("Atomicity Test Failed Process %d: read_buf[%d] is %d, should be %d\n", mpi_rank,
+                           k, read_buf[k], compare);
                     nerrors++;
                 }
                 k++;
diff --git a/testpar/t_file.c b/testpar/t_file.c
index b2c2c7d..868af65 100644
--- a/testpar/t_file.c
+++ b/testpar/t_file.c
@@ -66,7 +66,7 @@ test_split_comm_access(void)
 
     filename = (const char *)GetTestParameters();
     if (VERBOSE_MED)
-        HDprintf("Split Communicator access test on file %s\n", filename);
+        printf("Split Communicator access test on file %s\n", filename);
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -137,7 +137,7 @@ test_page_buffer_access(void)
     filename = (const char *)GetTestParameters();
 
     if (VERBOSE_MED)
-        HDprintf("Page Buffer Usage in Parallel %s\n", filename);
+        printf("Page Buffer Usage in Parallel %s\n", filename);
 
     fapl = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
     VRFY((fapl >= 0), "create_faccess_plist succeeded");
diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c
index 8895c15..d700da2 100644
--- a/testpar/t_filter_read.c
+++ b/testpar/t_filter_read.c
@@ -146,12 +146,11 @@ filter_read_internal(const char *filename, hid_t dcpl, hsize_t *dset_size)
     for (i = 0; i < hs_size[0]; i++) {
         for (j = 0; j < hs_size[1]; j++) {
             if (points[i * size[1] + (size_t)hs_offset[1] + j] != check[i * hs_size[1] + j]) {
-                HDfprintf(stderr, "    Read different values than written.\n");
-                HDfprintf(stderr, "    At index %lu,%lu\n", (unsigned long)(i),
-                          (unsigned long)(hs_offset[1] + j));
-                HDfprintf(stderr, "    At original: %d\n",
-                          (int)points[i * size[1] + (size_t)hs_offset[1] + j]);
-                HDfprintf(stderr, "    At returned: %d\n", (int)check[i * hs_size[1] + j]);
+                fprintf(stderr, "    Read different values than written.\n");
+                fprintf(stderr, "    At index %lu,%lu\n", (unsigned long)(i),
+                        (unsigned long)(hs_offset[1] + j));
+                fprintf(stderr, "    At original: %d\n", (int)points[i * size[1] + (size_t)hs_offset[1] + j]);
+                fprintf(stderr, "    At returned: %d\n", (int)check[i * hs_size[1] + j]);
                 VRFY(FALSE, "");
             }
         }
@@ -228,7 +227,7 @@ test_filter_read(void)
     filename = GetTestParameters();
 
     if (VERBOSE_MED)
-        HDprintf("Parallel reading of dataset written with filters %s\n", filename);
+        printf("Parallel reading of dataset written with filters %s\n", filename);
 
     /*----------------------------------------------------------
      * STEP 0: Test without filters.
diff --git a/testpar/t_filters_parallel.c b/testpar/t_filters_parallel.c
index 9fa5a9c..4024c34 100644
--- a/testpar/t_filters_parallel.c
+++ b/testpar/t_filters_parallel.c
@@ -471,10 +471,10 @@ test_write_one_chunk_filtered_dataset(const char *parent_group, H5Z_filter_t fil
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -627,10 +627,10 @@ test_write_filtered_dataset_no_overlap(const char *parent_group, H5Z_filter_t fi
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -774,10 +774,10 @@ test_write_filtered_dataset_no_overlap_partial(const char *parent_group, H5Z_fil
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -935,10 +935,10 @@ test_write_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filte
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -1105,11 +1105,11 @@ test_write_filtered_dataset_single_unlim_dim_no_overlap(const char *parent_group
         start[1]  = i * count[1] * block[1];
 
         if (VERBOSE_MED) {
-            HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                     ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                     ", %" PRIuHSIZE " ]\n",
-                     mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0],
-                     block[1]);
+            printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+                   ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+                   ", %" PRIuHSIZE " ]\n",
+                   mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0],
+                   block[1]);
             HDfflush(stdout);
         }
 
@@ -1258,11 +1258,11 @@ test_write_filtered_dataset_single_unlim_dim_overlap(const char *parent_group, H
         start[1]  = i * count[1] * block[1];
 
         if (VERBOSE_MED) {
-            HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                     ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                     ", %" PRIuHSIZE " ]\n",
-                     mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0],
-                     block[1]);
+            printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+                   ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+                   ", %" PRIuHSIZE " ]\n",
+                   mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0],
+                   block[1]);
             HDfflush(stdout);
         }
 
@@ -1422,11 +1422,11 @@ test_write_filtered_dataset_multi_unlim_dim_no_overlap(const char *parent_group,
         start[1]  = 0;
 
         if (VERBOSE_MED) {
-            HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                     ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                     ", %" PRIuHSIZE " ]\n",
-                     mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0],
-                     block[1]);
+            printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+                   ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+                   ", %" PRIuHSIZE " ]\n",
+                   mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0],
+                   block[1]);
             HDfflush(stdout);
         }
 
@@ -1589,11 +1589,11 @@ test_write_filtered_dataset_multi_unlim_dim_overlap(const char *parent_group, H5
         start[1]  = 0;
 
         if (VERBOSE_MED) {
-            HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                     ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                     ", %" PRIuHSIZE " ]\n",
-                     mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0],
-                     block[1]);
+            printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+                   ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+                   ", %" PRIuHSIZE " ]\n",
+                   mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0],
+                   block[1]);
             HDfflush(stdout);
         }
 
@@ -1736,10 +1736,10 @@ test_write_filtered_dataset_single_no_selection(const char *parent_group, H5Z_fi
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -2172,10 +2172,10 @@ test_write_filtered_dataset_interleaved_write(const char *parent_group, H5Z_filt
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -2343,10 +2343,10 @@ test_write_transformed_filtered_dataset_no_overlap(const char *parent_group, H5Z
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -2514,12 +2514,12 @@ test_write_3d_filtered_dataset_no_overlap_separate_pages(const char *parent_grou
     start[2]  = (hsize_t)mpi_rank;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
-                 " ], stride[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
-                 " ]\n",
-                 mpi_rank, count[0], count[1], count[2], stride[0], stride[1], stride[2], start[0], start[1],
-                 start[2], block[0], block[1], block[2]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
+               " ], stride[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE
+               ", %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
+               " ]\n",
+               mpi_rank, count[0], count[1], count[2], stride[0], stride[1], stride[2], start[0], start[1],
+               start[2], block[0], block[1], block[2]);
         HDfflush(stdout);
     }
 
@@ -2676,12 +2676,12 @@ test_write_3d_filtered_dataset_no_overlap_same_pages(const char *parent_group, H
     start[2] = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
-                 " ], stride[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
-                 " ]\n",
-                 mpi_rank, count[0], count[1], count[2], stride[0], stride[1], stride[2], start[0], start[1],
-                 start[2], block[0], block[1], block[2]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
+               " ], stride[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE
+               ", %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
+               " ]\n",
+               mpi_rank, count[0], count[1], count[2], stride[0], stride[1], stride[2], start[0], start[1],
+               start[2], block[0], block[1], block[2]);
         HDfflush(stdout);
     }
 
@@ -2837,12 +2837,12 @@ test_write_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t fi
     start[2]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
-                 " ], stride[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
-                 " ]\n",
-                 mpi_rank, count[0], count[1], count[2], stride[0], stride[1], stride[2], start[0], start[1],
-                 start[2], block[0], block[1], block[2]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
+               " ], stride[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE
+               ", %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
+               " ]\n",
+               mpi_rank, count[0], count[1], count[2], stride[0], stride[1], stride[2], start[0], start[1],
+               start[2], block[0], block[1], block[2]);
         HDfflush(stdout);
     }
 
@@ -3027,10 +3027,10 @@ test_write_cmpd_filtered_dataset_no_conversion_unshared(const char *parent_group
     start[1]  = ((hsize_t)mpi_rank * WRITE_COMPOUND_FILTERED_CHUNKS_NO_CONVERSION_UNSHARED_CH_NCOLS);
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -3208,10 +3208,10 @@ test_write_cmpd_filtered_dataset_no_conversion_shared(const char *parent_group,
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -3415,10 +3415,10 @@ test_write_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_gro
     start[1]  = ((hsize_t)mpi_rank * WRITE_COMPOUND_FILTERED_CHUNKS_TYPE_CONVERSION_UNSHARED_CH_NCOLS);
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -3614,10 +3614,10 @@ test_write_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -3830,10 +3830,10 @@ test_read_one_chunk_filtered_dataset(const char *parent_group, H5Z_filter_t filt
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -4030,10 +4030,10 @@ test_read_filtered_dataset_no_overlap(const char *parent_group, H5Z_filter_t fil
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -4232,10 +4232,10 @@ test_read_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -4459,10 +4459,10 @@ test_read_filtered_dataset_single_no_selection(const char *parent_group, H5Z_fil
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -5039,10 +5039,10 @@ test_read_filtered_dataset_interleaved_read(const char *parent_group, H5Z_filter
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -5265,10 +5265,10 @@ test_read_3d_filtered_dataset_no_overlap_separate_pages(const char *parent_group
     start[2]  = (hsize_t)mpi_rank;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -5490,10 +5490,10 @@ test_read_transformed_filtered_dataset_no_overlap(const char *parent_group, H5Z_
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -5709,10 +5709,10 @@ test_read_3d_filtered_dataset_no_overlap_same_pages(const char *parent_group, H5
     start[2]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -5931,10 +5931,10 @@ test_read_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t fil
     start[2]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -6169,10 +6169,10 @@ test_read_cmpd_filtered_dataset_no_conversion_unshared(const char *parent_group,
     start[1]  = ((hsize_t)mpi_rank * READ_COMPOUND_FILTERED_CHUNKS_NO_CONVERSION_UNSHARED_CH_NCOLS);
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -6402,10 +6402,10 @@ test_read_cmpd_filtered_dataset_no_conversion_shared(const char *parent_group, H
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -6637,10 +6637,10 @@ test_read_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_grou
     start[1]  = ((hsize_t)mpi_rank * READ_COMPOUND_FILTERED_CHUNKS_TYPE_CONVERSION_UNSHARED_CH_NCOLS);
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -6879,10 +6879,10 @@ test_read_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group,
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is reading with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -7167,12 +7167,12 @@ test_write_parallel_read_serial(const char *parent_group, H5Z_filter_t filter_id
     offset[2] = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
-                 " ], stride[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE " ], offset[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
-                 " ]\n",
-                 mpi_rank, count[0], count[1], count[2], stride[0], stride[1], stride[2], offset[0],
-                 offset[1], offset[2], block[0], block[1], block[2]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
+               " ], stride[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE " ], offset[ %" PRIuHSIZE
+               ", %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE
+               " ]\n",
+               mpi_rank, count[0], count[1], count[2], stride[0], stride[1], stride[2], offset[0], offset[1],
+               offset[2], block[0], block[1], block[2]);
         HDfflush(stdout);
     }
 
@@ -7336,10 +7336,10 @@ test_shrinking_growing_chunks(const char *parent_group, H5Z_filter_t filter_id,
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -7484,10 +7484,10 @@ test_edge_chunks_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hi
         (hsize_t)(WRITE_UNSHARED_FILTERED_EDGE_CHUNKS_NCOLS - WRITE_UNSHARED_FILTERED_EDGE_CHUNKS_CH_NCOLS);
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -7558,10 +7558,10 @@ test_edge_chunks_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hi
         (hsize_t)(WRITE_UNSHARED_FILTERED_EDGE_CHUNKS_NCOLS - WRITE_UNSHARED_FILTERED_EDGE_CHUNKS_CH_NCOLS);
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -7687,10 +7687,10 @@ test_edge_chunks_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t
         (hsize_t)(WRITE_SHARED_FILTERED_EDGE_CHUNKS_NCOLS - WRITE_SHARED_FILTERED_EDGE_CHUNKS_CH_NCOLS);
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -7762,10 +7762,10 @@ test_edge_chunks_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t
         (hsize_t)(WRITE_SHARED_FILTERED_EDGE_CHUNKS_NCOLS - WRITE_SHARED_FILTERED_EDGE_CHUNKS_CH_NCOLS);
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -7932,10 +7932,10 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -8009,10 +8009,10 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -8080,10 +8080,10 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -8145,10 +8145,10 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -8299,10 +8299,10 @@ test_fill_value_undefined(const char *parent_group, H5Z_filter_t filter_id, hid_
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -8354,10 +8354,10 @@ test_fill_value_undefined(const char *parent_group, H5Z_filter_t filter_id, hid_
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -8523,10 +8523,10 @@ test_fill_time_never(const char *parent_group, H5Z_filter_t filter_id, hid_t fap
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -8605,10 +8605,10 @@ test_fill_time_never(const char *parent_group, H5Z_filter_t filter_id, hid_t fap
     start[1]  = 0;
 
     if (VERBOSE_MED) {
-        HDprintf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
-                 ", %" PRIuHSIZE " ]\n",
-                 mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
+        printf("Process %d is writing with count[ %" PRIuHSIZE ", %" PRIuHSIZE " ], stride[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ], start[ %" PRIuHSIZE ", %" PRIuHSIZE " ], block size[ %" PRIuHSIZE
+               ", %" PRIuHSIZE " ]\n",
+               mpi_rank, count[0], count[1], stride[0], stride[1], start[0], start[1], block[0], block[1]);
         HDfflush(stdout);
     }
 
@@ -8674,8 +8674,8 @@ main(int argc, char **argv)
 
     if (mpi_size <= 0) {
         if (MAINPROCESS) {
-            HDprintf("The Parallel Filters tests require at least 1 rank.\n");
-            HDprintf("Quitting...\n");
+            printf("The Parallel Filters tests require at least 1 rank.\n");
+            printf("Quitting...\n");
         }
 
         MPI_Abort(MPI_COMM_WORLD, 1);
@@ -8683,16 +8683,16 @@ main(int argc, char **argv)
 
     if (H5dont_atexit() < 0) {
         if (MAINPROCESS) {
-            HDprintf("Failed to turn off atexit processing. Continue.\n");
+            printf("Failed to turn off atexit processing. Continue.\n");
         }
     }
 
     H5open();
 
     if (MAINPROCESS) {
-        HDprintf("==========================\n");
-        HDprintf("  Parallel Filters tests\n");
-        HDprintf("==========================\n\n");
+        printf("==========================\n");
+        printf("  Parallel Filters tests\n");
+        printf("==========================\n\n");
     }
 
     if (VERBOSE_MED)
@@ -8776,10 +8776,10 @@ main(int argc, char **argv)
                 }
 
                 if (MAINPROCESS)
-                    HDprintf("== Running tests with filter '%s' using '%s' and '%s' allocation time ==\n\n",
-                             filterNames[cur_filter_idx],
-                             H5FD_MPIO_CHUNK_ONE_IO == chunk_opt ? "Linked-Chunk I/O" : "Multi-Chunk I/O",
-                             alloc_time);
+                    printf("== Running tests with filter '%s' using '%s' and '%s' allocation time ==\n\n",
+                           filterNames[cur_filter_idx],
+                           H5FD_MPIO_CHUNK_ONE_IO == chunk_opt ? "Linked-Chunk I/O" : "Multi-Chunk I/O",
+                           alloc_time);
 
                 /* Make sure current filter is available before testing with it */
                 filter_avail = H5Zfilter_avail(cur_filter);
@@ -8787,8 +8787,8 @@ main(int argc, char **argv)
 
                 if (!filter_avail) {
                     if (MAINPROCESS)
-                        HDprintf(" ** SKIPPED tests with filter '%s' - filter unavailable **\n\n",
-                                 filterNames[cur_filter_idx]);
+                        printf(" ** SKIPPED tests with filter '%s' - filter unavailable **\n\n",
+                               filterNames[cur_filter_idx]);
                     continue;
                 }
 
@@ -8798,8 +8798,8 @@ main(int argc, char **argv)
                 /* Determine if filter is encode-enabled */
                 if (0 == (filter_config & H5Z_FILTER_CONFIG_ENCODE_ENABLED)) {
                     if (MAINPROCESS)
-                        HDprintf(" ** SKIPPED tests with filter '%s' - filter not encode-enabled **\n\n",
-                                 filterNames[cur_filter_idx]);
+                        printf(" ** SKIPPED tests with filter '%s' - filter not encode-enabled **\n\n",
+                               filterNames[cur_filter_idx]);
                     continue;
                 }
 
@@ -8864,7 +8864,7 @@ main(int argc, char **argv)
 exit:
     if (nerrors)
         if (MAINPROCESS)
-            HDprintf("*** %d TEST ERROR%s OCCURRED ***\n", nerrors, nerrors > 1 ? "S" : "");
+            printf("*** %d TEST ERROR%s OCCURRED ***\n", nerrors, nerrors > 1 ? "S" : "");
 
     TestAlarmOff();
 
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 10fcd19..a7498a8 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -196,7 +196,7 @@ multiple_dset_write(void)
         H5Dclose(dataset);
 #ifdef BARRIER_CHECKS
         if (!((n + 1) % 10)) {
-            HDprintf("created %d datasets\n", n + 1);
+            printf("created %d datasets\n", n + 1);
             MPI_Barrier(MPI_COMM_WORLD);
         }
 #endif /* BARRIER_CHECKS */
@@ -326,8 +326,8 @@ compact_dataset(void)
         for (j = 0; j < size; j++)
             if (!H5_DBL_ABS_EQUAL(inme[(i * size) + j], outme[(i * size) + j]))
                 if (err_num++ < MAX_ERR_REPORT || VERBOSE_MED)
-                    HDprintf("Dataset Verify failed at [%d][%d]: expect %f, got %f\n", i, j,
-                             outme[(i * size) + j], inme[(i * size) + j]);
+                    printf("Dataset Verify failed at [%d][%d]: expect %f, got %f\n", i, j,
+                           outme[(i * size) + j], inme[(i * size) + j]);
 
     H5Pclose(plist);
     H5Pclose(dxpl);
@@ -674,13 +674,13 @@ dataset_fillvalue(void)
                     for (l = 0; l < (int)dset_dims[3]; l++, trdata++)
                         if (*trdata != 0)
                             if (err_num++ < MAX_ERR_REPORT || VERBOSE_MED)
-                                HDprintf(
+                                printf(
                                     "Rank %d: Dataset Verify failed at [%d][%d][%d][%d]: expect 0, got %d\n",
                                     mpi_rank, i, j, k, l, *trdata);
         if (err_num > MAX_ERR_REPORT && !VERBOSE_MED)
-            HDprintf("Rank %d: [more errors ...]\n", mpi_rank);
+            printf("Rank %d: [more errors ...]\n", mpi_rank);
         if (err_num) {
-            HDprintf("Rank %d: %d errors found in check_value\n", mpi_rank, err_num);
+            printf("Rank %d: %d errors found in check_value\n", mpi_rank, err_num);
             nerrors++;
         }
     }
@@ -766,19 +766,19 @@ dataset_fillvalue(void)
                         if (i < mpi_size) {
                             if (*twdata != *trdata)
                                 if (err_num++ < MAX_ERR_REPORT || VERBOSE_MED)
-                                    HDprintf("Dataset Verify failed at [%d][%d][%d][%d]: expect %d, got %d\n",
-                                             i, j, k, l, *twdata, *trdata);
+                                    printf("Dataset Verify failed at [%d][%d][%d][%d]: expect %d, got %d\n",
+                                           i, j, k, l, *twdata, *trdata);
                         } /* end if */
                         else {
                             if (*trdata != 0)
                                 if (err_num++ < MAX_ERR_REPORT || VERBOSE_MED)
-                                    HDprintf("Dataset Verify failed at [%d][%d][%d][%d]: expect 0, got %d\n",
-                                             i, j, k, l, *trdata);
+                                    printf("Dataset Verify failed at [%d][%d][%d][%d]: expect 0, got %d\n", i,
+                                           j, k, l, *trdata);
                         } /* end else */
         if (err_num > MAX_ERR_REPORT && !VERBOSE_MED)
-            HDprintf("[more errors ...]\n");
+            printf("[more errors ...]\n");
         if (err_num) {
-            HDprintf("%d errors found in check_value\n", err_num);
+            printf("%d errors found in check_value\n", err_num);
             nerrors++;
         }
     }
@@ -900,7 +900,7 @@ collective_group_write(void)
 
 #ifdef BARRIER_CHECKS
         if (!((m + 1) % 10)) {
-            HDprintf("created %d groups\n", m + 1);
+            printf("created %d groups\n", m + 1);
             MPI_Barrier(MPI_COMM_WORLD);
         }
 #endif /* BARRIER_CHECKS */
@@ -1093,7 +1093,7 @@ multiple_group_write(void)
 
 #ifdef BARRIER_CHECKS
         if (!((m + 1) % 10)) {
-            HDprintf("created %d groups\n", m + 1);
+            printf("created %d groups\n", m + 1);
             MPI_Barrier(MPI_COMM_WORLD);
         }
 #endif /* BARRIER_CHECKS */
@@ -1168,7 +1168,7 @@ create_group_recursive(hid_t memspace, hid_t filespace, hid_t gid, int counter)
 
 #ifdef BARRIER_CHECKS
     if (!((counter + 1) % 10)) {
-        HDprintf("created %dth child groups\n", counter + 1);
+        printf("created %dth child groups\n", counter + 1);
         MPI_Barrier(MPI_COMM_WORLD);
     }
 #endif /* BARRIER_CHECKS */
@@ -1429,14 +1429,14 @@ check_value(DATATYPE *indata, DATATYPE *outdata, int size)
         for (j = chunk_origin[1]; j < (chunk_origin[1] + chunk_dims[1]); j++) {
             if (*indata != *outdata)
                 if (err_num++ < MAX_ERR_REPORT || VERBOSE_MED)
-                    HDprintf("Dataset Verify failed at [%lu][%lu](row %lu, col%lu): expect %d, got %d\n",
-                             (unsigned long)i, (unsigned long)j, (unsigned long)i, (unsigned long)j, *outdata,
-                             *indata);
+                    printf("Dataset Verify failed at [%lu][%lu](row %lu, col%lu): expect %d, got %d\n",
+                           (unsigned long)i, (unsigned long)j, (unsigned long)i, (unsigned long)j, *outdata,
+                           *indata);
         }
     if (err_num > MAX_ERR_REPORT && !VERBOSE_MED)
-        HDprintf("[more errors ...]\n");
+        printf("[more errors ...]\n");
     if (err_num)
-        HDprintf("%d errors found in check_value\n", err_num);
+        printf("%d errors found in check_value\n", err_num);
     return err_num;
 }
 
@@ -1531,7 +1531,7 @@ io_mode_confusion(void)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Setting up property list.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Setting up property list.\n", mpi_rank, fcn_name);
 
     plist_id = H5Pcreate(H5P_FILE_ACCESS);
     VRFY((plist_id != -1), "H5Pcreate() failed");
@@ -1544,7 +1544,7 @@ io_mode_confusion(void)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Creating new file.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Creating new file.\n", mpi_rank, fcn_name);
 
     file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, plist_id);
     VRFY((file_id >= 0), "H5Fcreate() failed");
@@ -1557,7 +1557,7 @@ io_mode_confusion(void)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Creating the dataspace for the dataset.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Creating the dataspace for the dataset.\n", mpi_rank, fcn_name);
 
     dimsf[0]  = N;
     filespace = H5Screate_simple(rank, dimsf, NULL);
@@ -1568,7 +1568,7 @@ io_mode_confusion(void)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Creating the dataset, and closing filespace.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Creating the dataset, and closing filespace.\n", mpi_rank, fcn_name);
 
     dset_id =
         H5Dcreate2(file_id, dataset_name, H5T_NATIVE_INT, filespace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -1578,33 +1578,33 @@ io_mode_confusion(void)
     VRFY((status >= 0), "H5Sclose() failed");
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling H5Screate_simple().\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling H5Screate_simple().\n", mpi_rank, fcn_name);
 
     memspace = H5Screate_simple(rank, dimsf, NULL);
     VRFY((memspace >= 0), "H5Screate_simple() failed.");
 
     if (mpi_rank == 0) {
         if (verbose)
-            HDfprintf(stdout, "%0d:%s: Calling H5Sselect_all(memspace).\n", mpi_rank, fcn_name);
+            fprintf(stdout, "%0d:%s: Calling H5Sselect_all(memspace).\n", mpi_rank, fcn_name);
 
         status = H5Sselect_all(memspace);
         VRFY((status >= 0), "H5Sselect_all() failed");
     }
     else {
         if (verbose)
-            HDfprintf(stdout, "%0d:%s: Calling H5Sselect_none(memspace).\n", mpi_rank, fcn_name);
+            fprintf(stdout, "%0d:%s: Calling H5Sselect_none(memspace).\n", mpi_rank, fcn_name);
 
         status = H5Sselect_none(memspace);
         VRFY((status >= 0), "H5Sselect_none() failed");
     }
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling MPI_Barrier().\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling MPI_Barrier().\n", mpi_rank, fcn_name);
 
     MPI_Barrier(MPI_COMM_WORLD);
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling H5Dget_space().\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling H5Dget_space().\n", mpi_rank, fcn_name);
 
     filespace = H5Dget_space(dset_id);
     VRFY((filespace >= 0), "H5Dget_space() failed");
@@ -1612,32 +1612,32 @@ io_mode_confusion(void)
     /* select all */
     if (mpi_rank == 0) {
         if (verbose)
-            HDfprintf(stdout, "%0d:%s: Calling H5Sselect_elements() -- set up hang?\n", mpi_rank, fcn_name);
+            fprintf(stdout, "%0d:%s: Calling H5Sselect_elements() -- set up hang?\n", mpi_rank, fcn_name);
 
         status = H5Sselect_elements(filespace, H5S_SELECT_SET, N, (const hsize_t *)&coord);
         VRFY((status >= 0), "H5Sselect_elements() failed");
     }
     else { /* select nothing */
         if (verbose)
-            HDfprintf(stdout, "%0d:%s: Calling H5Sselect_none().\n", mpi_rank, fcn_name);
+            fprintf(stdout, "%0d:%s: Calling H5Sselect_none().\n", mpi_rank, fcn_name);
 
         status = H5Sselect_none(filespace);
         VRFY((status >= 0), "H5Sselect_none() failed");
     }
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling MPI_Barrier().\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling MPI_Barrier().\n", mpi_rank, fcn_name);
 
     MPI_Barrier(MPI_COMM_WORLD);
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling H5Pcreate().\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling H5Pcreate().\n", mpi_rank, fcn_name);
 
     plist_id = H5Pcreate(H5P_DATASET_XFER);
     VRFY((plist_id != -1), "H5Pcreate() failed");
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling H5Pset_dxpl_mpio().\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling H5Pset_dxpl_mpio().\n", mpi_rank, fcn_name);
 
     status = H5Pset_dxpl_mpio(plist_id, H5FD_MPIO_COLLECTIVE);
     VRFY((status >= 0), "H5Pset_dxpl_mpio() failed");
@@ -1647,12 +1647,12 @@ io_mode_confusion(void)
     }
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Calling H5Dwrite() -- hang here?.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Calling H5Dwrite() -- hang here?.\n", mpi_rank, fcn_name);
 
     status = H5Dwrite(dset_id, H5T_NATIVE_INT, memspace, filespace, plist_id, data);
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Returned from H5Dwrite(), status=%d.\n", mpi_rank, fcn_name, status);
+        fprintf(stdout, "%0d:%s: Returned from H5Dwrite(), status=%d.\n", mpi_rank, fcn_name, status);
     VRFY((status >= 0), "H5Dwrite() failed");
 
     /*
@@ -1660,7 +1660,7 @@ io_mode_confusion(void)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Cleaning up from test.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Cleaning up from test.\n", mpi_rank, fcn_name);
 
     status = H5Dclose(dset_id);
     VRFY((status >= 0), "H5Dclose() failed");
@@ -1678,7 +1678,7 @@ io_mode_confusion(void)
     VRFY((status >= 0), "H5Fclose() failed");
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
 
     return;
 
@@ -1795,7 +1795,7 @@ rr_obj_hdr_flush_confusion(void)
 
     MPI_Comm_free(&comm);
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
 
     return;
 
@@ -1864,7 +1864,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Setting up property list.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Setting up property list.\n", mpi_rank, fcn_name);
 
     fapl_id = H5Pcreate(H5P_FILE_ACCESS);
     VRFY((fapl_id != -1), "H5Pcreate(H5P_FILE_ACCESS) failed");
@@ -1877,7 +1877,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Creating new file \"%s\".\n", mpi_rank, fcn_name, filename);
+        fprintf(stdout, "%0d:%s: Creating new file \"%s\".\n", mpi_rank, fcn_name, filename);
 
     file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
     VRFY((file_id >= 0), "H5Fcreate() failed");
@@ -1890,7 +1890,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Creating the datasets.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Creating the datasets.\n", mpi_rank, fcn_name);
 
     disk_size[0] = (hsize_t)(LOCAL_DATA_SIZE * mpi_size);
     mem_size[0]  = (hsize_t)(LOCAL_DATA_SIZE);
@@ -1911,7 +1911,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Setting up dxpl.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Setting up dxpl.\n", mpi_rank, fcn_name);
 
     dxpl_id = H5Pcreate(H5P_DATASET_XFER);
     VRFY((dxpl_id != -1), "H5Pcreate(H5P_DATASET_XFER) failed.\n");
@@ -1924,7 +1924,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Writing datasets.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Writing datasets.\n", mpi_rank, fcn_name);
 
     disk_count[0] = (hsize_t)(LOCAL_DATA_SIZE);
     disk_start[0] = (hsize_t)(LOCAL_DATA_SIZE * mpi_rank);
@@ -1953,7 +1953,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: closing dataspaces.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: closing dataspaces.\n", mpi_rank, fcn_name);
 
     for (i = 0; i < NUM_DATA_SETS; i++) {
         err = H5Sclose(disk_space[i]);
@@ -1969,7 +1969,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
     err = H5Fflush(file_id, H5F_SCOPE_GLOBAL);
     VRFY((err >= 0), "H5Fflush(1) failed.\n");
 
@@ -1983,7 +1983,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: writing attributes.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: writing attributes.\n", mpi_rank, fcn_name);
 
     att_size[0] = (hsize_t)(LOCAL_DATA_SIZE);
     for (j = 0; j < LOCAL_DATA_SIZE; j++) {
@@ -2008,7 +2008,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: closing attr ids and spaces .\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: closing attr ids and spaces .\n", mpi_rank, fcn_name);
 
     for (i = 0; i < NUM_DATA_SETS; i++) {
         err = H5Sclose(att_space[i]);
@@ -2024,7 +2024,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
     err = H5Fflush(file_id, H5F_SCOPE_GLOBAL);
     VRFY((err >= 0), "H5Fflush(2) failed.\n");
 
@@ -2038,7 +2038,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: writing large attributes.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: writing large attributes.\n", mpi_rank, fcn_name);
 
     lg_att_size[0] = (hsize_t)(LARGE_ATTR_SIZE);
 
@@ -2072,7 +2072,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
     err = H5Fflush(file_id, H5F_SCOPE_GLOBAL);
     VRFY((err >= 0), "H5Fflush(3) failed.\n");
 
@@ -2086,7 +2086,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: writing different large attributes.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: writing different large attributes.\n", mpi_rank, fcn_name);
 
     for (j = 0; j < LARGE_ATTR_SIZE; j++) {
         lg_att[j] = (double)(j + 2);
@@ -2106,7 +2106,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      * flush the metadata cache again
      */
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: flushing metadata cache.\n", mpi_rank, fcn_name);
     err = H5Fflush(file_id, H5F_SCOPE_GLOBAL);
     VRFY((err >= 0), "H5Fflush(3) failed.\n");
 
@@ -2122,7 +2122,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: closing large attr ids and spaces .\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: closing large attr ids and spaces .\n", mpi_rank, fcn_name);
 
     for (i = 0; i < NUM_DATA_SETS; i++) {
 
@@ -2137,7 +2137,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: closing datasets .\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: closing datasets .\n", mpi_rank, fcn_name);
 
     for (i = 0; i < NUM_DATA_SETS; i++) {
         err = H5Dclose(dataset[i]);
@@ -2149,7 +2149,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: closing dxpl .\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: closing dxpl .\n", mpi_rank, fcn_name);
 
     err = H5Pclose(dxpl_id);
     VRFY((err >= 0), "H5Pclose(dxpl_id) failed.\n");
@@ -2159,7 +2159,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
      */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: closing file.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: closing file.\n", mpi_rank, fcn_name);
 
     err = H5Fclose(file_id);
     VRFY((err >= 0), "H5Fclose(1) failed");
@@ -2176,7 +2176,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm)
     VRFY((MPI_SUCCESS == mrc), "Reader_check failed");
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
 
     return;
 
@@ -2251,7 +2251,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
              */
 
             if (verbose)
-                HDfprintf(stdout, "%0d:%s: Setting up property list.\n", mpi_rank, fcn_name);
+                fprintf(stdout, "%0d:%s: Setting up property list.\n", mpi_rank, fcn_name);
 
             fapl_id = H5Pcreate(H5P_FILE_ACCESS);
             VRFY((fapl_id != -1), "H5Pcreate(H5P_FILE_ACCESS) failed");
@@ -2263,7 +2263,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
              */
 
             if (verbose)
-                HDfprintf(stdout, "%0d:%s: Re-open file \"%s\".\n", mpi_rank, fcn_name, filename);
+                fprintf(stdout, "%0d:%s: Re-open file \"%s\".\n", mpi_rank, fcn_name, filename);
 
             file_id = H5Fopen(filename, H5F_ACC_RDONLY, fapl_id);
             VRFY((file_id >= 0), "H5Fopen() failed");
@@ -2277,7 +2277,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                  *=====================================================*/
 
                 if (verbose)
-                    HDfprintf(stdout, "%0d:%s: opening the datasets.\n", mpi_rank, fcn_name);
+                    fprintf(stdout, "%0d:%s: opening the datasets.\n", mpi_rank, fcn_name);
 
                 for (i = 0; i < NUM_DATA_SETS; i++) {
                     dataset[i] = -1;
@@ -2295,7 +2295,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                  */
 
                 if (verbose)
-                    HDfprintf(stdout, "%0d:%s: Setting up dxpl.\n", mpi_rank, fcn_name);
+                    fprintf(stdout, "%0d:%s: Setting up dxpl.\n", mpi_rank, fcn_name);
 
                 dxpl_id = H5Pcreate(H5P_DATASET_XFER);
                 VRFY((dxpl_id != -1), "H5Pcreate(H5P_DATASET_XFER) failed.\n");
@@ -2307,7 +2307,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                  */
 
                 if (verbose)
-                    HDfprintf(stdout, "%0d:%s: Reading datasets.\n", mpi_rank, fcn_name);
+                    fprintf(stdout, "%0d:%s: Reading datasets.\n", mpi_rank, fcn_name);
 
                 disk_count[0] = (hsize_t)(LOCAL_DATA_SIZE);
                 disk_start[0] = (hsize_t)(LOCAL_DATA_SIZE * mpi_rank);
@@ -2337,10 +2337,10 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                     /* compare read data with expected data */
                     for (j = 0; j < LOCAL_DATA_SIZE; j++)
                         if (!H5_DBL_ABS_EQUAL(data_read[j], data[j])) {
-                            HDfprintf(stdout,
-                                      "%0d:%s: Reading datasets value failed in "
-                                      "Dataset %d, at position %d: expect %f, got %f.\n",
-                                      mpi_rank, fcn_name, i, j, data[j], data_read[j]);
+                            fprintf(stdout,
+                                    "%0d:%s: Reading datasets value failed in "
+                                    "Dataset %d, at position %d: expect %f, got %f.\n",
+                                    mpi_rank, fcn_name, i, j, data[j], data_read[j]);
                             nerrors++;
                         }
                     for (j = 0; j < LOCAL_DATA_SIZE; j++)
@@ -2352,7 +2352,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                  */
 
                 if (verbose)
-                    HDfprintf(stdout, "%0d:%s: closing dataspaces.\n", mpi_rank, fcn_name);
+                    fprintf(stdout, "%0d:%s: closing dataspaces.\n", mpi_rank, fcn_name);
 
                 for (i = 0; i < NUM_DATA_SETS; i++) {
                     err = H5Sclose(disk_space[i]);
@@ -2372,7 +2372,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
 
             if (steps >= 2) {
                 if (verbose)
-                    HDfprintf(stdout, "%0d:%s: reading attributes.\n", mpi_rank, fcn_name);
+                    fprintf(stdout, "%0d:%s: reading attributes.\n", mpi_rank, fcn_name);
 
                 for (j = 0; j < LOCAL_DATA_SIZE; j++) {
                     att[j] = (double)(j + 1);
@@ -2388,8 +2388,8 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                     tri_err = H5Tequal(att_type, H5T_NATIVE_DOUBLE);
                     VRFY((tri_err >= 0), "H5Tequal failed.\n");
                     if (tri_err == 0) {
-                        HDfprintf(stdout, "%0d:%s: Mismatched Attribute type of Dataset %d.\n", mpi_rank,
-                                  fcn_name, i);
+                        fprintf(stdout, "%0d:%s: Mismatched Attribute type of Dataset %d.\n", mpi_rank,
+                                fcn_name, i);
                         nerrors++;
                     }
                     else {
@@ -2399,10 +2399,10 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                         /* compare read attribute data with expected data */
                         for (j = 0; j < LOCAL_DATA_SIZE; j++)
                             if (!H5_DBL_ABS_EQUAL(att_read[j], att[j])) {
-                                HDfprintf(stdout,
-                                          "%0d:%s: Mismatched attribute data read in Dataset %d, at position "
-                                          "%d: expect %f, got %f.\n",
-                                          mpi_rank, fcn_name, i, j, att[j], att_read[j]);
+                                fprintf(stdout,
+                                        "%0d:%s: Mismatched attribute data read in Dataset %d, at position "
+                                        "%d: expect %f, got %f.\n",
+                                        mpi_rank, fcn_name, i, j, att[j], att_read[j]);
                                 nerrors++;
                             }
                         for (j = 0; j < LOCAL_DATA_SIZE; j++) {
@@ -2425,7 +2425,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
 
             if (steps >= 3) {
                 if (verbose)
-                    HDfprintf(stdout, "%0d:%s: reading large attributes.\n", mpi_rank, fcn_name);
+                    fprintf(stdout, "%0d:%s: reading large attributes.\n", mpi_rank, fcn_name);
 
                 for (j = 0; j < LARGE_ATTR_SIZE; j++) {
                     lg_att[j] = (steps == 3) ? (double)(j + 1) : (double)(j + 2);
@@ -2439,8 +2439,8 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                     tri_err = H5Tequal(lg_att_type[i], H5T_NATIVE_DOUBLE);
                     VRFY((tri_err >= 0), "H5Tequal failed.\n");
                     if (tri_err == 0) {
-                        HDfprintf(stdout, "%0d:%s: Mismatched Large attribute type of Dataset %d.\n",
-                                  mpi_rank, fcn_name, i);
+                        fprintf(stdout, "%0d:%s: Mismatched Large attribute type of Dataset %d.\n", mpi_rank,
+                                fcn_name, i);
                         nerrors++;
                     }
                     else {
@@ -2450,10 +2450,10 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
                         /* compare read attribute data with expected data */
                         for (j = 0; j < LARGE_ATTR_SIZE; j++)
                             if (!H5_DBL_ABS_EQUAL(lg_att_read[j], lg_att[j])) {
-                                HDfprintf(stdout,
-                                          "%0d:%s: Mismatched large attribute data read in Dataset %d, at "
-                                          "position %d: expect %f, got %f.\n",
-                                          mpi_rank, fcn_name, i, j, lg_att[j], lg_att_read[j]);
+                                fprintf(stdout,
+                                        "%0d:%s: Mismatched large attribute data read in Dataset %d, at "
+                                        "position %d: expect %f, got %f.\n",
+                                        mpi_rank, fcn_name, i, j, lg_att[j], lg_att_read[j]);
                                 nerrors++;
                             }
                         for (j = 0; j < LARGE_ATTR_SIZE; j++) {
@@ -2487,7 +2487,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
              */
 
             if (verbose)
-                HDfprintf(stdout, "%0d:%s: closing datasets again.\n", mpi_rank, fcn_name);
+                fprintf(stdout, "%0d:%s: closing datasets again.\n", mpi_rank, fcn_name);
 
             for (i = 0; i < NUM_DATA_SETS; i++) {
                 if (dataset[i] >= 0) {
@@ -2501,7 +2501,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
              */
 
             if (verbose)
-                HDfprintf(stdout, "%0d:%s: closing dxpl .\n", mpi_rank, fcn_name);
+                fprintf(stdout, "%0d:%s: closing dxpl .\n", mpi_rank, fcn_name);
 
             err = H5Pclose(dxpl_id);
             VRFY((err >= 0), "H5Pclose(dxpl_id) failed.\n");
@@ -2510,7 +2510,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
              * Close the file
              */
             if (verbose)
-                HDfprintf(stdout, "%0d:%s: closing file again.\n", mpi_rank, fcn_name);
+                fprintf(stdout, "%0d:%s: closing file again.\n", mpi_rank, fcn_name);
             err = H5Fclose(file_id);
             VRFY((err >= 0), "H5Fclose(1) failed");
 
@@ -2519,7 +2519,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm)
     } /* end while(1) */
 
     if (verbose)
-        HDfprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
+        fprintf(stdout, "%0d:%s: Done.\n", mpi_rank, fcn_name);
 
     return;
 } /* rr_obj_hdr_flush_confusion_reader() */
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index d0400ae..4dd6a95 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -54,7 +54,7 @@ test_mpio_overlap_writes(char *filename)
     MPI_Status     mpi_stat;
 
     if (VERBOSE_MED)
-        HDprintf("MPIO independent overlapping writes test on file %s\n", filename);
+        printf("MPIO independent overlapping writes test on file %s\n", filename);
 
     nerrs = 0;
     /* set up MPI parameters */
@@ -64,15 +64,15 @@ test_mpio_overlap_writes(char *filename)
     /* Need at least 2 processes */
     if (mpi_size < 2) {
         if (MAINPROCESS)
-            HDprintf("Need at least 2 processes to run MPIO test.\n");
-        HDprintf(" -SKIP- \n");
+            printf("Need at least 2 processes to run MPIO test.\n");
+        printf(" -SKIP- \n");
         return 0;
     }
 
     bufsize = 4093; /* use some prime number for size */
     if (NULL == (buf = HDmalloc((size_t)bufsize))) {
         if (MAINPROCESS)
-            HDprintf("couldn't allocate buffer\n");
+            printf("couldn't allocate buffer\n");
         return 1;
     }
 
@@ -142,12 +142,12 @@ test_mpio_overlap_writes(char *filename)
                 unsigned char expected;
                 expected = (unsigned char)(mpi_off + i);
                 if ((expected != buf[i]) && (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED)) {
-                    HDprintf("proc %d: found data error at [%ld], expect %u, got %u\n", mpi_rank,
-                             (long)(mpi_off + i), expected, buf[i]);
+                    printf("proc %d: found data error at [%ld], expect %u, got %u\n", mpi_rank,
+                           (long)(mpi_off + i), expected, buf[i]);
                 }
             }
             if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-                HDprintf("proc %d: [more errors ...]\n", mpi_rank);
+                printf("proc %d: [more errors ...]\n", mpi_rank);
 
             nerrs += vrfyerrs;
         }
@@ -212,7 +212,7 @@ test_mpio_gb_file(char *filename)
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
     if (VERBOSE_MED)
-        HDprintf("MPI_Offset range test\n");
+        printf("MPI_Offset range test\n");
 
     /* figure out the signness and sizeof MPI_Offset */
     mpi_off           = 0;
@@ -224,11 +224,11 @@ test_mpio_gb_file(char *filename)
      * sizes.
      */
     if (MAINPROCESS) { /* only process 0 needs to check it*/
-        HDprintf("MPI_Offset is %s %d bytes integral type\n", is_signed ? "signed" : "unsigned",
-                 (int)sizeof(MPI_Offset));
+        printf("MPI_Offset is %s %d bytes integral type\n", is_signed ? "signed" : "unsigned",
+               (int)sizeof(MPI_Offset));
         if (sizeof_mpi_offset <= 4 && is_signed) {
-            HDprintf("Skipped 2GB range test "
-                     "because MPI_Offset cannot support it\n");
+            printf("Skipped 2GB range test "
+                   "because MPI_Offset cannot support it\n");
         }
         else {
             /* verify correctness of assigning 2GB sizes */
@@ -249,8 +249,8 @@ test_mpio_gb_file(char *filename)
         }
 
         if (sizeof_mpi_offset <= 4) {
-            HDprintf("Skipped 4GB range test "
-                     "because MPI_Offset cannot support it\n");
+            printf("Skipped 4GB range test "
+                   "because MPI_Offset cannot support it\n");
         }
         else {
             /* verify correctness of assigning 4GB sizes */
@@ -275,11 +275,11 @@ test_mpio_gb_file(char *filename)
      * Verify if we can write to a file of multiple GB sizes.
      */
     if (VERBOSE_MED)
-        HDprintf("MPIO GB file test %s\n", filename);
+        printf("MPIO GB file test %s\n", filename);
 
     if (sizeof_mpi_offset <= 4) {
-        HDprintf("Skipped GB file range test "
-                 "because MPI_Offset cannot support it\n");
+        printf("Skipped GB file range test "
+               "because MPI_Offset cannot support it\n");
     }
     else {
         buf = (char *)HDmalloc(MB);
@@ -294,7 +294,7 @@ test_mpio_gb_file(char *filename)
         mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_CREATE | MPI_MODE_RDWR, info, &fh);
         VRFY((mrc == MPI_SUCCESS), "MPI_FILE_OPEN");
 
-        HDprintf("MPIO GB file write test %s\n", filename);
+        printf("MPIO GB file write test %s\n", filename);
 
         /* instead of writing every bytes of the file, we will just write
          * some data around the 2 and 4 GB boundaries.  That should cover
@@ -306,13 +306,12 @@ test_mpio_gb_file(char *filename)
             for (i = ntimes - 2; i <= ntimes; i++) {
                 mpi_off = (i * mpi_size + mpi_rank) * (MPI_Offset)MB;
                 if (VERBOSE_MED)
-                    HDfprintf(stdout, "proc %d: write to mpi_off=%016llx, %lld\n", mpi_rank, mpi_off,
-                              mpi_off);
+                    fprintf(stdout, "proc %d: write to mpi_off=%016llx, %lld\n", mpi_rank, mpi_off, mpi_off);
                 /* set data to some trivial pattern for easy verification */
                 for (j = 0; j < MB; j++)
                     *(buf + j) = (int8_t)(i * mpi_size + mpi_rank);
                 if (VERBOSE_MED)
-                    HDfprintf(stdout, "proc %d: writing %d bytes at offset %lld\n", mpi_rank, MB, mpi_off);
+                    fprintf(stdout, "proc %d: writing %d bytes at offset %lld\n", mpi_rank, MB, mpi_off);
                 mrc = MPI_File_write_at(fh, mpi_off, buf, MB, MPI_BYTE, &mpi_stat);
                 INFO((mrc == MPI_SUCCESS), "GB size file write");
                 if (mrc != MPI_SUCCESS)
@@ -332,9 +331,9 @@ test_mpio_gb_file(char *filename)
          */
         /* open it again to verify the data written */
         /* but only if there was no write errors */
-        HDprintf("MPIO GB file read test %s\n", filename);
+        printf("MPIO GB file read test %s\n", filename);
         if (errors_sum(writerrs) > 0) {
-            HDprintf("proc %d: Skip read test due to previous write errors\n", mpi_rank);
+            printf("proc %d: Skip read test due to previous write errors\n", mpi_rank);
             goto finish;
         }
         mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY, info, &fh);
@@ -346,20 +345,19 @@ test_mpio_gb_file(char *filename)
             for (i = ntimes - 2; i <= ntimes; i++) {
                 mpi_off = (i * mpi_size + (mpi_size - mpi_rank - 1)) * (MPI_Offset)MB;
                 if (VERBOSE_MED)
-                    HDfprintf(stdout, "proc %d: read from mpi_off=%016llx, %lld\n", mpi_rank, mpi_off,
-                              mpi_off);
+                    fprintf(stdout, "proc %d: read from mpi_off=%016llx, %lld\n", mpi_rank, mpi_off, mpi_off);
                 mrc = MPI_File_read_at(fh, mpi_off, buf, MB, MPI_BYTE, &mpi_stat);
                 INFO((mrc == MPI_SUCCESS), "GB size file read");
                 expected = (int8_t)(i * mpi_size + (mpi_size - mpi_rank - 1));
                 vrfyerrs = 0;
                 for (j = 0; j < MB; j++) {
                     if ((*(buf + j) != expected) && (vrfyerrs++ < MAX_ERR_REPORT || VERBOSE_MED)) {
-                        HDprintf("proc %d: found data error at [%ld+%d], expect %d, got %d\n", mpi_rank,
-                                 (long)mpi_off, j, expected, *(buf + j));
+                        printf("proc %d: found data error at [%ld+%d], expect %d, got %d\n", mpi_rank,
+                               (long)mpi_off, j, expected, *(buf + j));
                     }
                 }
                 if (vrfyerrs > MAX_ERR_REPORT && !VERBOSE_MED)
-                    HDprintf("proc %d: [more errors ...]\n", mpi_rank);
+                    printf("proc %d: [more errors ...]\n", mpi_rank);
 
                 nerrs += vrfyerrs;
             }
@@ -376,7 +374,7 @@ test_mpio_gb_file(char *filename)
         mrc = MPI_Barrier(MPI_COMM_WORLD);
         VRFY((mrc == MPI_SUCCESS), "Sync before leaving test");
 
-        HDprintf("Test if MPI_File_get_size works correctly with %s\n", filename);
+        printf("Test if MPI_File_get_size works correctly with %s\n", filename);
 
         mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY, info, &fh);
         VRFY((mrc == MPI_SUCCESS), "");
@@ -423,7 +421,7 @@ finish:
  */
 
 #define DIMSIZE  32 /* Dimension size. */
-#define PRINTID  HDprintf("Proc %d: ", mpi_rank)
+#define PRINTID  printf("Proc %d: ", mpi_rank)
 #define USENONE  0
 #define USEATOM  1 /* request atomic I/O */
 #define USEFSYNC 2 /* request file_sync */
@@ -449,24 +447,24 @@ test_mpio_1wMr(char *filename, int special_request)
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
     if (MAINPROCESS && VERBOSE_MED) {
-        HDprintf("Testing one process writes, all processes read.\n");
-        HDprintf("Using %d processes accessing file %s\n", mpi_size, filename);
-        HDprintf("    (Filename can be specified via program argument)\n");
+        printf("Testing one process writes, all processes read.\n");
+        printf("Using %d processes accessing file %s\n", mpi_size, filename);
+        printf("    (Filename can be specified via program argument)\n");
     }
 
     /* show the hostname so that we can tell where the processes are running */
     if (VERBOSE_DEF) {
 #ifdef H5_HAVE_GETHOSTNAME
         if (HDgethostname(hostname, sizeof(hostname)) < 0) {
-            HDprintf("gethostname failed\n");
+            printf("gethostname failed\n");
             hostname[0] = '\0';
         }
 #else
-        HDprintf("gethostname unavailable\n");
+        printf("gethostname unavailable\n");
         hostname[0] = '\0';
 #endif
         PRINTID;
-        HDprintf("hostname=%s\n", hostname);
+        printf("hostname=%s\n", hostname);
     }
 
     /* Delete any old file in order to start anew. */
@@ -479,7 +477,7 @@ test_mpio_1wMr(char *filename, int special_request)
                                  &fh)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
         PRINTID;
-        HDprintf("MPI_File_open failed (%s)\n", mpi_err_str);
+        printf("MPI_File_open failed (%s)\n", mpi_err_str);
         return 1;
     }
 
@@ -491,29 +489,29 @@ test_mpio_1wMr(char *filename, int special_request)
         if ((mpi_err = MPI_File_get_atomicity(fh, &atomicity)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
             PRINTID;
-            HDprintf("MPI_File_get_atomicity failed (%s)\n", mpi_err_str);
+            printf("MPI_File_get_atomicity failed (%s)\n", mpi_err_str);
         }
         if (VERBOSE_HI)
-            HDprintf("Initial atomicity = %d\n", atomicity);
+            printf("Initial atomicity = %d\n", atomicity);
         if ((mpi_err = MPI_File_set_atomicity(fh, 1)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
             PRINTID;
-            HDprintf("MPI_File_set_atomicity failed (%s)\n", mpi_err_str);
+            printf("MPI_File_set_atomicity failed (%s)\n", mpi_err_str);
         }
         if ((mpi_err = MPI_File_get_atomicity(fh, &atomicity)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
             PRINTID;
-            HDprintf("MPI_File_get_atomicity failed (%s)\n", mpi_err_str);
+            printf("MPI_File_get_atomicity failed (%s)\n", mpi_err_str);
         }
         if (VERBOSE_HI)
-            HDprintf("After set_atomicity atomicity = %d\n", atomicity);
+            printf("After set_atomicity atomicity = %d\n", atomicity);
     }
 
     /* This barrier is not necessary but do it anyway. */
     MPI_Barrier(MPI_COMM_WORLD);
     if (VERBOSE_HI) {
         PRINTID;
-        HDprintf("between MPI_Barrier and MPI_File_write_at\n");
+        printf("between MPI_Barrier and MPI_File_write_at\n");
     }
 
     /* ==================================================
@@ -529,14 +527,14 @@ test_mpio_1wMr(char *filename, int special_request)
     if (mpi_rank == irank) {
         if (VERBOSE_HI) {
             PRINTID;
-            HDprintf("wrote %d bytes at %ld\n", DIMSIZE, (long)mpi_off);
+            printf("wrote %d bytes at %ld\n", DIMSIZE, (long)mpi_off);
         }
         if ((mpi_err = MPI_File_write_at(fh, mpi_off, writedata, DIMSIZE, MPI_BYTE, &mpi_stat)) !=
             MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
             PRINTID;
-            HDprintf("MPI_File_write_at offset(%ld), bytes (%d), failed (%s)\n", (long)mpi_off, DIMSIZE,
-                     mpi_err_str);
+            printf("MPI_File_write_at offset(%ld), bytes (%d), failed (%s)\n", (long)mpi_off, DIMSIZE,
+                   mpi_err_str);
             return 1;
         };
     };
@@ -546,7 +544,7 @@ test_mpio_1wMr(char *filename, int special_request)
     MPI_Bcast(&mpi_err, 1, MPI_INT, irank, MPI_COMM_WORLD);
     if (VERBOSE_HI) {
         PRINTID;
-        HDprintf("MPI_Bcast: mpi_err = %d\n", mpi_err);
+        printf("MPI_Bcast: mpi_err = %d\n", mpi_err);
     }
 
     if (special_request & USEFSYNC) {
@@ -555,19 +553,19 @@ test_mpio_1wMr(char *filename, int special_request)
          * should not need this.
          * ==================================================*/
         if (VERBOSE_HI)
-            HDprintf("Apply MPI_File_sync\n");
+            printf("Apply MPI_File_sync\n");
         /* call file_sync to force the write out */
         if ((mpi_err = MPI_File_sync(fh)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
             PRINTID;
-            HDprintf("MPI_File_sync failed (%s)\n", mpi_err_str);
+            printf("MPI_File_sync failed (%s)\n", mpi_err_str);
         }
         MPI_Barrier(MPI_COMM_WORLD);
         /* call file_sync to force the write out */
         if ((mpi_err = MPI_File_sync(fh)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
             PRINTID;
-            HDprintf("MPI_File_sync failed (%s)\n", mpi_err_str);
+            printf("MPI_File_sync failed (%s)\n", mpi_err_str);
         }
     }
 
@@ -576,7 +574,7 @@ test_mpio_1wMr(char *filename, int special_request)
     MPI_Barrier(MPI_COMM_WORLD);
     if (VERBOSE_HI) {
         PRINTID;
-        HDprintf("after MPI_Barrier\n");
+        printf("after MPI_Barrier\n");
     }
 
     /* ==================================================
@@ -587,15 +585,15 @@ test_mpio_1wMr(char *filename, int special_request)
     if ((mpi_err = MPI_File_read_at(fh, mpi_off, readdata, DIMSIZE, MPI_BYTE, &mpi_stat)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
         PRINTID;
-        HDprintf("MPI_File_read_at offset(%ld), bytes (%d), failed (%s)\n", (long)mpi_off, DIMSIZE,
-                 mpi_err_str);
+        printf("MPI_File_read_at offset(%ld), bytes (%d), failed (%s)\n", (long)mpi_off, DIMSIZE,
+               mpi_err_str);
         return 1;
     };
     for (i = 0; i < DIMSIZE; i++) {
         expect_val = (uint8_t)(irank * DIMSIZE + i);
         if (readdata[i] != expect_val) {
             PRINTID;
-            HDprintf("read data[%d:%d] got %02x, expect %02x\n", irank, i, readdata[i], expect_val);
+            printf("read data[%d:%d] got %02x, expect %02x\n", irank, i, readdata[i], expect_val);
             nerrs++;
         }
     }
@@ -604,7 +602,7 @@ test_mpio_1wMr(char *filename, int special_request)
 
     if (VERBOSE_HI) {
         PRINTID;
-        HDprintf("%d data errors detected\n", nerrs);
+        printf("%d data errors detected\n", nerrs);
     }
 
     mpi_err = MPI_Barrier(MPI_COMM_WORLD);
@@ -658,7 +656,7 @@ test_mpio_1wMr(char *filename, int special_request)
  2. This test will verify whether the complicated derived datatype is working on
  the current platform.
 
- If this bug has been fixed in the previous not-working package, this test will issue a HDprintf message to
+ If this bug has been fixed in the previous not-working package, this test will issue a printf message to
  tell the developer to change the configuration specific file of HDF5 so that we can change our
  configurationsetting to support collective IO for irregular selections.
 
@@ -699,7 +697,7 @@ test_mpio_derived_dtype(char *filename)
     if ((mpi_err = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDWR | MPI_MODE_CREATE, MPI_INFO_NULL,
                                  &fh)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_File_open failed (%s)\n", mpi_err_str);
+        printf("MPI_File_open failed (%s)\n", mpi_err_str);
         return 1;
     }
 
@@ -712,13 +710,13 @@ test_mpio_derived_dtype(char *filename)
 
     if ((mpi_err = MPI_Type_create_hindexed(count, blocklens, offsets, MPI_BYTE, &filetype)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
+        printf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_Type_commit(&filetype)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_Type_commit failed (%s)\n", mpi_err_str);
+        printf("MPI_Type_commit failed (%s)\n", mpi_err_str);
         return 1;
     }
 
@@ -728,13 +726,13 @@ test_mpio_derived_dtype(char *filename)
     if ((mpi_err = MPI_Type_create_hindexed(count, blocklens, offsets, MPI_BYTE, &filetypenew)) !=
         MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
+        printf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_Type_commit(&filetypenew)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_Type_commit failed (%s)\n", mpi_err_str);
+        printf("MPI_Type_commit failed (%s)\n", mpi_err_str);
         return 1;
     }
 
@@ -749,67 +747,67 @@ test_mpio_derived_dtype(char *filename)
     if ((mpi_err = MPI_Type_create_struct(outcount, adv_blocklens, adv_disp, bas_filetype, &adv_filetype)) !=
         MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_Type_create_struct failed (%s)\n", mpi_err_str);
+        printf("MPI_Type_create_struct failed (%s)\n", mpi_err_str);
         return 1;
     }
     if ((mpi_err = MPI_Type_commit(&adv_filetype)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_Type_commit failed (%s)\n", mpi_err_str);
+        printf("MPI_Type_commit failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_File_set_view(fh, disp, etype, adv_filetype, "native", MPI_INFO_NULL)) !=
         MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_File_set_view failed (%s)\n", mpi_err_str);
+        printf("MPI_File_set_view failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_File_write(fh, buf, 3, MPI_BYTE, &Status)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_File_write failed (%s)\n", mpi_err_str);
+        printf("MPI_File_write failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_File_close(&fh)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_File_close failed (%s)\n", mpi_err_str);
+        printf("MPI_File_close failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_Type_free(&filetype)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_Type_free failed (%s)\n", mpi_err_str);
+        printf("MPI_Type_free failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_Type_free(&adv_filetype)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_Type_free failed (%s)\n", mpi_err_str);
+        printf("MPI_Type_free failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_Type_free(&filetypenew)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_Type_free failed (%s)\n", mpi_err_str);
+        printf("MPI_Type_free failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDONLY, MPI_INFO_NULL, &fh)) !=
         MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_File_open failed (%s)\n", mpi_err_str);
+        printf("MPI_File_open failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     if ((mpi_err = MPI_File_set_view(fh, 0, MPI_BYTE, MPI_BYTE, "native", MPI_INFO_NULL)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_File_set_view failed (%s)\n", mpi_err_str);
+        printf("MPI_File_set_view failed (%s)\n", mpi_err_str);
         return 1;
     }
     if ((mpi_err = MPI_File_read(fh, outbuf, 3, MPI_BYTE, &Status)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_File_read failed (%s)\n", mpi_err_str);
+        printf("MPI_File_read failed (%s)\n", mpi_err_str);
         return 1;
     }
 
@@ -818,9 +816,9 @@ test_mpio_derived_dtype(char *filename)
     }
     else {
         /*      if(mpi_rank == 0) {
-        HDprintf("complicated derived datatype is NOT working at this platform\n");
-        HDprintf("go back to hdf5/config and find the corresponding\n");
-        HDprintf("configure-specific file and change ?????\n");
+        printf("complicated derived datatype is NOT working at this platform\n");
+        printf("go back to hdf5/config and find the corresponding\n");
+        printf("configure-specific file and change ?????\n");
         }
         */
         retcode = -1;
@@ -828,15 +826,15 @@ test_mpio_derived_dtype(char *filename)
 
     if ((mpi_err = MPI_File_close(&fh)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_File_close failed (%s)\n", mpi_err_str);
+        printf("MPI_File_close failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     mpi_err = MPI_Barrier(MPI_COMM_WORLD);
     if (retcode == -1) {
         if (mpi_rank == 0) {
-            HDprintf("Complicated derived datatype is NOT working at this platform\n");
-            HDprintf(" Please report to help@hdfgroup.org about this problem.\n");
+            printf("Complicated derived datatype is NOT working at this platform\n");
+            printf(" Please report to help@hdfgroup.org about this problem.\n");
         }
         retcode = 1;
     }
@@ -861,7 +859,7 @@ test_mpio_derived_dtype(char *filename)
  2. This test will fail with the MPI-IO package that doesn't support this. For example,
  mpich 1.2.6.
 
- If this bug has been fixed in the previous not-working package, this test will issue a HDprintf message to
+ If this bug has been fixed in the previous not-working package, this test will issue a printf message to
  tell the developer to change the configuration specific file of HDF5 so that we can change our
  configurationsetting to support special collective IO; currently only special collective IO.
 
@@ -913,25 +911,25 @@ test_mpio_special_collective(char *filename)
     if (count != 0) {
         if ((mpi_err = MPI_Type_create_hindexed(2, blocklens, offsets, etype, &filetype)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-            HDprintf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
+            printf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
             return 1;
         } /* end if */
 
         if ((mpi_err = MPI_Type_commit(&filetype)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-            HDprintf("MPI_Type_commit failed (%s)\n", mpi_err_str);
+            printf("MPI_Type_commit failed (%s)\n", mpi_err_str);
             return 1;
         } /* end if */
 
         if ((mpi_err = MPI_Type_create_hindexed(2, blocklens, offsets, etype, &buftype)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-            HDprintf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
+            printf("MPI_Type_contiguous failed (%s)\n", mpi_err_str);
             return 1;
         } /* end if */
 
         if ((mpi_err = MPI_Type_commit(&buftype)) != MPI_SUCCESS) {
             MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-            HDprintf("MPI_Type_commit failed (%s)\n", mpi_err_str);
+            printf("MPI_Type_commit failed (%s)\n", mpi_err_str);
             return 1;
         } /* end if */
     }     /* end if */
@@ -940,7 +938,7 @@ test_mpio_special_collective(char *filename)
     if ((mpi_err = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_RDWR | MPI_MODE_CREATE, MPI_INFO_NULL,
                                  &fh)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_File_open failed (%s)\n", mpi_err_str);
+        printf("MPI_File_open failed (%s)\n", mpi_err_str);
         return 1;
     } /* end if */
 
@@ -952,13 +950,13 @@ test_mpio_special_collective(char *filename)
     if ((mpi_err = MPI_File_set_view(fh, mpi_off, MPI_BYTE, filetype, filerep, MPI_INFO_NULL)) !=
         MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_File_set_view failed (%s)\n", mpi_err_str);
+        printf("MPI_File_set_view failed (%s)\n", mpi_err_str);
         return 1;
     } /* end if */
 
     if (filetype != MPI_BYTE && (mpi_err = MPI_Type_free(&filetype)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_Type_free failed (%s)\n", mpi_err_str);
+        printf("MPI_Type_free failed (%s)\n", mpi_err_str);
         return 1;
     }
 
@@ -966,21 +964,21 @@ test_mpio_special_collective(char *filename)
     if ((mpi_err = MPI_File_write_at_all(fh, mpi_off, writedata, bufcount, buftype, &mpi_stat)) !=
         MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_File_write_at offset(%ld), bytes (%d), failed (%s)\n", (long)mpi_off, bufcount,
-                 mpi_err_str);
+        printf("MPI_File_write_at offset(%ld), bytes (%d), failed (%s)\n", (long)mpi_off, bufcount,
+               mpi_err_str);
         return 1;
     } /* end if */
 
     if (buftype != MPI_BYTE && (mpi_err = MPI_Type_free(&buftype)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_Type_free failed (%s)\n", mpi_err_str);
+        printf("MPI_Type_free failed (%s)\n", mpi_err_str);
         return 1;
     }
 
     /* Close the file */
     if ((mpi_err = MPI_File_close(&fh)) != MPI_SUCCESS) {
         MPI_Error_string(mpi_err, mpi_err_str, &mpi_err_strlen);
-        HDprintf("MPI_File_close failed. \n");
+        printf("MPI_File_close failed. \n");
         return 1;
     } /* end if */
 
@@ -988,8 +986,8 @@ test_mpio_special_collective(char *filename)
     mpi_err = MPI_Barrier(MPI_COMM_WORLD);
     if (retcode != 0) {
         if (mpi_rank == 0) {
-            HDprintf("special collective IO is NOT working at this platform\n");
-            HDprintf(" Please report to help@hdfgroup.org about this problem.\n");
+            printf("special collective IO is NOT working at this platform\n");
+            printf(" Please report to help@hdfgroup.org about this problem.\n");
         } /* end if */
         retcode = 1;
     } /* end if */
@@ -1047,15 +1045,15 @@ parse_options(int argc, char **argv)
 
         for (i = 0; i < n; i++)
             if (h5_fixname(FILENAME[i], plist, filenames[i], sizeof(filenames[i])) == NULL) {
-                HDprintf("h5_fixname failed\n");
+                printf("h5_fixname failed\n");
                 nerrors++;
                 return (1);
             }
         H5Pclose(plist);
         if (VERBOSE_MED) {
-            HDprintf("Test filenames are:\n");
+            printf("Test filenames are:\n");
             for (i = 0; i < n; i++)
-                HDprintf("    %s\n", filenames[i]);
+                printf("    %s\n", filenames[i]);
         }
     }
 
@@ -1068,10 +1066,10 @@ parse_options(int argc, char **argv)
 static void
 usage(void)
 {
-    HDprintf("Usage: t_mpi [-v<verbosity>] [-f <prefix>]\n");
-    HDprintf("\t-v<verbosity>\tset verbose level (0-9,l,m,h)\n");
-    HDprintf("\t-f <prefix>\tfilename prefix\n");
-    HDprintf("\n");
+    printf("Usage: t_mpi [-v<verbosity>] [-f <prefix>]\n");
+    printf("\t-v<verbosity>\tset verbose level (0-9,l,m,h)\n");
+    printf("\t-f <prefix>\tfilename prefix\n");
+    printf("\n");
 }
 
 /*
@@ -1101,7 +1099,7 @@ main(int argc, char **argv)
      * calls.  By then, MPI calls may not work.
      */
     if (H5dont_atexit() < 0) {
-        HDprintf("Failed to turn off atexit processing. Continue.\n");
+        printf("Failed to turn off atexit processing. Continue.\n");
     };
     H5open();
     if (parse_options(argc, argv) != 0) {
@@ -1111,9 +1109,9 @@ main(int argc, char **argv)
     }
 
     if (MAINPROCESS) {
-        HDprintf("===================================\n");
-        HDprintf("MPI functionality tests\n");
-        HDprintf("===================================\n");
+        printf("===================================\n");
+        printf("MPI functionality tests\n");
+        printf("===================================\n");
     }
 
     if (VERBOSE_MED)
@@ -1132,7 +1130,7 @@ main(int argc, char **argv)
     ret_code = test_mpio_1wMr(filenames[0], USENONE);
     ret_code = errors_sum(ret_code);
     if (mpi_rank == 0 && ret_code > 0) {
-        HDprintf("***FAILED with %d total errors\n", ret_code);
+        printf("***FAILED with %d total errors\n", ret_code);
         nerrors += ret_code;
     }
 
@@ -1143,7 +1141,7 @@ main(int argc, char **argv)
         ret_code = test_mpio_1wMr(filenames[0], USEATOM);
         ret_code = errors_sum(ret_code);
         if (mpi_rank == 0 && ret_code > 0) {
-            HDprintf("***FAILED with %d total errors\n", ret_code);
+            printf("***FAILED with %d total errors\n", ret_code);
             nerrors += ret_code;
         }
 
@@ -1151,7 +1149,7 @@ main(int argc, char **argv)
         ret_code = test_mpio_1wMr(filenames[0], USEFSYNC);
         ret_code = errors_sum(ret_code);
         if (mpi_rank == 0 && ret_code > 0) {
-            HDprintf("***FAILED with %d total errors\n", ret_code);
+            printf("***FAILED with %d total errors\n", ret_code);
             nerrors += ret_code;
         }
     }
@@ -1164,12 +1162,12 @@ main(int argc, char **argv)
     ret_code = test_mpio_gb_file(filenames[0]);
     ret_code = errors_sum(ret_code);
     if (mpi_rank == 0 && ret_code > 0) {
-        HDprintf("***FAILED with %d total errors\n", ret_code);
+        printf("***FAILED with %d total errors\n", ret_code);
         nerrors += ret_code;
     }
 #else
     if (mpi_rank == 0)
-        HDprintf(" will be skipped on Windows (JIRA HDDFV-8064)\n");
+        printf(" will be skipped on Windows (JIRA HDDFV-8064)\n");
 #endif
 
     /*=======================================
@@ -1179,7 +1177,7 @@ main(int argc, char **argv)
     ret_code = test_mpio_overlap_writes(filenames[0]);
     ret_code = errors_sum(ret_code);
     if (mpi_rank == 0 && ret_code > 0) {
-        HDprintf("***FAILED with %d total errors\n", ret_code);
+        printf("***FAILED with %d total errors\n", ret_code);
         nerrors += ret_code;
     }
 
@@ -1190,7 +1188,7 @@ main(int argc, char **argv)
     ret_code = test_mpio_derived_dtype(filenames[0]);
     ret_code = errors_sum(ret_code);
     if (mpi_rank == 0 && ret_code > 0) {
-        HDprintf("***FAILED with %d total errors\n", ret_code);
+        printf("***FAILED with %d total errors\n", ret_code);
         nerrors += ret_code;
     }
 
@@ -1200,7 +1198,7 @@ main(int argc, char **argv)
     if (mpi_size < 4) {
         MPI_BANNER("MPIO special collective io test SKIPPED.");
         if (mpi_rank == 0)
-            HDprintf("This test needs at least four processes to run.\n");
+            printf("This test needs at least four processes to run.\n");
         ret_code = 0;
         goto sc_finish;
     } /* end if */
@@ -1211,7 +1209,7 @@ main(int argc, char **argv)
 sc_finish:
     ret_code = errors_sum(ret_code);
     if (mpi_rank == 0 && ret_code > 0) {
-        HDprintf("***FAILED with %d total errors\n", ret_code);
+        printf("***FAILED with %d total errors\n", ret_code);
         nerrors += ret_code;
     }
 
@@ -1221,14 +1219,14 @@ finish:
      */
     MPI_Barrier(MPI_COMM_WORLD);
     if (MAINPROCESS) { /* only process 0 reports */
-        HDprintf("===================================\n");
+        printf("===================================\n");
         if (nerrors) {
-            HDprintf("***MPI tests detected %d errors***\n", nerrors);
+            printf("***MPI tests detected %d errors***\n", nerrors);
         }
         else {
-            HDprintf("MPI tests finished with no errors\n");
+            printf("MPI tests finished with no errors\n");
         }
-        HDprintf("===================================\n");
+        printf("===================================\n");
     }
 
     /* turn off alarm */
diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c
index f7131d5..d5a8d83 100644
--- a/testpar/t_pflush1.c
+++ b/testpar/t_pflush1.c
@@ -212,8 +212,8 @@ main(int argc, char *argv[])
 error:
     HDfflush(stdout);
     HDfflush(stderr);
-    HDprintf("*** ERROR ***\n");
-    HDprintf("THERE WAS A REAL ERROR IN t_pflush1.\n");
+    printf("*** ERROR ***\n");
+    printf("THERE WAS A REAL ERROR IN t_pflush1.\n");
     HDfflush(stdout);
 
     if (data_g)
diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c
index 4f0ffe9..f12168a 100644
--- a/testpar/t_pflush2.c
+++ b/testpar/t_pflush2.c
@@ -78,9 +78,9 @@ check_test_file(char *name, size_t name_length, hid_t fapl_id)
             val = (int)(i + (i * j) + j);
             if (data_g[(i * 100) + j] != val) {
                 H5_FAILED();
-                HDprintf("    data_g[%lu][%lu] = %d\n", (unsigned long)i, (unsigned long)j,
-                         data_g[(i * 100) + j]);
-                HDprintf("    should be %d\n", val);
+                printf("    data_g[%lu][%lu] = %d\n", (unsigned long)i, (unsigned long)j,
+                       data_g[(i * 100) + j]);
+                printf("    should be %d\n", val);
             }
         }
     }
diff --git a/testpar/t_ph5basic.c b/testpar/t_ph5basic.c
index cef5d12..697b6e9 100644
--- a/testpar/t_ph5basic.c
+++ b/testpar/t_ph5basic.c
@@ -46,13 +46,13 @@ test_fapl_mpio_dup(void)
     int      nkeys, nkeys_tmp;
 
     if (VERBOSE_MED)
-        HDprintf("Verify fapl_mpio duplicates communicator and INFO objects\n");
+        printf("Verify fapl_mpio duplicates communicator and INFO objects\n");
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
     if (VERBOSE_MED)
-        HDprintf("rank/size of MPI_COMM_WORLD are %d/%d\n", mpi_rank, mpi_size);
+        printf("rank/size of MPI_COMM_WORLD are %d/%d\n", mpi_rank, mpi_size);
 
     /* Create a new communicator that has the same processes as MPI_COMM_WORLD.
      * Use MPI_Comm_split because it is simpler than MPI_Comm_create
@@ -62,7 +62,7 @@ test_fapl_mpio_dup(void)
     MPI_Comm_size(comm, &mpi_size_old);
     MPI_Comm_rank(comm, &mpi_rank_old);
     if (VERBOSE_MED)
-        HDprintf("rank/size of comm are %d/%d\n", mpi_rank_old, mpi_size_old);
+        printf("rank/size of comm are %d/%d\n", mpi_rank_old, mpi_size_old);
 
     /* create a new INFO object with some trivial information. */
     mrc = MPI_Info_create(&info);
@@ -99,7 +99,7 @@ test_fapl_mpio_dup(void)
     MPI_Comm_size(comm_tmp, &mpi_size_tmp);
     MPI_Comm_rank(comm_tmp, &mpi_rank_tmp);
     if (VERBOSE_MED)
-        HDprintf("After H5Pget_fapl_mpio: rank/size of comm are %d/%d\n", mpi_rank_tmp, mpi_size_tmp);
+        printf("After H5Pget_fapl_mpio: rank/size of comm are %d/%d\n", mpi_rank_tmp, mpi_size_tmp);
     VRFY((mpi_size_tmp == mpi_size), "MPI_Comm_size");
     VRFY((mpi_rank_tmp == mpi_rank), "MPI_Comm_rank");
     if (MPI_INFO_NULL != info_tmp) {
@@ -146,7 +146,7 @@ test_fapl_mpio_dup(void)
     MPI_Comm_size(comm_tmp, &mpi_size_tmp);
     MPI_Comm_rank(comm_tmp, &mpi_rank_tmp);
     if (VERBOSE_MED)
-        HDprintf("After second H5Pget_fapl_mpio: rank/size of comm are %d/%d\n", mpi_rank_tmp, mpi_size_tmp);
+        printf("After second H5Pget_fapl_mpio: rank/size of comm are %d/%d\n", mpi_rank_tmp, mpi_size_tmp);
     VRFY((mpi_size_tmp == mpi_size), "MPI_Comm_size");
     VRFY((mpi_rank_tmp == mpi_rank), "MPI_Comm_rank");
     if (MPI_INFO_NULL != info_tmp) {
@@ -165,7 +165,7 @@ test_fapl_mpio_dup(void)
     MPI_Comm_size(comm_tmp, &mpi_size_tmp);
     MPI_Comm_rank(comm_tmp, &mpi_rank_tmp);
     if (VERBOSE_MED)
-        HDprintf("After Property list closed: rank/size of comm are %d/%d\n", mpi_rank_tmp, mpi_size_tmp);
+        printf("After Property list closed: rank/size of comm are %d/%d\n", mpi_rank_tmp, mpi_size_tmp);
     if (MPI_INFO_NULL != info_tmp) {
         mrc = MPI_Info_get_nkeys(info_tmp, &nkeys_tmp);
         VRFY((mrc == MPI_SUCCESS), "MPI_Info_get_nkeys");
diff --git a/testpar/t_pread.c b/testpar/t_pread.c
index f408b71..d0bc09b 100644
--- a/testpar/t_pread.c
+++ b/testpar/t_pread.c
@@ -125,7 +125,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id)
 
     if (mpi_rank == 0) {
 
-        HDfprintf(stdout, "Constructing test files...");
+        fprintf(stdout, "Constructing test files...");
     }
 
     /* Setup the file names
@@ -429,11 +429,11 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id)
     /* report results */
     if (mpi_rank == 0) {
         if (pass) {
-            HDfprintf(stdout, "Done.\n");
+            fprintf(stdout, "Done.\n");
         }
         else {
-            HDfprintf(stdout, "FAILED.\n");
-            HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+            fprintf(stdout, "FAILED.\n");
+            fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
         }
     }
 
@@ -1023,7 +1023,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id)
         }
         else {
             H5_FAILED();
-            HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+            fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
         }
         HDremove(reloc_data_filename);
     }
@@ -1077,34 +1077,34 @@ main(int argc, char **argv)
     test_argv0 = HDstrdup(argv[0]);
 
     if ((MPI_Init(&argc, &argv)) != MPI_SUCCESS) {
-        HDfprintf(stderr, "FATAL: Unable to initialize MPI\n");
+        fprintf(stderr, "FATAL: Unable to initialize MPI\n");
         HDexit(EXIT_FAILURE);
     }
 
     if ((MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank)) != MPI_SUCCESS) {
-        HDfprintf(stderr, "FATAL: MPI_Comm_rank returned an error\n");
+        fprintf(stderr, "FATAL: MPI_Comm_rank returned an error\n");
         HDexit(EXIT_FAILURE);
     }
 
     if ((MPI_Comm_size(MPI_COMM_WORLD, &mpi_size)) != MPI_SUCCESS) {
-        HDfprintf(stderr, "FATAL: MPI_Comm_size returned an error\n");
+        fprintf(stderr, "FATAL: MPI_Comm_size returned an error\n");
         HDexit(EXIT_FAILURE);
     }
 
     H5open();
 
     if (mpi_rank == 0) {
-        HDfprintf(stdout, "========================================\n");
-        HDfprintf(stdout, "Collective file open optimization tests\n");
-        HDfprintf(stdout, "        mpi_size     = %d\n", mpi_size);
-        HDfprintf(stdout, "========================================\n");
+        fprintf(stdout, "========================================\n");
+        fprintf(stdout, "Collective file open optimization tests\n");
+        fprintf(stdout, "        mpi_size     = %d\n", mpi_size);
+        fprintf(stdout, "========================================\n");
     }
 
     if (mpi_size < 3) {
 
         if (mpi_rank == 0) {
 
-            HDprintf("    Need at least 3 processes.  Exiting.\n");
+            printf("    Need at least 3 processes.  Exiting.\n");
         }
         goto finish;
     }
@@ -1121,7 +1121,7 @@ main(int argc, char **argv)
 
     if ((MPI_Comm_split(MPI_COMM_WORLD, which_group, 0, &group_comm)) != MPI_SUCCESS) {
 
-        HDfprintf(stderr, "FATAL: MPI_Comm_split returned an error\n");
+        fprintf(stderr, "FATAL: MPI_Comm_split returned an error\n");
         HDexit(EXIT_FAILURE);
     }
 
@@ -1132,7 +1132,7 @@ main(int argc, char **argv)
 
     if (nerrs > 0) {
         if (mpi_rank == 0) {
-            HDprintf("    Test(1) file construction failed -- skipping tests.\n");
+            printf("    Test(1) file construction failed -- skipping tests.\n");
         }
         goto finish;
     }
@@ -1142,7 +1142,7 @@ main(int argc, char **argv)
 
     if (nerrs > 0) {
         if (mpi_rank == 0) {
-            HDprintf("    Test(2) file construction failed -- skipping tests.\n");
+            printf("    Test(2) file construction failed -- skipping tests.\n");
         }
         goto finish;
     }
@@ -1152,15 +1152,15 @@ main(int argc, char **argv)
 
     if (nerrs > 0) {
         if (mpi_rank == 0) {
-            HDprintf("    Parallel read test(1) failed -- skipping tests.\n");
+            printf("    Parallel read test(1) failed -- skipping tests.\n");
         }
         goto finish;
     }
 
     /* Update the user on our progress so far. */
     if (mpi_rank == 0) {
-        HDprintf("    Test 1 of 2 succeeded\n");
-        HDprintf("    -- Starting multi-group parallel read test.\n");
+        printf("    Test 1 of 2 succeeded\n");
+        printf("    -- Starting multi-group parallel read test.\n");
     }
 
     /* run the 2nd set of tests */
@@ -1168,19 +1168,19 @@ main(int argc, char **argv)
 
     if (nerrs > 0) {
         if (mpi_rank == 0) {
-            HDprintf("    Multi-group read test(2) failed\n");
+            printf("    Multi-group read test(2) failed\n");
         }
         goto finish;
     }
 
     if (mpi_rank == 0) {
-        HDprintf("    Test 2 of 2 succeeded\n");
+        printf("    Test 2 of 2 succeeded\n");
     }
 
 finish:
 
     if ((group_comm != MPI_COMM_NULL) && (MPI_Comm_free(&group_comm)) != MPI_SUCCESS) {
-        HDfprintf(stderr, "MPI_Comm_free failed!\n");
+        fprintf(stderr, "MPI_Comm_free failed!\n");
     }
 
     /* make sure all processes are finished before final report, cleanup
@@ -1191,19 +1191,19 @@ finish:
     if (mpi_rank == 0) { /* only process 0 reports */
         const char *header = "Collective file open optimization tests";
 
-        HDfprintf(stdout, "===================================\n");
+        fprintf(stdout, "===================================\n");
         if (nerrs > 0) {
-            HDfprintf(stdout, "***%s detected %d failures***\n", header, nerrs);
+            fprintf(stdout, "***%s detected %d failures***\n", header, nerrs);
         }
         else {
-            HDfprintf(stdout, "%s finished with no failures\n", header);
+            fprintf(stdout, "%s finished with no failures\n", header);
         }
-        HDfprintf(stdout, "===================================\n");
+        fprintf(stdout, "===================================\n");
     }
 
     /* close HDF5 library */
     if (H5close() != SUCCEED) {
-        HDfprintf(stdout, "H5close() failed. (Ignoring)\n");
+        fprintf(stdout, "H5close() failed. (Ignoring)\n");
     }
 
     /* MPI_Finalize must be called AFTER H5close which may use MPI calls */
diff --git a/testpar/t_prestart.c b/testpar/t_prestart.c
index dc291af..c80a78d 100644
--- a/testpar/t_prestart.c
+++ b/testpar/t_prestart.c
@@ -103,9 +103,9 @@ main(int argc, char **argv)
     for (i = 0; i < block[0]; i++) {
         for (j = 0; j < block[1]; j++) {
             if (*dataptr != mpi_rank + 1) {
-                HDprintf("Dataset Verify failed at [%lu][%lu](row %lu, col %lu): expect %d, got %d\n",
-                         (unsigned long)i, (unsigned long)j, (unsigned long)((hsize_t)i + start[0]),
-                         (unsigned long)((hsize_t)j + start[1]), mpi_rank + 1, *(dataptr));
+                printf("Dataset Verify failed at [%lu][%lu](row %lu, col %lu): expect %d, got %d\n",
+                       (unsigned long)i, (unsigned long)j, (unsigned long)((hsize_t)i + start[0]),
+                       (unsigned long)((hsize_t)j + start[1]), mpi_rank + 1, *(dataptr));
                 nerrors++;
             }
             dataptr++;
diff --git a/testpar/t_prop.c b/testpar/t_prop.c
index 6f7e28b..6768649 100644
--- a/testpar/t_prop.c
+++ b/testpar/t_prop.c
@@ -147,7 +147,7 @@ test_plist_ed(void)
     herr_t ret; /* Generic return value */
 
     if (VERBOSE_MED)
-        HDprintf("Encode/Decode DCPLs\n");
+        printf("Encode/Decode DCPLs\n");
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -474,7 +474,7 @@ external_links(void)
     char        link_path[50];
 
     if (VERBOSE_MED)
-        HDprintf("Check external links\n");
+        printf("Check external links\n");
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
diff --git a/testpar/t_select_io_dset.c b/testpar/t_select_io_dset.c
index 10b29e4..14fc592 100644
--- a/testpar/t_select_io_dset.c
+++ b/testpar/t_select_io_dset.c
@@ -168,15 +168,15 @@ check_io_mode(hid_t dxpl, unsigned chunked)
         if (actual_io_mode != H5D_MPIO_CHUNK_COLLECTIVE) {
             nerrors++;
             if (MAINPROCESS)
-                HDprintf("\n     Failed: Incorrect I/O mode (expected chunked, returned %u)",
-                         (unsigned)actual_io_mode);
+                printf("\n     Failed: Incorrect I/O mode (expected chunked, returned %u)",
+                       (unsigned)actual_io_mode);
         }
     }
     else if (actual_io_mode != H5D_MPIO_CONTIGUOUS_COLLECTIVE) {
         nerrors++;
         if (MAINPROCESS)
-            HDprintf("\n     Failed: Incorrect I/O mode (expected contiguous, returned %u)",
-                     (unsigned)actual_io_mode);
+            printf("\n     Failed: Incorrect I/O mode (expected contiguous, returned %u)",
+                   (unsigned)actual_io_mode);
     }
 
 } /* check_io_mode() */
@@ -289,9 +289,9 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf)
     for (i = 0; i < (int)block[0]; i++)
         if (rbuf[i] != (dtrans ? trans_wbuf[i] : wbuf[i])) {
             nerrors++;
-            HDprintf("\n     Error in first data verification:\n");
-            HDprintf("     At index %d: %d, %d\n", i + (int)start[0], dtrans ? trans_wbuf[i] : wbuf[i],
-                     rbuf[i]);
+            printf("\n     Error in first data verification:\n");
+            printf("     At index %d: %d, %d\n", i + (int)start[0], dtrans ? trans_wbuf[i] : wbuf[i],
+                   rbuf[i]);
             break;
         }
 
@@ -305,8 +305,8 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf)
         for (i = 0; i < (int)block[0]; i++)
             if (rbuf[i] != (2 * trans_wbuf[i])) {
                 nerrors++;
-                HDprintf("\n     Error in second data verification:.\n");
-                HDprintf("     At index %d: %d, %d\n", i + (int)start[0], 2 * trans_wbuf[i], rbuf[i]);
+                printf("\n     Error in second data verification:.\n");
+                printf("     At index %d: %d, %d\n", i + (int)start[0], 2 * trans_wbuf[i], rbuf[i]);
                 break;
             }
     }
@@ -436,8 +436,8 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         if (rbuf[4 * i + 0] != wbuf[4 * i + 0] || rbuf[4 * i + 1] != wbuf[4 * i + 1] ||
             rbuf[4 * i + 2] != wbuf[4 * i + 2] || rbuf[4 * i + 3] != wbuf[4 * i + 3]) {
             nerrors++;
-            HDprintf("\n     Error in data verification:\n");
-            HDprintf("\n     Error in data verification at index %d\n", i + (int)start[0]);
+            printf("\n     Error in data verification:\n");
+            printf("\n     Error in data verification at index %d\n", i + (int)start[0]);
             break;
         }
     }
@@ -451,7 +451,7 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         if (rbuf[4 * i + 0] != wbuf[4 * i + 3] || rbuf[4 * i + 1] != wbuf[4 * i + 2] ||
             rbuf[4 * i + 2] != wbuf[4 * i + 1] || rbuf[4 * i + 3] != wbuf[4 * i + 0]) {
             nerrors++;
-            HDprintf("\n     Error in data verification at index %d\n", i + (int)start[0]);
+            printf("\n     Error in data verification at index %d\n", i + (int)start[0]);
             break;
         }
     }
@@ -587,9 +587,9 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign
     for (i = 0; i < (int)block[0]; i++)
         if (rbuf[i] != (long long)(dtrans ? trans_wbuf[i] : wbuf[i])) {
             nerrors++;
-            HDprintf("\n     Error in first data verification:\n");
-            HDprintf("     At index %d: %lld, %lld\n", i + (int)start[0],
-                     (long long)(dtrans ? trans_wbuf[i] : wbuf[i]), rbuf[i]);
+            printf("\n     Error in first data verification:\n");
+            printf("     At index %d: %lld, %lld\n", i + (int)start[0],
+                   (long long)(dtrans ? trans_wbuf[i] : wbuf[i]), rbuf[i]);
             break;
         }
 
@@ -603,9 +603,9 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign
         for (i = 0; i < (int)block[0]; i++)
             if (rbuf[i] != (long long)(100 - trans_wbuf[i])) {
                 nerrors++;
-                HDprintf("\n     Error in second data verification:.\n");
-                HDprintf("     At index %d: %lld, %lld\n", i + (int)start[0],
-                         (long long)(100 - trans_wbuf[i]), rbuf[i]);
+                printf("\n     Error in second data verification:.\n");
+                printf("     At index %d: %lld, %lld\n", i + (int)start[0], (long long)(100 - trans_wbuf[i]),
+                       rbuf[i]);
                 break;
             }
     }
@@ -736,8 +736,8 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig
     for (i = 0; i < (int)block[0]; i++)
         if (rbuf[i] != (dtrans ? trans_wbuf[i] : wbuf[i])) {
             nerrors++;
-            HDprintf("\n     Error in first data verification:\n");
-            HDprintf("     At index %d: %d, %d\n", i + (int)start[0], wbuf[i], rbuf[i]);
+            printf("\n     Error in first data verification:\n");
+            printf("     At index %d: %d, %d\n", i + (int)start[0], wbuf[i], rbuf[i]);
             break;
         }
 
@@ -751,9 +751,8 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig
         for (i = 0; i < (int)block[0]; i++)
             if (rbuf[i] != (2 * (10 + trans_wbuf[i]))) {
                 nerrors++;
-                HDprintf("\n     Error in second data verification:.\n");
-                HDprintf("     At index %d: %d, %d\n", i + (int)start[0], (2 * (10 - trans_wbuf[i])),
-                         rbuf[i]);
+                printf("\n     Error in second data verification:.\n");
+                printf("     At index %d: %d, %d\n", i + (int)start[0], (2 * (10 - trans_wbuf[i])), rbuf[i]);
                 break;
             }
     }
@@ -929,10 +928,10 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         if (s1_wbuf[i].a != s1_rbuf[i].a || s1_wbuf[i].b != s1_rbuf[i].b || s1_wbuf[i].c != s1_rbuf[i].c ||
             s1_wbuf[i].d != s1_rbuf[i].d) {
             nerrors++;
-            HDprintf("\n     Error in 1st data verification:\n");
-            HDprintf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", i + (int)start[0], s1_wbuf[i].a,
-                     s1_rbuf[i].a, s1_wbuf[i].b, s1_rbuf[i].b, s1_wbuf[i].c, s1_rbuf[i].c, s1_wbuf[i].d,
-                     s1_rbuf[i].d);
+            printf("\n     Error in 1st data verification:\n");
+            printf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", i + (int)start[0], s1_wbuf[i].a,
+                   s1_rbuf[i].a, s1_wbuf[i].b, s1_rbuf[i].b, s1_wbuf[i].c, s1_rbuf[i].c, s1_wbuf[i].d,
+                   s1_rbuf[i].d);
             break;
         }
 
@@ -977,10 +976,10 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         if (s1_rbuf[i].a != s1_wbuf[i].a || s1_rbuf[i].b != (4 * (i + (int)start[0]) + 1) ||
             s1_rbuf[i].c != s1_wbuf[i].c || s1_rbuf[i].d != (4 * (i + (int)start[0]) + 3)) {
             nerrors++;
-            HDprintf("\n     Error in 2nd data verification:\n");
-            HDprintf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", i + (int)start[0], s1_wbuf[i].a,
-                     s1_rbuf[i].a, (4 * (i + (int)start[0]) + 1), s1_rbuf[i].b, s1_wbuf[i].c, s1_rbuf[i].c,
-                     (4 * (i + (int)start[0]) + 3), s1_rbuf[i].d);
+            printf("\n     Error in 2nd data verification:\n");
+            printf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", i + (int)start[0], s1_wbuf[i].a,
+                   s1_rbuf[i].a, (4 * (i + (int)start[0]) + 1), s1_rbuf[i].b, s1_wbuf[i].c, s1_rbuf[i].c,
+                   (4 * (i + (int)start[0]) + 3), s1_rbuf[i].d);
             break;
         }
 
@@ -1014,12 +1013,12 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             s1_rbuf[i].c != (4 * (i + (int)start[0]) + DSET_SELECT_DIM + 2) ||
             s1_rbuf[i].d != ((4 * (i + (int)start[0])) + (2 * DSET_SELECT_DIM) + 3)) {
             nerrors++;
-            HDprintf("\n     Error in 3rd data verification:\n");
-            HDprintf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", i + (int)start[0],
-                     ((4 * (i + (int)start[0])) + (2 * DSET_SELECT_DIM)), s1_rbuf[i].a,
-                     (4 * (i + (int)start[0]) + 1), s1_rbuf[i].b,
-                     (4 * (i + (int)start[0]) + DSET_SELECT_DIM + 2), s1_rbuf[i].c,
-                     ((4 * (i + (int)start[0])) + (2 * DSET_SELECT_DIM) + 3), s1_rbuf[i].d);
+            printf("\n     Error in 3rd data verification:\n");
+            printf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", i + (int)start[0],
+                   ((4 * (i + (int)start[0])) + (2 * DSET_SELECT_DIM)), s1_rbuf[i].a,
+                   (4 * (i + (int)start[0]) + 1), s1_rbuf[i].b,
+                   (4 * (i + (int)start[0]) + DSET_SELECT_DIM + 2), s1_rbuf[i].c,
+                   ((4 * (i + (int)start[0])) + (2 * DSET_SELECT_DIM) + 3), s1_rbuf[i].d);
             break;
         }
 
@@ -1068,10 +1067,10 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         if (s2_wbuf[i].a != s2_rbuf[i].a || s2_wbuf[i].b != s2_rbuf[i].b || s2_wbuf[i].c != s2_rbuf[i].c ||
             s2_wbuf[i].d != s2_rbuf[i].d) {
             nerrors++;
-            HDprintf("\n     Error in 4th data verification:\n");
-            HDprintf("     At index %d: %d/%d, %lld/%lld, %d/%d, %d/%d\n", i + (int)start[0], s2_wbuf[i].a,
-                     s2_rbuf[i].a, s2_wbuf[i].b, s2_rbuf[i].b, s2_wbuf[i].c, s2_rbuf[i].c, s2_wbuf[i].d,
-                     s2_rbuf[i].d);
+            printf("\n     Error in 4th data verification:\n");
+            printf("     At index %d: %d/%d, %lld/%lld, %d/%d, %d/%d\n", i + (int)start[0], s2_wbuf[i].a,
+                   s2_rbuf[i].a, s2_wbuf[i].b, s2_rbuf[i].b, s2_wbuf[i].c, s2_rbuf[i].c, s2_wbuf[i].d,
+                   s2_rbuf[i].d);
             break;
         }
 
@@ -1234,9 +1233,9 @@ test_type_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, unsigned
         for (i = 0; i < (int)block[0]; i++)
             if (lrbuf[i] != (dtrans ? trans_lwbuf[i] : lwbuf[i])) {
                 nerrors++;
-                HDprintf("\n     Error in first data verification:\n");
-                HDprintf("     At index %d: %ld, %ld\n", i + (int)start[0],
-                         dtrans ? trans_lwbuf[i] : lwbuf[i], lrbuf[i]);
+                printf("\n     Error in first data verification:\n");
+                printf("     At index %d: %ld, %ld\n", i + (int)start[0], dtrans ? trans_lwbuf[i] : lwbuf[i],
+                       lrbuf[i]);
                 break;
             }
     }
@@ -1290,9 +1289,9 @@ test_type_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, unsigned
     if (mpi_rank) {
         for (i = 0; i < (int)block[0]; i++)
             if (srbuf[i] != (short)(dtrans ? trans_lwbuf[i] : lwbuf[i])) {
-                HDprintf("\n     Error in second data verification:\n");
-                HDprintf("     At index %d: %d, %d\n", i + (int)start[0],
-                         (short)(dtrans ? trans_lwbuf[i] : lwbuf[i]), srbuf[i]);
+                printf("\n     Error in second data verification:\n");
+                printf("     At index %d: %d, %d\n", i + (int)start[0],
+                       (short)(dtrans ? trans_lwbuf[i] : lwbuf[i]), srbuf[i]);
                 break;
             }
     }
@@ -1351,9 +1350,9 @@ test_type_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, unsigned
     if (mpi_rank) {
         for (i = 0; i < (int)block[0]; i++)
             if (llrbuf[i] != (long long)(dtrans ? trans_swbuf[i] : swbuf[i])) {
-                HDprintf("\n     Error in third data verification:\n");
-                HDprintf("     At index %d: %lld, %lld\n", i + (int)start[0],
-                         (long long)(dtrans ? trans_swbuf[i] : swbuf[i]), llrbuf[i]);
+                printf("\n     Error in third data verification:\n");
+                printf("     At index %d: %lld, %lld\n", i + (int)start[0],
+                       (long long)(dtrans ? trans_swbuf[i] : swbuf[i]), llrbuf[i]);
                 break;
             }
     }
@@ -1562,9 +1561,9 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m
         for (j = 0; j < (int)block[0]; j++)
             if (rbufi[i][j] != (dtrans ? trans_wbufi[i][j] : wbufi[i][j])) {
                 nerrors++;
-                HDprintf("\n     Error in 1st data verification for dset %d:\n", i);
-                HDprintf("     At index %d: %d, %d\n", j + (int)start[0],
-                         dtrans ? trans_wbufi[i][j] : wbufi[i][j], rbufi[i][j]);
+                printf("\n     Error in 1st data verification for dset %d:\n", i);
+                printf("     At index %d: %d, %d\n", j + (int)start[0],
+                       dtrans ? trans_wbufi[i][j] : wbufi[i][j], rbufi[i][j]);
                 break;
             }
 
@@ -1579,9 +1578,9 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m
             for (j = 0; j < (int)block[0]; j++)
                 if (rbufi[i][j] != (2 * trans_wbufi[i][j])) {
                     nerrors++;
-                    HDprintf("\n     Error in 1st (with dtrans) data verification for dset %d:\n", i);
-                    HDprintf("     At index %d: %d, %d\n", j + (int)start[0], 2 * trans_wbufi[i][j],
-                             rbufi[i][j]);
+                    printf("\n     Error in 1st (with dtrans) data verification for dset %d:\n", i);
+                    printf("     At index %d: %d, %d\n", j + (int)start[0], 2 * trans_wbufi[i][j],
+                           rbufi[i][j]);
                     break;
                 }
     }
@@ -1628,9 +1627,9 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m
         for (j = 0; j < (int)block[0]; j++) {
             if (lrbufi[i][j] != (dtrans ? (2 * trans_lwbufi[i][j]) : lwbufi[i][j])) {
                 nerrors++;
-                HDprintf("\n     Error in 2nd data verification for dset %d:\n", i);
-                HDprintf("     At index %d: %ld/%ld\n", j + (int)start[0],
-                         (dtrans ? (2 * trans_lwbufi[i][j]) : lwbufi[i][j]), lrbufi[i][j]);
+                printf("\n     Error in 2nd data verification for dset %d:\n", i);
+                printf("     At index %d: %ld/%ld\n", j + (int)start[0],
+                       (dtrans ? (2 * trans_lwbufi[i][j]) : lwbufi[i][j]), lrbufi[i][j]);
                 break;
             }
         }
@@ -1866,10 +1865,10 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             if (wbufi[i][j].a != rbufi[i][j].a || wbufi[i][j].b != rbufi[i][j].b ||
                 wbufi[i][j].c != rbufi[i][j].c || wbufi[i][j].d != rbufi[i][j].d) {
                 nerrors++;
-                HDprintf("\n     Error in 1st data verification for dset %d:\n", i);
-                HDprintf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", j + (int)start[0], wbufi[i][j].a,
-                         rbufi[i][j].a, wbufi[i][j].b, rbufi[i][j].b, wbufi[i][j].c, rbufi[i][j].c,
-                         wbufi[i][j].d, rbufi[i][j].d);
+                printf("\n     Error in 1st data verification for dset %d:\n", i);
+                printf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", j + (int)start[0], wbufi[i][j].a,
+                       rbufi[i][j].a, wbufi[i][j].b, rbufi[i][j].b, wbufi[i][j].c, rbufi[i][j].c,
+                       wbufi[i][j].d, rbufi[i][j].d);
 
                 break;
             }
@@ -1929,10 +1928,10 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
                 if (wbufi[i][j].a != rbufi[i][j].a || (4 * (j + (int)start[0]) + 1) != rbufi[i][j].b ||
                     wbufi[i][j].c != rbufi[i][j].c || (4 * (j + (int)start[0]) + 3) != rbufi[i][j].d) {
                     nerrors++;
-                    HDprintf("\n     Error in 2nd data verification for dset %d:\n", i);
-                    HDprintf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", j + (int)start[0],
-                             wbufi[i][j].a, rbufi[i][j].a, (4 * (j + (int)start[0]) + 1), rbufi[i][j].b,
-                             wbufi[i][j].c, rbufi[i][j].c, (4 * (j + (int)start[0]) + 3), rbufi[i][j].d);
+                    printf("\n     Error in 2nd data verification for dset %d:\n", i);
+                    printf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", j + (int)start[0], wbufi[i][j].a,
+                           rbufi[i][j].a, (4 * (j + (int)start[0]) + 1), rbufi[i][j].b, wbufi[i][j].c,
+                           rbufi[i][j].c, (4 * (j + (int)start[0]) + 3), rbufi[i][j].d);
                     break;
                 }
         }
@@ -1943,11 +1942,11 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
                     (4 * (j + (int)start[0]) + 2) != rbufi[i][j].c ||
                     (4 * (j + (int)start[0]) + 3) != rbufi[i][j].d) {
                     nerrors++;
-                    HDprintf("\n     Error in 2nd data verification for dset %d:\n", i);
-                    HDprintf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", j + (int)start[0],
-                             (4 * (j + (int)start[0])), rbufi[i][j].a, (4 * (j + (int)start[0]) + 1),
-                             rbufi[i][j].b, (4 * (j + (int)start[0]) + 2), rbufi[i][j].c,
-                             (4 * (j + (int)start[0]) + 3), rbufi[i][j].d);
+                    printf("\n     Error in 2nd data verification for dset %d:\n", i);
+                    printf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", j + (int)start[0],
+                           (4 * (j + (int)start[0])), rbufi[i][j].a, (4 * (j + (int)start[0]) + 1),
+                           rbufi[i][j].b, (4 * (j + (int)start[0]) + 2), rbufi[i][j].c,
+                           (4 * (j + (int)start[0]) + 3), rbufi[i][j].d);
                     break;
                 }
         }
@@ -2004,10 +2003,10 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
         if (wbufi[0][j].a != rbufi[0][j].a || ((4 * (j + (int)start[0])) + 1) != rbufi[0][j].b ||
             wbufi[0][j].c != rbufi[0][j].c || ((4 * (j + (int)start[0])) + 3) != rbufi[0][j].d) {
             nerrors++;
-            HDprintf("\n     Error in 3rd data verification for dset0:\n");
-            HDprintf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", j + (int)start[0], wbufi[0][j].a,
-                     rbufi[0][j].a, (4 * (j + (int)start[0]) + 1), rbufi[0][j].b, wbufi[0][j].c,
-                     rbufi[0][j].c, (4 * (j + (int)start[0]) + 3), rbufi[0][j].d);
+            printf("\n     Error in 3rd data verification for dset0:\n");
+            printf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", j + (int)start[0], wbufi[0][j].a,
+                   rbufi[0][j].a, (4 * (j + (int)start[0]) + 1), rbufi[0][j].b, wbufi[0][j].c, rbufi[0][j].c,
+                   (4 * (j + (int)start[0]) + 3), rbufi[0][j].d);
             break;
         }
 
@@ -2018,11 +2017,11 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             rbufi[mm][j].c != ((4 * (j + (int)start[0])) + 2) ||
             rbufi[mm][j].d != ((4 * (j + (int)start[0])) + (2 * DSET_SELECT_DIM) + 3)) {
             nerrors++;
-            HDprintf("\n     Error in 3rd data verification for dset %d:\n", mm);
-            HDprintf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", j + (int)start[0],
-                     ((4 * (j + (int)start[0])) + (2 * DSET_SELECT_DIM)), rbufi[mm][j].a,
-                     ((4 * (j + (int)start[0])) + 1), rbufi[mm][j].b, ((4 * (j + (int)start[0])) + 2),
-                     rbufi[mm][j].c, ((4 * (j + (int)start[0])) + (2 * DSET_SELECT_DIM) + 3), rbufi[mm][j].d);
+            printf("\n     Error in 3rd data verification for dset %d:\n", mm);
+            printf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", j + (int)start[0],
+                   ((4 * (j + (int)start[0])) + (2 * DSET_SELECT_DIM)), rbufi[mm][j].a,
+                   ((4 * (j + (int)start[0])) + 1), rbufi[mm][j].b, ((4 * (j + (int)start[0])) + 2),
+                   rbufi[mm][j].c, ((4 * (j + (int)start[0])) + (2 * DSET_SELECT_DIM) + 3), rbufi[mm][j].d);
             break;
         }
 
@@ -2037,11 +2036,11 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
                 rbufi[i][j].c != ((4 * (j + (int)start[0])) + 2) ||
                 rbufi[i][j].d != ((4 * (j + (int)start[0])) + 3)) {
                 nerrors++;
-                HDprintf("\n     Error in 3rd data verification for dset %d:\n", i);
-                HDprintf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", j + (int)start[0],
-                         ((4 * (j + (int)start[0]))), rbufi[i][j].a, ((4 * (j + (int)start[0])) + 1),
-                         rbufi[i][j].b, ((4 * (j + (int)start[0])) + 2), rbufi[i][j].c,
-                         ((4 * (j + (int)start[0])) + 3), rbufi[i][j].d);
+                printf("\n     Error in 3rd data verification for dset %d:\n", i);
+                printf("     At index %d: %d/%d, %d/%d, %d/%d, %d/%d\n", j + (int)start[0],
+                       ((4 * (j + (int)start[0]))), rbufi[i][j].a, ((4 * (j + (int)start[0])) + 1),
+                       rbufi[i][j].b, ((4 * (j + (int)start[0])) + 2), rbufi[i][j].c,
+                       ((4 * (j + (int)start[0])) + 3), rbufi[i][j].d);
                 break;
             }
     }
@@ -2107,10 +2106,10 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             if (s2_rbufi[i][j].a != s2_wbufi[i][j].a || s2_rbufi[i][j].b != s2_wbufi[i][j].b ||
                 s2_rbufi[i][j].c != s2_wbufi[i][j].c || s2_rbufi[i][j].d != s2_wbufi[i][j].d) {
                 nerrors++;
-                HDprintf("\n     Error in 3rd data verification for dset %d:\n", i);
-                HDprintf("     At index %d: %d/%d, %lld/%lld, %d/%d, %d/%d\n", j + (int)start[0],
-                         s2_wbufi[i][j].a, s2_rbufi[i][j].a, s2_wbufi[i][j].b, s2_rbufi[i][j].b,
-                         s2_wbufi[i][j].c, s2_rbufi[i][j].c, s2_wbufi[i][j].d, s2_rbufi[i][j].d);
+                printf("\n     Error in 3rd data verification for dset %d:\n", i);
+                printf("     At index %d: %d/%d, %lld/%lld, %d/%d, %d/%d\n", j + (int)start[0],
+                       s2_wbufi[i][j].a, s2_rbufi[i][j].a, s2_wbufi[i][j].b, s2_rbufi[i][j].b,
+                       s2_wbufi[i][j].c, s2_rbufi[i][j].c, s2_wbufi[i][j].d, s2_rbufi[i][j].d);
                 break;
             }
     }
@@ -2312,8 +2311,8 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
                     rbufi[i][(int)ss * j + 2] != wbufi[i][(int)ss * j + 2] ||
                     rbufi[i][(int)ss * j + 3] != wbufi[i][(int)ss * j + 3]) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    For dset %d at index %d\n", i, j + (int)start[0]);
+                    printf("    Read different values than written.\n");
+                    printf("    For dset %d at index %d\n", i, j + (int)start[0]);
                     P_TEST_ERROR;
                 }
         }
@@ -2387,8 +2386,8 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
                     lrbufi[i][(int)ss * j + 6] != lwbufi[i][(int)ss * j + 6] ||
                     lrbufi[i][(int)ss * j + 7] != lwbufi[i][(int)ss * j + 7]) {
                     H5_FAILED();
-                    HDprintf("    Read different values than written.\n");
-                    HDprintf("    For dset %d at index %d\n", i, j + (int)start[0]);
+                    printf("    Read different values than written.\n");
+                    printf("    For dset %d at index %d\n", i, j + (int)start[0]);
                     P_TEST_ERROR;
                 }
         }
@@ -2449,8 +2448,8 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf)
             if (srbufi[i][(int)ss * j + 0] != swbufi[i][(int)ss * j + 0] ||
                 srbufi[i][(int)ss * j + 1] != swbufi[i][(int)ss * j + 1]) {
                 H5_FAILED();
-                HDprintf("    Read different values than written.\n");
-                HDprintf("    For dset %d at index %d\n", i, j + (int)start[0]);
+                printf("    Read different values than written.\n");
+                printf("    For dset %d at index %d\n", i, j + (int)start[0]);
                 P_TEST_ERROR;
             }
 
@@ -2785,8 +2784,8 @@ test_multi_dsets_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, un
         for (j = 0; j < save_block0; j++)
             if (l_rbufi[0][j] != (dtrans ? (long)trans_wbufi[0][j] : (long)wbufi[0][j])) {
                 nerrors++;
-                HDprintf("     Verify dset0 at index %d: %ld, %ld\n", j + (int)start[0],
-                         dtrans ? (long)trans_wbufi[0][j] : (long)wbufi[0][j], l_rbufi[0][j]);
+                printf("     Verify dset0 at index %d: %ld, %ld\n", j + (int)start[0],
+                       dtrans ? (long)trans_wbufi[0][j] : (long)wbufi[0][j], l_rbufi[0][j]);
                 break;
             }
     }
@@ -2796,8 +2795,8 @@ test_multi_dsets_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, un
         for (j = 0; j < (int)block[0]; j++)
             if (l_rbufi[mm][j] != (long)(dtrans ? trans_wbufi[mm][j] : wbufi[mm][j])) {
                 nerrors++;
-                HDprintf("     Verify dset %d at index %d: %ld, %ld\n", mm, j + (int)start[0],
-                         (long)(dtrans ? trans_wbufi[mm][j] : wbufi[mm][j]), l_rbufi[mm][j]);
+                printf("     Verify dset %d at index %d: %ld, %ld\n", mm, j + (int)start[0],
+                       (long)(dtrans ? trans_wbufi[mm][j] : wbufi[mm][j]), l_rbufi[mm][j]);
                 break;
             }
 
@@ -2805,8 +2804,8 @@ test_multi_dsets_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, un
         for (j = 0; j < (int)dims[0]; j++)
             if (l_rbufi[ll][j] != (long)(dtrans ? trans_wbufi[ll][j] : wbufi[ll][j])) {
                 nerrors++;
-                HDprintf("     Verify dset %d at index %d: %ld, %ld\n", ll, j,
-                         (long)(dtrans ? trans_wbufi[ll][j] : wbufi[ll][j]), l_rbufi[ll][j]);
+                printf("     Verify dset %d at index %d: %ld, %ld\n", ll, j,
+                       (long)(dtrans ? trans_wbufi[ll][j] : wbufi[ll][j]), l_rbufi[ll][j]);
                 break;
             }
     }
@@ -3253,8 +3252,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                         for (j = 0; j < (int)block[0]; j++)
                             if (rbufi1[i][j] != wbufi1[i][j]) {
                                 nerrors++;
-                                HDprintf("    Read different values than written.\n");
-                                HDprintf("    For dset %d at index %d\n", i, j + (int)start[0]);
+                                printf("    Read different values than written.\n");
+                                printf("    For dset %d at index %d\n", i, j + (int)start[0]);
                                 break;
                             }
 
@@ -3265,8 +3264,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                             for (j = 0; j < (int)block[0]; j++)
                                 if (l_rbufi2[i][j] != LONG_MAX) {
                                     nerrors++;
-                                    HDprintf("    Read different values than written.\n");
-                                    HDprintf("    For dset %d at index %d\n", i, j + (int)start[0]);
+                                    printf("    Read different values than written.\n");
+                                    printf("    For dset %d at index %d\n", i, j + (int)start[0]);
                                     break;
                                 }
                         }
@@ -3274,8 +3273,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                             for (j = 0; j < (int)block[0]; j++)
                                 if (s_rbufi2[i][j] != SHRT_MAX) {
                                     nerrors++;
-                                    HDprintf("    Read different values than written.\n");
-                                    HDprintf("    For dset %d at index %d\n", i, j + (int)start[0]);
+                                    printf("    Read different values than written.\n");
+                                    printf("    For dset %d at index %d\n", i, j + (int)start[0]);
                                     break;
                                 }
                         }
@@ -3290,8 +3289,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                                     s3_rbufi3[i][j].c != s1_wbufi3[i][j].c ||
                                     s3_rbufi3[i][j].d != s1_wbufi3[i][j].d) {
                                     nerrors++;
-                                    HDprintf("    Read different values than written.\n");
-                                    HDprintf("    For dset %d at index %d\n", i, j + (int)start[0]);
+                                    printf("    Read different values than written.\n");
+                                    printf("    For dset %d at index %d\n", i, j + (int)start[0]);
                                     break;
                                 }
                         }
@@ -3302,8 +3301,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf)
                                     s1_rbufi3[i][j].c != s1_wbufi3[i][j].c ||
                                     s1_rbufi3[i][j].d != (DSET_SELECT_DIM + j + (int)start[0])) {
                                     nerrors++;
-                                    HDprintf("    Read different values than written.\n");
-                                    HDprintf("    For dset %d at index %d\n", i, j + (int)start[0]);
+                                    printf("    Read different values than written.\n");
+                                    printf("    For dset %d at index %d\n", i, j + (int)start[0]);
                                     break;
                                 }
                         }
@@ -3769,9 +3768,9 @@ main(int argc, char *argv[])
     if (MAINPROCESS) {
         printf("\n===================================\n");
         if (nerrors)
-            HDprintf("***Parallel selection I/O dataset tests detected %d errors***\n", nerrors);
+            printf("***Parallel selection I/O dataset tests detected %d errors***\n", nerrors);
         else
-            HDprintf("Parallel selection I/O dataset tests finished with no errors\n");
+            printf("Parallel selection I/O dataset tests finished with no errors\n");
         printf("===================================\n");
     }
 
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index b702ffb..38f9604 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -238,16 +238,16 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker
 #if CONTIG_HS_DR_PIO_TEST__SETUP__DEBUG
     if (MAINPROCESS) {
 
-        HDfprintf(stdout, "%d: test num = %d.\n", tv_ptr->mpi_rank, tv_ptr->test_num);
-        HDfprintf(stdout, "%d: mpi_size = %d.\n", tv_ptr->mpi_rank, tv_ptr->mpi_size);
-        HDfprintf(stdout, "%d: small/large rank = %d/%d, use_collective_io = %d.\n", tv_ptr->mpi_rank,
-                  tv_ptr->small_rank, tv_ptr->large_rank, (int)use_collective_io);
-        HDfprintf(stdout, "%d: edge_size = %d, chunk_edge_size = %d.\n", tv_ptr->mpi_rank, tv_ptr->edge_size,
-                  tv_ptr->chunk_edge_size);
-        HDfprintf(stdout, "%d: checker_edge_size = %d.\n", tv_ptr->mpi_rank, tv_ptr->checker_edge_size);
-        HDfprintf(stdout, "%d: small_ds_size = %d, large_ds_size = %d.\n", tv_ptr->mpi_rank,
-                  (int)(tv_ptr->small_ds_size), (int)(tv_ptr->large_ds_size));
-        HDfprintf(stdout, "%d: filename = %s.\n", tv_ptr->mpi_rank, filename);
+        fprintf(stdout, "%d: test num = %d.\n", tv_ptr->mpi_rank, tv_ptr->test_num);
+        fprintf(stdout, "%d: mpi_size = %d.\n", tv_ptr->mpi_rank, tv_ptr->mpi_size);
+        fprintf(stdout, "%d: small/large rank = %d/%d, use_collective_io = %d.\n", tv_ptr->mpi_rank,
+                tv_ptr->small_rank, tv_ptr->large_rank, (int)use_collective_io);
+        fprintf(stdout, "%d: edge_size = %d, chunk_edge_size = %d.\n", tv_ptr->mpi_rank, tv_ptr->edge_size,
+                tv_ptr->chunk_edge_size);
+        fprintf(stdout, "%d: checker_edge_size = %d.\n", tv_ptr->mpi_rank, tv_ptr->checker_edge_size);
+        fprintf(stdout, "%d: small_ds_size = %d, large_ds_size = %d.\n", tv_ptr->mpi_rank,
+                (int)(tv_ptr->small_ds_size), (int)(tv_ptr->large_ds_size));
+        fprintf(stdout, "%d: filename = %s.\n", tv_ptr->mpi_rank, filename);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__SETUP__DEBUG */
     /* ----------------------------------------
@@ -729,7 +729,7 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
     HDmemset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size);
 
 #if CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG
-    HDfprintf(stdout, "%s reading slices from big cube on disk into small cube slice.\n", fcnName);
+    fprintf(stdout, "%s reading slices from big cube on disk into small cube slice.\n", fcnName);
 #endif /* CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
 
     /* in serial versions of this test, we loop through all the dimensions
@@ -816,12 +816,12 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
 
                     /* Read selection from disk */
 #if CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
-                              (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
-                              (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
-                    HDfprintf(stdout, "%s slice/file extent dims = %d/%d.\n", fcnName,
-                              H5Sget_simple_extent_ndims(tv_ptr->small_ds_slice_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
+                            (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
+                            (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
+                    fprintf(stdout, "%s slice/file extent dims = %d/%d.\n", fcnName,
+                            H5Sget_simple_extent_ndims(tv_ptr->small_ds_slice_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
 #endif /* CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
                     ret =
                         H5Dread(tv_ptr->large_dataset, H5T_NATIVE_UINT32, tv_ptr->small_ds_slice_sid,
@@ -937,7 +937,7 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
     VRFY((ret >= 0), "H5Sselect_hyperslab(file_small_ds_sid_0, set) succeeded");
 
 #if CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG
-    HDfprintf(stdout, "%s reading slices of on disk small data set into slices of big data set.\n", fcnName);
+    fprintf(stdout, "%s reading slices of on disk small data set into slices of big data set.\n", fcnName);
 #endif /* CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG */
 
     /* zero out the in memory large ds */
@@ -1047,12 +1047,12 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
 
                     /* Read selection from disk */
 #if CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
-                              (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
-                              (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->mem_large_ds_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_0));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
+                            (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
+                            (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->mem_large_ds_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_0));
 #endif /* CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG */
                     ret = H5Dread(tv_ptr->small_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_large_ds_sid,
                                   tv_ptr->file_small_ds_sid_0, tv_ptr->xfer_plist, tv_ptr->large_ds_buf_1);
@@ -1215,7 +1215,7 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
     HDmemset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size);
 
 #if CONTIG_HS_DR_PIO_TEST__M2D_L2S__DEBUG
-    HDfprintf(stdout, "%s writing slices from big ds to slices of small ds on disk.\n", fcnName);
+    fprintf(stdout, "%s writing slices from big ds to slices of small ds on disk.\n", fcnName);
 #endif /* CONTIG_HS_DR_PIO_TEST__M2D_L2S__DEBUG */
 
     /* in serial versions of this test, we loop through all the dimensions
@@ -1316,12 +1316,12 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
                     /* write the slice from the in memory large data set to the
                      * slice of the on disk small dataset. */
 #if CONTIG_HS_DR_PIO_TEST__M2D_L2S__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
-                              (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
-                              (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->mem_large_ds_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_0));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
+                            (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
+                            (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->mem_large_ds_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_0));
 #endif /* CONTIG_HS_DR_PIO_TEST__M2D_L2S__DEBUG */
                     ret = H5Dwrite(tv_ptr->small_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_large_ds_sid,
                                    tv_ptr->file_small_ds_sid_0, tv_ptr->xfer_plist, tv_ptr->large_ds_buf_0);
@@ -1490,7 +1490,7 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
     HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size);
 
 #if CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG
-    HDfprintf(stdout, "%s writing process slices of small ds to slices of large ds on disk.\n", fcnName);
+    fprintf(stdout, "%s writing process slices of small ds to slices of large ds on disk.\n", fcnName);
 #endif /* CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG */
 
     if (PAR_SS_DR_MAX_RANK - tv_ptr->large_rank == 0) {
@@ -1551,12 +1551,12 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                     tv_ptr->start[3] = (hsize_t)l;
                     tv_ptr->start[4] = 0;
 
-                    HDfprintf(stdout, "%s:%d: skipping test with start = %d %d %d %d %d.\n", fcnName,
-                              (int)(tv_ptr->mpi_rank), (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]),
-                              (int)(tv_ptr->start[2]), (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->mem_small_ds_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
+                    fprintf(stdout, "%s:%d: skipping test with start = %d %d %d %d %d.\n", fcnName,
+                            (int)(tv_ptr->mpi_rank), (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]),
+                            (int)(tv_ptr->start[2]), (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->mem_small_ds_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
 #endif /* CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG */
                 }
                 else { /* run the test */
@@ -1602,12 +1602,12 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                      * target slice of the disk data set
                      */
 #if CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
-                              (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
-                              (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->mem_small_ds_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, (int)(tv_ptr->mpi_rank),
+                            (int)(tv_ptr->start[0]), (int)(tv_ptr->start[1]), (int)(tv_ptr->start[2]),
+                            (int)(tv_ptr->start[3]), (int)(tv_ptr->start[4]));
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->mem_small_ds_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
 #endif /* CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG */
                     ret = H5Dwrite(tv_ptr->large_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_small_ds_sid,
                                    tv_ptr->file_large_ds_sid_0, tv_ptr->xfer_plist, tv_ptr->small_ds_buf_0);
@@ -1774,8 +1774,8 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: small rank = %d, large rank = %d.\n", test_num, small_rank, large_rank);
-        HDfprintf(stdout, "test %d: Initialization complete.\n", test_num);
+        fprintf(stdout, "test %d: small rank = %d, large rank = %d.\n", test_num, small_rank, large_rank);
+        fprintf(stdout, "test %d: Initialization complete.\n", test_num);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
 
@@ -1790,7 +1790,7 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: running contig_hs_dr_pio_test__d2m_l2s.\n", test_num);
+        fprintf(stdout, "test %d: running contig_hs_dr_pio_test__d2m_l2s.\n", test_num);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
     contig_hs_dr_pio_test__d2m_l2s(tv_ptr);
@@ -1802,7 +1802,7 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: running contig_hs_dr_pio_test__d2m_s2l.\n", test_num);
+        fprintf(stdout, "test %d: running contig_hs_dr_pio_test__d2m_s2l.\n", test_num);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
     contig_hs_dr_pio_test__d2m_s2l(tv_ptr);
@@ -1820,7 +1820,7 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: running contig_hs_dr_pio_test__m2d_l2s.\n", test_num);
+        fprintf(stdout, "test %d: running contig_hs_dr_pio_test__m2d_l2s.\n", test_num);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
     contig_hs_dr_pio_test__m2d_l2s(tv_ptr);
@@ -1835,16 +1835,16 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: running contig_hs_dr_pio_test__m2d_s2l.\n", test_num);
+        fprintf(stdout, "test %d: running contig_hs_dr_pio_test__m2d_s2l.\n", test_num);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
     contig_hs_dr_pio_test__m2d_s2l(tv_ptr);
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: Subtests complete -- tests run/skipped/total = %lld/%lld/%lld.\n",
-                  test_num, (long long)(tv_ptr->tests_run), (long long)(tv_ptr->tests_skipped),
-                  (long long)(tv_ptr->total_tests));
+        fprintf(stdout, "test %d: Subtests complete -- tests run/skipped/total = %lld/%lld/%lld.\n", test_num,
+                (long long)(tv_ptr->tests_run), (long long)(tv_ptr->tests_skipped),
+                (long long)(tv_ptr->total_tests));
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
 
@@ -1852,7 +1852,7 @@ contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: Takedown complete.\n", test_num);
+        fprintf(stdout, "test %d: Takedown complete.\n", test_num);
     }
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
 
@@ -1986,16 +1986,16 @@ contig_hs_dr_pio_test(ShapeSameTestMethods sstest_type)
             } /* end of switch(sstest_type) */
 #if CONTIG_HS_DR_PIO_TEST__DEBUG
             if ((MAINPROCESS) && (tests_skipped > 0)) {
-                HDfprintf(stdout, "    run/skipped/total = %lld/%lld/%lld.\n", tests_run, tests_skipped,
-                          total_tests);
+                fprintf(stdout, "    run/skipped/total = %lld/%lld/%lld.\n", tests_run, tests_skipped,
+                        total_tests);
             }
 #endif /* CONTIG_HS_DR_PIO_TEST__DEBUG */
         }
     }
 
     if ((MAINPROCESS) && (tests_skipped > 0)) {
-        HDfprintf(stdout, "    %" PRId64 " of %" PRId64 " subtests skipped to expedite testing.\n",
-                  tests_skipped, total_tests);
+        fprintf(stdout, "    %" PRId64 " of %" PRId64 " subtests skipped to expedite testing.\n",
+                tests_skipped, total_tests);
     }
 
     return;
@@ -2065,10 +2065,10 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons
     assert(n_cube_offset <= sel_offset);
 
 #if CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG
-    HDfprintf(stdout, "%s:%d: edge_size/checker_edge_size = %d/%d\n", fcnName, mpi_rank, edge_size,
-              checker_edge_size);
-    HDfprintf(stdout, "%s:%d: sel_rank/sel_offset = %d/%d.\n", fcnName, mpi_rank, sel_rank, sel_offset);
-    HDfprintf(stdout, "%s:%d: tgt_rank/n_cube_offset = %d/%d.\n", fcnName, mpi_rank, tgt_rank, n_cube_offset);
+    fprintf(stdout, "%s:%d: edge_size/checker_edge_size = %d/%d\n", fcnName, mpi_rank, edge_size,
+            checker_edge_size);
+    fprintf(stdout, "%s:%d: sel_rank/sel_offset = %d/%d.\n", fcnName, mpi_rank, sel_rank, sel_offset);
+    fprintf(stdout, "%s:%d: tgt_rank/n_cube_offset = %d/%d.\n", fcnName, mpi_rank, tgt_rank, n_cube_offset);
 #endif /* CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
     /* First, compute the base count (which assumes start == 0
@@ -2215,25 +2215,25 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons
                         if (((i + j + k + l + m) % 2) == 0) {
 
 #if CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG
-                            HDfprintf(stdout, "%s%d: *** first_selection = %d ***\n", fcnName, mpi_rank,
-                                      (int)first_selection);
-                            HDfprintf(stdout, "%s:%d: i/j/k/l/m = %d/%d/%d/%d/%d\n", fcnName, mpi_rank, i, j,
-                                      k, l, m);
-                            HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                      (int)start[0], (int)start[1], (int)start[2], (int)start[3],
-                                      (int)start[4]);
-                            HDfprintf(stdout, "%s:%d: stride = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                      (int)stride[0], (int)stride[1], (int)stride[2], (int)stride[3],
-                                      (int)stride[4]);
-                            HDfprintf(stdout, "%s:%d: count = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                      (int)count[0], (int)count[1], (int)count[2], (int)count[3],
-                                      (int)count[4]);
-                            HDfprintf(stdout, "%s:%d: block = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                      (int)block[0], (int)block[1], (int)block[2], (int)block[3],
-                                      (int)block[4]);
-                            HDfprintf(stdout, "%s:%d: n-cube extent dims = %d.\n", fcnName, mpi_rank,
-                                      H5Sget_simple_extent_ndims(tgt_sid));
-                            HDfprintf(stdout, "%s:%d: selection rank = %d.\n", fcnName, mpi_rank, sel_rank);
+                            fprintf(stdout, "%s%d: *** first_selection = %d ***\n", fcnName, mpi_rank,
+                                    (int)first_selection);
+                            fprintf(stdout, "%s:%d: i/j/k/l/m = %d/%d/%d/%d/%d\n", fcnName, mpi_rank, i, j, k,
+                                    l, m);
+                            fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                    (int)start[0], (int)start[1], (int)start[2], (int)start[3],
+                                    (int)start[4]);
+                            fprintf(stdout, "%s:%d: stride = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                    (int)stride[0], (int)stride[1], (int)stride[2], (int)stride[3],
+                                    (int)stride[4]);
+                            fprintf(stdout, "%s:%d: count = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                    (int)count[0], (int)count[1], (int)count[2], (int)count[3],
+                                    (int)count[4]);
+                            fprintf(stdout, "%s:%d: block = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                    (int)block[0], (int)block[1], (int)block[2], (int)block[3],
+                                    (int)block[4]);
+                            fprintf(stdout, "%s:%d: n-cube extent dims = %d.\n", fcnName, mpi_rank,
+                                    H5Sget_simple_extent_ndims(tgt_sid));
+                            fprintf(stdout, "%s:%d: selection rank = %d.\n", fcnName, mpi_rank, sel_rank);
 #endif
 
                             if (first_selection) {
@@ -2277,8 +2277,8 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons
     } while ((i <= 1) && (0 >= sel_offset));
 
 #if CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG
-    HDfprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
-              (int)H5Sget_select_npoints(tgt_sid));
+    fprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
+            (int)H5Sget_select_npoints(tgt_sid));
 #endif /* CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
     /* Clip the selection back to the dataspace proper. */
@@ -2296,9 +2296,9 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons
     VRFY((ret != FAIL), "H5Sselect_hyperslab(AND) succeeded");
 
 #if CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG
-    HDfprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
-              (int)H5Sget_select_npoints(tgt_sid));
-    HDfprintf(stdout, "%s%d: done.\n", fcnName, mpi_rank);
+    fprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
+            (int)H5Sget_select_npoints(tgt_sid));
+    fprintf(stdout, "%s%d: done.\n", fcnName, mpi_rank);
 #endif /* CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
     return;
@@ -2393,12 +2393,12 @@ ckrbrd_hs_dr_pio_test__verify_data(uint32_t *buf_ptr, const int rank, const int
     int mpi_rank;
 
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
-    HDfprintf(stdout, "%s mpi_rank = %d.\n", fcnName, mpi_rank);
-    HDfprintf(stdout, "%s rank = %d.\n", fcnName, rank);
-    HDfprintf(stdout, "%s edge_size = %d.\n", fcnName, edge_size);
-    HDfprintf(stdout, "%s checker_edge_size = %d.\n", fcnName, checker_edge_size);
-    HDfprintf(stdout, "%s first_expected_val = %d.\n", fcnName, (int)first_expected_val);
-    HDfprintf(stdout, "%s starts_in_checker = %d.\n", fcnName, (int)buf_starts_in_checker);
+    fprintf(stdout, "%s mpi_rank = %d.\n", fcnName, mpi_rank);
+    fprintf(stdout, "%s rank = %d.\n", fcnName, rank);
+    fprintf(stdout, "%s edge_size = %d.\n", fcnName, edge_size);
+    fprintf(stdout, "%s checker_edge_size = %d.\n", fcnName, checker_edge_size);
+    fprintf(stdout, "%s first_expected_val = %d.\n", fcnName, (int)first_expected_val);
+    fprintf(stdout, "%s starts_in_checker = %d.\n", fcnName, (int)buf_starts_in_checker);
 }
 #endif
 
@@ -2448,12 +2448,12 @@ do {
                 m = 0;
                 z = 0;
 #if CKRBRD_HS_DR_PIO_TEST__VERIFY_DATA__DEBUG
-                HDfprintf(stdout, "%d, %d, %d, %d, %d:", i, j, k, l, m);
+                fprintf(stdout, "%d, %d, %d, %d, %d:", i, j, k, l, m);
 #endif
                 in_checker = start_in_checker[3];
                 do {
 #if CKRBRD_HS_DR_PIO_TEST__VERIFY_DATA__DEBUG
-                    HDfprintf(stdout, " %d", (int)(*val_ptr));
+                    fprintf(stdout, " %d", (int)(*val_ptr));
 #endif
                     if (z >= checker_edge_size) {
 
@@ -2486,7 +2486,7 @@ do {
 
                 } while ((rank >= (test_max_rank - 4)) && (m < edge_size));
 #if CKRBRD_HS_DR_PIO_TEST__VERIFY_DATA__DEBUG
-                HDfprintf(stdout, "\n");
+                fprintf(stdout, "\n");
 #endif
                 l++;
                 y++;
@@ -2572,13 +2572,13 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
     HDmemset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size);
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG
-    HDfprintf(stdout, "%s:%d: initial small_ds_slice_buf = ", fcnName, tv_ptr->mpi_rank);
+    fprintf(stdout, "%s:%d: initial small_ds_slice_buf = ", fcnName, tv_ptr->mpi_rank);
     ptr_0 = tv_ptr->small_ds_slice_buf;
     for (i = 0; i < (int)(tv_ptr->small_ds_slice_size); i++) {
-        HDfprintf(stdout, "%d ", (int)(*ptr_0));
+        fprintf(stdout, "%d ", (int)(*ptr_0));
         ptr_0++;
     }
-    HDfprintf(stdout, "\n");
+    fprintf(stdout, "\n");
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
 
     /* set up start, stride, count, and block -- note that we will
@@ -2600,8 +2600,8 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
     }
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG
-    HDfprintf(stdout, "%s:%d: reading slice from big ds on disk into small ds slice.\n", fcnName,
-              tv_ptr->mpi_rank);
+    fprintf(stdout, "%s:%d: reading slice from big ds on disk into small ds slice.\n", fcnName,
+            tv_ptr->mpi_rank);
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
     /* in serial versions of this test, we loop through all the dimensions
      * of the large data set.  However, in the parallel version, each
@@ -2693,12 +2693,12 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
 
                     /* Read selection from disk */
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
-                              tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
-                              tv_ptr->start[4]);
-                    HDfprintf(stdout, "%s slice/file extent dims = %d/%d.\n", fcnName,
-                              H5Sget_simple_extent_ndims(tv_ptr->small_ds_slice_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
+                            tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
+                            tv_ptr->start[4]);
+                    fprintf(stdout, "%s slice/file extent dims = %d/%d.\n", fcnName,
+                            H5Sget_simple_extent_ndims(tv_ptr->small_ds_slice_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_0));
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
 
                     ret =
@@ -2707,7 +2707,7 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
                     VRFY((ret >= 0), "H5Dread() slice from large ds succeeded.");
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG
-                    HDfprintf(stdout, "%s:%d: H5Dread() returns.\n", fcnName, tv_ptr->mpi_rank);
+                    fprintf(stdout, "%s:%d: H5Dread() returns.\n", fcnName, tv_ptr->mpi_rank);
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG */
 
                     /* verify that expected data is retrieved */
@@ -2799,7 +2799,7 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                                        sel_start);
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG
-    HDfprintf(stdout, "%s reading slices of on disk small data set into slices of big data set.\n", fcnName);
+    fprintf(stdout, "%s reading slices of on disk small data set into slices of big data set.\n", fcnName);
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG */
 
     /* zero out the buffer we will be reading into */
@@ -2917,12 +2917,12 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
 
                     /* Read selection from disk */
 #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
-                              tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
-                              tv_ptr->start[4]);
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->large_ds_slice_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_0));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
+                            tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
+                            tv_ptr->start[4]);
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->large_ds_slice_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_0));
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG */
                     ret = H5Dread(tv_ptr->small_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_large_ds_sid,
                                   tv_ptr->file_small_ds_sid_0, tv_ptr->xfer_plist, tv_ptr->large_ds_buf_1);
@@ -2945,21 +2945,21 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                     {
                         int m, n;
 
-                        HDfprintf(stdout, "%s:%d: expected_value = %d.\n", fcnName, tv_ptr->mpi_rank,
-                                  expected_value);
-                        HDfprintf(stdout, "%s:%d: start/stop index = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                                  start_index, stop_index);
+                        fprintf(stdout, "%s:%d: expected_value = %d.\n", fcnName, tv_ptr->mpi_rank,
+                                expected_value);
+                        fprintf(stdout, "%s:%d: start/stop index = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                                start_index, stop_index);
                         n = 0;
                         for (m = 0; (unsigned)m < tv_ptr->large_ds_size; m++) {
-                            HDfprintf(stdout, "%d ", (int)(*ptr_1));
+                            fprintf(stdout, "%d ", (int)(*ptr_1));
                             ptr_1++;
                             n++;
                             if (n >= tv_ptr->edge_size) {
-                                HDfprintf(stdout, "\n");
+                                fprintf(stdout, "\n");
                                 n = 0;
                             }
                         }
-                        HDfprintf(stdout, "\n");
+                        fprintf(stdout, "\n");
                         ptr_1 = tv_ptr->large_ds_buf_1;
                     }
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG */
@@ -3132,9 +3132,9 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
     HDmemset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size);
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG
-    HDfprintf(stdout,
-              "%s writing checker boards selections of slices from big ds to slices of small ds on disk.\n",
-              fcnName);
+    fprintf(stdout,
+            "%s writing checker boards selections of slices from big ds to slices of small ds on disk.\n",
+            fcnName);
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG */
 
     /* in serial versions of this test, we loop through all the dimensions
@@ -3244,12 +3244,12 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr)
                      * dataset.
                      */
 #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
-                              tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
-                              tv_ptr->start[4]);
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->mem_large_ds_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_1));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
+                            tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
+                            tv_ptr->start[4]);
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->mem_large_ds_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_small_ds_sid_1));
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG */
                     ret = H5Dwrite(tv_ptr->small_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_large_ds_sid,
                                    tv_ptr->file_small_ds_sid_1, tv_ptr->xfer_plist, tv_ptr->large_ds_buf_0);
@@ -3431,10 +3431,10 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
     HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size);
 
 #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_S2L__DEBUG
-    HDfprintf(stdout,
-              "%s writing process checkerboard selections of slices of small ds to process slices of large "
-              "ds on disk.\n",
-              fcnName);
+    fprintf(stdout,
+            "%s writing process checkerboard selections of slices of small ds to process slices of large "
+            "ds on disk.\n",
+            fcnName);
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__M2D_S2L__DEBUG */
 
     if (PAR_SS_DR_MAX_RANK - tv_ptr->large_rank == 0) {
@@ -3536,12 +3536,12 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr)
                      * target slice of the disk data set
                      */
 #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_S2L__DEBUG
-                    HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
-                              tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
-                              tv_ptr->start[4]);
-                    HDfprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
-                              H5Sget_simple_extent_ndims(tv_ptr->mem_small_ds_sid),
-                              H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_1));
+                    fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, tv_ptr->mpi_rank,
+                            tv_ptr->start[0], tv_ptr->start[1], tv_ptr->start[2], tv_ptr->start[3],
+                            tv_ptr->start[4]);
+                    fprintf(stdout, "%s:%d: mem/file extent dims = %d/%d.\n", fcnName, tv_ptr->mpi_rank,
+                            H5Sget_simple_extent_ndims(tv_ptr->mem_small_ds_sid),
+                            H5Sget_simple_extent_ndims(tv_ptr->file_large_ds_sid_1));
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__M2D_S2L__DEBUG */
                     ret = H5Dwrite(tv_ptr->large_dataset, H5T_NATIVE_UINT32, tv_ptr->mem_small_ds_sid,
                                    tv_ptr->file_large_ds_sid_1, tv_ptr->xfer_plist, tv_ptr->small_ds_buf_0);
@@ -3711,8 +3711,8 @@ ckrbrd_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: small rank = %d, large rank = %d.\n", test_num, small_rank, large_rank);
-        HDfprintf(stdout, "test %d: Initialization complete.\n", test_num);
+        fprintf(stdout, "test %d: small rank = %d, large rank = %d.\n", test_num, small_rank, large_rank);
+        fprintf(stdout, "test %d: Initialization complete.\n", test_num);
     }
 #endif /* CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
 
@@ -3763,9 +3763,9 @@ ckrbrd_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: Subtests complete -- tests run/skipped/total = %lld/%lld/%lld.\n",
-                  test_num, (long long)(tv_ptr->tests_run), (long long)(tv_ptr->tests_skipped),
-                  (long long)(tv_ptr->total_tests));
+        fprintf(stdout, "test %d: Subtests complete -- tests run/skipped/total = %lld/%lld/%lld.\n", test_num,
+                (long long)(tv_ptr->tests_run), (long long)(tv_ptr->tests_skipped),
+                (long long)(tv_ptr->total_tests));
     }
 #endif /* CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
 
@@ -3773,7 +3773,7 @@ ckrbrd_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const i
 
 #if CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     if (MAINPROCESS) {
-        HDfprintf(stdout, "test %d: Takedown complete.\n", test_num);
+        fprintf(stdout, "test %d: Takedown complete.\n", test_num);
     }
 #endif /* CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
 
@@ -3911,16 +3911,16 @@ ckrbrd_hs_dr_pio_test(ShapeSameTestMethods sstest_type)
             } /* end of switch(sstest_type) */
 #if CONTIG_HS_DR_PIO_TEST__DEBUG
             if ((MAINPROCESS) && (tests_skipped > 0)) {
-                HDfprintf(stdout, "     run/skipped/total = %" PRId64 "/%" PRId64 "/%" PRId64 ".\n",
-                          tests_run, tests_skipped, total_tests);
+                fprintf(stdout, "     run/skipped/total = %" PRId64 "/%" PRId64 "/%" PRId64 ".\n", tests_run,
+                        tests_skipped, total_tests);
             }
 #endif /* CONTIG_HS_DR_PIO_TEST__DEBUG */
         }
     }
 
     if ((MAINPROCESS) && (tests_skipped > 0)) {
-        HDfprintf(stdout, "     %" PRId64 " of %" PRId64 " subtests skipped to expedite testing.\n",
-                  tests_skipped, total_tests);
+        fprintf(stdout, "     %" PRId64 " of %" PRId64 " subtests skipped to expedite testing.\n",
+                tests_skipped, total_tests);
     }
 
     return;
@@ -3998,10 +3998,9 @@ pause_proc(void)
     if (MAINPROCESS)
         while ((HDstat(greenlight, &statbuf) == -1) && loops < maxloop) {
             if (!loops++) {
-                HDprintf("Proc %d (%*s, %d): to debug, attach %d\n", mpi_rank, mpi_namelen, mpi_name, pid,
-                         pid);
+                printf("Proc %d (%*s, %d): to debug, attach %d\n", mpi_rank, mpi_namelen, mpi_name, pid, pid);
             }
-            HDprintf("waiting(%ds) for file %s ...\n", time_int, greenlight);
+            printf("waiting(%ds) for file %s ...\n", time_int, greenlight);
             fflush(stdout);
             HDsleep(time_int);
         }
@@ -4025,18 +4024,18 @@ MPI_Init(int *argc, char ***argv)
 static void
 usage(void)
 {
-    HDprintf("    [-r] [-w] [-m<n_datasets>] [-n<n_groups>] "
-             "[-o] [-f <prefix>] [-d <dim0> <dim1>]\n");
-    HDprintf("\t-m<n_datasets>"
-             "\tset number of datasets for the multiple dataset test\n");
-    HDprintf("\t-n<n_groups>"
-             "\tset number of groups for the multiple group test\n");
-    HDprintf("\t-f <prefix>\tfilename prefix\n");
-    HDprintf("\t-2\t\tuse Split-file together with MPIO\n");
-    HDprintf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n", ROW_FACTOR,
-             COL_FACTOR);
-    HDprintf("\t-c <dim0> <dim1>\tdataset chunk dimensions. Defaults (dim0/10,dim1/10)\n");
-    HDprintf("\n");
+    printf("    [-r] [-w] [-m<n_datasets>] [-n<n_groups>] "
+           "[-o] [-f <prefix>] [-d <dim0> <dim1>]\n");
+    printf("\t-m<n_datasets>"
+           "\tset number of datasets for the multiple dataset test\n");
+    printf("\t-n<n_groups>"
+           "\tset number of groups for the multiple group test\n");
+    printf("\t-f <prefix>\tfilename prefix\n");
+    printf("\t-2\t\tuse Split-file together with MPIO\n");
+    printf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n", ROW_FACTOR,
+           COL_FACTOR);
+    printf("\t-c <dim0> <dim1>\tdataset chunk dimensions. Defaults (dim0/10,dim1/10)\n");
+    printf("\n");
 }
 
 /*
@@ -4118,7 +4117,7 @@ parse_options(int argc, char **argv)
                 case 'h': /* print help message--return with nerrors set */
                     return (1);
                 default:
-                    HDprintf("Illegal option(%s)\n", *argv);
+                    printf("Illegal option(%s)\n", *argv);
                     nerrors++;
                     return (1);
             }
@@ -4127,12 +4126,12 @@ parse_options(int argc, char **argv)
 
     /* check validity of dimension and chunk sizes */
     if (dim0 <= 0 || dim1 <= 0) {
-        HDprintf("Illegal dim sizes (%d, %d)\n", dim0, dim1);
+        printf("Illegal dim sizes (%d, %d)\n", dim0, dim1);
         nerrors++;
         return (1);
     }
     if (chunkdim0 <= 0 || chunkdim1 <= 0) {
-        HDprintf("Illegal chunkdim sizes (%d, %d)\n", chunkdim0, chunkdim1);
+        printf("Illegal chunkdim sizes (%d, %d)\n", chunkdim0, chunkdim1);
         nerrors++;
         return (1);
     }
@@ -4140,7 +4139,7 @@ parse_options(int argc, char **argv)
     /* Make sure datasets can be divided into equal portions by the processes */
     if ((dim0 % mpi_size) || (dim1 % mpi_size)) {
         if (MAINPROCESS)
-            HDprintf("dim0(%d) and dim1(%d) must be multiples of processes(%d)\n", dim0, dim1, mpi_size);
+            printf("dim0(%d) and dim1(%d) must be multiples of processes(%d)\n", dim0, dim1, mpi_size);
         nerrors++;
         return (1);
     }
@@ -4153,13 +4152,13 @@ parse_options(int argc, char **argv)
 
         for (i = 0; i < n; i++)
             if (h5_fixname(FILENAME[i], fapl, filenames[i], PATH_MAX) == NULL) {
-                HDprintf("h5_fixname failed\n");
+                printf("h5_fixname failed\n");
                 nerrors++;
                 return (1);
             }
-        HDprintf("Test filenames are:\n");
+        printf("Test filenames are:\n");
         for (i = 0; i < n; i++)
-            HDprintf("    %s\n", filenames[i]);
+            printf("    %s\n", filenames[i]);
     }
 
     return (0);
@@ -4293,10 +4292,10 @@ main(int argc, char **argv)
     dim1 = COL_FACTOR * mpi_size;
 
     if (MAINPROCESS) {
-        HDprintf("===================================\n");
-        HDprintf("Shape Same Tests Start\n");
-        HDprintf("    express_test = %d.\n", GetTestExpress());
-        HDprintf("===================================\n");
+        printf("===================================\n");
+        printf("Shape Same Tests Start\n");
+        printf("    express_test = %d.\n", GetTestExpress());
+        printf("===================================\n");
     }
 
     /* Attempt to turn off atexit post processing so that in case errors
@@ -4306,7 +4305,7 @@ main(int argc, char **argv)
      */
     if (H5dont_atexit() < 0) {
         if (MAINPROCESS)
-            HDprintf("%d: Failed to turn off atexit processing. Continue.\n", mpi_rank);
+            printf("%d: Failed to turn off atexit processing. Continue.\n", mpi_rank);
     };
     H5open();
     h5_show_hostname();
@@ -4314,7 +4313,7 @@ main(int argc, char **argv)
     HDmemset(filenames, 0, sizeof(filenames));
     for (int i = 0; i < NFILENAME; i++) {
         if (NULL == (filenames[i] = HDmalloc(PATH_MAX))) {
-            HDprintf("couldn't allocate filename array\n");
+            printf("couldn't allocate filename array\n");
             MPI_Abort(MPI_COMM_WORLD, -1);
         }
     }
@@ -4345,9 +4344,9 @@ main(int argc, char **argv)
     TestParseCmdLine(argc, argv);
 
     if (dxfer_coll_type == DXFER_INDEPENDENT_IO && MAINPROCESS) {
-        HDprintf("===================================\n"
-                 "   Using Independent I/O with file set view to replace collective I/O \n"
-                 "===================================\n");
+        printf("===================================\n"
+               "   Using Independent I/O with file set view to replace collective I/O \n"
+               "===================================\n");
     }
 
     /* Perform requested testing */
@@ -4375,12 +4374,12 @@ main(int argc, char **argv)
     }
 
     if (MAINPROCESS) { /* only process 0 reports */
-        HDprintf("===================================\n");
+        printf("===================================\n");
         if (nerrors)
-            HDprintf("***Shape Same tests detected %d errors***\n", nerrors);
+            printf("***Shape Same tests detected %d errors***\n", nerrors);
         else
-            HDprintf("Shape Same tests finished with no errors\n");
-        HDprintf("===================================\n");
+            printf("Shape Same tests finished with no errors\n");
+        printf("===================================\n");
     }
 
     for (int i = 0; i < NFILENAME; i++) {
diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c
index 423b121..82da3bd 100644
--- a/testpar/t_span_tree.c
+++ b/testpar/t_span_tree.c
@@ -934,8 +934,8 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 
 #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: dims/checker_edge_size = %d %d %d %d %d / %d\n", fcnName, mpi_rank,
-                  (int)dims[0], (int)dims[1], (int)dims[2], (int)dims[3], (int)dims[4], checker_edge_size);
+        fprintf(stdout, "%s:%d: dims/checker_edge_size = %d %d %d %d %d / %d\n", fcnName, mpi_rank,
+                (int)dims[0], (int)dims[1], (int)dims[2], (int)dims[3], (int)dims[4], checker_edge_size);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
@@ -957,8 +957,8 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 
 #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: sel_rank/sel_offset = %d/%d.\n", fcnName, mpi_rank, sel_rank, sel_offset);
-        HDfprintf(stdout, "%s:%d: tgt_rank/ds_offset = %d/%d.\n", fcnName, mpi_rank, tgt_rank, ds_offset);
+        fprintf(stdout, "%s:%d: sel_rank/sel_offset = %d/%d.\n", fcnName, mpi_rank, sel_rank, sel_offset);
+        fprintf(stdout, "%s:%d: tgt_rank/ds_offset = %d/%d.\n", fcnName, mpi_rank, tgt_rank, ds_offset);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
@@ -992,8 +992,8 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 
 #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: base_count/offset_count = %d/%d.\n", fcnName, mpi_rank, base_count,
-                  offset_count);
+        fprintf(stdout, "%s:%d: base_count/offset_count = %d/%d.\n", fcnName, mpi_rank, base_count,
+                offset_count);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
@@ -1116,26 +1116,25 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG
                             if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
 
-                                HDfprintf(stdout, "%s%d: *** first_selection = %d ***\n", fcnName, mpi_rank,
-                                          (int)first_selection);
-                                HDfprintf(stdout, "%s:%d: i/j/k/l/m = %d/%d/%d/%d/%d\n", fcnName, mpi_rank, i,
-                                          j, k, l, m);
-                                HDfprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                          (int)start[0], (int)start[1], (int)start[2], (int)start[3],
-                                          (int)start[4]);
-                                HDfprintf(stdout, "%s:%d: stride = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                          (int)stride[0], (int)stride[1], (int)stride[2], (int)stride[3],
-                                          (int)stride[4]);
-                                HDfprintf(stdout, "%s:%d: count = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                          (int)count[0], (int)count[1], (int)count[2], (int)count[3],
-                                          (int)count[4]);
-                                HDfprintf(stdout, "%s:%d: block = %d %d %d %d %d.\n", fcnName, mpi_rank,
-                                          (int)block[0], (int)block[1], (int)block[2], (int)block[3],
-                                          (int)block[4]);
-                                HDfprintf(stdout, "%s:%d: n-cube extent dims = %d.\n", fcnName, mpi_rank,
-                                          H5Sget_simple_extent_ndims(tgt_sid));
-                                HDfprintf(stdout, "%s:%d: selection rank = %d.\n", fcnName, mpi_rank,
-                                          sel_rank);
+                                fprintf(stdout, "%s%d: *** first_selection = %d ***\n", fcnName, mpi_rank,
+                                        (int)first_selection);
+                                fprintf(stdout, "%s:%d: i/j/k/l/m = %d/%d/%d/%d/%d\n", fcnName, mpi_rank, i,
+                                        j, k, l, m);
+                                fprintf(stdout, "%s:%d: start = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                        (int)start[0], (int)start[1], (int)start[2], (int)start[3],
+                                        (int)start[4]);
+                                fprintf(stdout, "%s:%d: stride = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                        (int)stride[0], (int)stride[1], (int)stride[2], (int)stride[3],
+                                        (int)stride[4]);
+                                fprintf(stdout, "%s:%d: count = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                        (int)count[0], (int)count[1], (int)count[2], (int)count[3],
+                                        (int)count[4]);
+                                fprintf(stdout, "%s:%d: block = %d %d %d %d %d.\n", fcnName, mpi_rank,
+                                        (int)block[0], (int)block[1], (int)block[2], (int)block[3],
+                                        (int)block[4]);
+                                fprintf(stdout, "%s:%d: n-cube extent dims = %d.\n", fcnName, mpi_rank,
+                                        H5Sget_simple_extent_ndims(tgt_sid));
+                                fprintf(stdout, "%s:%d: selection rank = %d.\n", fcnName, mpi_rank, sel_rank);
                             }
 #endif
 
@@ -1181,8 +1180,8 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 
 #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
-                  (int)H5Sget_select_npoints(tgt_sid));
+        fprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
+                (int)H5Sget_select_npoints(tgt_sid));
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
@@ -1202,9 +1201,9 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t
 
 #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
-                  (int)H5Sget_select_npoints(tgt_sid));
-        HDfprintf(stdout, "%s%d: done.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s%d: H5Sget_select_npoints(tgt_sid) = %d.\n", fcnName, mpi_rank,
+                (int)H5Sget_select_npoints(tgt_sid));
+        fprintf(stdout, "%s%d: done.\n", fcnName, mpi_rank);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG */
 
@@ -1300,12 +1299,12 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr,
 
 #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s mpi_rank = %d.\n", fcnName, mpi_rank);
-        HDfprintf(stdout, "%s rank = %d.\n", fcnName, rank);
-        HDfprintf(stdout, "%s edge_size = %d.\n", fcnName, edge_size);
-        HDfprintf(stdout, "%s checker_edge_size = %d.\n", fcnName, checker_edge_size);
-        HDfprintf(stdout, "%s first_expected_val = %d.\n", fcnName, (int)first_expected_val);
-        HDfprintf(stdout, "%s starts_in_checker = %d.\n", fcnName, (int)buf_starts_in_checker);
+        fprintf(stdout, "%s mpi_rank = %d.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s rank = %d.\n", fcnName, rank);
+        fprintf(stdout, "%s edge_size = %d.\n", fcnName, edge_size);
+        fprintf(stdout, "%s checker_edge_size = %d.\n", fcnName, checker_edge_size);
+        fprintf(stdout, "%s first_expected_val = %d.\n", fcnName, (int)first_expected_val);
+        fprintf(stdout, "%s starts_in_checker = %d.\n", fcnName, (int)buf_starts_in_checker);
     }
 #endif
 
@@ -1356,14 +1355,14 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr,
                     z = 0;
 #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG
                     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-                        HDfprintf(stdout, "%d, %d, %d, %d, %d:", i, j, k, l, m);
+                        fprintf(stdout, "%d, %d, %d, %d, %d:", i, j, k, l, m);
                     }
 #endif
                     in_checker = start_in_checker[3];
                     do {
 #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG
                         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-                            HDfprintf(stdout, " %d", (int)(*val_ptr));
+                            fprintf(stdout, " %d", (int)(*val_ptr));
                         }
 #endif
                         if (z >= checker_edge_size) {
@@ -1398,7 +1397,7 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr,
                     } while ((rank >= (test_max_rank - 4)) && (m < edge_size));
 #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG
                     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-                        HDfprintf(stdout, "\n");
+                        fprintf(stdout, "\n");
                     }
 #endif
                     l++;
@@ -1506,8 +1505,8 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: chunk_edge_size = %d.\n", fcnName, mpi_rank, (int)chunk_edge_size);
-        HDfprintf(stdout, "%s:%d: use_collective_io = %d.\n", fcnName, mpi_rank, (int)use_collective_io);
+        fprintf(stdout, "%s:%d: chunk_edge_size = %d.\n", fcnName, mpi_rank, (int)chunk_edge_size);
+        fprintf(stdout, "%s:%d: use_collective_io = %d.\n", fcnName, mpi_rank, (int)use_collective_io);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1519,10 +1518,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
     large_ds_slice_size = (size_t)(10 * 10 * 10 * 10);
 
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: small ds size / slice size = %d / %d.\n", fcnName, mpi_rank,
-                  (int)small_ds_size, (int)small_ds_slice_size);
-        HDfprintf(stdout, "%s:%d: large ds size / slice size = %d / %d.\n", fcnName, mpi_rank,
-                  (int)large_ds_size, (int)large_ds_slice_size);
+        fprintf(stdout, "%s:%d: small ds size / slice size = %d / %d.\n", fcnName, mpi_rank,
+                (int)small_ds_size, (int)small_ds_slice_size);
+        fprintf(stdout, "%s:%d: large ds size / slice size = %d / %d.\n", fcnName, mpi_rank,
+                (int)large_ds_size, (int)large_ds_slice_size);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1602,10 +1601,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: small_dims[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)small_dims[0],
-                  (int)small_dims[1], (int)small_dims[2], (int)small_dims[3], (int)small_dims[4]);
-        HDfprintf(stdout, "%s:%d: large_dims[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)large_dims[0],
-                  (int)large_dims[1], (int)large_dims[2], (int)large_dims[3], (int)large_dims[4]);
+        fprintf(stdout, "%s:%d: small_dims[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)small_dims[0],
+                (int)small_dims[1], (int)small_dims[2], (int)small_dims[3], (int)small_dims[4]);
+        fprintf(stdout, "%s:%d: large_dims[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)large_dims[0],
+                (int)large_dims[1], (int)large_dims[2], (int)large_dims[3], (int)large_dims[4]);
     }
 #endif
 
@@ -1661,9 +1660,9 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-            HDfprintf(stdout, "%s:%d: small chunk dims[] = %d %d %d %d %d\n", fcnName, mpi_rank,
-                      (int)small_chunk_dims[0], (int)small_chunk_dims[1], (int)small_chunk_dims[2],
-                      (int)small_chunk_dims[3], (int)small_chunk_dims[4]);
+            fprintf(stdout, "%s:%d: small chunk dims[] = %d %d %d %d %d\n", fcnName, mpi_rank,
+                    (int)small_chunk_dims[0], (int)small_chunk_dims[1], (int)small_chunk_dims[2],
+                    (int)small_chunk_dims[3], (int)small_chunk_dims[4]);
         }
 #endif
 
@@ -1682,9 +1681,9 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-            HDfprintf(stdout, "%s:%d: large chunk dims[] = %d %d %d %d %d\n", fcnName, mpi_rank,
-                      (int)large_chunk_dims[0], (int)large_chunk_dims[1], (int)large_chunk_dims[2],
-                      (int)large_chunk_dims[3], (int)large_chunk_dims[4]);
+            fprintf(stdout, "%s:%d: large chunk dims[] = %d %d %d %d %d\n", fcnName, mpi_rank,
+                    (int)large_chunk_dims[0], (int)large_chunk_dims[1], (int)large_chunk_dims[2],
+                    (int)large_chunk_dims[3], (int)large_chunk_dims[4]);
         }
 #endif
 
@@ -1710,8 +1709,8 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: small/large ds id = %d / %d.\n", fcnName, mpi_rank, (int)small_dataset,
-                  (int)large_dataset);
+        fprintf(stdout, "%s:%d: small/large ds id = %d / %d.\n", fcnName, mpi_rank, (int)small_dataset,
+                (int)large_dataset);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1743,15 +1742,15 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: settings for small data set initialization.\n", fcnName, mpi_rank);
-        HDfprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0],
-                  (int)start[1], (int)start[2], (int)start[3], (int)start[4]);
-        HDfprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
-                  (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
-        HDfprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0],
-                  (int)count[1], (int)count[2], (int)count[3], (int)count[4]);
-        HDfprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0],
-                  (int)block[1], (int)block[2], (int)block[3], (int)block[4]);
+        fprintf(stdout, "%s:%d: settings for small data set initialization.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0], (int)start[1],
+                (int)start[2], (int)start[3], (int)start[4]);
+        fprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
+                (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
+        fprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0], (int)count[1],
+                (int)count[2], (int)count[3], (int)count[4]);
+        fprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0], (int)block[1],
+                (int)block[2], (int)block[3], (int)block[4]);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1768,15 +1767,15 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-            HDfprintf(stdout, "%s:%d: added settings for main process.\n", fcnName, mpi_rank);
-            HDfprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0],
-                      (int)start[1], (int)start[2], (int)start[3], (int)start[4]);
-            HDfprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
-                      (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
-            HDfprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0],
-                      (int)count[1], (int)count[2], (int)count[3], (int)count[4]);
-            HDfprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0],
-                      (int)block[1], (int)block[2], (int)block[3], (int)block[4]);
+            fprintf(stdout, "%s:%d: added settings for main process.\n", fcnName, mpi_rank);
+            fprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0],
+                    (int)start[1], (int)start[2], (int)start[3], (int)start[4]);
+            fprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
+                    (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
+            fprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0],
+                    (int)count[1], (int)count[2], (int)count[3], (int)count[4]);
+            fprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0],
+                    (int)block[1], (int)block[2], (int)block[3], (int)block[4]);
         }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1796,7 +1795,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
     /* write the initial value of the small data set to file */
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: writing init value of small ds to file.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s:%d: writing init value of small ds to file.\n", fcnName, mpi_rank);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
     ret = H5Dwrite(small_dataset, dset_type, mem_small_ds_sid, file_small_ds_sid, xfer_plist, small_ds_buf_0);
@@ -1850,15 +1849,15 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: settings for large data set initialization.\n", fcnName, mpi_rank);
-        HDfprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0],
-                  (int)start[1], (int)start[2], (int)start[3], (int)start[4]);
-        HDfprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
-                  (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
-        HDfprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0],
-                  (int)count[1], (int)count[2], (int)count[3], (int)count[4]);
-        HDfprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0],
-                  (int)block[1], (int)block[2], (int)block[3], (int)block[4]);
+        fprintf(stdout, "%s:%d: settings for large data set initialization.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0], (int)start[1],
+                (int)start[2], (int)start[3], (int)start[4]);
+        fprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
+                (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
+        fprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0], (int)count[1],
+                (int)count[2], (int)count[3], (int)count[4]);
+        fprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0], (int)block[1],
+                (int)block[2], (int)block[3], (int)block[4]);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1870,10 +1869,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s%d: H5Sget_select_npoints(mem_large_ds_sid) = %d.\n", fcnName, mpi_rank,
-                  (int)H5Sget_select_npoints(mem_large_ds_sid));
-        HDfprintf(stdout, "%s%d: H5Sget_select_npoints(file_large_ds_sid) = %d.\n", fcnName, mpi_rank,
-                  (int)H5Sget_select_npoints(file_large_ds_sid));
+        fprintf(stdout, "%s%d: H5Sget_select_npoints(mem_large_ds_sid) = %d.\n", fcnName, mpi_rank,
+                (int)H5Sget_select_npoints(mem_large_ds_sid));
+        fprintf(stdout, "%s%d: H5Sget_select_npoints(file_large_ds_sid) = %d.\n", fcnName, mpi_rank,
+                (int)H5Sget_select_npoints(file_large_ds_sid));
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1883,15 +1882,15 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-            HDfprintf(stdout, "%s:%d: added settings for main process.\n", fcnName, mpi_rank);
-            HDfprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0],
-                      (int)start[1], (int)start[2], (int)start[3], (int)start[4]);
-            HDfprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
-                      (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
-            HDfprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0],
-                      (int)count[1], (int)count[2], (int)count[3], (int)count[4]);
-            HDfprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0],
-                      (int)block[1], (int)block[2], (int)block[3], (int)block[4]);
+            fprintf(stdout, "%s:%d: added settings for main process.\n", fcnName, mpi_rank);
+            fprintf(stdout, "%s:%d: start[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)start[0],
+                    (int)start[1], (int)start[2], (int)start[3], (int)start[4]);
+            fprintf(stdout, "%s:%d: stride[] = %d %d %d %d %d\n", fcnName, mpi_rank, (int)stride[0],
+                    (int)stride[1], (int)stride[2], (int)stride[3], (int)stride[4]);
+            fprintf(stdout, "%s:%d: count[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)count[0],
+                    (int)count[1], (int)count[2], (int)count[3], (int)count[4]);
+            fprintf(stdout, "%s:%d: block[]  = %d %d %d %d %d\n", fcnName, mpi_rank, (int)block[0],
+                    (int)block[1], (int)block[2], (int)block[3], (int)block[4]);
         }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1903,10 +1902,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
         if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-            HDfprintf(stdout, "%s%d: H5Sget_select_npoints(mem_large_ds_sid) = %d.\n", fcnName, mpi_rank,
-                      (int)H5Sget_select_npoints(mem_large_ds_sid));
-            HDfprintf(stdout, "%s%d: H5Sget_select_npoints(file_large_ds_sid) = %d.\n", fcnName, mpi_rank,
-                      (int)H5Sget_select_npoints(file_large_ds_sid));
+            fprintf(stdout, "%s%d: H5Sget_select_npoints(mem_large_ds_sid) = %d.\n", fcnName, mpi_rank,
+                    (int)H5Sget_select_npoints(mem_large_ds_sid));
+            fprintf(stdout, "%s%d: H5Sget_select_npoints(file_large_ds_sid) = %d.\n", fcnName, mpi_rank,
+                    (int)H5Sget_select_npoints(file_large_ds_sid));
         }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
     }
@@ -1932,12 +1931,12 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
 
         rank = H5Sget_simple_extent_dims(mem_large_ds_sid, dims, max_dims);
-        HDfprintf(stdout, "%s:%d: mem_large_ds_sid dims[%d] = %d %d %d %d %d\n", fcnName, mpi_rank, rank,
-                  (int)dims[0], (int)dims[1], (int)dims[2], (int)dims[3], (int)dims[4]);
+        fprintf(stdout, "%s:%d: mem_large_ds_sid dims[%d] = %d %d %d %d %d\n", fcnName, mpi_rank, rank,
+                (int)dims[0], (int)dims[1], (int)dims[2], (int)dims[3], (int)dims[4]);
 
         rank = H5Sget_simple_extent_dims(file_large_ds_sid, dims, max_dims);
-        HDfprintf(stdout, "%s:%d: file_large_ds_sid dims[%d] = %d %d %d %d %d\n", fcnName, mpi_rank, rank,
-                  (int)dims[0], (int)dims[1], (int)dims[2], (int)dims[3], (int)dims[4]);
+        fprintf(stdout, "%s:%d: file_large_ds_sid dims[%d] = %d %d %d %d %d\n", fcnName, mpi_rank, rank,
+                (int)dims[0], (int)dims[1], (int)dims[2], (int)dims[3], (int)dims[4]);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -1950,10 +1949,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
     /* write the initial value of the large data set to file */
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: writing init value of large ds to file.\n", fcnName, mpi_rank);
-        HDfprintf(stdout, "%s:%d: large_dataset = %d.\n", fcnName, mpi_rank, (int)large_dataset);
-        HDfprintf(stdout, "%s:%d: mem_large_ds_sid = %d, file_large_ds_sid = %d.\n", fcnName, mpi_rank,
-                  (int)mem_large_ds_sid, (int)file_large_ds_sid);
+        fprintf(stdout, "%s:%d: writing init value of large ds to file.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s:%d: large_dataset = %d.\n", fcnName, mpi_rank, (int)large_dataset);
+        fprintf(stdout, "%s:%d: mem_large_ds_sid = %d, file_large_ds_sid = %d.\n", fcnName, mpi_rank,
+                (int)mem_large_ds_sid, (int)file_large_ds_sid);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -2042,7 +2041,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: H5Dread() returns.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s:%d: H5Dread() returns.\n", fcnName, mpi_rank);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -2139,7 +2138,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-        HDfprintf(stdout, "%s:%d: H5Dread() returns.\n", fcnName, mpi_rank);
+        fprintf(stdout, "%s:%d: H5Dread() returns.\n", fcnName, mpi_rank);
     }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */
 
@@ -2197,8 +2196,8 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_
 
 #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG
             if (mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK) {
-                HDfprintf(stdout, "%s:%d: unexpected value at index %d: %d.\n", fcnName, mpi_rank, (int)i,
-                          (int)(*ptr_1));
+                fprintf(stdout, "%s:%d: unexpected value at index %d: %d.\n", fcnName, mpi_rank, (int)i,
+                        (int)(*ptr_1));
             }
 #endif /* LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG */
 
diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c
index ba22718..c30d551 100644
--- a/testpar/t_subfiling_vfd.c
+++ b/testpar/t_subfiling_vfd.c
@@ -941,7 +941,7 @@ test_selection_strategies(void)
                     case SELECT_IOC_WITH_CONFIG:
                     case ioc_selection_options:
                     default:
-                        HDprintf("invalid IOC selection strategy\n");
+                        printf("invalid IOC selection strategy\n");
                         MPI_Abort(comm_g, -1);
                 }
 
@@ -1957,13 +1957,13 @@ test_subfiling_h5fuse(void)
                 int ret;
 
                 if ((ret = WEXITSTATUS(status)) != 0) {
-                    HDprintf("h5fuse process exited with error code %d\n", ret);
+                    printf("h5fuse process exited with error code %d\n", ret);
                     HDfflush(stdout);
                     MPI_Abort(comm_g, -1);
                 }
             }
             else {
-                HDprintf("h5fuse process terminated abnormally\n");
+                printf("h5fuse process terminated abnormally\n");
                 HDfflush(stdout);
                 MPI_Abort(comm_g, -1);
             }
@@ -2033,7 +2033,7 @@ test_subfiling_h5fuse(void)
 
         /* Delete the configuration file */
         if (HDremove(filename_buf) < 0) {
-            HDprintf("couldn't remove Subfiling VFD configuration file '%s'\n", filename_buf);
+            printf("couldn't remove Subfiling VFD configuration file '%s'\n", filename_buf);
             nerrors++;
         }
 
@@ -2044,7 +2044,7 @@ test_subfiling_h5fuse(void)
 
             /* Delete the subfile */
             if (HDremove(filename_buf) < 0) {
-                HDprintf("couldn't remove subfile '%s'\n", filename_buf);
+                printf("couldn't remove subfile '%s'\n", filename_buf);
                 nerrors++;
             }
         }
@@ -2129,27 +2129,27 @@ main(int argc, char **argv)
 
     /* Initialize MPI */
     if (MPI_SUCCESS != (mpi_code_g = MPI_Init_thread(&argc, &argv, required, &provided))) {
-        HDprintf("MPI_Init_thread failed with error code %d\n", mpi_code_g);
+        printf("MPI_Init_thread failed with error code %d\n", mpi_code_g);
         nerrors++;
         goto exit;
     }
 
     if (MPI_SUCCESS != (mpi_code_g = MPI_Comm_rank(comm_g, &mpi_rank))) {
-        HDprintf("MPI_Comm_rank failed with error code %d\n", mpi_code_g);
+        printf("MPI_Comm_rank failed with error code %d\n", mpi_code_g);
         nerrors++;
         goto exit;
     }
 
     if (provided != required) {
         if (MAINPROCESS)
-            HDprintf("MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE\n");
+            printf("MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE\n");
         nerrors++;
         goto exit;
     }
 
     if (MPI_SUCCESS != (mpi_code_g = MPI_Comm_size(comm_g, &mpi_size))) {
         if (MAINPROCESS)
-            HDprintf("MPI_Comm_size failed with error code %d\n", mpi_code_g);
+            printf("MPI_Comm_size failed with error code %d\n", mpi_code_g);
         nerrors++;
         goto exit;
     }
@@ -2158,19 +2158,19 @@ main(int argc, char **argv)
     if (MPI_SUCCESS != (mpi_code_g = MPI_Comm_split_type(comm_g, MPI_COMM_TYPE_SHARED, mpi_rank,
                                                          MPI_INFO_NULL, &node_local_comm))) {
         if (MAINPROCESS)
-            HDprintf("MPI_Comm_split_type failed with error code %d\n", mpi_code_g);
+            printf("MPI_Comm_split_type failed with error code %d\n", mpi_code_g);
         nerrors++;
         goto exit;
     }
     if (MPI_SUCCESS != (mpi_code_g = MPI_Comm_size(node_local_comm, &node_local_size))) {
         if (MAINPROCESS)
-            HDprintf("MPI_Comm_size failed with error code %d\n", mpi_code_g);
+            printf("MPI_Comm_size failed with error code %d\n", mpi_code_g);
         nerrors++;
         goto exit;
     }
     if (MPI_SUCCESS != (mpi_code_g = MPI_Comm_rank(node_local_comm, &node_local_rank))) {
         if (MAINPROCESS)
-            HDprintf("MPI_Comm_rank failed with error code %d\n", mpi_code_g);
+            printf("MPI_Comm_rank failed with error code %d\n", mpi_code_g);
         nerrors++;
         goto exit;
     }
@@ -2180,7 +2180,7 @@ main(int argc, char **argv)
     if (MPI_SUCCESS !=
         (mpi_code_g = MPI_Allreduce(MPI_IN_PLACE, &num_nodes_g, 1, MPI_INT, MPI_SUM, comm_g))) {
         if (MAINPROCESS)
-            HDprintf("MPI_Allreduce failed with error code %d\n", mpi_code_g);
+            printf("MPI_Allreduce failed with error code %d\n", mpi_code_g);
         nerrors++;
         goto exit;
     }
@@ -2193,32 +2193,32 @@ main(int argc, char **argv)
      */
     if (MPI_SUCCESS != (mpi_code_g = MPI_Comm_split(comm_g, node_local_rank, mpi_rank, &ioc_comm))) {
         if (MAINPROCESS)
-            HDprintf("MPI_Comm_split failed with error code %d\n", mpi_code_g);
+            printf("MPI_Comm_split failed with error code %d\n", mpi_code_g);
         nerrors++;
         goto exit;
     }
     if (MPI_SUCCESS != (mpi_code_g = MPI_Comm_size(ioc_comm, &ioc_comm_size))) {
         if (MAINPROCESS)
-            HDprintf("MPI_Comm_size failed with error code %d\n", mpi_code_g);
+            printf("MPI_Comm_size failed with error code %d\n", mpi_code_g);
         nerrors++;
         goto exit;
     }
     if (MPI_SUCCESS != (mpi_code_g = MPI_Comm_rank(ioc_comm, &ioc_comm_rank))) {
         if (MAINPROCESS)
-            HDprintf("MPI_Comm_rank failed with error code %d\n", mpi_code_g);
+            printf("MPI_Comm_rank failed with error code %d\n", mpi_code_g);
         nerrors++;
         goto exit;
     }
 
     if (H5dont_atexit() < 0) {
         if (MAINPROCESS)
-            HDprintf("Failed to turn off atexit processing. Continue.\n");
+            printf("Failed to turn off atexit processing. Continue.\n");
     }
 
     H5open();
 
     if (MAINPROCESS) {
-        HDprintf("Testing Subfiling VFD functionality\n");
+        printf("Testing Subfiling VFD functionality\n");
     }
 
     TestAlarmOn();
@@ -2236,7 +2236,7 @@ main(int argc, char **argv)
     if (mpi_size > 1) {
         if (MPI_SUCCESS != (mpi_code_g = MPI_Bcast(&seed, 1, MPI_UNSIGNED, 0, comm_g))) {
             if (MAINPROCESS)
-                HDprintf("MPI_Bcast failed with error code %d\n", mpi_code_g);
+                printf("MPI_Bcast failed with error code %d\n", mpi_code_g);
             nerrors++;
             goto exit;
         }
@@ -2245,13 +2245,13 @@ main(int argc, char **argv)
     srand(seed);
 
     if (MAINPROCESS)
-        HDprintf("Using seed: %u\n\n", seed);
+        printf("Using seed: %u\n\n", seed);
 
     /* Allocate buffer for possible config file directory specified */
     config_dir = HDmalloc(PATH_MAX);
     if (!config_dir) {
         if (MAINPROCESS)
-            HDprintf("couldn't allocate space for subfiling config file directory buffer\n");
+            printf("couldn't allocate space for subfiling config file directory buffer\n");
         nerrors++;
         goto exit;
     }
@@ -2312,7 +2312,7 @@ main(int argc, char **argv)
 
         if (HDsetenv(H5FD_SUBFILING_STRIPE_SIZE, tmp, 1) < 0) {
             if (MAINPROCESS)
-                HDprintf("HDsetenv failed\n");
+                printf("HDsetenv failed\n");
             nerrors++;
             goto exit;
         }
@@ -2329,7 +2329,7 @@ main(int argc, char **argv)
 
         if (HDsetenv(H5FD_SUBFILING_IOC_PER_NODE, ioc_per_node_str, 1) < 0) {
             if (MAINPROCESS)
-                HDprintf("HDsetenv failed\n");
+                printf("HDsetenv failed\n");
             nerrors++;
             goto exit;
         }
@@ -2339,7 +2339,7 @@ main(int argc, char **argv)
     if (ioc_thread_pool_size_g < 0) {
         if (HDsetenv(H5FD_IOC_THREAD_POOL_SIZE, "2", 1) < 0) {
             if (MAINPROCESS)
-                HDprintf("HDsetenv failed\n");
+                printf("HDsetenv failed\n");
             nerrors++;
             goto exit;
         }
@@ -2364,7 +2364,7 @@ main(int argc, char **argv)
 
             if (MAINPROCESS) {
                 if ((HDmkdir(SUBFILING_CONFIG_FILE_DIR, (mode_t)0755) < 0) && (errno != EEXIST)) {
-                    HDprintf("couldn't create temporary testing directory\n");
+                    printf("couldn't create temporary testing directory\n");
                     mkdir_success = 0;
                 }
                 else
@@ -2376,14 +2376,14 @@ main(int argc, char **argv)
 
             if (!mkdir_success) {
                 if (MAINPROCESS)
-                    HDprintf("HDmkdir failed\n");
+                    printf("HDmkdir failed\n");
                 nerrors++;
                 goto exit;
             }
 
             if (HDsetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX, SUBFILING_CONFIG_FILE_DIR, 1) < 0) {
                 if (MAINPROCESS)
-                    HDprintf("HDsetenv failed\n");
+                    printf("HDsetenv failed\n");
                 nerrors++;
                 goto exit;
             }
@@ -2391,7 +2391,7 @@ main(int argc, char **argv)
         else {
             if (HDsetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX, ".", 1) < 0) {
                 if (MAINPROCESS)
-                    HDprintf("HDsetenv failed\n");
+                    printf("HDsetenv failed\n");
                 nerrors++;
                 goto exit;
             }
@@ -2413,7 +2413,7 @@ main(int argc, char **argv)
         num_iocs_g = mpi_size;
 
     if (MAINPROCESS) {
-        HDprintf("Re-running tests with environment variables set\n");
+        printf("Re-running tests with environment variables set\n");
     }
 
     for (size_t i = 0; i < ARRAY_SIZE(tests); i++) {
@@ -2448,14 +2448,14 @@ exit:
 
     if (MAINPROCESS) {
         if (HDrmdir(SUBFILING_CONFIG_FILE_DIR) < 0 && (errno != ENOENT)) {
-            HDprintf("couldn't remove temporary testing directory\n");
+            printf("couldn't remove temporary testing directory\n");
             nerrors++;
         }
     }
 
     if (nerrors) {
         if (MAINPROCESS)
-            HDprintf("*** %d TEST ERROR%s OCCURRED ***\n", nerrors, nerrors > 1 ? "S" : "");
+            printf("*** %d TEST ERROR%s OCCURRED ***\n", nerrors, nerrors > 1 ? "S" : "");
     }
 
     TestAlarmOff();
@@ -2478,8 +2478,8 @@ int
 main(void)
 {
     h5_reset();
-    HDprintf("Testing Subfiling VFD functionality\n");
-    HDprintf("SKIPPED - Subfiling VFD not built\n");
+    printf("Testing Subfiling VFD functionality\n");
+    printf("SKIPPED - Subfiling VFD not built\n");
     HDexit(EXIT_SUCCESS);
 }
 
diff --git a/testpar/t_vfd.c b/testpar/t_vfd.c
index 94dfb92..88e6db1 100644
--- a/testpar/t_vfd.c
+++ b/testpar/t_vfd.c
@@ -133,7 +133,7 @@ alloc_and_init_file_images(int mpi_size)
     pass = TRUE;
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* allocate the file image buffers */
     if (pass) {
@@ -156,7 +156,7 @@ alloc_and_init_file_images(int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* initialize the file image buffers */
     if (pass) {
@@ -172,7 +172,7 @@ alloc_and_init_file_images(int mpi_size)
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* discard file image buffers if there was an error */
     if (!pass) {
@@ -276,7 +276,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x
     assert(dxpl_id_ptr);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name -- do this now, since setting up the ioc faple requires it.  This will probably
      * change */
@@ -290,7 +290,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setupf fapl for target VFD */
     if (pass) {
@@ -407,7 +407,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* setup the file name */
     if (pass) {
@@ -420,7 +420,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* Open the VFD test file with the specified VFD.  */
 
@@ -436,7 +436,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* set eoa as specified */
 
@@ -452,7 +452,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) { /* setup dxpl */
 
@@ -466,7 +466,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -478,7 +478,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -538,7 +538,7 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap
     assert(dxpl_id_ptr);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* Close the test file if it is open, regardless of the value of pass.
      * This should let the test program shut down more cleanly.
@@ -554,7 +554,7 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) On rank 0, delete the test file.
      */
@@ -575,7 +575,7 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* Close the fapl */
     if (H5Pclose(*fapl_id_ptr) < 0) {
@@ -585,7 +585,7 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* Close the dxpl */
     if (H5Pclose(*dxpl_id_ptr) < 0) {
@@ -595,7 +595,7 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     return;
 
@@ -693,7 +693,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file with the specified VFD, set the eoa, and setup the dxpl */
     if (pass) {
@@ -705,7 +705,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Using rank zero, write the entire increasing_fi_buf to
      *    the file.
@@ -729,7 +729,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) On each rank, zero the read buffer, and then read
      *    INTS_PER_RANK * sizeof(int32) bytes from the file
@@ -787,13 +787,13 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Barrier */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Close the test file and delete it (on rank 0 only).
      *    Close FAPL and DXPL.
@@ -801,7 +801,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     takedown_vfd_test_file(mpi_rank, filename, &lf, &fapl_id, &dxpl_id);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -815,7 +815,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
             H5_FAILED();
 
             if ((disp_failure_mssgs) || (show_progress)) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -926,7 +926,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file with the specified VFD, set the eoa, and setup the dxpl */
     if (pass) {
@@ -938,7 +938,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Using rank zero, write the entire decreasing_fi_buf to
      *    the file.
@@ -962,7 +962,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) On each rank, zero the read buffer. */
     if (pass) {
@@ -974,7 +974,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) On even ranks, read INTS_PER_RANK * sizeof(int32)
      *    bytes from the file starting at offset mpi_rank *
@@ -1007,13 +1007,13 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Barrier */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) On odd ranks, read INTS_PER_RANK * sizeof(int32)
      *    bytes from the file starting at offset mpi_rank *
@@ -1046,7 +1046,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Verify that read_fi_buf contains zeros for all
      *    indices less than mpi_rank * INTS_PER_RANK, or
@@ -1081,20 +1081,20 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 9) Barrier */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 10) Close the test file and delete it (on rank 0 only).
      *     Close FAPL and DXPL.
      */
     takedown_vfd_test_file(mpi_rank, filename, &lf, &fapl_id, &dxpl_id);
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -1108,7 +1108,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
             H5_FAILED();
 
             if ((disp_failure_mssgs) || (show_progress)) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -1230,7 +1230,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file with the specified VFD, set the eoa, and setup the dxpl */
     if (pass) {
@@ -1242,7 +1242,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Using rank zero, write the entire negative_fi_buf to
      *    the file.
@@ -1266,7 +1266,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) On each rank, zero the four read buffers. */
     if (pass) {
@@ -1281,7 +1281,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) On each rank, do a vector read from the file, with
      *    each rank's vector having four elements, with each
@@ -1354,7 +1354,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Verify that buf_0, buf_1, buf_2, and buf_3 contain
      *    the expected data.  Note that this will be different
@@ -1412,13 +1412,13 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Barrier */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Close the test file and delete it (on rank 0 only).
      *    Close FAPL and DXPL.
@@ -1426,7 +1426,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     takedown_vfd_test_file(mpi_rank, filename, &lf, &fapl_id, &dxpl_id);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -1440,7 +1440,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
             H5_FAILED();
 
             if ((disp_failure_mssgs) || (show_progress)) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -1586,7 +1586,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file with the specified VFD, set the eoa, and setup the dxpl */
     if (pass) {
@@ -1598,7 +1598,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Using rank zero, write the entire negative_fi_buf to
      *    the file.
@@ -1622,7 +1622,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Set all cells of read_fi_buf to zero. */
     if (pass) {
@@ -1634,7 +1634,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) For each rank, define base_index equal to:
      *
@@ -1775,8 +1775,8 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
 
                                     pass         = FALSE;
                                     failure_mssg = "unexpected data read from file (1.1)";
-                                    HDfprintf(stdout, "\nread_fi_buf[%d] = %d, increasing_fi_buf[%d] = %d\n",
-                                              j, read_fi_buf[j], j, increasing_fi_buf[j]);
+                                    fprintf(stdout, "\nread_fi_buf[%d] = %d, increasing_fi_buf[%d] = %d\n", j,
+                                            read_fi_buf[j], j, increasing_fi_buf[j]);
                                 }
                             }
                             else if (((INTS_PER_RANK / 4) <= k) && (k < (3 * (INTS_PER_RANK / 8)))) {
@@ -1874,13 +1874,13 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }         /* end if */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Barrier */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Close the test file and delete it (on rank 0 only).
      *    Close FAPL and DXPL.
@@ -1888,7 +1888,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     takedown_vfd_test_file(mpi_rank, filename, &lf, &fapl_id, &dxpl_id);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -1902,7 +1902,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
             H5_FAILED();
 
             if ((disp_failure_mssgs) || (show_progress)) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -2016,7 +2016,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file with the specified VFD, set the eoa, and setup the dxpl */
     if (pass) {
@@ -2028,7 +2028,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Using rank zero, write the entire negative_fi_buf to
      *    the file.
@@ -2052,7 +2052,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Set all cells of read_fi_buf to zero. */
     if (pass) {
@@ -2064,7 +2064,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) For each rank, define base_index equal to:
      *
@@ -2108,7 +2108,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) On each rank, verify that read_fi_buf contains the
      *    the expected values -- that is the matching values from
@@ -2141,13 +2141,13 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     }         /* end if */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Barrier */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Close the test file and delete it (on rank 0 only).
      *    Close FAPL and DXPL.
@@ -2155,7 +2155,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
     takedown_vfd_test_file(mpi_rank, filename, &lf, &fapl_id, &dxpl_id);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -2168,7 +2168,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_
 
             H5_FAILED();
             if ((disp_failure_mssgs) || (show_progress)) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -2255,7 +2255,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file with the specified VFD, set the eoa, and setup the dxpl */
     if (pass) {
@@ -2267,7 +2267,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Write the entire increasing_fi_buf to the file, with
      *    exactly one buffer per vector per rank.  Use either
@@ -2290,14 +2290,14 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Barrier
      */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) On each rank, read the entire file into the read_fi_buf,
      *    and compare against increasing_fi_buf.  Report failure
@@ -2326,7 +2326,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Close the test file and delete it (on rank 0 only).
      *    Close FAPL and DXPL.
@@ -2334,7 +2334,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     takedown_vfd_test_file(mpi_rank, filename, &lf, &fapl_id, &dxpl_id);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -2348,7 +2348,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
             H5_FAILED();
 
             if ((disp_failure_mssgs) || (show_progress)) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -2445,7 +2445,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file with the specified VFD, set the eoa, and setup the dxpl */
     if (pass) {
@@ -2457,7 +2457,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Write the odd blocks of the increasing_fi_buf to the file,
      *    with the odd ranks writing the odd blocks, and the even
@@ -2494,7 +2494,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Write the even blocks of the negative_fi_buf to the file,
      *    with the even ranks writing the even blocks, and the odd
@@ -2527,14 +2527,14 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) Barrier
      */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) On each rank, read the entire file into the read_fi_buf,
      *    and compare against increasing_fi_buf.  Report failure
@@ -2581,7 +2581,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) Close the test file and delete it (on rank 0 only).
      *    Close FAPL and DXPL.
@@ -2589,7 +2589,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     takedown_vfd_test_file(mpi_rank, filename, &lf, &fapl_id, &dxpl_id);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -2603,7 +2603,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
             H5_FAILED();
 
             if ((disp_failure_mssgs) || (show_progress)) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -2701,7 +2701,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file with the specified VFD, set the eoa, and setup the dxpl */
     if (pass) {
@@ -2713,7 +2713,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) For each rank, construct a vector with base address
      *    (mpi_rank * INTS_PER_RANK) and writing all bytes from
@@ -2759,14 +2759,14 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Barrier
      */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) On each rank, read the entire file into the read_fi_buf,
      *    and compare against increasing_fi_buf,
@@ -2838,7 +2838,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Close the test file and delete it (on rank 0 only).
      *    Close FAPL and DXPL.
@@ -2846,7 +2846,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     takedown_vfd_test_file(mpi_rank, filename, &lf, &fapl_id, &dxpl_id);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -2860,7 +2860,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
             H5_FAILED();
 
             if ((disp_failure_mssgs) || (show_progress)) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -2964,7 +2964,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file with the specified VFD, set the eoa, and setup the dxpl */
     if (pass) {
@@ -2976,7 +2976,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) For each rank, construct a vector with base address
      *    (mpi_rank * INTS_PER_RANK) and writing all bytes from
@@ -3023,14 +3023,14 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Barrier
      */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) On each rank, read the entire file into the read_fi_buf,
      *    and compare against increasing_fi_buf,
@@ -3102,7 +3102,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Close the test file and delete it (on rank 0 only).
      *    Close FAPL and DXPL.
@@ -3110,7 +3110,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     takedown_vfd_test_file(mpi_rank, filename, &lf, &fapl_id, &dxpl_id);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -3124,7 +3124,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
             H5_FAILED();
 
             if ((disp_failure_mssgs) || (show_progress)) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -3264,7 +3264,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file with the specified VFD, set the eoa, and setup the dxpl */
     if (pass) {
@@ -3276,7 +3276,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Set the test file in a known state by writing zeros
      *    to all bytes in the test file.  Since we have already
@@ -3298,14 +3298,14 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Barrier
      */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) For each rank, define base_index equal to:
      *
@@ -3415,13 +3415,13 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Barrier */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) On each rank, read the entire file into the read_fi_buf,
      *    and compare against increasing_fi_buf,
@@ -3458,8 +3458,8 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
                                 pass         = FALSE;
                                 failure_mssg = "unexpected data read from file (1.1)";
 
-                                HDprintf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
-                                         negative_fi_buf[j]);
+                                printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
+                                       negative_fi_buf[j]);
                             }
                         }
                         else if (((INTS_PER_RANK / 4) <= k) && (k < (3 * (INTS_PER_RANK / 8)))) {
@@ -3469,8 +3469,8 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
                                 pass         = FALSE;
                                 failure_mssg = "unexpected data read from file (1.2)";
 
-                                HDprintf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
-                                         decreasing_fi_buf[j]);
+                                printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
+                                       decreasing_fi_buf[j]);
                             }
                         }
                         else if (((INTS_PER_RANK / 16) <= k) && (k < (INTS_PER_RANK / 8))) {
@@ -3480,8 +3480,8 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
                                 pass         = FALSE;
                                 failure_mssg = "unexpected data read from file (1.3)";
 
-                                HDprintf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
-                                         increasing_fi_buf[j]);
+                                printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
+                                       increasing_fi_buf[j]);
                             }
                         }
                         else {
@@ -3502,8 +3502,8 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
                                 pass         = FALSE;
                                 failure_mssg = "unexpected data read from file (2.1)";
 
-                                HDprintf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
-                                         increasing_fi_buf[j]);
+                                printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
+                                       increasing_fi_buf[j]);
                             }
                         }
                         else if ((((INTS_PER_RANK / 2) + 1) <= k) && (k <= (INTS_PER_RANK - 2))) {
@@ -3513,8 +3513,8 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
                                 pass         = FALSE;
                                 failure_mssg = "unexpected data read from file (2.2)";
 
-                                HDprintf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
-                                         decreasing_fi_buf[j]);
+                                printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
+                                       decreasing_fi_buf[j]);
                             }
                         }
                         else {
@@ -3535,8 +3535,8 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
                                 pass         = FALSE;
                                 failure_mssg = "unexpected data read from file (3.1)";
 
-                                HDprintf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
-                                         negative_fi_buf[j]);
+                                printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
+                                       negative_fi_buf[j]);
                             }
                         }
                         else {
@@ -3566,7 +3566,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Close the test file and delete it (on rank 0 only).
      *    Close FAPL and DXPL.
@@ -3574,7 +3574,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     takedown_vfd_test_file(mpi_rank, filename, &lf, &fapl_id, &dxpl_id);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -3588,7 +3588,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
             H5_FAILED();
 
             if ((disp_failure_mssgs) || (show_progress)) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -3701,7 +3701,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file with the specified VFD, set the eoa, and setup the dxpl */
     if (pass) {
@@ -3713,7 +3713,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Using rank zero, write the entire negative_fi_buf to
      *    the file.
@@ -3736,7 +3736,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 4) For each rank, define base_index equal to:
      *
@@ -3780,13 +3780,13 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Barrier */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) On each rank, read the entire file into the read_fi_buf,
      *    and compare against zero_fi_buf, and increasing_fi_buf
@@ -3822,13 +3822,13 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     } /* end if */
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Barrier */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 8) Close the test file and delete it (on rank 0 only).
      *    Close FAPL and DXPL.
@@ -3836,7 +3836,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     takedown_vfd_test_file(mpi_rank, filename, &lf, &fapl_id, &dxpl_id);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -3850,7 +3850,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
             H5_FAILED();
 
             if ((disp_failure_mssgs) || (show_progress)) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -3958,7 +3958,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     show_progress = ((show_progress) && (mpi_rank == 0));
 
     if (show_progress)
-        HDfprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "\n%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 1) Open the test file with the specified VFD, set the eoa, and setup the dxpl */
     if (pass) {
@@ -3970,7 +3970,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 2) Set the test file in a known state by writing zeros
      *    to all bytes in the test file.  Since we have already
@@ -3992,14 +3992,14 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 3) Barrier
      */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     if (pass) {
 
@@ -4025,13 +4025,13 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 5) Barrier */
     MPI_Barrier(comm);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 6) On each rank, read the entire file into the read_fi_buf,
      *    and compare against increasing_fi_buf, and zero_fi_buf as
@@ -4064,8 +4064,8 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
                         pass         = FALSE;
                         failure_mssg = "unexpected data read from file (1)";
 
-                        HDprintf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
-                                 increasing_fi_buf[j]);
+                        printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j],
+                               increasing_fi_buf[j]);
                     }
                 }
                 else {
@@ -4075,7 +4075,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
                         pass         = FALSE;
                         failure_mssg = "unexpected data read from file (2)";
 
-                        HDprintf("\nread_fi_buf[%d] = %d, 0 expected.\n", j, read_fi_buf[j]);
+                        printf("\nread_fi_buf[%d] = %d, 0 expected.\n", j, read_fi_buf[j]);
                     }
                 }
             }
@@ -4083,7 +4083,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     }
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* 7) Close the test file and delete it (on rank 0 only).
      *    Close FAPL and DXPL.
@@ -4091,7 +4091,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
     takedown_vfd_test_file(mpi_rank, filename, &lf, &fapl_id, &dxpl_id);
 
     if (show_progress)
-        HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
+        fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass);
 
     /* report results */
     if (mpi_rank == 0) {
@@ -4105,7 +4105,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer
             H5_FAILED();
 
             if ((disp_failure_mssgs) || (show_progress)) {
-                HDfprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
+                fprintf(stdout, "%s: failure_mssg = \"%s\"\n", fcn_name, failure_mssg);
             }
         }
     }
@@ -4142,17 +4142,17 @@ main(int argc, char **argv)
 
 #ifdef H5_HAVE_SUBFILING_VFD
     if (MPI_SUCCESS != MPI_Init_thread(&argc, &argv, required, &provided)) {
-        HDprintf("    MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE. Exiting\n");
+        printf("    MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE. Exiting\n");
         goto finish;
     }
 
     if (provided != required) {
-        HDprintf("    MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE. Exiting\n");
+        printf("    MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE. Exiting\n");
         goto finish;
     }
 #else
     if (MPI_SUCCESS != MPI_Init(&argc, &argv)) {
-        HDprintf("    MPI_Init failed. Exiting\n");
+        printf("    MPI_Init failed. Exiting\n");
         goto finish;
     }
 #endif
@@ -4166,20 +4166,20 @@ main(int argc, char **argv)
      * calls which may not work.
      */
     if (H5dont_atexit() < 0)
-        HDprintf("%d:Failed to turn off atexit processing. Continue.\n", mpi_rank);
+        printf("%d:Failed to turn off atexit processing. Continue.\n", mpi_rank);
 
     H5open();
 
     if (mpi_rank == 0) {
-        HDprintf("=========================================\n");
-        HDprintf("Parallel virtual file driver (VFD) tests\n");
-        HDprintf("        mpi_size     = %d\n", mpi_size);
-        HDprintf("=========================================\n");
+        printf("=========================================\n");
+        printf("Parallel virtual file driver (VFD) tests\n");
+        printf("        mpi_size     = %d\n", mpi_size);
+        printf("=========================================\n");
     }
 
     if (mpi_size < 2) {
         if (mpi_rank == 0)
-            HDprintf("    Need at least 2 processes.  Exiting.\n");
+            printf("    Need at least 2 processes.  Exiting.\n");
         goto finish;
     }
 
@@ -4187,14 +4187,14 @@ main(int argc, char **argv)
 
     if (!pass) {
 
-        HDprintf("\nAllocation and initialize of file image buffers failed.  Test aborted.\n");
+        printf("\nAllocation and initialize of file image buffers failed.  Test aborted.\n");
     }
 
     MPI_Barrier(comm);
 
     if (mpi_rank == 0) {
 
-        HDprintf("\n\n --- TESTING MPIO VFD --- \n\n");
+        printf("\n\n --- TESTING MPIO VFD --- \n\n");
     }
 
     nerrs +=
@@ -4276,7 +4276,7 @@ main(int argc, char **argv)
 #ifdef H5_HAVE_SUBFILING_VFD
     if (mpi_rank == 0) {
 
-        HDprintf("\n\n --- TESTING SUBFILING VFD --- \n\n");
+        printf("\n\n --- TESTING SUBFILING VFD --- \n\n");
     }
 
     nerrs += vector_read_test_1(7, mpi_rank, mpi_size, H5FD_MPIO_INDEPENDENT, H5FD_MPIO_INDIVIDUAL_IO,
@@ -4371,12 +4371,12 @@ finish:
     MPI_Barrier(comm);
 
     if (mpi_rank == 0) { /* only process 0 reports */
-        HDprintf("===================================\n");
+        printf("===================================\n");
         if (nerrs > 0)
-            HDprintf("***vfd tests detected %d failures***\n", nerrs);
+            printf("***vfd tests detected %d failures***\n", nerrs);
         else
-            HDprintf("vfd tests finished with no failures\n");
-        HDprintf("===================================\n");
+            printf("vfd tests finished with no failures\n");
+        printf("===================================\n");
     }
 
     /* discard the file image buffers */
diff --git a/testpar/testpar.h b/testpar/testpar.h
index 58bcab4..ca0f608 100644
--- a/testpar/testpar.h
+++ b/testpar/testpar.h
@@ -32,7 +32,7 @@
 #define MESG(mesg)                                                                                           \
     do {                                                                                                     \
         if (VERBOSE_MED && *mesg != '\0') {                                                                  \
-            HDprintf("%s\n", mesg);                                                                          \
+            printf("%s\n", mesg);                                                                            \
         }                                                                                                    \
     } while (0)
 
@@ -52,13 +52,13 @@
             MESG(mesg);                                                                                      \
         }                                                                                                    \
         else {                                                                                               \
-            HDprintf("Proc %d: ", rankvar);                                                                  \
-            HDprintf("*** Parallel ERROR ***\n");                                                            \
-            HDprintf("    VRFY (%s) failed at line %4d in %s\n", mesg, (int)__LINE__, __FILE__);             \
+            printf("Proc %d: ", rankvar);                                                                    \
+            printf("*** Parallel ERROR ***\n");                                                              \
+            printf("    VRFY (%s) failed at line %4d in %s\n", mesg, (int)__LINE__, __FILE__);               \
             ++nerrors;                                                                                       \
             fflush(stdout);                                                                                  \
             if (!VERBOSE_MED) {                                                                              \
-                HDprintf("aborting MPI processes\n");                                                        \
+                printf("aborting MPI processes\n");                                                          \
                 MPI_Abort(MPI_COMM_WORLD, 1);                                                                \
             }                                                                                                \
         }                                                                                                    \
@@ -78,9 +78,9 @@
             MESG(mesg);                                                                                      \
         }                                                                                                    \
         else {                                                                                               \
-            HDprintf("Proc %d: ", mpi_rank);                                                                 \
-            HDprintf("*** PHDF5 REMARK (not an error) ***\n");                                               \
-            HDprintf("        Condition (%s) failed at line %4d in %s\n", mesg, (int)__LINE__, __FILE__);    \
+            printf("Proc %d: ", mpi_rank);                                                                   \
+            printf("*** PHDF5 REMARK (not an error) ***\n");                                                 \
+            printf("        Condition (%s) failed at line %4d in %s\n", mesg, (int)__LINE__, __FILE__);      \
             fflush(stdout);                                                                                  \
         }                                                                                                    \
     } while (0)
@@ -88,10 +88,10 @@
 #define MPI_BANNER(mesg)                                                                                     \
     do {                                                                                                     \
         if (VERBOSE_MED || MAINPROCESS) {                                                                    \
-            HDprintf("--------------------------------\n");                                                  \
-            HDprintf("Proc %d: ", mpi_rank);                                                                 \
-            HDprintf("*** %s\n", mesg);                                                                      \
-            HDprintf("--------------------------------\n");                                                  \
+            printf("--------------------------------\n");                                                    \
+            printf("Proc %d: ", mpi_rank);                                                                   \
+            printf("*** %s\n", mesg);                                                                        \
+            printf("--------------------------------\n");                                                    \
         }                                                                                                    \
     } while (0)
 
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index e7befd6..f83bd4e 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -76,10 +76,9 @@ pause_proc(void)
     if (MAINPROCESS)
         while ((HDstat(greenlight, &statbuf) == -1) && loops < maxloop) {
             if (!loops++) {
-                HDprintf("Proc %d (%*s, %d): to debug, attach %d\n", mpi_rank, mpi_namelen, mpi_name, pid,
-                         pid);
+                printf("Proc %d (%*s, %d): to debug, attach %d\n", mpi_rank, mpi_namelen, mpi_name, pid, pid);
             }
-            HDprintf("waiting(%ds) for file %s ...\n", time_int, greenlight);
+            printf("waiting(%ds) for file %s ...\n", time_int, greenlight);
             HDfflush(stdout);
             HDsleep(time_int);
         }
@@ -103,18 +102,18 @@ MPI_Init(int *argc, char ***argv)
 static void
 usage(void)
 {
-    HDprintf("    [-r] [-w] [-m<n_datasets>] [-n<n_groups>] "
-             "[-o] [-f <prefix>] [-d <dim0> <dim1>]\n");
-    HDprintf("\t-m<n_datasets>"
-             "\tset number of datasets for the multiple dataset test\n");
-    HDprintf("\t-n<n_groups>"
-             "\tset number of groups for the multiple group test\n");
-    HDprintf("\t-f <prefix>\tfilename prefix\n");
-    HDprintf("\t-2\t\tuse Split-file together with MPIO\n");
-    HDprintf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n", ROW_FACTOR,
-             COL_FACTOR);
-    HDprintf("\t-c <dim0> <dim1>\tdataset chunk dimensions. Defaults (dim0/10,dim1/10)\n");
-    HDprintf("\n");
+    printf("    [-r] [-w] [-m<n_datasets>] [-n<n_groups>] "
+           "[-o] [-f <prefix>] [-d <dim0> <dim1>]\n");
+    printf("\t-m<n_datasets>"
+           "\tset number of datasets for the multiple dataset test\n");
+    printf("\t-n<n_groups>"
+           "\tset number of groups for the multiple group test\n");
+    printf("\t-f <prefix>\tfilename prefix\n");
+    printf("\t-2\t\tuse Split-file together with MPIO\n");
+    printf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n", ROW_FACTOR,
+           COL_FACTOR);
+    printf("\t-c <dim0> <dim1>\tdataset chunk dimensions. Defaults (dim0/10,dim1/10)\n");
+    printf("\n");
 }
 
 /*
@@ -196,7 +195,7 @@ parse_options(int argc, char **argv)
                 case 'h': /* print help message--return with nerrors set */
                     return (1);
                 default:
-                    HDprintf("Illegal option(%s)\n", *argv);
+                    printf("Illegal option(%s)\n", *argv);
                     nerrors++;
                     return (1);
             }
@@ -205,12 +204,12 @@ parse_options(int argc, char **argv)
 
     /* check validity of dimension and chunk sizes */
     if (dim0 <= 0 || dim1 <= 0) {
-        HDprintf("Illegal dim sizes (%d, %d)\n", dim0, dim1);
+        printf("Illegal dim sizes (%d, %d)\n", dim0, dim1);
         nerrors++;
         return (1);
     }
     if (chunkdim0 <= 0 || chunkdim1 <= 0) {
-        HDprintf("Illegal chunkdim sizes (%d, %d)\n", chunkdim0, chunkdim1);
+        printf("Illegal chunkdim sizes (%d, %d)\n", chunkdim0, chunkdim1);
         nerrors++;
         return (1);
     }
@@ -218,7 +217,7 @@ parse_options(int argc, char **argv)
     /* Make sure datasets can be divided into equal portions by the processes */
     if ((dim0 % mpi_size) || (dim1 % mpi_size)) {
         if (MAINPROCESS)
-            HDprintf("dim0(%d) and dim1(%d) must be multiples of processes(%d)\n", dim0, dim1, mpi_size);
+            printf("dim0(%d) and dim1(%d) must be multiples of processes(%d)\n", dim0, dim1, mpi_size);
         nerrors++;
         return (1);
     }
@@ -231,13 +230,13 @@ parse_options(int argc, char **argv)
 
         for (i = 0; i < n; i++)
             if (h5_fixname(FILENAME[i], fapl, filenames[i], PATH_MAX) == NULL) {
-                HDprintf("h5_fixname failed\n");
+                printf("h5_fixname failed\n");
                 nerrors++;
                 return (1);
             }
-        HDprintf("Test filenames are:\n");
+        printf("Test filenames are:\n");
         for (i = 0; i < n; i++)
-            HDprintf("    %s\n", filenames[i]);
+            printf("    %s\n", filenames[i]);
     }
 
     return (0);
@@ -319,9 +318,9 @@ main(int argc, char **argv)
     dim1 = COL_FACTOR * mpi_size;
 
     if (MAINPROCESS) {
-        HDprintf("===================================\n");
-        HDprintf("PHDF5 TESTS START\n");
-        HDprintf("===================================\n");
+        printf("===================================\n");
+        printf("PHDF5 TESTS START\n");
+        printf("===================================\n");
     }
 
     /* Attempt to turn off atexit post processing so that in case errors
@@ -330,7 +329,7 @@ main(int argc, char **argv)
      * calls.  By then, MPI calls may not work.
      */
     if (H5dont_atexit() < 0) {
-        HDprintf("Failed to turn off atexit processing. Continue.\n");
+        printf("Failed to turn off atexit processing. Continue.\n");
     };
     H5open();
     h5_show_hostname();
@@ -338,7 +337,7 @@ main(int argc, char **argv)
     HDmemset(filenames, 0, sizeof(filenames));
     for (int i = 0; i < NFILENAME; i++) {
         if (NULL == (filenames[i] = HDmalloc(PATH_MAX))) {
-            HDprintf("couldn't allocate filename array\n");
+            printf("couldn't allocate filename array\n");
             MPI_Abort(MPI_COMM_WORLD, -1);
         }
     }
@@ -402,7 +401,7 @@ main(int argc, char **argv)
 #ifndef H5_HAVE_WIN32_API
     AddTest("bigdset", big_dataset, NULL, "big dataset test", PARATESTFILE);
 #else
-    HDprintf("big dataset test will be skipped on Windows (JIRA HDDFV-8064)\n");
+    printf("big dataset test will be skipped on Windows (JIRA HDDFV-8064)\n");
 #endif
     AddTest("fill", dataset_fillvalue, NULL, "dataset fill value", PARATESTFILE);
 
@@ -412,9 +411,9 @@ main(int argc, char **argv)
     AddTest("cchunk4", coll_chunk4, NULL, "collective chunk io with partial non-selection ", PARATESTFILE);
 
     if ((mpi_size < 3) && MAINPROCESS) {
-        HDprintf("Collective chunk IO optimization APIs ");
-        HDprintf("needs at least 3 processes to participate\n");
-        HDprintf("Collective chunk IO API tests will be skipped \n");
+        printf("Collective chunk IO optimization APIs ");
+        printf("needs at least 3 processes to participate\n");
+        printf("Collective chunk IO API tests will be skipped \n");
     }
     AddTest((mpi_size < 3) ? "-cchunk5" : "cchunk5", coll_chunk5, NULL,
             "linked chunk collective IO without optimization", PARATESTFILE);
@@ -450,8 +449,8 @@ main(int argc, char **argv)
             &io_mode_confusion_params);
 
     if ((mpi_size < 3) && MAINPROCESS) {
-        HDprintf("rr_obj_hdr_flush_confusion test needs at least 3 processes.\n");
-        HDprintf("rr_obj_hdr_flush_confusion test will be skipped \n");
+        printf("rr_obj_hdr_flush_confusion test needs at least 3 processes.\n");
+        printf("rr_obj_hdr_flush_confusion test will be skipped \n");
     }
     if (mpi_size > 2) {
         rr_obj_flush_confusion_params.name  = PARATESTFILE;
@@ -477,18 +476,18 @@ main(int argc, char **argv)
     AddTest("extlink", external_links, NULL, "test external links", NULL);
 
     if ((mpi_size < 2) && MAINPROCESS) {
-        HDprintf("File Image Ops daisy chain test needs at least 2 processes.\n");
-        HDprintf("File Image Ops daisy chain test will be skipped \n");
+        printf("File Image Ops daisy chain test needs at least 2 processes.\n");
+        printf("File Image Ops daisy chain test will be skipped \n");
     }
     AddTest((mpi_size < 2) ? "-fiodc" : "fiodc", file_image_daisy_chain_test, NULL,
             "file image ops daisy chain", NULL);
 
     if ((mpi_size < 2) && MAINPROCESS) {
-        HDprintf("Atomicity tests need at least 2 processes to participate\n");
-        HDprintf("8 is more recommended.. Atomicity tests will be skipped \n");
+        printf("Atomicity tests need at least 2 processes to participate\n");
+        printf("8 is more recommended.. Atomicity tests will be skipped \n");
     }
     else if (facc_type != FACC_MPIO && MAINPROCESS) {
-        HDprintf("Atomicity tests will not work with a non MPIO VFD\n");
+        printf("Atomicity tests will not work with a non MPIO VFD\n");
     }
     else if (mpi_size >= 2 && facc_type == FACC_MPIO) {
         AddTest("atomicity", dataset_atomicity, NULL, "dataset atomic updates", PARATESTFILE);
@@ -516,9 +515,9 @@ main(int argc, char **argv)
     TestParseCmdLine(argc, argv);
 
     if (dxfer_coll_type == DXFER_INDEPENDENT_IO && MAINPROCESS) {
-        HDprintf("===================================\n"
-                 "   Using Independent I/O with file set view to replace collective I/O \n"
-                 "===================================\n");
+        printf("===================================\n"
+               "   Using Independent I/O with file set view to replace collective I/O \n"
+               "===================================\n");
     }
 
     /* Perform requested testing */
@@ -546,12 +545,12 @@ main(int argc, char **argv)
     }
 
     if (MAINPROCESS) { /* only process 0 reports */
-        HDprintf("===================================\n");
+        printf("===================================\n");
         if (nerrors)
-            HDprintf("***PHDF5 tests detected %d errors***\n", nerrors);
+            printf("***PHDF5 tests detected %d errors***\n", nerrors);
         else
-            HDprintf("PHDF5 tests finished with no errors\n");
-        HDprintf("===================================\n");
+            printf("PHDF5 tests finished with no errors\n");
+        printf("===================================\n");
     }
 
     for (int i = 0; i < NFILENAME; i++) {
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index c617ec3..8f8522b 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -116,7 +116,7 @@ print_incoming_data(void)
             MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA,
                      MPI_COMM_WORLD, &Status);
 
-            HDprintf("%s", data);
+            printf("%s", data);
         }
     } while (incomingMessage);
 }
@@ -997,8 +997,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
         int i;
 
         if ((HDstrlen(fname1) > MAX_FILENAME) || (HDstrlen(fname2) > MAX_FILENAME)) {
-            HDfprintf(stderr, "The parallel diff only supports path names up to %d characters\n",
-                      MAX_FILENAME);
+            fprintf(stderr, "The parallel diff only supports path names up to %d characters\n", MAX_FILENAME);
             MPI_Abort(MPI_COMM_WORLD, 0);
         } /* end if */
 
@@ -1248,7 +1247,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
 
                     /*Set up args to pass to worker task. */
                     if (HDstrlen(obj1_fullpath) > 255 || HDstrlen(obj2_fullpath) > 255) {
-                        HDprintf("The parallel diff only supports object names up to 255 characters\n");
+                        printf("The parallel diff only supports object names up to 255 characters\n");
                         MPI_Abort(MPI_COMM_WORLD, 0);
                     } /* end if */
 
@@ -1393,7 +1392,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
                                          MPI_COMM_WORLD);
                             } /* end else-if */
                             else {
-                                HDprintf("ERROR: Invalid tag (%d) received \n", Status.MPI_TAG);
+                                printf("ERROR: Invalid tag (%d) received \n", Status.MPI_TAG);
                                 MPI_Abort(MPI_COMM_WORLD, 0);
                                 MPI_Finalize();
                             } /* end else */
@@ -1478,10 +1477,10 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
                     MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA,
                              MPI_COMM_WORLD, &Status);
 
-                    HDprintf("%s", data);
+                    printf("%s", data);
                 } /* end else-if */
                 else {
-                    HDprintf("ph5diff-manager: ERROR!! Invalid tag (%d) received \n", Status.MPI_TAG);
+                    printf("ph5diff-manager: ERROR!! Invalid tag (%d) received \n", Status.MPI_TAG);
                     MPI_Abort(MPI_COMM_WORLD, 0);
                 } /* end else */
             }     /* end while */
diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c
index 17b8d3c..fc74a39 100644
--- a/tools/lib/h5diff_util.c
+++ b/tools/lib/h5diff_util.c
@@ -321,7 +321,7 @@ print_found(hsize_t nfound)
     if (g_Parallel)
         parallel_print("%" PRIuHSIZE " differences found\n", nfound);
     else
-        HDfprintf(stdout, "%" PRIuHSIZE " differences found\n", nfound);
+        fprintf(stdout, "%" PRIuHSIZE " differences found\n", nfound);
 }
 
 /*-----------------------------------------------------------------
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index e752895..e0e3e06 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -175,7 +175,7 @@ h5tools_close(void)
     if (h5tools_init_g) {
         /* special case where only data is output to stdout */
         if ((rawoutstream == NULL) && rawdatastream && (rawdatastream == stdout))
-            HDfprintf(rawdatastream, "\n");
+            fprintf(rawdatastream, "\n");
 
         if (tools_func)
             H5Eprint2(H5tools_ERR_STACK_g, rawerrorstream);
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index 753a83b..86fea01 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -36,10 +36,10 @@
     HDfflush(S)
 #define PRINTSTREAM(S, F, ...)                                                                               \
     if (S != NULL)                                                                                           \
-    HDfprintf(S, F, __VA_ARGS__)
+    fprintf(S, F, __VA_ARGS__)
 #define PRINTVALSTREAM(S, V)                                                                                 \
     if (S != NULL)                                                                                           \
-    HDfprintf(S, V)
+    fprintf(S, V)
 #define PUTSTREAM(X, S)                                                                                      \
     do {                                                                                                     \
         if (S != NULL)                                                                                       \
diff --git a/tools/lib/h5tools_error.h b/tools/lib/h5tools_error.h
index 5417eb9..0e30cdf 100644
--- a/tools/lib/h5tools_error.h
+++ b/tools/lib/h5tools_error.h
@@ -40,27 +40,27 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_dbg_id_g;
                                                                                                              \
         /* Create new HDF5 error stack for the tools to use */                                               \
         if ((H5tools_ERR_STACK_g = H5Ecreate_stack()) < 0)                                                   \
-            HDfprintf(stderr, "Failed to create HDF5 tools error stack\n");                                  \
+            fprintf(stderr, "Failed to create HDF5 tools error stack\n");                                    \
                                                                                                              \
         /* Register errors from the HDF5 tools as a new error class */                                       \
         if ((H5tools_ERR_CLS_g = H5Eregister_class("H5tools", "HDF5:tools", lib_str)) < 0)                   \
-            HDfprintf(stderr, "Failed to register HDF5 tools error class\n");                                \
+            fprintf(stderr, "Failed to register HDF5 tools error class\n");                                  \
                                                                                                              \
         /* Create a new HDF5 major error message for errors from the tools library */                        \
         if ((H5E_tools_g = H5Ecreate_msg(H5tools_ERR_CLS_g, H5E_MAJOR, "Failure in tools library")) < 0)     \
-            HDfprintf(stderr, "Failed to register major error message for tools library errors\n");          \
+            fprintf(stderr, "Failed to register major error message for tools library errors\n");            \
                                                                                                              \
         /* Create a new HDF5 minor error message for errors from the tools library */                        \
         if ((H5E_tools_min_id_g = H5Ecreate_msg(H5tools_ERR_CLS_g, H5E_MINOR, "error in function")) < 0)     \
-            HDfprintf(stderr, "Failed to register minor error message for tools library errors\n");          \
+            fprintf(stderr, "Failed to register minor error message for tools library errors\n");            \
                                                                                                              \
         /* Create a new HDF5 minor error message for info messages from the tools library */                 \
         if ((H5E_tools_min_info_id_g = H5Ecreate_msg(H5tools_ERR_CLS_g, H5E_MINOR, "function info")) < 0)    \
-            HDfprintf(stderr, "Failed to register minor error message for tools library info messages\n");   \
+            fprintf(stderr, "Failed to register minor error message for tools library info messages\n");     \
                                                                                                              \
         /* Create a new HDF5 minor error message for debug messages from the tools library */                \
         if ((H5E_tools_min_dbg_id_g = H5Ecreate_msg(H5tools_ERR_CLS_g, H5E_MINOR, "function debug")) < 0)    \
-            HDfprintf(stderr, "Failed to register minor error message for tools library debug messages\n");  \
+            fprintf(stderr, "Failed to register minor error message for tools library debug messages\n");    \
     } while (0)
 
 /*
@@ -70,21 +70,21 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_dbg_id_g;
     do {                                                                                                     \
         /* Close all error messages created by H5TOOLS_INIT_ERROR() */                                       \
         if (H5Eclose_msg(H5E_tools_min_dbg_id_g) < 0)                                                        \
-            HDfprintf(stderr, "Failed to close minor error message for tools library debug messages\n");     \
+            fprintf(stderr, "Failed to close minor error message for tools library debug messages\n");       \
         if (H5Eclose_msg(H5E_tools_min_info_id_g) < 0)                                                       \
-            HDfprintf(stderr, "Failed to close minor error message for tools library info messages\n");      \
+            fprintf(stderr, "Failed to close minor error message for tools library info messages\n");        \
         if (H5Eclose_msg(H5E_tools_min_id_g) < 0)                                                            \
-            HDfprintf(stderr, "Failed to close minor error message for tools library errors\n");             \
+            fprintf(stderr, "Failed to close minor error message for tools library errors\n");               \
         if (H5Eclose_msg(H5E_tools_g) < 0)                                                                   \
-            HDfprintf(stderr, "Failed to close major error message for tools library errors\n");             \
+            fprintf(stderr, "Failed to close major error message for tools library errors\n");               \
                                                                                                              \
         /* Unregister the HDF5 tools error class */                                                          \
         if (H5Eunregister_class(H5tools_ERR_CLS_g) < 0)                                                      \
-            HDfprintf(stderr, "Failed to unregister the HDF5 tools error class\n");                          \
+            fprintf(stderr, "Failed to unregister the HDF5 tools error class\n");                            \
                                                                                                              \
         /* Close the tools error stack */                                                                    \
         if (H5Eclose_stack(H5tools_ERR_STACK_g) < 0)                                                         \
-            HDfprintf(stderr, "Failed to close HDF5 tools error stack\n");                                   \
+            fprintf(stderr, "Failed to close HDF5 tools error stack\n");                                     \
     } while (0)
 
 /*
@@ -98,8 +98,8 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_dbg_id_g;
                 H5Epush2(estack_id, __FILE__, __func__, __LINE__, err_cls, maj_err_id, min_err_id,           \
                          __VA_ARGS__);                                                                       \
             else {                                                                                           \
-                HDfprintf(stderr, __VA_ARGS__);                                                              \
-                HDfprintf(stderr, "\n");                                                                     \
+                fprintf(stderr, __VA_ARGS__);                                                                \
+                fprintf(stderr, "\n");                                                                       \
             }                                                                                                \
         }                                                                                                    \
     } while (0)
@@ -166,25 +166,25 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_dbg_id_g;
 #define H5TOOLS_START_DEBUG(...)                                                                             \
     do {                                                                                                     \
         H5tools_INDENT_g += 2;                                                                               \
-        HDfprintf(stderr, "%*sENTER %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, __func__);  \
-        HDfprintf(stderr, __VA_ARGS__);                                                                      \
-        HDfprintf(stderr, "\n");                                                                             \
+        fprintf(stderr, "%*sENTER %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, __func__);    \
+        fprintf(stderr, __VA_ARGS__);                                                                        \
+        fprintf(stderr, "\n");                                                                               \
         HDfflush(stderr);                                                                                    \
     } while (0)
 
 #define H5TOOLS_DEBUG(...)                                                                                   \
     do {                                                                                                     \
-        HDfprintf(stderr, "%*s %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, __func__);       \
-        HDfprintf(stderr, __VA_ARGS__);                                                                      \
-        HDfprintf(stderr, "\n");                                                                             \
+        fprintf(stderr, "%*s %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, __func__);         \
+        fprintf(stderr, __VA_ARGS__);                                                                        \
+        fprintf(stderr, "\n");                                                                               \
         HDfflush(stderr);                                                                                    \
     } while (0)
 
 #define H5TOOLS_ENDDEBUG(...)                                                                                \
     do {                                                                                                     \
-        HDfprintf(stderr, "%*sEXIT %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, __func__);   \
-        HDfprintf(stderr, __VA_ARGS__);                                                                      \
-        HDfprintf(stderr, "\n");                                                                             \
+        fprintf(stderr, "%*sEXIT %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, __func__);     \
+        fprintf(stderr, __VA_ARGS__);                                                                        \
+        fprintf(stderr, "\n");                                                                               \
         H5tools_INDENT_g -= 2;                                                                               \
         HDfflush(stderr);                                                                                    \
     } while (0)
diff --git a/tools/lib/h5tools_filters.c b/tools/lib/h5tools_filters.c
index 899b7be..58a71b3 100644
--- a/tools/lib/h5tools_filters.c
+++ b/tools/lib/h5tools_filters.c
@@ -20,7 +20,7 @@
 static void
 print_filter_warning(const char *dname, const char *fname)
 {
-    HDfprintf(stderr, "Warning: dataset <%s> cannot be read, %s filter is not available\n", dname, fname);
+    fprintf(stderr, "Warning: dataset <%s> cannot be read, %s filter is not available\n", dname, fname);
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index 46b27df..6cc9125 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -81,8 +81,8 @@ parallel_print(const char *format, ...)
 
                 overflow_file = HDtmpfile();
                 if (overflow_file == NULL)
-                    HDfprintf(rawerrorstream,
-                              "warning: could not create overflow file.  Output may be truncated.\n");
+                    fprintf(rawerrorstream,
+                            "warning: could not create overflow file.  Output may be truncated.\n");
                 else
                     bytes_written = HDvfprintf(overflow_file, format, ap);
             }
@@ -113,7 +113,7 @@ error_msg(const char *fmt, ...)
     FLUSHSTREAM(rawattrstream);
     FLUSHSTREAM(rawdatastream);
     FLUSHSTREAM(rawoutstream);
-    HDfprintf(rawerrorstream, "%s error: ", h5tools_getprogname());
+    fprintf(rawerrorstream, "%s error: ", h5tools_getprogname());
     HDvfprintf(rawerrorstream, fmt, ap);
 
     va_end(ap);
@@ -137,7 +137,7 @@ warn_msg(const char *fmt, ...)
     FLUSHSTREAM(rawattrstream);
     FLUSHSTREAM(rawdatastream);
     FLUSHSTREAM(rawoutstream);
-    HDfprintf(rawerrorstream, "%s warning: ", h5tools_getprogname());
+    fprintf(rawerrorstream, "%s warning: ", h5tools_getprogname());
     HDvfprintf(rawerrorstream, fmt, ap);
     va_end(ap);
 }
@@ -153,8 +153,8 @@ warn_msg(const char *fmt, ...)
 void
 help_ref_msg(FILE *output)
 {
-    HDfprintf(output, "Try '-h' or '--help' for more information or ");
-    HDfprintf(output, "see the <%s> entry in the 'HDF5 Reference Manual'.\n", h5tools_getprogname());
+    fprintf(output, "Try '-h' or '--help' for more information or ");
+    fprintf(output, "see the <%s> entry in the 'HDF5 Reference Manual'.\n", h5tools_getprogname());
 }
 
 /*-------------------------------------------------------------------------
@@ -508,7 +508,7 @@ indentation(unsigned x)
             PRINTVALSTREAM(rawoutstream, " ");
     }
     else {
-        HDfprintf(rawerrorstream, "error: the indentation exceeds the number of cols.\n");
+        fprintf(rawerrorstream, "error: the indentation exceeds the number of cols.\n");
         HDexit(1);
     }
 }
@@ -1130,19 +1130,19 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_t *fa, const char **values)
                            /* e.g.? if (!populate()) { then failed } */
 
     if (show_progress) {
-        HDprintf("called h5tools_populate_ros3_fapl\n");
+        printf("called h5tools_populate_ros3_fapl\n");
     }
 
     if (fa == NULL) {
         if (show_progress) {
-            HDprintf("  ERROR: null pointer to fapl_t\n");
+            printf("  ERROR: null pointer to fapl_t\n");
         }
         ret_value = 0;
         goto done;
     }
 
     if (show_progress) {
-        HDprintf("  preset fapl with default values\n");
+        printf("  preset fapl with default values\n");
     }
     fa->version       = H5FD_CURR_ROS3_FAPL_T_VERSION;
     fa->authenticate  = FALSE;
@@ -1155,21 +1155,21 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_t *fa, const char **values)
     if (values != NULL) {
         if (values[0] == NULL) {
             if (show_progress) {
-                HDprintf("  ERROR: aws_region value cannot be NULL\n");
+                printf("  ERROR: aws_region value cannot be NULL\n");
             }
             ret_value = 0;
             goto done;
         }
         if (values[1] == NULL) {
             if (show_progress) {
-                HDprintf("  ERROR: secret_id value cannot be NULL\n");
+                printf("  ERROR: secret_id value cannot be NULL\n");
             }
             ret_value = 0;
             goto done;
         }
         if (values[2] == NULL) {
             if (show_progress) {
-                HDprintf("  ERROR: secret_key value cannot be NULL\n");
+                printf("  ERROR: secret_key value cannot be NULL\n");
             }
             ret_value = 0;
             goto done;
@@ -1181,48 +1181,48 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_t *fa, const char **values)
         if (*values[0] != '\0' && *values[1] != '\0') {
             if (HDstrlen(values[0]) > H5FD_ROS3_MAX_REGION_LEN) {
                 if (show_progress) {
-                    HDprintf("  ERROR: aws_region value too long\n");
+                    printf("  ERROR: aws_region value too long\n");
                 }
                 ret_value = 0;
                 goto done;
             }
             HDmemcpy(fa->aws_region, values[0], (HDstrlen(values[0]) + 1));
             if (show_progress) {
-                HDprintf("  aws_region set\n");
+                printf("  aws_region set\n");
             }
 
             if (HDstrlen(values[1]) > H5FD_ROS3_MAX_SECRET_ID_LEN) {
                 if (show_progress) {
-                    HDprintf("  ERROR: secret_id value too long\n");
+                    printf("  ERROR: secret_id value too long\n");
                 }
                 ret_value = 0;
                 goto done;
             }
             HDmemcpy(fa->secret_id, values[1], (HDstrlen(values[1]) + 1));
             if (show_progress) {
-                HDprintf("  secret_id set\n");
+                printf("  secret_id set\n");
             }
 
             if (HDstrlen(values[2]) > H5FD_ROS3_MAX_SECRET_KEY_LEN) {
                 if (show_progress) {
-                    HDprintf("  ERROR: secret_key value too long\n");
+                    printf("  ERROR: secret_key value too long\n");
                 }
                 ret_value = 0;
                 goto done;
             }
             HDmemcpy(fa->secret_key, values[2], (HDstrlen(values[2]) + 1));
             if (show_progress) {
-                HDprintf("  secret_key set\n");
+                printf("  secret_key set\n");
             }
 
             fa->authenticate = TRUE;
             if (show_progress) {
-                HDprintf("  set to authenticate\n");
+                printf("  set to authenticate\n");
             }
         }
         else if (*values[0] != '\0' || *values[1] != '\0' || *values[2] != '\0') {
             if (show_progress) {
-                HDprintf("  ERROR: invalid assortment of empty/non-empty values\n");
+                printf("  ERROR: invalid assortment of empty/non-empty values\n");
             }
             ret_value = 0;
             goto done;
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index b55d1f5..4ee2914 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -814,14 +814,14 @@ trav_attr(hid_t
     const char          *buf     = op_data->path;
 
     if ((strlen(buf) == 1) && (*buf == '/'))
-        HDprintf(" %-10s %s%s", "attribute", buf, attr_name);
+        printf(" %-10s %s%s", "attribute", buf, attr_name);
     else
-        HDprintf(" %-10s %s/%s", "attribute", buf, attr_name);
+        printf(" %-10s %s/%s", "attribute", buf, attr_name);
 
 #ifdef H5TRAV_PRINT_SPACE
     if (trav_verbosity < 2) {
 #endif
-        HDprintf("\n");
+        printf("\n");
 #ifdef H5TRAV_PRINT_SPACE
     }
     else {
@@ -841,26 +841,26 @@ trav_attr(hid_t
             switch (space_type) {
                 case H5S_SCALAR:
                     /* scalar dataspace */
-                    HDprintf(" scalar\n");
+                    printf(" scalar\n");
                     break;
 
                 case H5S_SIMPLE:
                     /* simple dataspace */
-                    HDprintf(" {");
+                    printf(" {");
                     for (i = 0; i < ndims; i++) {
-                        HDprintf("%s%" PRIuHSIZE, i ? ", " : "", size[i]);
+                        printf("%s%" PRIuHSIZE, i ? ", " : "", size[i]);
                     }
-                    HDprintf("}\n");
+                    printf("}\n");
                     break;
 
                 case H5S_NULL:
                     /* null dataspace */
-                    HDprintf(" null\n");
+                    printf(" null\n");
                     break;
 
                 default:
                     /* Unknown dataspace type */
-                    HDprintf(" unknown\n");
+                    printf(" unknown\n");
                     break;
             } /* end switch */
 
@@ -892,22 +892,22 @@ trav_print_visit_obj(const char *path, const H5O_info2_t *oinfo, const char *alr
      */
     switch (oinfo->type) {
         case H5O_TYPE_GROUP:
-            HDprintf(" %-10s %s", "group", path);
+            printf(" %-10s %s", "group", path);
             break;
 
         case H5O_TYPE_DATASET:
-            HDprintf(" %-10s %s", "dataset", path);
+            printf(" %-10s %s", "dataset", path);
             break;
 
         case H5O_TYPE_NAMED_DATATYPE:
-            HDprintf(" %-10s %s", "datatype", path);
+            printf(" %-10s %s", "datatype", path);
             break;
 
         case H5O_TYPE_MAP:
         case H5O_TYPE_UNKNOWN:
         case H5O_TYPE_NTYPES:
         default:
-            HDprintf(" %-10s %s", "unknown object type", path);
+            printf(" %-10s %s", "unknown object type", path);
             break;
     } /* end switch */
 
@@ -917,14 +917,14 @@ trav_print_visit_obj(const char *path, const H5O_info2_t *oinfo, const char *alr
 
         op_data.path = path;
         /* Finish printing line about object */
-        HDprintf("\n");
+        printf("\n");
         if (trav_verbosity > 0)
             H5Aiterate_by_name(print_udata->fid, path, trav_index_by, trav_index_order, NULL, trav_attr,
                                &op_data, H5P_DEFAULT);
     }
     else
         /* Print the link's original name */
-        HDprintf(" -> %s\n", already_visited);
+        printf(" -> %s\n", already_visited);
 
     return (0);
 } /* end trav_print_visit_obj() */
@@ -951,12 +951,12 @@ trav_print_visit_lnk(const char *path, const H5L_info2_t *linfo, void *udata)
                 if (targbuf) {
                     if (H5Lget_val(print_udata->fid, path, targbuf, linfo->u.val_size + 1, H5P_DEFAULT) < 0)
                         targbuf[0] = 0;
-                    HDprintf(" %-10s %s -> %s\n", "link", path, targbuf);
+                    printf(" %-10s %s -> %s\n", "link", path, targbuf);
                     HDfree(targbuf);
                 }
             } /* end if */
             else
-                HDprintf(" %-10s %s ->\n", "link", path);
+                printf(" %-10s %s ->\n", "link", path);
             break;
 
         case H5L_TYPE_EXTERNAL:
@@ -970,12 +970,12 @@ trav_print_visit_lnk(const char *path, const H5L_info2_t *linfo, void *udata)
                     if (H5Lget_val(print_udata->fid, path, targbuf, linfo->u.val_size + 1, H5P_DEFAULT) < 0)
                         targbuf[0] = 0;
                     if (H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &objname) >= 0)
-                        HDprintf(" %-10s %s -> %s %s\n", "ext link", path, filename, objname);
+                        printf(" %-10s %s -> %s %s\n", "ext link", path, filename, objname);
                     HDfree(targbuf);
                 }
             } /* end if */
             else
-                HDprintf(" %-10s %s ->\n", "ext link", path);
+                printf(" %-10s %s ->\n", "ext link", path);
             break;
 
         case H5L_TYPE_HARD:
@@ -985,7 +985,7 @@ trav_print_visit_lnk(const char *path, const H5L_info2_t *linfo, void *udata)
         case H5L_TYPE_ERROR:
         case H5L_TYPE_MAX:
         default:
-            HDprintf(" %-10s %s -> ???\n", "unknown type of UD link", path);
+            printf(" %-10s %s -> ???\n", "unknown type of UD link", path);
             break;
     } /* end switch() */
 
diff --git a/tools/lib/io_timer.c b/tools/lib/io_timer.c
index d565264..17d20f5 100644
--- a/tools/lib/io_timer.c
+++ b/tools/lib/io_timer.c
@@ -158,7 +158,7 @@ io_time_set(io_time_t *pt, timer_type t, int start_stop)
             break;
 #else
         case MPI_CLOCK:
-            HDfprintf(stderr, "MPI clock set in serial library\n");
+            fprintf(stderr, "MPI clock set in serial library\n");
             return NULL;
 #endif /* H5_HAVE_PARALLEL */
         case SYS_CLOCK:
@@ -192,7 +192,7 @@ io_time_set(io_time_t *pt, timer_type t, int start_stop)
             break;
 
         default:
-            HDfprintf(stderr, "Unknown time clock type (%d)\n", pt->type);
+            fprintf(stderr, "Unknown time clock type (%d)\n", pt->type);
             return NULL;
     } /* end switch */
 
diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c
index 5fc5dc1..d59978b 100644
--- a/tools/libtest/h5tools_test_utils.c
+++ b/tools/libtest/h5tools_test_utils.c
@@ -100,7 +100,7 @@ H5_GCC_CLANG_DIAG_OFF("format")
  */
 #define JSFAILED_AT()                                                                                        \
     {                                                                                                        \
-        HDprintf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);                            \
+        printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);                              \
     }
 
 /*----------------------------------------------------------------------------
@@ -189,10 +189,10 @@ H5_GCC_CLANG_DIAG_OFF("format")
     {                                                                                                        \
         JSFAILED_AT()                                                                                        \
         if (reason != NULL) {                                                                                \
-            HDprintf("%s\n", (reason));                                                                      \
+            printf("%s\n", (reason));                                                                        \
         }                                                                                                    \
         else {                                                                                               \
-            HDprintf("  ! Expected %ld\n  ! Actual   %ld\n", (long)(expected), (long)(actual));              \
+            printf("  ! Expected %ld\n  ! Actual   %ld\n", (long)(expected), (long)(actual));                \
         }                                                                                                    \
     }
 
@@ -228,10 +228,10 @@ H5_GCC_CLANG_DIAG_OFF("format")
     {                                                                                                        \
         JSFAILED_AT()                                                                                        \
         if ((reason) != NULL) {                                                                              \
-            HDprintf("%s\n", (reason));                                                                      \
+            printf("%s\n", (reason));                                                                        \
         }                                                                                                    \
         else {                                                                                               \
-            HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", (expected), (actual));                           \
+            printf("!!! Expected:\n%s\n!!!Actual:\n%s\n", (expected), (actual));                             \
         }                                                                                                    \
     }
 
@@ -536,7 +536,7 @@ test_parse_tuple(void)
         assert(cpy == NULL);
         tc = cases[i];
         if (show_progress == TRUE) {
-            HDprintf("testing %d: %s...\n", i, tc.test_msg);
+            printf("testing %d: %s...\n", i, tc.test_msg);
         }
 
         /* VERIFY
@@ -635,7 +635,7 @@ test_populate_ros3_fa(void)
         const char *values[] = {"x", "y", "z"};
 
         if (show_progress) {
-            HDprintf("NULL fapl pointer\n");
+            printf("NULL fapl pointer\n");
         }
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(NULL, values), "fapl pointer cannot be null")
@@ -647,7 +647,7 @@ test_populate_ros3_fa(void)
         H5FD_ros3_fapl_t fa = {bad_version, TRUE, "u", "v", "w"};
 
         if (show_progress) {
-            HDprintf("NULL values pointer\n");
+            printf("NULL values pointer\n");
         }
 
         JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, NULL), "NULL values pointer yields \"default\" fapl")
@@ -666,7 +666,7 @@ test_populate_ros3_fa(void)
         const char      *values[] = {"", "", ""};
 
         if (show_progress) {
-            HDprintf("all empty values\n");
+            printf("all empty values\n");
         }
 
         JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, values), "empty values yields \"default\" fapl")
@@ -685,7 +685,7 @@ test_populate_ros3_fa(void)
         const char      *values[] = {"x", "y", "z", "a"};
 
         if (show_progress) {
-            HDprintf("successful full set\n");
+            printf("successful full set\n");
         }
 
         JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, values), "four values")
@@ -704,7 +704,7 @@ test_populate_ros3_fa(void)
         const char      *values[] = {NULL, "y", "z", NULL};
 
         if (show_progress) {
-            HDprintf("NULL region\n");
+            printf("NULL region\n");
         }
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
@@ -723,7 +723,7 @@ test_populate_ros3_fa(void)
         const char      *values[] = {"", "y", "z", NULL};
 
         if (show_progress) {
-            HDprintf("empty region; non-empty id, key\n");
+            printf("empty region; non-empty id, key\n");
         }
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
@@ -744,7 +744,7 @@ test_populate_ros3_fa(void)
                                 "y", "z"};
 
         if (show_progress) {
-            HDprintf("region overflow\n");
+            printf("region overflow\n");
         }
 
         assert(HDstrlen(values[0]) > H5FD_ROS3_MAX_REGION_LEN);
@@ -765,7 +765,7 @@ test_populate_ros3_fa(void)
         const char      *values[] = {"x", NULL, "z", NULL};
 
         if (show_progress) {
-            HDprintf("NULL id\n");
+            printf("NULL id\n");
         }
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
@@ -784,7 +784,7 @@ test_populate_ros3_fa(void)
         const char      *values[] = {"x", "", "z", NULL};
 
         if (show_progress) {
-            HDprintf("empty id; non-empty region and key\n");
+            printf("empty id; non-empty region and key\n");
         }
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
@@ -814,7 +814,7 @@ test_populate_ros3_fa(void)
                                 "z"};
 
         if (show_progress) {
-            HDprintf("id overflow\n");
+            printf("id overflow\n");
         }
 
         assert(HDstrlen(values[1]) > H5FD_ROS3_MAX_SECRET_ID_LEN);
@@ -835,7 +835,7 @@ test_populate_ros3_fa(void)
         const char      *values[] = {"x", "y", NULL, NULL};
 
         if (show_progress) {
-            HDprintf("NULL key\n");
+            printf("NULL key\n");
         }
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
@@ -854,7 +854,7 @@ test_populate_ros3_fa(void)
         const char      *values[] = {"x", "y", "", NULL};
 
         if (show_progress) {
-            HDprintf("empty key; non-empty region and id\n");
+            printf("empty key; non-empty region and id\n");
         }
 
         JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
@@ -873,7 +873,7 @@ test_populate_ros3_fa(void)
         const char      *values[] = {"", "y", "", NULL};
 
         if (show_progress) {
-            HDprintf("empty key and region; non-empty id\n");
+            printf("empty key and region; non-empty id\n");
         }
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
@@ -892,7 +892,7 @@ test_populate_ros3_fa(void)
         const char      *values[] = {"x", "", "", NULL};
 
         if (show_progress) {
-            HDprintf("empty key and id; non-empty region\n");
+            printf("empty key and id; non-empty region\n");
         }
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
@@ -921,7 +921,7 @@ test_populate_ros3_fa(void)
                                      "Can you separate the various parts of the problem?"};
 
         if (show_progress) {
-            HDprintf("key overflow\n");
+            printf("key overflow\n");
         }
 
         assert(HDstrlen(values[2]) > H5FD_ROS3_MAX_SECRET_KEY_LEN);
@@ -1134,7 +1134,7 @@ test_set_configured_fapl(void)
         fapl_id = H5I_INVALID_HID;
 
 #if UTIL_TEST_DEBUG
-        HDfprintf(stderr, "setup test %d\t%s\n", i, C.message);
+        fprintf(stderr, "setup test %d\t%s\n", i, C.message);
         fflush(stderr);
 #endif /* UTIL_TEST_DEBUG */
 
@@ -1148,7 +1148,7 @@ test_set_configured_fapl(void)
         }
 
 #if UTIL_TEST_DEBUG
-        HDfprintf(stderr, "before test\n");
+        fprintf(stderr, "before test\n");
         fflush(stderr);
 #endif /* UTIL_TEST_DEBUG */
 
@@ -1165,7 +1165,7 @@ test_set_configured_fapl(void)
         }
 
 #if UTIL_TEST_DEBUG
-        HDfprintf(stderr, "after test\n");
+        fprintf(stderr, "after test\n");
         fflush(stderr);
 #endif /* UTIL_TEST_DEBUG */
 
@@ -1176,13 +1176,13 @@ test_set_configured_fapl(void)
         fapl_id = H5I_INVALID_HID;
 
 #if UTIL_TEST_DEBUG
-        HDfprintf(stderr, "after cleanup\n");
+        fprintf(stderr, "after cleanup\n");
         fflush(stderr);
 #endif /* UTIL_TEST_DEBUG */
     }
 
 #if UTIL_TEST_DEBUG
-    HDfprintf(stderr, "after loop\n");
+    fprintf(stderr, "after loop\n");
     fflush(stderr);
 #endif /* UTIL_TEST_DEBUG */
 
@@ -1195,7 +1195,7 @@ error:
      ***********/
 
 #if UTIL_TEST_DEBUG
-    HDfprintf(stderr, "ERROR\n");
+    fprintf(stderr, "ERROR\n");
     fflush(stderr);
 #endif /* UTIL_TEST_DEBUG */
 
@@ -1234,18 +1234,18 @@ main(void)
     h5reset(); /* h5test? */
 #endif         /* _H5TEST_ */
 
-    HDfprintf(stdout, "Testing h5tools_utils corpus.\n");
+    fprintf(stdout, "Testing h5tools_utils corpus.\n");
 
     nerrors += test_parse_tuple();
     nerrors += test_populate_ros3_fa();
     nerrors += test_set_configured_fapl();
 
     if (nerrors > 0) {
-        HDfprintf(stdout, "***** %d h5tools_utils TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
+        fprintf(stdout, "***** %d h5tools_utils TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : "");
         nerrors = 1;
     }
     else {
-        HDfprintf(stdout, "All h5tools_utils tests passed\n");
+        fprintf(stdout, "All h5tools_utils tests passed\n");
     }
 
     return (int)nerrors;
diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c
index 43b78b3..62a3905 100644
--- a/tools/src/h5copy/h5copy.c
+++ b/tools/src/h5copy/h5copy.c
@@ -369,10 +369,10 @@ main(int argc, char *argv[])
      *-------------------------------------------------------------------------*/
 
     if (verbose) {
-        HDprintf("Copying file <%s> and object <%s> to file <%s> and object <%s>\n", fname_src, oname_src,
-                 fname_dst, oname_dst);
+        printf("Copying file <%s> and object <%s> to file <%s> and object <%s>\n", fname_src, oname_src,
+               fname_dst, oname_dst);
         if (flag) {
-            HDprintf("Using %s flag\n", str_flag);
+            printf("Using %s flag\n", str_flag);
         }
     }
 
@@ -406,7 +406,7 @@ main(int argc, char *argv[])
 
         /* Display some output if requested */
         if (verbose)
-            HDprintf("%s: Creating parent groups\n", h5tools_getprogname());
+            printf("%s: Creating parent groups\n", h5tools_getprogname());
     } /* end if */
     else {
         /* error, if parent groups doesn't already exist in destination file */
@@ -475,7 +475,7 @@ main(int argc, char *argv[])
     leave(EXIT_SUCCESS);
 
 done:
-    HDprintf("Error in copy...Exiting\n");
+    printf("Error in copy...Exiting\n");
 
     /* free link info path */
     if (linkinfo.trg_path)
diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c
index a2fe5d9..6248cd5 100644
--- a/tools/src/h5diff/h5diff_common.c
+++ b/tools/src/h5diff/h5diff_common.c
@@ -95,11 +95,11 @@ check_options(diff_opt_t *opts)
      * These options are mutually exclusive.
      */
     if ((opts->delta_bool + opts->percent_bool + opts->use_system_epsilon) > 1) {
-        HDprintf("%s error: -d, -p and --use-system-epsilon options are mutually-exclusive;\n", PROGRAMNAME);
-        HDprintf("use no more than one.\n");
-        HDprintf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 "
-                 "Reference Manual'.\n",
-                 PROGRAMNAME);
+        printf("%s error: -d, -p and --use-system-epsilon options are mutually-exclusive;\n", PROGRAMNAME);
+        printf("use no more than one.\n");
+        printf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 "
+               "Reference Manual'.\n",
+               PROGRAMNAME);
         h5diff_exit(EXIT_FAILURE);
     }
 }
@@ -218,7 +218,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
                 /* create linked list of excluding objects */
                 if ((exclude_node = (struct exclude_path_list *)HDmalloc(sizeof(struct exclude_path_list))) ==
                     NULL) {
-                    HDprintf("Error: lack of memory!\n");
+                    printf("Error: lack of memory!\n");
                     h5diff_exit(EXIT_FAILURE);
                 }
 
@@ -250,7 +250,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
                 /* create linked list of excluding objects */
                 if ((exclude_attr_node =
                          (struct exclude_path_list *)HDmalloc(sizeof(struct exclude_path_list))) == NULL) {
-                    HDprintf("Error: lack of memory!\n");
+                    printf("Error: lack of memory!\n");
                     h5diff_exit(EXIT_FAILURE);
                 }
 
@@ -276,7 +276,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
                 opts->delta_bool = 1;
 
                 if (check_d_input(H5_optarg) == -1) {
-                    HDprintf("<-d %s> is not a valid option\n", H5_optarg);
+                    printf("<-d %s> is not a valid option\n", H5_optarg);
                     usage();
                     h5diff_exit(EXIT_FAILURE);
                 }
@@ -287,7 +287,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
             case 'p':
                 opts->percent_bool = 1;
                 if (check_p_input(H5_optarg) == -1) {
-                    HDprintf("<-p %s> is not a valid option\n", H5_optarg);
+                    printf("<-p %s> is not a valid option\n", H5_optarg);
                     usage();
                     h5diff_exit(EXIT_FAILURE);
                 }
@@ -301,7 +301,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
             case 'n':
                 opts->count_bool = 1;
                 if (check_n_input(H5_optarg) == -1) {
-                    HDprintf("<-n %s> is not a valid option\n", H5_optarg);
+                    printf("<-n %s> is not a valid option\n", H5_optarg);
                     usage();
                     h5diff_exit(EXIT_FAILURE);
                 }
@@ -392,7 +392,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
             errno                     = 0;
             onion_fa_g_1.revision_num = HDstrtoull(opts->vfd_info[0].info, NULL, 10);
             if (errno == ERANGE) {
-                HDprintf("Invalid onion revision specified for file 1\n");
+                printf("Invalid onion revision specified for file 1\n");
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
@@ -409,7 +409,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
             errno                     = 0;
             onion_fa_g_2.revision_num = HDstrtoull(opts->vfd_info[1].info, NULL, 10);
             if (errno == ERANGE) {
-                HDprintf("Invalid onion revision specified for file 2\n");
+                printf("Invalid onion revision specified for file 2\n");
                 usage();
                 h5diff_exit(EXIT_FAILURE);
             }
@@ -480,20 +480,20 @@ print_info(diff_opt_t *opts)
         return;
 
     if (opts->cmn_objs == 0) {
-        HDprintf("No common objects found. Files are not comparable.\n");
+        printf("No common objects found. Files are not comparable.\n");
         if (!opts->mode_verbose)
-            HDprintf("Use -v for a list of objects.\n");
+            printf("Use -v for a list of objects.\n");
     }
 
     if (opts->not_cmp == 1) {
         if (opts->mode_list_not_cmp == 0) {
-            HDprintf("--------------------------------\n");
-            HDprintf("Some objects are not comparable\n");
-            HDprintf("--------------------------------\n");
+            printf("--------------------------------\n");
+            printf("Some objects are not comparable\n");
+            printf("--------------------------------\n");
             if (opts->mode_verbose)
-                HDprintf("Use -c for a list of objects without details of differences.\n");
+                printf("Use -c for a list of objects without details of differences.\n");
             else
-                HDprintf("Use -c for a list of objects.\n");
+                printf("Use -c for a list of objects.\n");
         }
     }
 }
diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c
index f65d2b0..d1be2ff 100644
--- a/tools/src/h5diff/ph5diff_main.c
+++ b/tools/src/h5diff/ph5diff_main.c
@@ -67,7 +67,7 @@ main(int argc, char *argv[])
     MPI_Comm_size(MPI_COMM_WORLD, &g_nTasks);
 
     if (g_nTasks == 1) {
-        HDprintf("Only 1 task available...doing serial diff\n");
+        printf("Only 1 task available...doing serial diff\n");
 
         g_Parallel = 0;
 
@@ -141,11 +141,11 @@ ph5diff_worker(int nID)
             {
                 /* Open the files */
                 if ((file1_id = H5Fopen(filenames[0], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
-                    HDprintf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[0]);
+                    printf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[0]);
                     MPI_Abort(MPI_COMM_WORLD, 0);
                 }
                 if ((file2_id = H5Fopen(filenames[1], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
-                    HDprintf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[1]);
+                    printf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[1]);
                     MPI_Abort(MPI_COMM_WORLD, 0);
                 }
                 /* enable error reporting */
@@ -160,7 +160,7 @@ ph5diff_worker(int nID)
 
             /* Make certain we've received the filenames and opened the files already */
             if (file1_id < 0 || file2_id < 0) {
-                HDprintf("ph5diff_worker: ERROR: work received before/without filenames\n");
+                printf("ph5diff_worker: ERROR: work received before/without filenames\n");
                 break;
             }
 
@@ -225,7 +225,7 @@ ph5diff_worker(int nID)
             break;
         }
         else {
-            HDprintf("ph5diff_worker: ERROR: invalid tag (%d) received\n", Status.MPI_TAG);
+            printf("ph5diff_worker: ERROR: invalid tag (%d) received\n", Status.MPI_TAG);
             break;
         }
     }
@@ -252,7 +252,7 @@ print_manager_output(void)
 {
     /* If there was something we buffered, let's print it now */
     if ((outBuffOffset > 0) && g_Parallel) {
-        HDprintf("%s", outBuff);
+        printf("%s", outBuff);
 
         if (overflow_file) {
             int tmp;
@@ -268,7 +268,7 @@ print_manager_output(void)
         outBuffOffset = 0;
     }
     else if ((outBuffOffset > 0) && !g_Parallel) {
-        HDfprintf(stderr, "h5diff error: outBuffOffset>0, but we're not in parallel!\n");
+        fprintf(stderr, "h5diff error: outBuffOffset>0, but we're not in parallel!\n");
     }
 }
 
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c
index 2a5eeb7..6b1d520 100644
--- a/tools/src/h5dump/h5dump.c
+++ b/tools/src/h5dump/h5dump.c
@@ -1232,11 +1232,11 @@ end_collect:
                 errno                   = 0;
                 onion_fa_g.revision_num = HDstrtoull(vfd_info_g.info, NULL, 10);
                 if (errno == ERANGE) {
-                    HDprintf("Invalid onion revision specified\n");
+                    printf("Invalid onion revision specified\n");
                     goto error;
                 }
 
-                HDprintf("Using revision %" PRIu64 "\n", onion_fa_g.revision_num);
+                printf("Using revision %" PRIu64 "\n", onion_fa_g.revision_num);
             }
         }
         else
@@ -1374,7 +1374,7 @@ main(int argc, char *argv[])
                 goto done;
             }
 
-            HDprintf("The number of revisions for the onion file is %" PRIu64 "\n", revision_count);
+            printf("The number of revisions for the onion file is %" PRIu64 "\n", revision_count);
             goto done;
         }
         else
diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index 82f91e7..ac98b25 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -55,31 +55,31 @@ static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},    {"version",
 static void
 usage(const char *prog)
 {
-    HDfprintf(stdout, "usage: %s [OPTIONS] file_name\n", prog);
-    HDfprintf(stdout, "  OPTIONS\n");
-    HDfprintf(stdout, "   -h, --help                Print a usage message and exit\n");
-    HDfprintf(stdout, "   -V, --version             Print version number and exit\n");
-    HDfprintf(stdout, "   -v, --verbose             Turn on verbose mode\n");
-    HDfprintf(stdout, "   -d dname, --dname=dataset_name    Pathname for the dataset\n");
-    HDfprintf(stdout, "   -n, --noop                Perform all the steps except the actual conversion\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "Examples of use:\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "h5format_convert -d /group/dataset file_name\n");
-    HDfprintf(stdout, "  Convert the dataset </group/dataset> in the HDF5 file <file_name>:\n");
-    HDfprintf(stdout, "    a. chunked dataset: convert the chunk indexing type to version 1 B-tree\n");
-    HDfprintf(stdout, "    b. compact/contiguous dataset: downgrade the layout version to 3\n");
-    HDfprintf(stdout, "    c. virtual dataset: no action\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "h5format_convert file_name\n");
-    HDfprintf(stdout, "  Convert all datasets in the HDF5 file <file_name>:\n");
-    HDfprintf(stdout, "    a. chunked dataset: convert the chunk indexing type to version 1 B-tree\n");
-    HDfprintf(stdout, "    b. compact/contiguous dataset: downgrade the layout version to 3\n");
-    HDfprintf(stdout, "    c. virtual dataset: no action\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "h5format_convert -n -d /group/dataset file_name\n");
-    HDfprintf(stdout, "  Go through all the steps except the actual conversion when \n");
-    HDfprintf(stdout, "  converting the dataset </group/dataset> in the HDF5 file <file_name>.\n");
+    fprintf(stdout, "usage: %s [OPTIONS] file_name\n", prog);
+    fprintf(stdout, "  OPTIONS\n");
+    fprintf(stdout, "   -h, --help                Print a usage message and exit\n");
+    fprintf(stdout, "   -V, --version             Print version number and exit\n");
+    fprintf(stdout, "   -v, --verbose             Turn on verbose mode\n");
+    fprintf(stdout, "   -d dname, --dname=dataset_name    Pathname for the dataset\n");
+    fprintf(stdout, "   -n, --noop                Perform all the steps except the actual conversion\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "Examples of use:\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "h5format_convert -d /group/dataset file_name\n");
+    fprintf(stdout, "  Convert the dataset </group/dataset> in the HDF5 file <file_name>:\n");
+    fprintf(stdout, "    a. chunked dataset: convert the chunk indexing type to version 1 B-tree\n");
+    fprintf(stdout, "    b. compact/contiguous dataset: downgrade the layout version to 3\n");
+    fprintf(stdout, "    c. virtual dataset: no action\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "h5format_convert file_name\n");
+    fprintf(stdout, "  Convert all datasets in the HDF5 file <file_name>:\n");
+    fprintf(stdout, "    a. chunked dataset: convert the chunk indexing type to version 1 B-tree\n");
+    fprintf(stdout, "    b. compact/contiguous dataset: downgrade the layout version to 3\n");
+    fprintf(stdout, "    c. virtual dataset: no action\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "h5format_convert -n -d /group/dataset file_name\n");
+    fprintf(stdout, "  Go through all the steps except the actual conversion when \n");
+    fprintf(stdout, "  converting the dataset </group/dataset> in the HDF5 file <file_name>.\n");
 } /* usage() */
 
 /*-------------------------------------------------------------------------
@@ -214,7 +214,7 @@ convert(hid_t fid, const char *dname)
         goto error;
     }
     else if (verbose_g)
-        HDfprintf(stdout, "Open the dataset\n");
+        fprintf(stdout, "Open the dataset\n");
 
     /* Get the dataset's creation property list */
     if ((dcpl = H5Dget_create_plist(did)) < 0) {
@@ -230,12 +230,12 @@ convert(hid_t fid, const char *dname)
         goto error;
     }
     else if (verbose_g)
-        HDfprintf(stdout, "Retrieve the dataset's layout\n");
+        fprintf(stdout, "Retrieve the dataset's layout\n");
 
     switch (layout_type) {
         case H5D_CHUNKED:
             if (verbose_g)
-                HDfprintf(stdout, "Dataset is a chunked dataset\n");
+                fprintf(stdout, "Dataset is a chunked dataset\n");
 
             /* Get the dataset's chunk indexing type */
             if (H5Dget_chunk_index_type(did, &idx_type) < 0) {
@@ -244,34 +244,33 @@ convert(hid_t fid, const char *dname)
                 goto error;
             }
             else if (verbose_g)
-                HDfprintf(stdout, "Retrieve the dataset's chunk indexing type\n");
+                fprintf(stdout, "Retrieve the dataset's chunk indexing type\n");
 
             if (idx_type == H5D_CHUNK_IDX_BTREE) {
                 if (verbose_g)
-                    HDfprintf(
-                        stdout,
-                        "Dataset's chunk indexing type is already version 1 B-tree: no further action\n");
+                    fprintf(stdout,
+                            "Dataset's chunk indexing type is already version 1 B-tree: no further action\n");
                 h5tools_setstatus(EXIT_SUCCESS);
                 goto done;
             }
             else if (verbose_g)
-                HDfprintf(stdout, "Dataset's chunk indexing type is not version 1 B-tree\n");
+                fprintf(stdout, "Dataset's chunk indexing type is not version 1 B-tree\n");
 
             break;
 
         case H5D_CONTIGUOUS:
             if (verbose_g)
-                HDfprintf(stdout, "Dataset is a contiguous dataset: downgrade layout version as needed\n");
+                fprintf(stdout, "Dataset is a contiguous dataset: downgrade layout version as needed\n");
             break;
 
         case H5D_COMPACT:
             if (verbose_g)
-                HDfprintf(stdout, "Dataset is a compact dataset: downgrade layout version as needed\n");
+                fprintf(stdout, "Dataset is a compact dataset: downgrade layout version as needed\n");
             break;
 
         case H5D_VIRTUAL:
             if (verbose_g)
-                HDfprintf(stdout, "No further action for virtual dataset\n");
+                fprintf(stdout, "No further action for virtual dataset\n");
             goto done;
 
         case H5D_NLAYOUTS:
@@ -286,13 +285,13 @@ convert(hid_t fid, const char *dname)
     /* No further action if it is a noop */
     if (noop_g) {
         if (verbose_g)
-            HDfprintf(stdout, "Not converting the dataset\n");
+            fprintf(stdout, "Not converting the dataset\n");
         h5tools_setstatus(EXIT_SUCCESS);
         goto done;
     }
 
     if (verbose_g)
-        HDfprintf(stdout, "Converting the dataset...\n");
+        fprintf(stdout, "Converting the dataset...\n");
 
     /* Downgrade the dataset */
     if (H5Dformat_convert(did) < 0) {
@@ -301,7 +300,7 @@ convert(hid_t fid, const char *dname)
         goto error;
     }
     else if (verbose_g)
-        HDfprintf(stdout, "Done\n");
+        fprintf(stdout, "Done\n");
 
 done:
     /* Close the dataset */
@@ -311,7 +310,7 @@ done:
         goto error;
     }
     else if (verbose_g)
-        HDfprintf(stdout, "Close the dataset\n");
+        fprintf(stdout, "Close the dataset\n");
 
     /* Close the dataset creation property list */
     if (H5Pclose(dcpl) < 0) {
@@ -320,13 +319,13 @@ done:
         goto error;
     }
     else if (verbose_g)
-        HDprintf("Close the dataset creation property list\n");
+        printf("Close the dataset creation property list\n");
 
     return 0;
 
 error:
     if (verbose_g)
-        HDfprintf(stdout, "Error encountered\n");
+        fprintf(stdout, "Error encountered\n");
 
     H5E_BEGIN_TRY
     {
@@ -357,7 +356,7 @@ convert_dsets_cb(const char *path, const H5O_info2_t *oi, const char *already_vi
     if (NULL == already_visited) {
         if (oi->type == H5O_TYPE_DATASET) {
             if (verbose_g)
-                HDfprintf(stdout, "Going to process dataset:%s...\n", path);
+                fprintf(stdout, "Going to process dataset:%s...\n", path);
             if (convert(fid, path) < 0)
                 goto error;
         } /* end if */
@@ -395,10 +394,10 @@ main(int argc, char *argv[])
     if (parse_command_line(argc, (const char *const *)argv) < 0)
         goto done;
     else if (verbose_g)
-        HDfprintf(stdout, "Process command line options\n");
+        fprintf(stdout, "Process command line options\n");
 
     if (noop_g && verbose_g)
-        HDfprintf(stdout, "It is noop...\n");
+        fprintf(stdout, "It is noop...\n");
 
     /* enable error reporting if command line option */
     h5tools_error_report();
@@ -410,28 +409,28 @@ main(int argc, char *argv[])
         goto done;
     }
     else if (verbose_g)
-        HDfprintf(stdout, "Open the file %s\n", fname_g);
+        fprintf(stdout, "Open the file %s\n", fname_g);
 
     if (dset_g) { /* Convert a specified dataset in the file */
         if (verbose_g)
-            HDfprintf(stdout, "Going to process dataset: %s...\n", dname_g);
+            fprintf(stdout, "Going to process dataset: %s...\n", dname_g);
         if (convert(fid, dname_g) < 0)
             goto done;
     }
     else { /* Convert all datasets in the file */
         if (verbose_g)
-            HDfprintf(stdout, "Processing all datasets in the file...\n");
+            fprintf(stdout, "Processing all datasets in the file...\n");
         if (h5trav_visit(fid, "/", TRUE, TRUE, convert_dsets_cb, NULL, &fid, H5O_INFO_BASIC) < 0)
             goto done;
     } /* end else */
 
     if (verbose_g) {
         if (noop_g) {
-            HDfprintf(stdout, "Not processing the file's superblock...\n");
+            fprintf(stdout, "Not processing the file's superblock...\n");
             h5tools_setstatus(EXIT_SUCCESS);
             goto done;
         } /* end if */
-        HDfprintf(stdout, "Processing the file's superblock...\n");
+        fprintf(stdout, "Processing the file's superblock...\n");
     } /* end if */
 
     /* Process superblock */
@@ -449,7 +448,7 @@ done:
             h5tools_setstatus(EXIT_FAILURE);
         }
         else if (verbose_g) {
-            HDfprintf(stdout, "Close the file\n");
+            fprintf(stdout, "Close the file\n");
         }
     } /* end if */
 
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index 428d32f..05f51e4 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -113,7 +113,7 @@ main(int argc, char *argv[])
      * validate the number of command line arguments
      */
     if (argc < 2) {
-        (void)HDfprintf(stderr, err1, argc);
+        (void)fprintf(stderr, err1, argc);
         usage(argv[0]);
         goto err;
     }
@@ -140,7 +140,7 @@ main(int argc, char *argv[])
                     opt->fcount++;
                 }
                 else {
-                    (void)HDfprintf(stderr, err9, argv[i]);
+                    (void)fprintf(stderr, err9, argv[i]);
                     goto err;
                 }
 
@@ -159,7 +159,7 @@ main(int argc, char *argv[])
 
             case 5: /* get outfile found */
                 if (HDstrlen(argv[i]) > MAX_PATH_NAME_LENGTH) {
-                    (void)HDfprintf(stderr, err10, argv[i]);
+                    (void)fprintf(stderr, err10, argv[i]);
                     goto err;
                 }
                 (void)HDstrcpy(opt->outfile, argv[i]);
@@ -176,7 +176,7 @@ main(int argc, char *argv[])
 
             case 8: /* read dimensions */
                 if (parseDimensions(in, argv[i]) == -1) {
-                    (void)HDfprintf(stderr, err6, argv[i]);
+                    (void)fprintf(stderr, err6, argv[i]);
                     goto err;
                 }
                 break;
@@ -186,7 +186,7 @@ main(int argc, char *argv[])
 
             case 10: /* read path name */
                 if (parsePathInfo(&in->path, argv[i]) == -1) {
-                    (void)HDfprintf(stderr, err5, argv[i]);
+                    (void)fprintf(stderr, err5, argv[i]);
                     goto err;
                 }
                 break;
@@ -196,7 +196,7 @@ main(int argc, char *argv[])
 
             case 12: /* read data type */
                 if (getInputClass(in, argv[i]) == -1) {
-                    (void)HDfprintf(stderr, err7, argv[i]);
+                    (void)fprintf(stderr, err7, argv[i]);
                     goto err;
                 }
 
@@ -213,7 +213,7 @@ main(int argc, char *argv[])
 
             case 14: /* read data size */
                 if (getInputSize(in, (int)HDstrtol(argv[i], NULL, BASE_10)) == -1) {
-                    (void)HDfprintf(stderr, err8, argv[i]);
+                    (void)fprintf(stderr, err8, argv[i]);
                     goto err;
                 }
                 /*set default value for output-size */
@@ -222,14 +222,14 @@ main(int argc, char *argv[])
 
             case ERR: /* command syntax error */
             default:
-                (void)HDfprintf(stderr, "%s", err2);
+                (void)fprintf(stderr, "%s", err2);
                 usage(argv[0]);
                 goto err;
         }
     }
 
     if (FALSE == outfile_named) {
-        (void)HDfprintf(stderr, "%s", err3);
+        (void)fprintf(stderr, "%s", err3);
         usage(argv[0]);
         goto err;
     }
@@ -256,7 +256,7 @@ main(int argc, char *argv[])
 
     return EXIT_SUCCESS;
 err:
-    (void)HDfprintf(stderr, "%s", err4);
+    (void)fprintf(stderr, "%s", err4);
     for (i = 0; i < opt->fcount; i++) {
         in = &(opt->infiles[i].in);
         if (in->sizeOfDimension)
@@ -329,7 +329,7 @@ gtoken(char *s)
         }
 
         if (token == ERR)
-            (void)HDfprintf(stderr, err1, s);
+            (void)fprintf(stderr, err1, s);
     }
     else { /* filename */
         token = FILNAME;
@@ -376,7 +376,7 @@ processDataFile(char *infile, struct Input *in, hid_t file_id)
     if (in->inputClass == 4 /* "IN" */ || in->inputClass == 3 /* "FP" */ || in->inputClass == 7 /* "UIN" */) {
 
         if ((strm = HDfopen(infile, READ_OPEN_FLAGS)) == NULL) {
-            (void)HDfprintf(stderr, err1, infile);
+            (void)fprintf(stderr, err1, infile);
             goto error;
         }
     }
@@ -386,7 +386,7 @@ processDataFile(char *infile, struct Input *in, hid_t file_id)
      */
     else {
         if ((strm = HDfopen(infile, "r")) == NULL) {
-            (void)HDfprintf(stderr, err1, infile);
+            (void)fprintf(stderr, err1, infile);
             goto error;
         }
     }
@@ -395,12 +395,12 @@ processDataFile(char *infile, struct Input *in, hid_t file_id)
         case 0: /*  TEXTIN */
         case 4: /*  IN  */
             if (allocateIntegerStorage(in) == -1) {
-                (void)HDfprintf(stderr, err2, infile);
+                (void)fprintf(stderr, err2, infile);
                 goto error;
             }
 
             if (readIntegerData(strm, in) == -1) {
-                (void)HDfprintf(stderr, err4, infile);
+                (void)fprintf(stderr, err4, infile);
                 goto error;
             }
             break;
@@ -409,12 +409,12 @@ processDataFile(char *infile, struct Input *in, hid_t file_id)
         case 2: /*  TEXTFPE  */
         case 3: /*  FP  */
             if (allocateFloatStorage(in) == -1) {
-                (void)HDfprintf(stderr, err3, infile);
+                (void)fprintf(stderr, err3, infile);
                 goto error;
             }
 
             if (readFloatData(strm, in) == -1) {
-                (void)HDfprintf(stderr, err5, infile);
+                (void)fprintf(stderr, err5, infile);
                 goto error;
             }
             break;
@@ -422,13 +422,13 @@ processDataFile(char *infile, struct Input *in, hid_t file_id)
         case 5: /*  STR  */
             if (in->h5dumpInput) {
                 if (processStrHDFData(strm, in, file_id) == -1) {
-                    (void)HDfprintf(stderr, err11, infile);
+                    (void)fprintf(stderr, err11, infile);
                     goto error;
                 }
             }
             else {
                 if (processStrData(strm, in, file_id) == -1) {
-                    (void)HDfprintf(stderr, err11, infile);
+                    (void)fprintf(stderr, err11, infile);
                     goto error;
                 }
             }
@@ -438,17 +438,17 @@ processDataFile(char *infile, struct Input *in, hid_t file_id)
         case 6: /* TEXTUIN */
         case 7: /* UIN */
             if (allocateUIntegerStorage(in) == -1) {
-                (void)HDfprintf(stderr, err6, infile);
+                (void)fprintf(stderr, err6, infile);
                 goto error;
             }
             if (readUIntegerData(strm, in) == -1) {
-                (void)HDfprintf(stderr, err7, infile);
+                (void)fprintf(stderr, err7, infile);
                 goto error;
             }
             break;
 
         default:
-            (void)HDfprintf(stderr, "%s", err10);
+            (void)fprintf(stderr, "%s", err10);
             goto error;
     }
 
@@ -492,7 +492,7 @@ readIntegerData(FILE *strm, struct Input *in)
                     in08 = (H5DT_INT8 *)in->data;
                     for (i = 0; i < len; i++, in08++) {
                         if (HDfscanf(strm, "%hd", &temp16) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                         (*in08) = (H5DT_INT8)temp16;
@@ -503,17 +503,17 @@ readIntegerData(FILE *strm, struct Input *in)
                     in08 = (H5DT_INT8 *)in->data;
                     for (i = 0; i < len; i++, in08++) {
                         if (HDfread((char *)in08, sizeof(H5DT_INT8), 1, strm) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
 #ifdef H5DEBUGIMPORT
-                        HDprintf("readIntegerData %d (0x%.8X)\n", *in08, *in08);
+                        printf("readIntegerData %d (0x%.8X)\n", *in08, *in08);
 #endif
                     }
                     break;
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err2);
+                    (void)fprintf(stderr, "%s", err2);
                     return (-1);
             }
             break;
@@ -524,7 +524,7 @@ readIntegerData(FILE *strm, struct Input *in)
                 case 0: /* TEXTIN */
                     for (i = 0; i < len; i++, in16++) {
                         if (HDfscanf(strm, "%hd", in16) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                     }
@@ -534,7 +534,7 @@ readIntegerData(FILE *strm, struct Input *in)
                 case 4: /* IN */
                     for (i = 0; i < len; i++, in16++) {
                         if (HDfread((char *)&temp16, sizeof(H5DT_INT16), 1, strm) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                         /*
@@ -544,13 +544,13 @@ readIntegerData(FILE *strm, struct Input *in)
                         */
                         *in16 = temp16;
 #ifdef H5DEBUGIMPORT
-                        HDprintf("readIntegerData %d (0x%.8X)\n", *in16, temp16);
+                        printf("readIntegerData %d (0x%.8X)\n", *in16, temp16);
 #endif
                     }
                     break;
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err2);
+                    (void)fprintf(stderr, "%s", err2);
                     return (-1);
             }
             break;
@@ -561,7 +561,7 @@ readIntegerData(FILE *strm, struct Input *in)
                 case 0: /* TEXTIN */
                     for (i = 0; i < len; i++, in32++) {
                         if (HDfscanf(strm, "%d", in32) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                     }
@@ -570,7 +570,7 @@ readIntegerData(FILE *strm, struct Input *in)
                 case 4: /* IN */
                     for (i = 0; i < len; i++, in32++) {
                         if (HDfread((char *)&temp32, sizeof(H5DT_INT32), 1, strm) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                         /*
@@ -580,13 +580,13 @@ readIntegerData(FILE *strm, struct Input *in)
                         */
                         *in32 = temp32;
 #ifdef H5DEBUGIMPORT
-                        HDprintf("readIntegerData %d (0x%.8X = 0x%.8X)\n", *in32, *in32, temp32);
+                        printf("readIntegerData %d (0x%.8X = 0x%.8X)\n", *in32, *in32, temp32);
 #endif
                     }
                     break;
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err2);
+                    (void)fprintf(stderr, "%s", err2);
                     return (-1);
             }
             break;
@@ -597,7 +597,7 @@ readIntegerData(FILE *strm, struct Input *in)
                 case 0: /* TEXTIN */
                     for (i = 0; i < len; i++, in64++) {
                         if (HDfscanf(strm, "%s", buffer) < 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                         *in64 = (H5DT_INT64)HDstrtoll(buffer, NULL, 10);
@@ -607,7 +607,7 @@ readIntegerData(FILE *strm, struct Input *in)
                 case 4: /* IN */
                     for (i = 0; i < len; i++, in64++) {
                         if (HDfread((char *)&temp64, sizeof(H5DT_INT64), 1, strm) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                         /*
@@ -617,19 +617,19 @@ readIntegerData(FILE *strm, struct Input *in)
                         */
                         *in64 = temp64;
 #ifdef H5DEBUGIMPORT
-                        HDprintf("readIntegerData %d (0x%.8X)\n", *in64, temp64);
+                        printf("readIntegerData %d (0x%.8X)\n", *in64, temp64);
 #endif
                     }
                     break;
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err2);
+                    (void)fprintf(stderr, "%s", err2);
                     return (-1);
             }
             break;
 
         default:
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             break;
     }
     return (0);
@@ -663,7 +663,7 @@ readUIntegerData(FILE *strm, struct Input *in)
                     in08 = (H5DT_UINT8 *)in->data;
                     for (i = 0; i < len; i++, in08++) {
                         if (HDfscanf(strm, "%hu", &temp16) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                         (*in08) = (H5DT_UINT8)temp16;
@@ -674,14 +674,14 @@ readUIntegerData(FILE *strm, struct Input *in)
                     in08 = (H5DT_UINT8 *)in->data;
                     for (i = 0; i < len; i++, in08++) {
                         if (HDfread((char *)in08, sizeof(H5DT_UINT8), 1, strm) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                     }
                     break;
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err2);
+                    (void)fprintf(stderr, "%s", err2);
                     return (-1);
             }
             break;
@@ -692,7 +692,7 @@ readUIntegerData(FILE *strm, struct Input *in)
                 case 6: /* TEXTUIN */
                     for (i = 0; i < len; i++, in16++) {
                         if (HDfscanf(strm, "%hu", in16) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                     }
@@ -701,7 +701,7 @@ readUIntegerData(FILE *strm, struct Input *in)
                 case 7: /* UIN */
                     for (i = 0; i < len; i++, in16++) {
                         if (HDfread((char *)&temp16, sizeof(H5DT_UINT16), 1, strm) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                         /*
@@ -711,13 +711,13 @@ readUIntegerData(FILE *strm, struct Input *in)
                         */
                         *in16 = temp16;
 #ifdef H5DEBUGIMPORT
-                        HDprintf("readUIntegerData %d (0x%.4X = 0x%.4X)\n", *in16, *in16, temp16);
+                        printf("readUIntegerData %d (0x%.4X = 0x%.4X)\n", *in16, *in16, temp16);
 #endif
                     }
                     break;
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err2);
+                    (void)fprintf(stderr, "%s", err2);
                     return (-1);
             }
             break;
@@ -728,7 +728,7 @@ readUIntegerData(FILE *strm, struct Input *in)
                 case 6: /* TEXTUIN */
                     for (i = 0; i < len; i++, in32++) {
                         if (HDfscanf(strm, "%u", in32) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                     }
@@ -737,7 +737,7 @@ readUIntegerData(FILE *strm, struct Input *in)
                 case 7: /* UIN */
                     for (i = 0; i < len; i++, in32++) {
                         if (HDfread((char *)&temp32, sizeof(H5DT_UINT32), 1, strm) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                         /*
@@ -747,13 +747,13 @@ readUIntegerData(FILE *strm, struct Input *in)
                         */
                         *in32 = temp32;
 #ifdef H5DEBUGIMPORT
-                        HDprintf("readUIntegerData %d (0x%.8X = 0x%.8X)\n", *in32, *in32, temp32);
+                        printf("readUIntegerData %d (0x%.8X = 0x%.8X)\n", *in32, *in32, temp32);
 #endif
                     }
                     break;
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err2);
+                    (void)fprintf(stderr, "%s", err2);
                     return (-1);
             }
             break;
@@ -764,7 +764,7 @@ readUIntegerData(FILE *strm, struct Input *in)
                 case 6: /* TEXTUIN */
                     for (i = 0; i < len; i++, in64++) {
                         if (HDfscanf(strm, "%s", buffer) < 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                         *in64 = (H5DT_UINT64)HDstrtoll(buffer, NULL, 10);
@@ -774,7 +774,7 @@ readUIntegerData(FILE *strm, struct Input *in)
                 case 7: /* UIN */
                     for (i = 0; i < len; i++, in64++) {
                         if (HDfread((char *)&temp64, sizeof(H5DT_UINT64), 1, strm) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                         /*
@@ -784,19 +784,19 @@ readUIntegerData(FILE *strm, struct Input *in)
                         */
                         *in64 = temp64;
 #ifdef H5DEBUGIMPORT
-                        HDprintf("readUIntegerData %ld (0x%.8X = 0x%.8X)\n", *in64, *in64, temp64);
+                        printf("readUIntegerData %ld (0x%.8X = 0x%.8X)\n", *in64, *in64, temp64);
 #endif
                     }
                     break;
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err2);
+                    (void)fprintf(stderr, "%s", err2);
                     return (-1);
             }
             break;
 
         default:
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             break;
     }
     return (0);
@@ -829,7 +829,7 @@ readFloatData(FILE *strm, struct Input *in)
                 case 1: /* TEXTFP */
                     for (i = 0; i < len; i++, fp32++) {
                         if (HDfscanf(strm, "%f", fp32) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                     }
@@ -842,7 +842,7 @@ readFloatData(FILE *strm, struct Input *in)
 
                     for (i = 0; i < len; i++, fp32++) {
                         if (HDfscanf(strm, "%f", fp32) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                     }
@@ -854,7 +854,7 @@ readFloatData(FILE *strm, struct Input *in)
                     bfp32 = (uint32_t *)in->data;
                     for (i = 0; i < len; i++, bfp32++) {
                         if (HDfread((char *)&temp32, sizeof(uint32_t), 1, strm) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                         /*
@@ -864,13 +864,13 @@ readFloatData(FILE *strm, struct Input *in)
                         */
                         *bfp32 = temp32;
 #ifdef H5DEBUGIMPORT
-                        HDprintf("readFloatData %ld (0x%.8X = 0x%.8X)\n", *bfp32, *bfp32, temp32);
+                        printf("readFloatData %ld (0x%.8X = 0x%.8X)\n", *bfp32, *bfp32, temp32);
 #endif
                     }
                     break;
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err2);
+                    (void)fprintf(stderr, "%s", err2);
                     return (-1);
             }
             break;
@@ -881,7 +881,7 @@ readFloatData(FILE *strm, struct Input *in)
                 case 1: /* TEXTFP */
                     for (i = 0; i < len; i++, fp64++) {
                         if (HDfscanf(strm, "%lf", fp64) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                     }
@@ -894,7 +894,7 @@ readFloatData(FILE *strm, struct Input *in)
 
                     for (i = 0; i < len; i++, fp64++) {
                         if (HDfscanf(strm, "%lf", fp64) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                     }
@@ -906,7 +906,7 @@ readFloatData(FILE *strm, struct Input *in)
                     bfp64 = (uint64_t *)in->data;
                     for (i = 0; i < len; i++, bfp64++) {
                         if (HDfread((char *)&temp64, sizeof(uint64_t), 1, strm) != 1) {
-                            (void)HDfprintf(stderr, "%s", err1);
+                            (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
                         /*
@@ -916,19 +916,19 @@ readFloatData(FILE *strm, struct Input *in)
                         */
                         *bfp64 = temp64;
 #ifdef H5DEBUGIMPORT
-                        HDprintf("readFloatData %ld (0x%.16lX)\n", *bfp64, temp64);
+                        printf("readFloatData %ld (0x%.16lX)\n", *bfp64, temp64);
 #endif
                     }
                     break;
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err2);
+                    (void)fprintf(stderr, "%s", err2);
                     return (-1);
             }
             break;
 
         default:
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             break;
     }
     return (0);
@@ -1111,7 +1111,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id)
      *-------------------------------------------------------------------------
      */
 #ifdef H5DEBUGIMPORT
-    HDprintf("processStrHDFData DATATYPE STRING\n");
+    printf("processStrHDFData DATATYPE STRING\n");
 #endif
 
     if ((type_id = H5Tcopy(H5T_C_S1)) < 0)
@@ -1149,7 +1149,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id)
     }
     H5E_END_TRY
 #ifdef H5DEBUGIMPORT
-    HDprintf("processStrHDFData DATATYPE STRING groups created\n");
+    printf("processStrHDFData DATATYPE STRING groups created\n");
 #endif
 
     if ((space_id = H5Screate_simple(in->rank, in->sizeOfDimension, NULL)) < 0)
@@ -1163,7 +1163,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id)
         goto out;
 
 #ifdef H5DEBUGIMPORT
-    HDprintf("processStrHDFData DATATYPE STRING ready to process strings\n");
+    printf("processStrHDFData DATATYPE STRING ready to process strings\n");
 #endif
     line = 0;
     j    = 0;
@@ -1173,27 +1173,27 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id)
         str2 = NULL;
         str3 = NULL;
 #ifdef H5DEBUGIMPORT
-        HDprintf("processStrHDFData DATATYPE STRING[%llu]={%s}\n", (unsigned long long)line, str1);
+        printf("processStrHDFData DATATYPE STRING[%llu]={%s}\n", (unsigned long long)line, str1);
 #endif
         /* process string to remove the first and last quote char */
         str2 = strchr(str1, '"');
         if (str2 != NULL) {
 #ifdef H5DEBUGIMPORT
-            HDprintf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2);
+            printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2);
 #endif
             str2++;
 #ifdef H5DEBUGIMPORT
-            HDprintf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2);
+            printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2);
 #endif
             str3 = strrchr(str2, '"');
             if (str3 != NULL) {
 #ifdef H5DEBUGIMPORT
-                HDprintf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str3), str3);
+                printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str3), str3);
 #endif
                 *str3 = '\0';
 
 #ifdef H5DEBUGIMPORT
-                HDprintf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2);
+                printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2);
 #endif
 
                 if (HDstrlen(str2) > 0) {
@@ -1202,8 +1202,8 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id)
                     hsize_t count[1] = {1};
 
 #ifdef H5DEBUGIMPORT
-                    HDprintf("processStrHDFData DATATYPE STRING[%llu] store %s\n", (unsigned long long)line,
-                             str2);
+                    printf("processStrHDFData DATATYPE STRING[%llu] store %s\n", (unsigned long long)line,
+                           str2);
 #endif
                     if ((fspace_id = H5Dget_space(dset_id)) < 0)
                         goto out;
@@ -1225,7 +1225,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id)
         j++;
     }
 #ifdef H5DEBUGIMPORT
-    HDprintf("processStrHDFData DATATYPE STRING eof reached\n");
+    printf("processStrHDFData DATATYPE STRING eof reached\n");
 #endif
 
     /* close */
@@ -1238,7 +1238,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id)
 
 out:
 #ifdef H5DEBUGIMPORT
-    HDprintf("processStrHDFData DATATYPE STRING error exit\n");
+    printf("processStrHDFData DATATYPE STRING error exit\n");
 #endif
     /* disable error reporting */
     H5E_BEGIN_TRY
@@ -1268,34 +1268,34 @@ allocateIntegerStorage(struct Input *in)
     switch (in->inputSize) {
         case 8:
             if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_INT8))) == NULL) {
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
             }
             break;
 
         case 16:
             if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_INT16))) == NULL) {
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
             }
             break;
 
         case 32:
             if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_INT32))) == NULL) {
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
             }
             break;
 
         case 64:
             if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_INT64))) == NULL) {
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
             }
             break;
 
         default:
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             break;
     }
     return (0);
@@ -1315,34 +1315,34 @@ allocateUIntegerStorage(struct Input *in)
     switch (in->inputSize) {
         case 8:
             if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_UINT8))) == NULL) {
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
             }
             break;
 
         case 16:
             if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_UINT16))) == NULL) {
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
             }
             break;
 
         case 32:
             if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_UINT32))) == NULL) {
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
             }
             break;
 
         case 64:
             if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_UINT64))) == NULL) {
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
             }
             break;
 
         default:
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             break;
     }
     return (0);
@@ -1362,20 +1362,20 @@ allocateFloatStorage(struct Input *in)
     switch (in->inputSize) {
         case 32:
             if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_FLOAT32))) == NULL) {
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
             }
             break;
 
         case 64:
             if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_FLOAT64))) == NULL) {
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
             }
             break;
 
         default:
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             break;
     }
     return (0);
@@ -1446,24 +1446,24 @@ processConfigurationFile(char *infile, struct Input *in)
     /* 0 for big endian, 1 for little endian. */
     if ((*((volatile uint8_t *)(&ibyte))) == 0x67) {
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err11e);
+            (void)fprintf(stderr, "%s", err11e);
             return (-1);
         }
     }
     else {
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err11e);
+            (void)fprintf(stderr, "%s", err11e);
             return (-1);
         }
     }
     in->inputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-    HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+    printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
     in->inputArchitecture = 0; /* default to NATIVE */
 
     if ((strm = HDfopen(infile, "r")) == NULL) {
-        (void)HDfprintf(stderr, err1, infile);
+        (void)fprintf(stderr, err1, infile);
         goto error;
     }
 
@@ -1471,7 +1471,7 @@ processConfigurationFile(char *infile, struct Input *in)
     if ((scanret == 1) && !HDstrcmp("HDF5", key)) {
 #ifdef H5DEBUGIMPORT
         int pndx;
-        HDprintf("\nh5dump file\n");
+        printf("\nh5dump file\n");
 #endif
         in->h5dumpInput = 1;
         scanret         = HDfscanf(strm, "%254s", temp); /* filename */
@@ -1480,51 +1480,51 @@ processConfigurationFile(char *infile, struct Input *in)
         while (scanret == 1) {
             if (!HDstrcmp("DATASET", key)) { /* PATH */
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump DATASET key\n");
+                printf("h5dump DATASET key\n");
 #endif
                 if (in->configOptionVector[PATH] == 1) {
-                    (void)HDfprintf(stderr, err3a, infile);
+                    (void)fprintf(stderr, err3a, infile);
                     goto error;
                 }
                 if (HDfscanf(strm, "%254s", temp) != 1) {
-                    (void)HDfprintf(stderr, "%s", err18);
+                    (void)fprintf(stderr, "%s", err18);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump DATASET %s found\n", temp);
+                printf("h5dump DATASET %s found\n", temp);
 #endif
                 if (parsePathInfo(&in->path, temp) == -1) {
-                    (void)HDfprintf(stderr, err3b, infile);
+                    (void)fprintf(stderr, err3b, infile);
                     goto error;
                 }
                 in->configOptionVector[PATH] = 1;
                 scanret                      = HDfscanf(strm, "%254s", temp); /* start bracket */
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump DATASET %s found\n", temp);
+                printf("h5dump DATASET %s found\n", temp);
 #endif
             }                                      /* if(!HDstrcmp("DATASET", key))  PATH */
             else if (!HDstrcmp("DATATYPE", key)) { /* INPUT-CLASS */
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump DATATYPE key\n");
+                printf("h5dump DATATYPE key\n");
 #endif
                 if (in->configOptionVector[INPUT_CLASS] == 1) {
-                    (void)HDfprintf(stderr, err4a, infile);
+                    (void)fprintf(stderr, err4a, infile);
                     goto error;
                 }
 
                 if (HDfscanf(strm, "%254s", temp) != 1) {
-                    (void)HDfprintf(stderr, "%s", err18);
+                    (void)fprintf(stderr, "%s", err18);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump DATATYPE %s found\n", temp);
+                printf("h5dump DATATYPE %s found\n", temp);
 #endif
                 if ((kindex = getInputClassType(in, temp)) == -1) {
-                    (void)HDfprintf(stderr, err4b, infile);
+                    (void)fprintf(stderr, err4b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump DATATYPE type %d inputClass\n", in->inputClass);
+                printf("h5dump DATATYPE type %d inputClass\n", in->inputClass);
 #endif
 
                 in->configOptionVector[INPUT_CLASS] = 1;
@@ -1539,80 +1539,80 @@ processConfigurationFile(char *infile, struct Input *in)
                         in->outputClass = 2;
                 }
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump DATATYPE type %d outputClass\n", in->outputClass);
+                printf("h5dump DATATYPE type %d outputClass\n", in->outputClass);
 #endif
 
                 if (in->inputClass == 5) { /* STRING */
                     int get_next_prop = 1;
                     in->outputClass   = -1;
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump DATATYPE STRING found\n");
+                    printf("h5dump DATATYPE STRING found\n");
 #endif
                     if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */
-                        (void)HDfprintf(stderr, "%s", err18);
+                        (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump DATATYPE STRING %s found\n", temp);
+                    printf("h5dump DATATYPE STRING %s found\n", temp);
 #endif
                     if (HDfscanf(strm, "%254s", temp) != 1) { /* string properties */
-                        (void)HDfprintf(stderr, "%s", err18);
+                        (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
                     while (get_next_prop) {
                         if (!HDstrcmp("STRSIZE", temp)) { /* STRSIZE */
                             if (HDfscanf(strm, "%254s", temp) != 1) {
-                                (void)HDfprintf(stderr, "%s", err19);
+                                (void)fprintf(stderr, "%s", err19);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump DATATYPE STRING STRSIZE %s found\n", temp);
+                            printf("h5dump DATATYPE STRING STRSIZE %s found\n", temp);
 #endif
                             if (HDstrcmp("H5T_VARIABLE;", temp) != 0) {
                                 char *more = temp;
                                 ival       = (int)HDstrtol(more, &more, 10);
                                 if (getInputSize(in, ival) == -1) {
-                                    (void)HDfprintf(stderr, err5b, infile);
+                                    (void)fprintf(stderr, err5b, infile);
                                     goto error;
                                 }
 #ifdef H5DEBUGIMPORT
-                                HDprintf("h5dump DATATYPE STRING %d InputSize\n", in->inputSize);
+                                printf("h5dump DATATYPE STRING %d InputSize\n", in->inputSize);
 #endif
                             }
                         }
                         else if (!HDstrcmp("STRPAD", temp)) {         /* STRPAD */
                             if (HDfscanf(strm, "%254s", temp) != 1) { /* STRPAD type */
-                                (void)HDfprintf(stderr, "%s", err18);
+                                (void)fprintf(stderr, "%s", err18);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump DATATYPE STRING STRPAD %s found\n", temp);
+                            printf("h5dump DATATYPE STRING STRPAD %s found\n", temp);
 #endif
                         }
                         else if (!HDstrcmp("CSET", key)) {            /* CSET */
                             if (HDfscanf(strm, "%254s", temp) != 1) { /* CSET type */
-                                (void)HDfprintf(stderr, "%s", err18);
+                                (void)fprintf(stderr, "%s", err18);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump DATATYPE STRING CSET %s found\n", temp);
+                            printf("h5dump DATATYPE STRING CSET %s found\n", temp);
 #endif
                         }
                         else if (!HDstrcmp("CTYPE", temp)) {          /* CTYPE */
                             if (HDfscanf(strm, "%254s", temp) != 1) { /* CTYPE type */
-                                (void)HDfprintf(stderr, "%s", err18);
+                                (void)fprintf(stderr, "%s", err18);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump DATATYPE STRING  CTYPE %s found\n", temp);
+                            printf("h5dump DATATYPE STRING  CTYPE %s found\n", temp);
 #endif
                         } /* if(!HDstrcmp("CSET", key)) */
                         if (HDfscanf(strm, "%254s", temp) != 1) {
-                            (void)HDfprintf(stderr, "%s", err18);
+                            (void)fprintf(stderr, "%s", err18);
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
-                        HDprintf("h5dump DATATYPE STRING %s found\n", temp);
+                        printf("h5dump DATATYPE STRING %s found\n", temp);
 #endif
                         if (!HDstrcmp("}", temp)) { /* end bracket */
                             get_next_prop = 0;
@@ -1624,58 +1624,58 @@ processConfigurationFile(char *infile, struct Input *in)
                 hsize_t temp_dims[MAX_NUM_DIMENSION];
 
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump DATASPACE key\n");
+                printf("h5dump DATASPACE key\n");
 #endif
                 if (HDfscanf(strm, "%254s", temp) != 1) {
-                    (void)HDfprintf(stderr, "%s", err18);
+                    (void)fprintf(stderr, "%s", err18);
                     goto error;
                 }
                 if (!HDstrcmp("SCALAR", temp)) { /* SCALAR */
                     in->rank = 0;
                 }                                   /* if(!HDstrcmp("SCALAR", key)) */
                 else if (!HDstrcmp("NULL", temp)) { /* NULL */
-                    (void)HDfprintf(stderr, err6b, infile);
+                    (void)fprintf(stderr, err6b, infile);
                     goto error;
                 }                                     /* else if(!HDstrcmp("NULL", key)) */
                 else if (!HDstrcmp("SIMPLE", temp)) { /* SIMPLE */
                     int icount = 0;
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump DATASPACE SIMPLE found\n");
+                    printf("h5dump DATASPACE SIMPLE found\n");
 #endif
                     if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */
-                        (void)HDfprintf(stderr, err6b, infile);
+                        (void)fprintf(stderr, err6b, infile);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
+                    printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
                     if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */
-                        (void)HDfprintf(stderr, err6b, infile);
+                        (void)fprintf(stderr, err6b, infile);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
+                    printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
                     if (!HDstrcmp("(", temp)) { /* start paren */
                         int get_next_dim = 1;
                         int i            = 0;
 
                         if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
-                            (void)HDfprintf(stderr, err16c, infile);
+                            (void)fprintf(stderr, err16c, infile);
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
-                        HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
+                        printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
                         while (get_next_dim) {
                             char *more        = temp;
                             temp_dims[icount] = HDstrtoull(more, &more, 10);
                             if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
-                                (void)HDfprintf(stderr, err6b, infile);
+                                (void)fprintf(stderr, err6b, infile);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
+                            printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
                             if (!HDstrcmp(")", temp)) { /* end paren */
                                 in->rank                     = ++icount;
@@ -1685,7 +1685,7 @@ processConfigurationFile(char *infile, struct Input *in)
                             else { /* Dimension */
                                 icount++;
                                 if (icount > MAX_NUM_DIMENSION) {
-                                    (void)HDfprintf(stderr, "Invalid value for rank.\n");
+                                    (void)fprintf(stderr, "Invalid value for rank.\n");
                                     goto error;
                                 }
                             }
@@ -1696,30 +1696,30 @@ processConfigurationFile(char *infile, struct Input *in)
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
-                        HDprintf("h5dump DATASPACE SIMPLE %ld rank\n", in->rank);
+                        printf("h5dump DATASPACE SIMPLE %ld rank\n", in->rank);
 #endif
                         for (i = 0; i < in->rank; i++) {
                             in->sizeOfDimension[i] = temp_dims[i];
                         }
 #ifdef H5DEBUGIMPORT
-                        HDprintf("h5dump DATASPACE SIMPLE dims[%ld]:", in->rank);
+                        printf("h5dump DATASPACE SIMPLE dims[%ld]:", in->rank);
                         for (pndx = 0; pndx < in->rank; pndx++) {
-                            HDprintf(" %ld", in->sizeOfDimension[pndx]);
+                            printf(" %ld", in->sizeOfDimension[pndx]);
                         }
-                        HDprintf("\n");
+                        printf("\n");
 #endif
                         in->configOptionVector[DIM] = 1;
                     } /* if(!HDstrcmp("(", key))  start paren */
                     else {
-                        (void)HDfprintf(stderr, err5b, infile);
+                        (void)fprintf(stderr, err5b, infile);
                         goto error;
                     }
                     if (HDfscanf(strm, "%254s", temp) != 1) {
-                        (void)HDfprintf(stderr, "%s", err18);
+                        (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
+                    printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
                     if (!HDstrcmp("/", temp)) { /* / max dims */
                         if ((in->maxsizeOfDimension =
@@ -1727,29 +1727,29 @@ processConfigurationFile(char *infile, struct Input *in)
                             goto error;
                         }
                         if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */
-                            (void)HDfprintf(stderr, err6b, infile);
+                            (void)fprintf(stderr, err6b, infile);
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
-                        HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
+                        printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
                         if (!HDstrcmp("(", temp)) { /* start paren */
                             int get_next_dim = 1;
                             int i            = 0;
 
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump DATASPACE SIMPLE process max dim values\n");
+                            printf("h5dump DATASPACE SIMPLE process max dim values\n");
 #endif
                             if (HDfscanf(strm, "%254s", temp) != 1) { /* max dim with optional comma */
-                                (void)HDfprintf(stderr, err16c, infile);
+                                (void)fprintf(stderr, err16c, infile);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
+                            printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
                             while (get_next_dim) {
 #ifdef H5DEBUGIMPORT
-                                HDprintf("h5dump DATASPACE SIMPLE get max dim value\n");
+                                printf("h5dump DATASPACE SIMPLE get max dim value\n");
 #endif
                                 if (!HDstrcmp("H5S_UNLIMITED", temp) ||
                                     !HDstrcmp("H5S_UNLIMITED,", temp)) { /* unlimited */
@@ -1761,11 +1761,11 @@ processConfigurationFile(char *infile, struct Input *in)
                                     in->maxsizeOfDimension[i] = HDstrtoull(more, &more, 10);
                                 }
                                 if (HDfscanf(strm, "%254s", temp) != 1) { /* max dim or end paren */
-                                    (void)HDfprintf(stderr, err16c, infile);
+                                    (void)fprintf(stderr, err16c, infile);
                                     goto error;
                                 }
 #ifdef H5DEBUGIMPORT
-                                HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
+                                printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
                                 if (!HDstrcmp(")", temp)) { /* end paren */
                                     get_next_dim = 0;
@@ -1773,85 +1773,85 @@ processConfigurationFile(char *infile, struct Input *in)
                                 else { /* comma */
                                     i++;
                                     if (i >= MAX_NUM_DIMENSION) {
-                                        (void)HDfprintf(stderr, "Invalid value for rank.\n");
+                                        (void)fprintf(stderr, "Invalid value for rank.\n");
                                         goto error;
                                     }
                                 }
                             } /* while (get_next_dim) */
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump DATASPACE SIMPLE maxdims[%ld]:", in->rank);
+                            printf("h5dump DATASPACE SIMPLE maxdims[%ld]:", in->rank);
                             for (pndx = 0; pndx < in->rank; pndx++) {
-                                HDprintf(" %ld", in->maxsizeOfDimension[pndx]);
+                                printf(" %ld", in->maxsizeOfDimension[pndx]);
                             }
-                            HDprintf("\n");
-                            HDprintf("h5dump DATASPACE SIMPLE get max dim finished\n");
+                            printf("\n");
+                            printf("h5dump DATASPACE SIMPLE get max dim finished\n");
 #endif
                         } /* if(!HDstrcmp("(", key))  start paren */
                         else {
-                            (void)HDfprintf(stderr, err16c, infile);
+                            (void)fprintf(stderr, err16c, infile);
                             goto error;
                         }
                         scanret = HDfscanf(strm, "%254s", temp); /* end bracket */
 #ifdef H5DEBUGIMPORT
-                        HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp);
+                        printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
                     } /* if(!HDstrcmp("/", key)) max dims separator */
                 }     /* else if(!HDstrcmp("SIMPLE", key)) */
                 else {
-                    (void)HDfprintf(stderr, err5b, infile);
+                    (void)fprintf(stderr, err5b, infile);
                     goto error;
                 }
             } /* else if(!HDstrcmp("DATASPACE", key))  RANK and DIMENSIONS */
             else if (!HDstrcmp("STORAGE_LAYOUT", key)) { /* CHUNKED-DIMENSION-SIZES */
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump STORAGE_LAYOUT key\n");
+                printf("h5dump STORAGE_LAYOUT key\n");
 #endif
                 if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */
-                    (void)HDfprintf(stderr, err6b, infile);
+                    (void)fprintf(stderr, err6b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump STORAGE_LAYOUT %s found\n", temp);
+                printf("h5dump STORAGE_LAYOUT %s found\n", temp);
 #endif
                 if (HDfscanf(strm, "%254s", temp) != 1) { /* CHUNKED */
-                    (void)HDfprintf(stderr, err6b, infile);
+                    (void)fprintf(stderr, err6b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump STORAGE_LAYOUT %s found\n", temp);
+                printf("h5dump STORAGE_LAYOUT %s found\n", temp);
 #endif
                 if (!HDstrcmp("CHUNKED", temp)) { /* CHUNKED */
                     if ((in->sizeOfChunk = (hsize_t *)HDmalloc((size_t)in->rank * sizeof(hsize_t))) == NULL) {
-                        (void)HDfprintf(stderr, "Unable to allocate dynamic memory.\n");
+                        (void)fprintf(stderr, "Unable to allocate dynamic memory.\n");
                         goto error;
                     }
                     if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */
-                        (void)HDfprintf(stderr, err6b, infile);
+                        (void)fprintf(stderr, err6b, infile);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
+                    printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
 #endif
                     if (!HDstrcmp("(", temp)) { /* start paren */
                         int get_next_dim = 1;
                         int icount       = 0;
 
                         if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
-                            (void)HDfprintf(stderr, err16c, infile);
+                            (void)fprintf(stderr, err16c, infile);
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
-                        HDprintf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
+                        printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
 #endif
                         while (get_next_dim) {
                             char *more              = temp;
                             in->sizeOfChunk[icount] = HDstrtoull(more, &more, 10);
                             if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
-                                (void)HDfprintf(stderr, err6b, infile);
+                                (void)fprintf(stderr, err6b, infile);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
+                            printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
 #endif
                             if (!HDstrcmp(")", temp)) { /* end paren */
                                 in->configOptionVector[RANK] = 1;
@@ -1860,47 +1860,47 @@ processConfigurationFile(char *infile, struct Input *in)
                             else { /* Dimension */
                                 icount++;
                                 if (icount > MAX_NUM_DIMENSION) {
-                                    (void)HDfprintf(stderr, "Invalid value for rank.\n");
+                                    (void)fprintf(stderr, "Invalid value for rank.\n");
                                     goto error;
                                 }
                             }
                         } /* while (get_next_dim) */
 #ifdef H5DEBUGIMPORT
-                        HDprintf("h5dump STORAGE_LAYOUT CHUNKED dims [%ld]:", in->rank);
+                        printf("h5dump STORAGE_LAYOUT CHUNKED dims [%ld]:", in->rank);
                         for (pndx = 0; pndx < in->rank; pndx++) {
-                            HDprintf(" %ld", in->sizeOfChunk[pndx]);
+                            printf(" %ld", in->sizeOfChunk[pndx]);
                         }
-                        HDprintf("\n");
+                        printf("\n");
 #endif
                         in->configOptionVector[DIM] = 1;
                     } /* if(!HDstrcmp("(", key))  start paren */
                     else {
-                        (void)HDfprintf(stderr, err5b, infile);
+                        (void)fprintf(stderr, err5b, infile);
                         goto error;
                     }
                     if (HDfscanf(strm, "%254s", temp) != 1) { /* SIZE */
-                        (void)HDfprintf(stderr, err6b, infile);
+                        (void)fprintf(stderr, err6b, infile);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
+                    printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
 #endif
                     if (!HDstrcmp("SIZE", temp)) { /* SIZE */
                         if (HDfscanf(strm, "%d", (&ival)) != 1) {
-                            (void)HDfprintf(stderr, "%s", err19);
+                            (void)fprintf(stderr, "%s", err19);
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
-                        HDprintf("h5dump STORAGE_LAYOUT CHUNKED SIZE %d found\n", ival);
+                        printf("h5dump STORAGE_LAYOUT CHUNKED SIZE %d found\n", ival);
 #endif
                     }
                     while (HDstrcmp("}", temp) != 0) {
                         if (HDfscanf(strm, "%254s", temp) != 1) { /* end bracket */
-                            (void)HDfprintf(stderr, "%s", err18);
+                            (void)fprintf(stderr, "%s", err18);
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
-                        HDprintf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
+                        printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
 #endif
                     }
                     in->configOptionVector[CHUNK] = 1;
@@ -1908,135 +1908,135 @@ processConfigurationFile(char *infile, struct Input *in)
             }     /* else if(!HDstrcmp("STORAGE_LAYOUT", key))  CHUNKED-DIMENSION-SIZES */
             else if (!HDstrcmp("FILTERS", key)) { /* FILTERS */
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump FILTERS key\n");
+                printf("h5dump FILTERS key\n");
 #endif
                 if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */
-                    (void)HDfprintf(stderr, err6b, infile);
+                    (void)fprintf(stderr, err6b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump FILTERS %s found\n", temp);
+                printf("h5dump FILTERS %s found\n", temp);
 #endif
                 if (HDfscanf(strm, "%254s", temp) != 1) {
-                    (void)HDfprintf(stderr, err6b, infile);
+                    (void)fprintf(stderr, err6b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump FILTERS %s found\n", temp);
+                printf("h5dump FILTERS %s found\n", temp);
 #endif
                 if (!HDstrcmp("COMPRESSION", temp)) { /* COMPRESSION */
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump FILTERS COMPRESSION found\n");
+                    printf("h5dump FILTERS COMPRESSION found\n");
 #endif
                     if (HDfscanf(strm, "%254s", temp) != 1) { /* DEFLATE */
-                        (void)HDfprintf(stderr, "%s", err18);
+                        (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump FILTERS COMPRESSION %s found\n", temp);
+                    printf("h5dump FILTERS COMPRESSION %s found\n", temp);
 #endif
                     if (HDfscanf(strm, "%254s", temp) != 1) { /* bgin bracket */
-                        (void)HDfprintf(stderr, "%s", err18);
+                        (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump FILTERS COMPRESSION %s found\n", temp);
+                    printf("h5dump FILTERS COMPRESSION %s found\n", temp);
 #endif
                     if (HDfscanf(strm, "%254s", temp) != 1) { /* LEVEL */
-                        (void)HDfprintf(stderr, "%s", err18);
+                        (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump FILTERS COMPRESSION %s found\n", temp);
+                    printf("h5dump FILTERS COMPRESSION %s found\n", temp);
 #endif
                     if (HDfscanf(strm, "%d", (&ival)) != 1) {
-                        (void)HDfprintf(stderr, "%s", err19);
+                        (void)fprintf(stderr, "%s", err19);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump FILTERS COMPRESSION LEVEL %d found\n", ival);
+                    printf("h5dump FILTERS COMPRESSION LEVEL %d found\n", ival);
 #endif
                     in->compressionParam = ival;
                     if (HDfscanf(strm, "%254s", temp) != 1) { /* end bracket */
-                        (void)HDfprintf(stderr, "%s", err18);
+                        (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump FILTERS COMPRESSION %s found\n", temp);
+                    printf("h5dump FILTERS COMPRESSION %s found\n", temp);
 #endif
                     in->compressionType              = 0; /* ONLY GZIP supported */
                     in->configOptionVector[COMPRESS] = 1;
                 }
                 else if (!HDstrcmp("CONTIGUOUS", temp)) { /* CONTIGUOUS */
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump FILTERS CONTIGUOUS found\n");
+                    printf("h5dump FILTERS CONTIGUOUS found\n");
 #endif
                     in->configOptionVector[COMPRESS] = 0;
                 }
                 else if (!HDstrcmp("NONE", temp)) { /* NONE */
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump FILTERS NONE found\n");
+                    printf("h5dump FILTERS NONE found\n");
 #endif
                     in->configOptionVector[COMPRESS] = 0;
                 }
                 if (HDfscanf(strm, "%254s", temp) != 1) { /* end bracket */
-                    (void)HDfprintf(stderr, "%s", err18);
+                    (void)fprintf(stderr, "%s", err18);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump FILTERS %s found\n", temp);
+                printf("h5dump FILTERS %s found\n", temp);
 #endif
             }
             else if (!HDstrcmp("SUBSET", key)) { /* reduce dimensions */
                 hsize_t temp_dims[MAX_NUM_DIMENSION];
                 int     get_next_prop = 1;
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump SUBSET key\n");
+                printf("h5dump SUBSET key\n");
 #endif
                 if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */
-                    (void)HDfprintf(stderr, err20, infile);
+                    (void)fprintf(stderr, err20, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump SUBSET %s found\n", temp);
+                printf("h5dump SUBSET %s found\n", temp);
 #endif
                 if (HDfscanf(strm, "%254s", temp) != 1) { /* SUBSET keyword */
-                    (void)HDfprintf(stderr, "%s", err18);
+                    (void)fprintf(stderr, "%s", err18);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump SUBSET %s found\n", temp);
+                printf("h5dump SUBSET %s found\n", temp);
 #endif
                 while (get_next_prop) {
                     if (!HDstrcmp("COUNT", temp)) { /* COUNT */
                         int icount = 0;
                         if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */
-                            (void)HDfprintf(stderr, err6b, infile);
+                            (void)fprintf(stderr, err6b, infile);
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
-                        HDprintf("h5dump SUBSET %s found\n", temp);
+                        printf("h5dump SUBSET %s found\n", temp);
 #endif
                         if (!HDstrcmp("(", temp)) { /* start paren */
                             int get_next_dim = 1;
                             int i            = 0;
 
                             if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
-                                (void)HDfprintf(stderr, err16c, infile);
+                                (void)fprintf(stderr, err16c, infile);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump SUBSET COUNT [%s] found\n", temp);
+                            printf("h5dump SUBSET COUNT [%s] found\n", temp);
 #endif
                             while (get_next_dim) {
                                 char *more        = temp;
                                 temp_dims[icount] = HDstrtoull(more, &more, 10);
                                 if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
-                                    (void)HDfprintf(stderr, err6b, infile);
+                                    (void)fprintf(stderr, err6b, infile);
                                     goto error;
                                 }
 #ifdef H5DEBUGIMPORT
-                                HDprintf("h5dump SUBSET COUNT %s found\n", temp);
+                                printf("h5dump SUBSET COUNT %s found\n", temp);
 #endif
                                 if (!HDstrcmp(");", temp)) { /* end paren */
                                     in->rank                     = ++icount;
@@ -2046,7 +2046,7 @@ processConfigurationFile(char *infile, struct Input *in)
                                 else { /* Dimension */
                                     icount++;
                                     if (icount >= MAX_NUM_DIMENSION) {
-                                        (void)HDfprintf(stderr, "Invalid value for rank.\n");
+                                        (void)fprintf(stderr, "Invalid value for rank.\n");
                                         goto error;
                                     }
                                 }
@@ -2055,11 +2055,11 @@ processConfigurationFile(char *infile, struct Input *in)
                                 in->sizeOfDimension[i] = temp_dims[i];
                             }
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump SUBSET COUNT dims: [%d]", in->rank);
+                            printf("h5dump SUBSET COUNT dims: [%d]", in->rank);
                             for (pndx = 0; pndx < in->rank; pndx++) {
-                                HDprintf(" %ld", in->sizeOfDimension[pndx]);
+                                printf(" %ld", in->sizeOfDimension[pndx]);
                             }
-                            HDprintf("\n");
+                            printf("\n");
 #endif
                             in->configOptionVector[DIM] = 1;
                         }                           /* if(!HDstrcmp("(", key))  start paren */
@@ -2067,32 +2067,32 @@ processConfigurationFile(char *infile, struct Input *in)
                     if (!HDstrcmp("BLOCK", temp)) { /* BLOCK */
                         int icount = 0;
                         if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */
-                            (void)HDfprintf(stderr, err6b, infile);
+                            (void)fprintf(stderr, err6b, infile);
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
-                        HDprintf("h5dump SUBSET %s found\n", temp);
+                        printf("h5dump SUBSET %s found\n", temp);
 #endif
                         if (!HDstrcmp("(", temp)) { /* start paren */
                             int get_next_dim = 1;
                             int i            = 0;
 
                             if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
-                                (void)HDfprintf(stderr, err16c, infile);
+                                (void)fprintf(stderr, err16c, infile);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump SUBSET BLOCK [%s] found\n", temp);
+                            printf("h5dump SUBSET BLOCK [%s] found\n", temp);
 #endif
                             while (get_next_dim) {
                                 char *more        = temp;
                                 temp_dims[icount] = HDstrtoull(more, &more, 10);
                                 if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
-                                    (void)HDfprintf(stderr, err6b, infile);
+                                    (void)fprintf(stderr, err6b, infile);
                                     goto error;
                                 }
 #ifdef H5DEBUGIMPORT
-                                HDprintf("h5dump SUBSET BLOCK %s found\n", temp);
+                                printf("h5dump SUBSET BLOCK %s found\n", temp);
 #endif
                                 if (!HDstrcmp(");", temp)) { /* end paren */
                                     in->rank                     = ++icount;
@@ -2102,7 +2102,7 @@ processConfigurationFile(char *infile, struct Input *in)
                                 else { /* Dimension */
                                     icount++;
                                     if (icount > MAX_NUM_DIMENSION) {
-                                        (void)HDfprintf(stderr, "Invalid value for rank.\n");
+                                        (void)fprintf(stderr, "Invalid value for rank.\n");
                                         goto error;
                                     }
                                 }
@@ -2111,21 +2111,21 @@ processConfigurationFile(char *infile, struct Input *in)
                                 in->sizeOfDimension[i] = in->sizeOfDimension[i] * temp_dims[i];
                             }
 #ifdef H5DEBUGIMPORT
-                            HDprintf("h5dump SUBSET BLOCK dims: [%d]", in->rank);
+                            printf("h5dump SUBSET BLOCK dims: [%d]", in->rank);
                             for (pndx = 0; pndx < in->rank; pndx++) {
-                                HDprintf(" %ld", in->sizeOfDimension[pndx]);
+                                printf(" %ld", in->sizeOfDimension[pndx]);
                             }
-                            HDprintf("\n");
+                            printf("\n");
 #endif
                             in->configOptionVector[DIM] = 1;
                         } /* if(!HDstrcmp("(", key))  start paren */
                     }     /* if(!HDstrcmp("BLOCK", temp))  BLOCK */
                     if (HDfscanf(strm, "%254s", temp) != 1) {
-                        (void)HDfprintf(stderr, "%s", err18);
+                        (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
-                    HDprintf("h5dump SUBSET %s found\n", temp);
+                    printf("h5dump SUBSET %s found\n", temp);
 #endif
                     if (!HDstrcmp("}", temp)) { /* end bracket */
                         get_next_prop = 0;
@@ -2134,7 +2134,7 @@ processConfigurationFile(char *infile, struct Input *in)
             }                                  /* else if(!HDstrcmp("SUBSET", key)) */
             else if (!HDstrcmp("DATA", key)) { /* FINISHED */
 #ifdef H5DEBUGIMPORT
-                HDprintf("h5dump DATA key\n");
+                printf("h5dump DATA key\n");
 #endif
                 scanret = 0;
                 break;
@@ -2142,50 +2142,50 @@ processConfigurationFile(char *infile, struct Input *in)
             scanret = HDfscanf(strm, "%254s", key);
         }
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump path");
+        printf("h5dump path");
         for (pndx = 0; pndx < in->path.count; pndx++) {
-            HDprintf(" : %s", in->path.group[pndx]);
+            printf(" : %s", in->path.group[pndx]);
         }
-        HDprintf("\n");
-        HDprintf("h5dump inputClass=%d\n", in->inputClass);
-        HDprintf("h5dump inputSize=%d\n", in->inputSize);
-        HDprintf("h5dump inputArchitecture=%d\n", in->inputArchitecture);
-        HDprintf("h5dump inputByteOrder=%d\n", in->inputByteOrder);
-        HDprintf("h5dump rank=%d\n", in->rank);
-        HDprintf("h5dump outputClass=%d\n", in->outputClass);
-        HDprintf("h5dump outputSize=%d\n", in->outputSize);
-        HDprintf("h5dump outputArchitecture=%d\n", in->outputArchitecture);
-        HDprintf("h5dump outputByteOrder=%d\n", in->outputByteOrder);
-        HDprintf("h5dump compressionType=%d\n", in->compressionType);
-        HDprintf("h5dump compressionParam=%d\n", in->compressionParam);
-        HDprintf("h5dump externFilename=%s\n", in->externFilename);
-        HDprintf("h5dump sizeOfDimensions:\n");
+        printf("\n");
+        printf("h5dump inputClass=%d\n", in->inputClass);
+        printf("h5dump inputSize=%d\n", in->inputSize);
+        printf("h5dump inputArchitecture=%d\n", in->inputArchitecture);
+        printf("h5dump inputByteOrder=%d\n", in->inputByteOrder);
+        printf("h5dump rank=%d\n", in->rank);
+        printf("h5dump outputClass=%d\n", in->outputClass);
+        printf("h5dump outputSize=%d\n", in->outputSize);
+        printf("h5dump outputArchitecture=%d\n", in->outputArchitecture);
+        printf("h5dump outputByteOrder=%d\n", in->outputByteOrder);
+        printf("h5dump compressionType=%d\n", in->compressionType);
+        printf("h5dump compressionParam=%d\n", in->compressionParam);
+        printf("h5dump externFilename=%s\n", in->externFilename);
+        printf("h5dump sizeOfDimensions:\n");
         for (pndx = 0; pndx < in->rank; pndx++) {
-            HDprintf("  %ld\n", in->sizeOfDimension[pndx]);
+            printf("  %ld\n", in->sizeOfDimension[pndx]);
         }
 #endif
     }
     else {
 #ifdef H5DEBUGIMPORT
-        HDprintf("original option keyword parsing\n");
+        printf("original option keyword parsing\n");
 #endif
         while (scanret == 1) {
             if ((kindex = mapKeywordToIndex(key)) == -1) {
-                (void)HDfprintf(stderr, err2, key, infile);
+                (void)fprintf(stderr, err2, key, infile);
                 goto error;
             }
             switch (kindex) {
                 case 0: /* PATH */
                     if (in->configOptionVector[PATH] == 1) {
-                        (void)HDfprintf(stderr, err3a, infile);
+                        (void)fprintf(stderr, err3a, infile);
                         goto error;
                     }
                     if (HDfscanf(strm, "%254s", temp) != 1) {
-                        (void)HDfprintf(stderr, "%s", err18);
+                        (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
                     if (parsePathInfo(&in->path, temp) == -1) {
-                        (void)HDfprintf(stderr, err3b, infile);
+                        (void)fprintf(stderr, err3b, infile);
                         goto error;
                     }
                     in->configOptionVector[PATH] = 1;
@@ -2193,16 +2193,16 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 1: /* INPUT-CLASS */
                     if (in->configOptionVector[INPUT_CLASS] == 1) {
-                        (void)HDfprintf(stderr, err4a, infile);
+                        (void)fprintf(stderr, err4a, infile);
                         goto error;
                     }
 
                     if (HDfscanf(strm, "%254s", temp) != 1) {
-                        (void)HDfprintf(stderr, "%s", err18);
+                        (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
                     if (getInputClass(in, temp) == -1) {
-                        (void)HDfprintf(stderr, err4b, infile);
+                        (void)fprintf(stderr, err4b, infile);
                         goto error;
                     }
 
@@ -2221,15 +2221,15 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 2: /* INPUT-SIZE */
                     if (in->configOptionVector[INPUT_SIZE] == 1) {
-                        (void)HDfprintf(stderr, err5a, infile);
+                        (void)fprintf(stderr, err5a, infile);
                         goto error;
                     }
                     if (HDfscanf(strm, "%254d", (&ival)) != 1) {
-                        (void)HDfprintf(stderr, "%s", err19);
+                        (void)fprintf(stderr, "%s", err19);
                         goto error;
                     }
                     if (getInputSize(in, ival) == -1) {
-                        (void)HDfprintf(stderr, err5b, infile);
+                        (void)fprintf(stderr, err5b, infile);
                         goto error;
                     }
                     in->configOptionVector[INPUT_SIZE] = 1;
@@ -2241,12 +2241,12 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 3: /* RANK */
                     if (in->configOptionVector[RANK] == 1) {
-                        (void)HDfprintf(stderr, err6a, infile);
+                        (void)fprintf(stderr, err6a, infile);
                         goto error;
                     }
 
                     if (getRank(in, strm) == -1) {
-                        (void)HDfprintf(stderr, err6b, infile);
+                        (void)fprintf(stderr, err6b, infile);
                         goto error;
                     }
                     in->configOptionVector[RANK] = 1;
@@ -2254,16 +2254,16 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 4: /* DIMENSION-SIZES */
                     if (in->configOptionVector[DIM] == 1) {
-                        (void)HDfprintf(stderr, err7a, infile);
+                        (void)fprintf(stderr, err7a, infile);
                         goto error;
                     }
 
                     if (in->configOptionVector[RANK] == 0) {
-                        (void)HDfprintf(stderr, err7b, infile);
+                        (void)fprintf(stderr, err7b, infile);
                         goto error;
                     }
                     if (getDimensionSizes(in, strm) == -1) {
-                        (void)HDfprintf(stderr, err7c, infile);
+                        (void)fprintf(stderr, err7c, infile);
                         goto error;
                     }
                     in->configOptionVector[DIM] = 1;
@@ -2271,12 +2271,12 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 5: /* OUTPUT-CLASS */
                     if (in->configOptionVector[OUTPUT_CLASS] == 1) {
-                        (void)HDfprintf(stderr, err8a, infile);
+                        (void)fprintf(stderr, err8a, infile);
                         goto error;
                     }
 
                     if (getOutputClass(in, strm) == -1) {
-                        (void)HDfprintf(stderr, err8b, infile);
+                        (void)fprintf(stderr, err8b, infile);
                         goto error;
                     }
                     in->configOptionVector[OUTPUT_CLASS] = 1;
@@ -2284,12 +2284,12 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 6: /* OUTPUT-SIZE */
                     if (in->configOptionVector[OUTPUT_SIZE] == 1) {
-                        (void)HDfprintf(stderr, err9a, infile);
+                        (void)fprintf(stderr, err9a, infile);
                         goto error;
                     }
 
                     if (getOutputSize(in, strm) == -1) {
-                        (void)HDfprintf(stderr, err9b, infile);
+                        (void)fprintf(stderr, err9b, infile);
                         goto error;
                     }
                     in->configOptionVector[OUTPUT_SIZE] = 1;
@@ -2297,12 +2297,12 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 7: /* OUTPUT-ARCHITECTURE */
                     if (in->configOptionVector[OUTPUT_ARCH] == 1) {
-                        (void)HDfprintf(stderr, err10a, infile);
+                        (void)fprintf(stderr, err10a, infile);
                         goto error;
                     }
 
                     if (getOutputArchitecture(in, strm) == -1) {
-                        (void)HDfprintf(stderr, err10b, infile);
+                        (void)fprintf(stderr, err10b, infile);
                         goto error;
                     }
                     in->configOptionVector[OUTPUT_ARCH] = 1;
@@ -2310,12 +2310,12 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 8: /* OUTPUT-BYTE-ORDER */
                     if (in->configOptionVector[OUTPUT_B_ORDER] == 1) {
-                        (void)HDfprintf(stderr, err11a, infile);
+                        (void)fprintf(stderr, err11a, infile);
                         goto error;
                     }
 
                     if (getOutputByteOrder(in, strm) == -1) {
-                        (void)HDfprintf(stderr, err11b, infile);
+                        (void)fprintf(stderr, err11b, infile);
                         goto error;
                     }
                     in->configOptionVector[OUTPUT_B_ORDER] = 1;
@@ -2323,17 +2323,17 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 9: /* CHUNKED-DIMENSION-SIZES */
                     if (in->configOptionVector[CHUNK] == 1) {
-                        (void)HDfprintf(stderr, err12a, infile);
+                        (void)fprintf(stderr, err12a, infile);
                         goto error;
                     }
                     /* can't appear before dimension sizes have been provided */
                     if (in->configOptionVector[DIM] == 0) {
-                        (void)HDfprintf(stderr, err12b, infile);
+                        (void)fprintf(stderr, err12b, infile);
                         goto error;
                     }
 
                     if (getChunkedDimensionSizes(in, strm) == -1) {
-                        (void)HDfprintf(stderr, err12c, infile);
+                        (void)fprintf(stderr, err12c, infile);
                         goto error;
                     }
                     in->configOptionVector[CHUNK] = 1;
@@ -2341,12 +2341,12 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 10: /* COMPRESSION-TYPE */
                     if (in->configOptionVector[COMPRESS] == 1) {
-                        (void)HDfprintf(stderr, err13a, infile);
+                        (void)fprintf(stderr, err13a, infile);
                         goto error;
                     }
 
                     if (getCompressionType(in, strm) == -1) {
-                        (void)HDfprintf(stderr, err13b, infile);
+                        (void)fprintf(stderr, err13b, infile);
                         goto error;
                     }
                     in->configOptionVector[COMPRESS] = 1;
@@ -2359,12 +2359,12 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 11: /* COMPRESSION-PARAM */
                     if (in->configOptionVector[COMPRESS_PARAM] == 1) {
-                        (void)HDfprintf(stderr, err14a, infile);
+                        (void)fprintf(stderr, err14a, infile);
                         goto error;
                     }
 
                     if (getCompressionParameter(in, strm) == -1) {
-                        (void)HDfprintf(stderr, err14b, infile);
+                        (void)fprintf(stderr, err14b, infile);
                         goto error;
                     }
 
@@ -2377,12 +2377,12 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 12: /* EXTERNAL-STORAGE */
                     if (in->configOptionVector[EXTERNALSTORE] == 1) {
-                        (void)HDfprintf(stderr, err15a, infile);
+                        (void)fprintf(stderr, err15a, infile);
                         goto error;
                     }
 
                     if (getExternalFilename(in, strm) == -1) {
-                        (void)HDfprintf(stderr, err15b, infile);
+                        (void)fprintf(stderr, err15b, infile);
                         goto error;
                     }
                     in->configOptionVector[EXTERNALSTORE] = 1;
@@ -2390,16 +2390,16 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 13: /* MAXIMUM-DIMENSIONS */
                     if (in->configOptionVector[EXTEND] == 1) {
-                        (void)HDfprintf(stderr, err16a, infile);
+                        (void)fprintf(stderr, err16a, infile);
                         goto error;
                     }
                     /* can't appear before dimension sizes have been provided */
                     if (in->configOptionVector[DIM] == 0) {
-                        (void)HDfprintf(stderr, err16b, infile);
+                        (void)fprintf(stderr, err16b, infile);
                         goto error;
                     }
                     if (getMaximumDimensionSizes(in, strm) == -1) {
-                        (void)HDfprintf(stderr, err16c, infile);
+                        (void)fprintf(stderr, err16c, infile);
                         goto error;
                     }
                     in->configOptionVector[EXTEND] = 1;
@@ -2407,12 +2407,12 @@ processConfigurationFile(char *infile, struct Input *in)
 
                 case 14: /* INPUT-BYTE-ORDER */
                     if (in->configOptionVector[INPUT_B_ORDER] == 1) {
-                        (void)HDfprintf(stderr, err11c, infile);
+                        (void)fprintf(stderr, err11c, infile);
                         goto error;
                     }
 
                     if (getInputByteOrder(in, strm) == -1) {
-                        (void)HDfprintf(stderr, err11d, infile);
+                        (void)fprintf(stderr, err11d, infile);
                         goto error;
                     }
                     in->configOptionVector[INPUT_B_ORDER] = 1;
@@ -2430,7 +2430,7 @@ processConfigurationFile(char *infile, struct Input *in)
         */
 
         if (validateConfigurationParameters(in) == -1) {
-            (void)HDfprintf(stderr, err17, infile);
+            (void)fprintf(stderr, err17, infile);
             goto error;
         }
     }
@@ -2463,21 +2463,21 @@ validateConfigurationParameters(struct Input *in)
         return (0);
 
     if ((in->configOptionVector[DIM] != 1) || (in->configOptionVector[RANK] != 1)) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
     if (in->configOptionVector[EXTERNALSTORE] == 1) {
         if ((in->configOptionVector[COMPRESS] == 1) || (in->configOptionVector[CHUNK] == 1) ||
             (in->configOptionVector[EXTEND] == 1)) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
     }
 
     if ((in->configOptionVector[COMPRESS] == 1) || (in->configOptionVector[EXTEND] == 1)) {
         if (in->configOptionVector[CHUNK] != 1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
     }
@@ -2485,20 +2485,20 @@ validateConfigurationParameters(struct Input *in)
     /* Arch can't be STD if O/p class is FP */
     if (in->outputArchitecture == 1)
         if (in->outputClass == 1) {
-            (void)HDfprintf(stderr, "%s", err4a);
+            (void)fprintf(stderr, "%s", err4a);
             return (-1);
         }
 
     /* Arch can't be IEEE if O/p class is IN */
     if (in->outputArchitecture == 2)
         if (in->outputClass == 0) {
-            (void)HDfprintf(stderr, "%s", err4b);
+            (void)fprintf(stderr, "%s", err4b);
             return (-1);
         }
 
     if (in->outputClass == 1)
         if (in->outputSize != 32 && in->outputSize != 64) {
-            (void)HDfprintf(stderr, "%s", err5);
+            (void)fprintf(stderr, "%s", err5);
             return (-1);
         }
 
@@ -2526,7 +2526,7 @@ parsePathInfo(struct path_info *path, char *temp)
 
     token = HDstrtok(temp, delimiter);
     if (HDstrlen(token) >= MAX_PATH_NAME_LENGTH) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
     HDstrcpy(path->group[i++], token);
@@ -2536,7 +2536,7 @@ parsePathInfo(struct path_info *path, char *temp)
         if (token == NULL)
             break;
         if (HDstrlen(token) >= MAX_PATH_NAME_LENGTH) {
-            (void)HDfprintf(stderr, "%s", err1);
+            (void)fprintf(stderr, "%s", err1);
             return (-1);
         }
         HDstrcpy(path->group[i++], token);
@@ -2566,7 +2566,7 @@ parseDimensions(struct Input *in, char *strm)
     }
     in->rank = i + 1;
     if ((in->sizeOfDimension = (hsize_t *)HDmalloc((size_t)in->rank * sizeof(hsize_t))) == NULL) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
@@ -2593,12 +2593,12 @@ getOutputClass(struct Input *in, FILE *strm)
     const char *err2 = "Invalid value for output class.\n";
 
     if (HDfscanf(strm, "%254s", temp) != 1) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
     if ((kindex = OutputClassStrToInt(temp)) == -1) {
-        (void)HDfprintf(stderr, "%s", err2);
+        (void)fprintf(stderr, "%s", err2);
         return (-1);
     }
 
@@ -2628,7 +2628,7 @@ getOutputSize(struct Input *in, FILE *strm)
     const char *err2                     = "Invalid value for output size.\n";
 
     if (HDfscanf(strm, "%d", (&ival)) != 1) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
@@ -2637,7 +2637,7 @@ getOutputSize(struct Input *in, FILE *strm)
             in->outputSize = ival;
             return (0);
         }
-    (void)HDfprintf(stderr, "%s", err2);
+    (void)fprintf(stderr, "%s", err2);
     return (-1);
 }
 
@@ -2648,7 +2648,7 @@ getInputClass(struct Input *in, char *temp)
     const char *err1 = "Invalid value for input class.\n";
 
     if ((kindex = InputClassStrToInt(temp)) == -1) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
@@ -2669,18 +2669,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 4;
@@ -2690,18 +2690,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 4;
@@ -2711,18 +2711,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 4;
@@ -2732,18 +2732,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 4;
@@ -2753,18 +2753,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 4;
@@ -2774,18 +2774,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 4;
@@ -2795,18 +2795,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 4;
@@ -2816,18 +2816,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 4;
@@ -2837,18 +2837,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 7;
@@ -2858,18 +2858,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 7;
@@ -2879,18 +2879,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 7;
@@ -2900,18 +2900,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 7;
@@ -2921,18 +2921,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 7;
@@ -2942,18 +2942,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 7;
@@ -2963,18 +2963,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 7;
@@ -2984,18 +2984,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 7;
@@ -3005,7 +3005,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3017,7 +3017,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3029,7 +3029,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3041,7 +3041,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3053,7 +3053,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3065,7 +3065,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3077,7 +3077,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3089,7 +3089,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3101,7 +3101,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3113,7 +3113,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3125,18 +3125,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("IEEE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 3;
@@ -3146,18 +3146,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("IEEE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 3;
@@ -3167,18 +3167,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("IEEE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 3;
@@ -3188,18 +3188,18 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("IEEE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = 3;
@@ -3221,7 +3221,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3233,7 +3233,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3245,7 +3245,7 @@ getInputClassType(struct Input *in, char *buffer)
         in->configOptionVector[INPUT_SIZE] = 1;
 
         if ((kindex = OutputArchStrToInt("NATIVE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
@@ -3262,18 +3262,18 @@ getInputClassType(struct Input *in, char *buffer)
     else if (!HDstrcmp(buffer, "H5T_STD_B8BE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = -1;
@@ -3281,18 +3281,18 @@ getInputClassType(struct Input *in, char *buffer)
     else if (!HDstrcmp(buffer, "H5T_STD_B8LE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = -1;
@@ -3300,18 +3300,18 @@ getInputClassType(struct Input *in, char *buffer)
     else if (!HDstrcmp(buffer, "H5T_STD_B16BE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = -1;
@@ -3319,18 +3319,18 @@ getInputClassType(struct Input *in, char *buffer)
     else if (!HDstrcmp(buffer, "H5T_STD_B16LE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = -1;
@@ -3338,18 +3338,18 @@ getInputClassType(struct Input *in, char *buffer)
     else if (!HDstrcmp(buffer, "H5T_STD_B32BE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = -1;
@@ -3357,18 +3357,18 @@ getInputClassType(struct Input *in, char *buffer)
     else if (!HDstrcmp(buffer, "H5T_STD_B32LE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = -1;
@@ -3376,18 +3376,18 @@ getInputClassType(struct Input *in, char *buffer)
     else if (!HDstrcmp(buffer, "H5T_STD_B64BE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("BE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = -1;
@@ -3395,18 +3395,18 @@ getInputClassType(struct Input *in, char *buffer)
     else if (!HDstrcmp(buffer, "H5T_STD_B64LE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
-            (void)HDfprintf(stderr, "%s", err2);
+            (void)fprintf(stderr, "%s", err2);
             return (-1);
         }
         in->outputArchitecture = kindex;
 
         if ((kindex = OutputByteOrderStrToInt("LE")) == -1) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
         in->outputByteOrder = kindex;
 #ifdef H5DEBUGIMPORT
-        HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder);
+        printf("h5dump inputByteOrder %d\n", in->inputByteOrder);
 #endif
 
         kindex = -1;
@@ -3437,7 +3437,7 @@ getInputClassType(struct Input *in, char *buffer)
     }
 
     if (kindex == -1) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
@@ -3445,9 +3445,9 @@ getInputClassType(struct Input *in, char *buffer)
     if (in->configOptionVector[OUTPUT_SIZE] == 0)
         in->outputSize = in->inputSize;
 #ifdef H5DEBUGIMPORT
-    HDprintf("h5dump DATATYPE InClass %d inputSize\n", in->inputSize);
-    HDprintf("h5dump DATATYPE InClass %d outputSize\n", in->outputSize);
-    HDprintf("h5dump DATATYPE InClass %d outputArchitecture\n", in->outputArchitecture);
+    printf("h5dump DATATYPE InClass %d inputSize\n", in->inputSize);
+    printf("h5dump DATATYPE InClass %d outputSize\n", in->outputSize);
+    printf("h5dump DATATYPE InClass %d outputArchitecture\n", in->outputArchitecture);
 #endif
 
     in->inputClass = kindex;
@@ -3478,7 +3478,7 @@ getInputSize(struct Input *in, int ival)
             in->inputSize = ival;
             return (0);
         }
-    (void)HDfprintf(stderr, "%s", err1);
+    (void)fprintf(stderr, "%s", err1);
     return (-1);
 }
 
@@ -3491,12 +3491,12 @@ getInputByteOrder(struct Input *in, FILE *strm)
     const char *err2 = "Invalid value for input byte-order.\n";
 
     if (HDfscanf(strm, "%254s", temp) != 1) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
     if ((kindex = OutputByteOrderStrToInt(temp)) == -1) {
-        (void)HDfprintf(stderr, "%s", err2);
+        (void)fprintf(stderr, "%s", err2);
         return (-1);
     }
 
@@ -3513,7 +3513,7 @@ getRank(struct Input *in, FILE *strm)
     const char *err2 = "Invalid value for rank.\n";
 
     if (HDfscanf(strm, "%d", (&ival)) != 1) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
     if (ival >= MIN_NUM_DIMENSION && ival <= MAX_NUM_DIMENSION) {
@@ -3521,7 +3521,7 @@ getRank(struct Input *in, FILE *strm)
         return (0);
     }
 
-    (void)HDfprintf(stderr, "%s", err2);
+    (void)fprintf(stderr, "%s", err2);
     return (-1);
 }
 
@@ -3537,7 +3537,7 @@ getDimensionSizes(struct Input *in, FILE *strm)
         "No. of dimensions for which dimension sizes provided is not equal to provided rank.\n";
 
     if ((in->sizeOfDimension = (hsize_t *)HDmalloc((size_t)in->rank * sizeof(hsize_t))) == NULL) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
@@ -3545,7 +3545,7 @@ getDimensionSizes(struct Input *in, FILE *strm)
         in->sizeOfDimension[i++] = ullval;
 
     if (in->rank != i) {
-        (void)HDfprintf(stderr, "%s", err2);
+        (void)fprintf(stderr, "%s", err2);
         return (-1);
     }
     return (0);
@@ -3563,7 +3563,7 @@ getChunkedDimensionSizes(struct Input *in, FILE *strm)
     const char *err3 = "The CHUNKED-DIMENSION-SIZES cannot exceed the sizes of DIMENSION-SIZES\n";
 
     if ((in->sizeOfChunk = (hsize_t *)HDmalloc((size_t)in->rank * sizeof(hsize_t))) == NULL) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
@@ -3571,13 +3571,13 @@ getChunkedDimensionSizes(struct Input *in, FILE *strm)
         in->sizeOfChunk[i++] = ullval;
 
     if (in->rank != i) {
-        (void)HDfprintf(stderr, "%s", err2);
+        (void)fprintf(stderr, "%s", err2);
         return (-1);
     }
 
     for (i = 0; i < in->rank; i++)
         if (in->sizeOfChunk[i] > in->sizeOfDimension[i]) {
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
         }
     return (0);
@@ -3596,7 +3596,7 @@ getMaximumDimensionSizes(struct Input *in, FILE *strm)
                        "can be -1 to indicate unlimited size\n";
 
     if ((in->maxsizeOfDimension = (hsize_t *)HDmalloc((size_t)in->rank * sizeof(hsize_t))) == NULL) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
@@ -3608,14 +3608,14 @@ getMaximumDimensionSizes(struct Input *in, FILE *strm)
     }
 
     if (in->rank != i) {
-        (void)HDfprintf(stderr, "%s", err2);
+        (void)fprintf(stderr, "%s", err2);
         return (-1);
     }
 
     for (i = 0; i < in->rank; i++) {
         if (in->maxsizeOfDimension[i] != H5S_UNLIMITED)
             if (in->maxsizeOfDimension[i] < in->sizeOfDimension[i]) {
-                (void)HDfprintf(stderr, "%s", err3);
+                (void)fprintf(stderr, "%s", err3);
                 return (-1);
             }
     }
@@ -3631,12 +3631,12 @@ getOutputArchitecture(struct Input *in, FILE *strm)
     const char *err2 = "Invalid value for output architecture.\n";
 
     if (HDfscanf(strm, "%254s", temp) != 1) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
     if ((kindex = OutputArchStrToInt(temp)) == -1) {
-        (void)HDfprintf(stderr, "%s", err2);
+        (void)fprintf(stderr, "%s", err2);
         return (-1);
     }
 
@@ -3664,12 +3664,12 @@ getOutputByteOrder(struct Input *in, FILE *strm)
     const char *err2 = "Invalid value for output byte-order.\n";
 
     if (HDfscanf(strm, "%254s", temp) != 1) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
     if ((kindex = OutputByteOrderStrToInt(temp)) == -1) {
-        (void)HDfprintf(stderr, "%s", err2);
+        (void)fprintf(stderr, "%s", err2);
         return (-1);
     }
 
@@ -3697,12 +3697,12 @@ getCompressionType(struct Input *in, FILE *strm)
     const char *err2 = "Invalid value for compression.\n";
 
     if (HDfscanf(strm, "%254s", temp) != 1) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
     if ((kindex = CompressionTypeStrToInt(temp)) == -1) {
-        (void)HDfprintf(stderr, "%s", err2);
+        (void)fprintf(stderr, "%s", err2);
         return (-1);
     }
 
@@ -3739,19 +3739,19 @@ getCompressionParameter(struct Input *in, FILE *strm)
     switch (in->compressionType) {
         case 0: /* GZIP */
             if (HDfscanf(strm, "%d", (&ival)) != 1) {
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
             }
 
             if (ival < 0 || ival > 9) {
-                (void)HDfprintf(stderr, "%s", err2);
+                (void)fprintf(stderr, "%s", err2);
                 return (-1);
             }
             in->compressionParam = ival;
             return (0);
 
         default:
-            (void)HDfprintf(stderr, "%s", err3);
+            (void)fprintf(stderr, "%s", err3);
             return (-1);
     }
 }
@@ -3764,7 +3764,7 @@ getExternalFilename(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
 
     if (HDfscanf(strm, "%254s", temp) != 1) {
-        (void)HDfprintf(stderr, "%s", err1);
+        (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
@@ -3836,7 +3836,7 @@ createOutputDataType(struct Input *in)
                             break;
 
                         default:
-                            (void)HDfprintf(stderr, "%s", err2);
+                            (void)fprintf(stderr, "%s", err2);
                             return (-1);
                     }
                     switch (in->outputByteOrder) {
@@ -3851,7 +3851,7 @@ createOutputDataType(struct Input *in)
                             break;
 
                         default:
-                            (void)HDfprintf(stderr, "%s", err3);
+                            (void)fprintf(stderr, "%s", err3);
                             return (-1);
                     }
                     break;
@@ -3870,7 +3870,7 @@ createOutputDataType(struct Input *in)
                                     break;
 
                                 default:
-                                    (void)HDfprintf(stderr, "%s", err3);
+                                    (void)fprintf(stderr, "%s", err3);
                                     return (-1);
                             }
                             break;
@@ -3887,7 +3887,7 @@ createOutputDataType(struct Input *in)
                                     break;
 
                                 default:
-                                    (void)HDfprintf(stderr, "%s", err3);
+                                    (void)fprintf(stderr, "%s", err3);
                                     return (-1);
                             }
                             break;
@@ -3904,7 +3904,7 @@ createOutputDataType(struct Input *in)
                                     break;
 
                                 default:
-                                    (void)HDfprintf(stderr, "%s", err3);
+                                    (void)fprintf(stderr, "%s", err3);
                                     return (-1);
                             }
                             break;
@@ -3921,19 +3921,19 @@ createOutputDataType(struct Input *in)
                                     break;
 
                                 default:
-                                    (void)HDfprintf(stderr, "%s", err3);
+                                    (void)fprintf(stderr, "%s", err3);
                                     return (-1);
                             }
                             break;
 
                         default:
-                            (void)HDfprintf(stderr, "%s", err2);
+                            (void)fprintf(stderr, "%s", err2);
                             return (-1);
                     }
                     break;
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err4);
+                    (void)fprintf(stderr, "%s", err4);
                     return (-1);
             }
             break;
@@ -3951,7 +3951,7 @@ createOutputDataType(struct Input *in)
                             break;
 
                         default:
-                            (void)HDfprintf(stderr, "%s", err2);
+                            (void)fprintf(stderr, "%s", err2);
                             return (-1);
                     }
                     switch (in->outputByteOrder) {
@@ -3966,13 +3966,13 @@ createOutputDataType(struct Input *in)
                             break;
 
                         default:
-                            (void)HDfprintf(stderr, "%s", err3);
+                            (void)fprintf(stderr, "%s", err3);
                             return (-1);
                     }
                     break;
 
                 case 1:
-                    (void)HDfprintf(stderr, "%s", err5);
+                    (void)fprintf(stderr, "%s", err5);
                     return (-1);
 
                 case 2:
@@ -3989,7 +3989,7 @@ createOutputDataType(struct Input *in)
                                     break;
 
                                 default:
-                                    (void)HDfprintf(stderr, "%s", err3);
+                                    (void)fprintf(stderr, "%s", err3);
                                     return (-1);
                             }
                             break;
@@ -4006,19 +4006,19 @@ createOutputDataType(struct Input *in)
                                     break;
 
                                 default:
-                                    (void)HDfprintf(stderr, "%s", err3);
+                                    (void)fprintf(stderr, "%s", err3);
                                     return (-1);
                             }
                             break;
 
                         default:
-                            (void)HDfprintf(stderr, "%s", err2);
+                            (void)fprintf(stderr, "%s", err2);
                             return (-1);
                     }
                     break;
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err4);
+                    (void)fprintf(stderr, "%s", err4);
                     return (-1);
             }
             break;
@@ -4044,7 +4044,7 @@ createOutputDataType(struct Input *in)
                             break;
 
                         default:
-                            (void)HDfprintf(stderr, "%s", err2);
+                            (void)fprintf(stderr, "%s", err2);
                             return (-1);
                     }
                     switch (in->outputByteOrder) {
@@ -4059,7 +4059,7 @@ createOutputDataType(struct Input *in)
                             break;
 
                         default:
-                            (void)HDfprintf(stderr, "%s", err3);
+                            (void)fprintf(stderr, "%s", err3);
                             return (-1);
                     }
                     break;
@@ -4078,7 +4078,7 @@ createOutputDataType(struct Input *in)
                                     break;
 
                                 default:
-                                    (void)HDfprintf(stderr, "%s", err3);
+                                    (void)fprintf(stderr, "%s", err3);
                                     return (-1);
                             }
                             break;
@@ -4095,7 +4095,7 @@ createOutputDataType(struct Input *in)
                                     break;
 
                                 default:
-                                    (void)HDfprintf(stderr, "%s", err3);
+                                    (void)fprintf(stderr, "%s", err3);
                                     return (-1);
                             }
                             break;
@@ -4112,7 +4112,7 @@ createOutputDataType(struct Input *in)
                                     break;
 
                                 default:
-                                    (void)HDfprintf(stderr, "%s", err3);
+                                    (void)fprintf(stderr, "%s", err3);
                                     return (-1);
                             }
                             break;
@@ -4129,29 +4129,29 @@ createOutputDataType(struct Input *in)
                                     break;
 
                                 default:
-                                    (void)HDfprintf(stderr, "%s", err3);
+                                    (void)fprintf(stderr, "%s", err3);
                                     return (-1);
                             }
                             break;
 
                         default:
-                            (void)HDfprintf(stderr, "%s", err2);
+                            (void)fprintf(stderr, "%s", err2);
                             return (-1);
                     }
                     break;
 
                 case 2:
-                    (void)HDfprintf(stderr, "%s", err6);
+                    (void)fprintf(stderr, "%s", err6);
                     return (-1);
 
                 default:
-                    (void)HDfprintf(stderr, "%s", err4);
+                    (void)fprintf(stderr, "%s", err4);
                     return (-1);
             }
             break;
 
         default:
-            (void)HDfprintf(stderr, "%s", err1);
+            (void)fprintf(stderr, "%s", err1);
             return (-1);
     }
     return new_type;
@@ -4191,7 +4191,7 @@ createInputDataType(struct Input *in)
                                 break;
 
                             default:
-                                (void)HDfprintf(stderr, "%s", err2);
+                                (void)fprintf(stderr, "%s", err2);
                                 return (-1);
                         }
                         switch (in->inputByteOrder) {
@@ -4206,7 +4206,7 @@ createInputDataType(struct Input *in)
                                 break;
 
                             default:
-                                (void)HDfprintf(stderr, "%s", err3);
+                                (void)fprintf(stderr, "%s", err3);
                                 return (-1);
                         }
                         break;
@@ -4225,7 +4225,7 @@ createInputDataType(struct Input *in)
                                         break;
 
                                     default:
-                                        (void)HDfprintf(stderr, "%s", err3);
+                                        (void)fprintf(stderr, "%s", err3);
                                         return (-1);
                                 }
                                 break;
@@ -4242,7 +4242,7 @@ createInputDataType(struct Input *in)
                                         break;
 
                                     default:
-                                        (void)HDfprintf(stderr, "%s", err3);
+                                        (void)fprintf(stderr, "%s", err3);
                                         return (-1);
                                 }
                                 break;
@@ -4259,7 +4259,7 @@ createInputDataType(struct Input *in)
                                         break;
 
                                     default:
-                                        (void)HDfprintf(stderr, "%s", err3);
+                                        (void)fprintf(stderr, "%s", err3);
                                         return (-1);
                                 }
                                 break;
@@ -4276,19 +4276,19 @@ createInputDataType(struct Input *in)
                                         break;
 
                                     default:
-                                        (void)HDfprintf(stderr, "%s", err3);
+                                        (void)fprintf(stderr, "%s", err3);
                                         return (-1);
                                 }
                                 break;
 
                             default:
-                                (void)HDfprintf(stderr, "%s", err2);
+                                (void)fprintf(stderr, "%s", err2);
                                 return (-1);
                         }
                         break;
 
                     default:
-                        (void)HDfprintf(stderr, "%s", err4);
+                        (void)fprintf(stderr, "%s", err4);
                         return (-1);
                 }
                 break;
@@ -4306,7 +4306,7 @@ createInputDataType(struct Input *in)
                                 break;
 
                             default:
-                                (void)HDfprintf(stderr, "%s", err2);
+                                (void)fprintf(stderr, "%s", err2);
                                 return (-1);
                         }
                         switch (in->inputByteOrder) {
@@ -4321,13 +4321,13 @@ createInputDataType(struct Input *in)
                                 break;
 
                             default:
-                                (void)HDfprintf(stderr, "%s", err3);
+                                (void)fprintf(stderr, "%s", err3);
                                 return (-1);
                         }
                         break;
 
                     case 1:
-                        (void)HDfprintf(stderr, "%s", err5);
+                        (void)fprintf(stderr, "%s", err5);
                         return (-1);
 
                     case 2:
@@ -4344,7 +4344,7 @@ createInputDataType(struct Input *in)
                                         break;
 
                                     default:
-                                        (void)HDfprintf(stderr, "%s", err3);
+                                        (void)fprintf(stderr, "%s", err3);
                                         return (-1);
                                 }
                                 break;
@@ -4361,19 +4361,19 @@ createInputDataType(struct Input *in)
                                         break;
 
                                     default:
-                                        (void)HDfprintf(stderr, "%s", err3);
+                                        (void)fprintf(stderr, "%s", err3);
                                         return (-1);
                                 }
                                 break;
 
                             default:
-                                (void)HDfprintf(stderr, "%s", err2);
+                                (void)fprintf(stderr, "%s", err2);
                                 return (-1);
                         }
                         break;
 
                     default:
-                        (void)HDfprintf(stderr, "%s", err4);
+                        (void)fprintf(stderr, "%s", err4);
                         return (-1);
                 }
                 break;
@@ -4399,7 +4399,7 @@ createInputDataType(struct Input *in)
                                 break;
 
                             default:
-                                (void)HDfprintf(stderr, "%s", err2);
+                                (void)fprintf(stderr, "%s", err2);
                                 return (-1);
                         }
                         switch (in->inputByteOrder) {
@@ -4414,7 +4414,7 @@ createInputDataType(struct Input *in)
                                 break;
 
                             default:
-                                (void)HDfprintf(stderr, "%s", err3);
+                                (void)fprintf(stderr, "%s", err3);
                                 return (-1);
                         }
                         break;
@@ -4433,7 +4433,7 @@ createInputDataType(struct Input *in)
                                         break;
 
                                     default:
-                                        (void)HDfprintf(stderr, "%s", err3);
+                                        (void)fprintf(stderr, "%s", err3);
                                         return (-1);
                                 }
                                 break;
@@ -4450,7 +4450,7 @@ createInputDataType(struct Input *in)
                                         break;
 
                                     default:
-                                        (void)HDfprintf(stderr, "%s", err3);
+                                        (void)fprintf(stderr, "%s", err3);
                                         return (-1);
                                 }
                                 break;
@@ -4467,7 +4467,7 @@ createInputDataType(struct Input *in)
                                         break;
 
                                     default:
-                                        (void)HDfprintf(stderr, "%s", err3);
+                                        (void)fprintf(stderr, "%s", err3);
                                         return (-1);
                                 }
                                 break;
@@ -4484,29 +4484,29 @@ createInputDataType(struct Input *in)
                                         break;
 
                                     default:
-                                        (void)HDfprintf(stderr, "%s", err3);
+                                        (void)fprintf(stderr, "%s", err3);
                                         return (-1);
                                 }
                                 break;
 
                             default:
-                                (void)HDfprintf(stderr, "%s", err2);
+                                (void)fprintf(stderr, "%s", err2);
                                 return (-1);
                         }
                         break;
 
                     case 2:
-                        (void)HDfprintf(stderr, "%s", err6);
+                        (void)fprintf(stderr, "%s", err6);
                         return (-1);
 
                     default:
-                        (void)HDfprintf(stderr, "%s", err4);
+                        (void)fprintf(stderr, "%s", err4);
                         return (-1);
                 }
                 break;
 
             default:
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
         }
     }
@@ -4532,7 +4532,7 @@ createInputDataType(struct Input *in)
                         break;
 
                     default:
-                        (void)HDfprintf(stderr, "%s", err2);
+                        (void)fprintf(stderr, "%s", err2);
                         return (-1);
                 }
                 break;
@@ -4550,13 +4550,13 @@ createInputDataType(struct Input *in)
                         break;
 
                     default:
-                        (void)HDfprintf(stderr, "%s", err2);
+                        (void)fprintf(stderr, "%s", err2);
                         return (-1);
                 }
                 break;
 
             case 5:
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
                 break;
 
@@ -4580,13 +4580,13 @@ createInputDataType(struct Input *in)
                         break;
 
                     default:
-                        (void)HDfprintf(stderr, "%s", err2);
+                        (void)fprintf(stderr, "%s", err2);
                         return (-1);
                 }
                 break;
 
             default:
-                (void)HDfprintf(stderr, "%s", err1);
+                (void)fprintf(stderr, "%s", err1);
                 return (-1);
         }
     }
@@ -4624,7 +4624,7 @@ process(struct Options *opt)
     {
         if ((file_id = H5Fopen(opt->outfile, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
             if ((file_id = H5Fcreate(opt->outfile, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) == FAIL) {
-                (void)HDfprintf(stderr, err1, opt->outfile);
+                (void)fprintf(stderr, err1, opt->outfile);
                 return (-1);
             }
         }
@@ -4635,13 +4635,13 @@ process(struct Options *opt)
         in = &(opt->infiles[k].in);
         if (opt->infiles[k].config == 1) {
             if (processConfigurationFile(opt->infiles[k].configfile, in) == -1) {
-                (void)HDfprintf(stderr, err2, opt->infiles[k].configfile);
+                (void)fprintf(stderr, err2, opt->infiles[k].configfile);
                 return (-1);
             }
         }
 
         if (processDataFile(opt->infiles[k].datafile, in, file_id) == -1) {
-            (void)HDfprintf(stderr, err3, opt->infiles[k].datafile);
+            (void)fprintf(stderr, err3, opt->infiles[k].datafile);
             return (-1);
         }
 
@@ -4683,7 +4683,7 @@ process(struct Options *opt)
             intype  = createInputDataType(in);
             outtype = createOutputDataType(in);
 #ifdef H5DEBUGIMPORT
-            HDprintf("process intype %ld outtype %ld\n", intype, outtype);
+            printf("process intype %ld outtype %ld\n", intype, outtype);
 #endif
 
             /* create property list */
@@ -4701,7 +4701,7 @@ process(struct Options *opt)
             if (in->configOptionVector[EXTERNALSTORE] == 1) {
                 /* creating the external file if it doesn't exist */
                 if ((extfile = HDfopen(in->externFilename, "ab")) == NULL) {
-                    (void)HDfprintf(stderr, "%s", err4);
+                    (void)fprintf(stderr, "%s", err4);
                     H5Pclose(proplist);
                     H5Sclose(dataspace);
                     H5Fclose(file_id);
@@ -4724,7 +4724,7 @@ process(struct Options *opt)
                 /* create data set */
                 if ((dataset = H5Dcreate2(handle, in->path.group[j], outtype, dataspace, H5P_DEFAULT,
                                           proplist, H5P_DEFAULT)) < 0) {
-                    (void)HDfprintf(stderr, "%s", err5);
+                    (void)fprintf(stderr, "%s", err5);
                     H5Pclose(proplist);
                     H5Sclose(dataspace);
                     H5Fclose(file_id);
@@ -4737,7 +4737,7 @@ process(struct Options *opt)
 
             /* write dataset */
             if (H5Dwrite(dataset, intype, H5S_ALL, H5S_ALL, H5P_DEFAULT, (VOIDP)in->data) < 0) {
-                (void)HDfprintf(stderr, "%s", err6);
+                (void)fprintf(stderr, "%s", err6);
                 H5Dclose(dataset);
                 H5Pclose(proplist);
                 H5Sclose(dataspace);
@@ -4813,292 +4813,292 @@ swap_uint64(uint64_t val)
 void
 help(char *name)
 {
-    (void)HDfprintf(stdout, "Name:\n\n");
-    (void)HDfprintf(stdout, "\t%s\n\n", name);
-    (void)HDfprintf(stdout, "\t  TOOL NAME:\n");
-    (void)HDfprintf(stdout, "\t   %s\n", name);
-    (void)HDfprintf(stdout, "\t   SYNTAX:\n");
-    (void)HDfprintf(stdout, "\t   %s -h[elp], OR\n", name);
-    (void)HDfprintf(stdout, "\t   %s <infile> -c[onfig] <configfile> [<infile> -c[config] <configfile>...]",
-                    name);
-    (void)HDfprintf(stdout, "\t\t\t\t      -o[utfile] <outfile>\n\n");
-    (void)HDfprintf(stdout, "\t   PURPOSE:\n");
-    (void)HDfprintf(stdout, "\t   To convert data stored in one or more ASCII or binary files\n");
-    (void)HDfprintf(stdout, "\t  into one or more datasets (in accordance with the \n");
-    (void)HDfprintf(stdout, "\t  user-specified type and storage properties) in an existing \n");
-    (void)HDfprintf(stdout, "\t  or new HDF5 file.\n\n");
-    (void)HDfprintf(stdout, "\t   DESCRIPTION:\n");
-    (void)HDfprintf(stdout, "\t  The primary objective of the utility is to convert floating\n");
-    (void)HDfprintf(stdout, "\t  point or integer data stored in ASCII text or binary form \n");
-    (void)HDfprintf(stdout, "\t  into a data-set according to the type and storage properties\n");
-    (void)HDfprintf(stdout, "\t  specified by the user. The utility can also accept ASCII\n");
-    (void)HDfprintf(stdout, "\t  text files and store the contents in a compact form as an\n");
-    (void)HDfprintf(stdout, "\t  array of one-dimensional strings.\n\n");
-    (void)HDfprintf(stdout, "\t  The input data to be written as a data-set can be provided\n");
-    (void)HDfprintf(stdout, "\t  to the utility in one of the following forms:\n");
-    (void)HDfprintf(stdout, "\t  1. ASCII text file with numeric data (floating point or \n");
-    (void)HDfprintf(stdout, "\t  integer data). \n");
-    (void)HDfprintf(stdout, "\t  2. Binary file with native floating point data (32-bit or \n");
-    (void)HDfprintf(stdout, "\t  64-bit) \n");
-    (void)HDfprintf(stdout, "\t  3. Binary file with native integer (signed or unsigned)\n");
-    (void)HDfprintf(stdout, "\t  data (8-bit or 16-bit or 32-bit or 64-bit). \n");
-    (void)HDfprintf(stdout, "\t  4. ASCII text file containing strings (text data).\n");
-    (void)HDfprintf(stdout, "\t    \n");
-    (void)HDfprintf(stdout, "\t  Every input file is associated with a configuration file \n");
-    (void)HDfprintf(stdout, "\t  also provided as an input to the utility. (See Section \n");
-    (void)HDfprintf(stdout, "\t  \"CONFIGURATION FILE\" to know how it is to be organized).\n");
-    (void)HDfprintf(stdout, "\t  The class, size and dimensions of the input data is \n");
-    (void)HDfprintf(stdout, "\t  specified in this configuration file. A point to note is\n");
-    (void)HDfprintf(stdout, "\t  that the floating point data in the ASCII text file may be\n");
-    (void)HDfprintf(stdout, "\t  organized in the fixed floating form (for example 323.56)\n");
-    (void)HDfprintf(stdout, "\t  or in a scientific notation (for example 3.23E+02). A \n");
-    (void)HDfprintf(stdout, "\t  different input-class specification is to be used for both\n");
-    (void)HDfprintf(stdout, "\t  forms.\n\n");
-    (void)HDfprintf(stdout, "\t  The utility extracts the input data from the input file \n");
-    (void)HDfprintf(stdout, "\t  according to the specified parameters and saves it into \n");
-    (void)HDfprintf(stdout, "\t  an H5 dataset. \n\n");
-    (void)HDfprintf(stdout, "\t  The user can specify output type and storage properties in \n");
-    (void)HDfprintf(stdout, "\t  the configuration file. The user is required to specify the \n");
-    (void)HDfprintf(stdout, "\t  path of the dataset. If the groups in the path leading to \n");
-    (void)HDfprintf(stdout, "\t  the data-set do not exist, the groups will be created by the\n");
-    (void)HDfprintf(stdout, "\t  utility. If no group is specified, the dataset will be\n");
-    (void)HDfprintf(stdout, "\t  created under the root group.\n\n");
-    (void)HDfprintf(stdout, "\t  In addition to the name, the user is also required to \n");
-    (void)HDfprintf(stdout, "\t  provide the class and size of output data to be written to \n");
-    (void)HDfprintf(stdout, "\t  the dataset and may optionally specify the output-architecture,\n");
-    (void)HDfprintf(stdout, "\t  and the output-byte-order. If output-architecture is not \n");
-    (void)HDfprintf(stdout, "\t  specified the default is NATIVE. Output-byte-orders are fixed\n");
-    (void)HDfprintf(stdout, "\t  for some architectures and may be specified only if output-\n");
-    (void)HDfprintf(stdout, "\t  architecture is IEEE, UNIX or STD.\n\n");
-    (void)HDfprintf(stdout, "\t   Also, layout and other storage properties such as \n");
-    (void)HDfprintf(stdout, "\t  compression, external storage and extendible data-sets may be\n");
-    (void)HDfprintf(stdout, "\t  optionally specified.  The layout and storage properties \n");
-    (void)HDfprintf(stdout, "\t  denote how raw data is to be organized on the disk. If these \n");
-    (void)HDfprintf(stdout, "\t  options are not specified the default is Contiguous layout \n");
-    (void)HDfprintf(stdout, "\t  and storage.\n\n");
-    (void)HDfprintf(stdout, "\t  The dataset can be organized in any of the following ways:\n");
-    (void)HDfprintf(stdout, "\t  1. Contiguous.\n");
-    (void)HDfprintf(stdout, "\t  2. Chunked.\n");
-    (void)HDfprintf(stdout, "\t  3. External Storage File    (has to be contiguous)\n");
-    (void)HDfprintf(stdout, "\t  4. Extendible data sets     (has to be chunked)\n");
-    (void)HDfprintf(stdout, "\t  5. Compressed.        (has to be chunked)\n");
-    (void)HDfprintf(stdout, "\t  6. Compressed & Extendible  (has to be chunked)\n\n");
-    (void)HDfprintf(stdout, "\t  If the user wants to store raw data in a non-HDF file then \n");
-    (void)HDfprintf(stdout, "\t  the external storage file option is to be used and the name \n");
-    (void)HDfprintf(stdout, "\t  of the file is to be specified. \n\n");
-    (void)HDfprintf(stdout, "\t  If the user wants the dimensions of the data-set to be\n");
-    (void)HDfprintf(stdout, "\t  unlimited, the extendible data set option can be chosen. \n\n");
-    (void)HDfprintf(stdout, "\t  The user may also specify the type of compression and the \n");
-    (void)HDfprintf(stdout, "\t  level to which the data set must be compresses by setting \n");
-    (void)HDfprintf(stdout, "\t  the compressed option.\n\n");
-    (void)HDfprintf(stdout, "\t   SYNOPSIS:\n");
-    (void)HDfprintf(stdout, "\t  h5import -h[elp], OR\n");
-    (void)HDfprintf(stdout, "\t  h5import <infile> -c[onfig] <configfile> \
+    (void)fprintf(stdout, "Name:\n\n");
+    (void)fprintf(stdout, "\t%s\n\n", name);
+    (void)fprintf(stdout, "\t  TOOL NAME:\n");
+    (void)fprintf(stdout, "\t   %s\n", name);
+    (void)fprintf(stdout, "\t   SYNTAX:\n");
+    (void)fprintf(stdout, "\t   %s -h[elp], OR\n", name);
+    (void)fprintf(stdout, "\t   %s <infile> -c[onfig] <configfile> [<infile> -c[config] <configfile>...]",
+                  name);
+    (void)fprintf(stdout, "\t\t\t\t      -o[utfile] <outfile>\n\n");
+    (void)fprintf(stdout, "\t   PURPOSE:\n");
+    (void)fprintf(stdout, "\t   To convert data stored in one or more ASCII or binary files\n");
+    (void)fprintf(stdout, "\t  into one or more datasets (in accordance with the \n");
+    (void)fprintf(stdout, "\t  user-specified type and storage properties) in an existing \n");
+    (void)fprintf(stdout, "\t  or new HDF5 file.\n\n");
+    (void)fprintf(stdout, "\t   DESCRIPTION:\n");
+    (void)fprintf(stdout, "\t  The primary objective of the utility is to convert floating\n");
+    (void)fprintf(stdout, "\t  point or integer data stored in ASCII text or binary form \n");
+    (void)fprintf(stdout, "\t  into a data-set according to the type and storage properties\n");
+    (void)fprintf(stdout, "\t  specified by the user. The utility can also accept ASCII\n");
+    (void)fprintf(stdout, "\t  text files and store the contents in a compact form as an\n");
+    (void)fprintf(stdout, "\t  array of one-dimensional strings.\n\n");
+    (void)fprintf(stdout, "\t  The input data to be written as a data-set can be provided\n");
+    (void)fprintf(stdout, "\t  to the utility in one of the following forms:\n");
+    (void)fprintf(stdout, "\t  1. ASCII text file with numeric data (floating point or \n");
+    (void)fprintf(stdout, "\t  integer data). \n");
+    (void)fprintf(stdout, "\t  2. Binary file with native floating point data (32-bit or \n");
+    (void)fprintf(stdout, "\t  64-bit) \n");
+    (void)fprintf(stdout, "\t  3. Binary file with native integer (signed or unsigned)\n");
+    (void)fprintf(stdout, "\t  data (8-bit or 16-bit or 32-bit or 64-bit). \n");
+    (void)fprintf(stdout, "\t  4. ASCII text file containing strings (text data).\n");
+    (void)fprintf(stdout, "\t    \n");
+    (void)fprintf(stdout, "\t  Every input file is associated with a configuration file \n");
+    (void)fprintf(stdout, "\t  also provided as an input to the utility. (See Section \n");
+    (void)fprintf(stdout, "\t  \"CONFIGURATION FILE\" to know how it is to be organized).\n");
+    (void)fprintf(stdout, "\t  The class, size and dimensions of the input data is \n");
+    (void)fprintf(stdout, "\t  specified in this configuration file. A point to note is\n");
+    (void)fprintf(stdout, "\t  that the floating point data in the ASCII text file may be\n");
+    (void)fprintf(stdout, "\t  organized in the fixed floating form (for example 323.56)\n");
+    (void)fprintf(stdout, "\t  or in a scientific notation (for example 3.23E+02). A \n");
+    (void)fprintf(stdout, "\t  different input-class specification is to be used for both\n");
+    (void)fprintf(stdout, "\t  forms.\n\n");
+    (void)fprintf(stdout, "\t  The utility extracts the input data from the input file \n");
+    (void)fprintf(stdout, "\t  according to the specified parameters and saves it into \n");
+    (void)fprintf(stdout, "\t  an H5 dataset. \n\n");
+    (void)fprintf(stdout, "\t  The user can specify output type and storage properties in \n");
+    (void)fprintf(stdout, "\t  the configuration file. The user is required to specify the \n");
+    (void)fprintf(stdout, "\t  path of the dataset. If the groups in the path leading to \n");
+    (void)fprintf(stdout, "\t  the data-set do not exist, the groups will be created by the\n");
+    (void)fprintf(stdout, "\t  utility. If no group is specified, the dataset will be\n");
+    (void)fprintf(stdout, "\t  created under the root group.\n\n");
+    (void)fprintf(stdout, "\t  In addition to the name, the user is also required to \n");
+    (void)fprintf(stdout, "\t  provide the class and size of output data to be written to \n");
+    (void)fprintf(stdout, "\t  the dataset and may optionally specify the output-architecture,\n");
+    (void)fprintf(stdout, "\t  and the output-byte-order. If output-architecture is not \n");
+    (void)fprintf(stdout, "\t  specified the default is NATIVE. Output-byte-orders are fixed\n");
+    (void)fprintf(stdout, "\t  for some architectures and may be specified only if output-\n");
+    (void)fprintf(stdout, "\t  architecture is IEEE, UNIX or STD.\n\n");
+    (void)fprintf(stdout, "\t   Also, layout and other storage properties such as \n");
+    (void)fprintf(stdout, "\t  compression, external storage and extendible data-sets may be\n");
+    (void)fprintf(stdout, "\t  optionally specified.  The layout and storage properties \n");
+    (void)fprintf(stdout, "\t  denote how raw data is to be organized on the disk. If these \n");
+    (void)fprintf(stdout, "\t  options are not specified the default is Contiguous layout \n");
+    (void)fprintf(stdout, "\t  and storage.\n\n");
+    (void)fprintf(stdout, "\t  The dataset can be organized in any of the following ways:\n");
+    (void)fprintf(stdout, "\t  1. Contiguous.\n");
+    (void)fprintf(stdout, "\t  2. Chunked.\n");
+    (void)fprintf(stdout, "\t  3. External Storage File    (has to be contiguous)\n");
+    (void)fprintf(stdout, "\t  4. Extendible data sets     (has to be chunked)\n");
+    (void)fprintf(stdout, "\t  5. Compressed.        (has to be chunked)\n");
+    (void)fprintf(stdout, "\t  6. Compressed & Extendible  (has to be chunked)\n\n");
+    (void)fprintf(stdout, "\t  If the user wants to store raw data in a non-HDF file then \n");
+    (void)fprintf(stdout, "\t  the external storage file option is to be used and the name \n");
+    (void)fprintf(stdout, "\t  of the file is to be specified. \n\n");
+    (void)fprintf(stdout, "\t  If the user wants the dimensions of the data-set to be\n");
+    (void)fprintf(stdout, "\t  unlimited, the extendible data set option can be chosen. \n\n");
+    (void)fprintf(stdout, "\t  The user may also specify the type of compression and the \n");
+    (void)fprintf(stdout, "\t  level to which the data set must be compresses by setting \n");
+    (void)fprintf(stdout, "\t  the compressed option.\n\n");
+    (void)fprintf(stdout, "\t   SYNOPSIS:\n");
+    (void)fprintf(stdout, "\t  h5import -h[elp], OR\n");
+    (void)fprintf(stdout, "\t  h5import <infile> -c[onfig] <configfile> \
                     [<infile> -c[config] <confile2>...] -o[utfile] <outfile>\n\n");
-    (void)HDfprintf(stdout, "\t   -h[elp]:\n");
-    (void)HDfprintf(stdout, "\t           Prints this summary of usage, and exits.\n\n");
-    (void)HDfprintf(stdout, "\t   <infile(s)>:\n");
-    (void)HDfprintf(stdout, "\t           Name of the Input file(s), containing a \n");
-    (void)HDfprintf(stdout, "\t    single n-dimensional floating point or integer array \n");
-    (void)HDfprintf(stdout, "\t    in either ASCII text, native floating point(32-bit \n");
-    (void)HDfprintf(stdout, "\t    or 64-bit) or native integer(8-bit or 16-bit or \n");
-    (void)HDfprintf(stdout, "\t    32-bit or 64-bit). Data to be specified in the order\n");
-    (void)HDfprintf(stdout, "\t    of fastest changing dimensions first.\n\n");
-    (void)HDfprintf(stdout, "\t  -c[config] <configfile>:\n");
-    (void)HDfprintf(stdout, "\t    Every input file should be associated with a \n");
-    (void)HDfprintf(stdout, "\t    configuration file and this is done by the -c option.\n");
-    (void)HDfprintf(stdout, "\t    <configfile> is the name of the configuration file.\n");
-    (void)HDfprintf(stdout, "\t    (See Section \"CONFIGURATION FILE\")\n\n");
-    (void)HDfprintf(stdout, "\t   -o[utfile] <outfile>:\n");
-    (void)HDfprintf(stdout, "\t           Name of the HDF5 output file. Data from one or more \n");
-    (void)HDfprintf(stdout, "\t    input files are stored as one or more data sets in \n");
-    (void)HDfprintf(stdout, "\t    <outfile>. The output file may be an existing file or \n");
-    (void)HDfprintf(stdout, "\t    it maybe new in which case it will be created.\n\n\n");
-    (void)HDfprintf(stdout, "\t   CONFIGURATION FILE:\n");
-    (void)HDfprintf(stdout, "\t  The configuration file is an ASCII text file and must be \n");
-    (void)HDfprintf(stdout, "\t  the ddl formatted file (without data values) produced by h5dump \n");
-    (void)HDfprintf(stdout, "\t  when used with the options '-o outfilename -b' of a single dataset (-d) \n");
-    (void)HDfprintf(stdout, "\t  OR organized as \"CONFIG-KEYWORD VALUE\" pairs, one pair on each \n");
-    (void)HDfprintf(stdout, "\t  line.\n\n");
-    (void)HDfprintf(stdout, "\t   The configuration file may have the following keywords each \n");
-    (void)HDfprintf(stdout, "\t   followed by an acceptable value.\n\n");
-    (void)HDfprintf(stdout, "\t  Required KEYWORDS:\n");
-    (void)HDfprintf(stdout, "\t    PATH\n");
-    (void)HDfprintf(stdout, "\t    INPUT-CLASS\n");
-    (void)HDfprintf(stdout, "\t    INPUT-SIZE\n");
-    (void)HDfprintf(stdout, "\t    INPUT-BYTE-ORDER\n");
-    (void)HDfprintf(stdout, "\t    RANK\n");
-    (void)HDfprintf(stdout, "\t    DIMENSION-SIZES\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-CLASS\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-SIZE\n\n");
-    (void)HDfprintf(stdout, "\t  Optional KEYWORDS:\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-ARCHITECTURE\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-BYTE-ORDER\n");
-    (void)HDfprintf(stdout, "\t    CHUNKED-DIMENSION-SIZES\n");
-    (void)HDfprintf(stdout, "\t    COMPRESSION-TYPE\n");
-    (void)HDfprintf(stdout, "\t    COMPRESSION-PARAM\n");
-    (void)HDfprintf(stdout, "\t    EXTERNAL-STORAGE\n");
-    (void)HDfprintf(stdout, "\t    MAXIMUM-DIMENSIONS\n\n\n");
-    (void)HDfprintf(stdout, "\t    Values for keywords:\n");
-    (void)HDfprintf(stdout, "\t    PATH:\n");
-    (void)HDfprintf(stdout, "\t      Strings separated by spaces to represent\n");
-    (void)HDfprintf(stdout, "\t      the path of the data-set. If the groups in\n");
-    (void)HDfprintf(stdout, "\t      the path do not exist, they will be created. \n");
-    (void)HDfprintf(stdout, "\t      For example,\n");
-    (void)HDfprintf(stdout, "\t        PATH grp1/grp2/dataset1\n");
-    (void)HDfprintf(stdout, "\t        PATH: keyword\n");
-    (void)HDfprintf(stdout, "\t        grp1: group under the root. If\n");
-    (void)HDfprintf(stdout, "\t              non-existent will be created.\n");
-    (void)HDfprintf(stdout, "\t        grp2: group under grp1. If \n");
-    (void)HDfprintf(stdout, "\t              non-existent will be created \n");
-    (void)HDfprintf(stdout, "\t              under grp1.\n");
-    (void)HDfprintf(stdout, "\t        dataset1: the name of the data-set \n");
-    (void)HDfprintf(stdout, "\t            to be created.\n\n");
-    (void)HDfprintf(stdout, "\t               INPUT-CLASS:\n");
-    (void)HDfprintf(stdout, "\t      String denoting the type of input data.\n");
-    (void)HDfprintf(stdout, "\t      (\"TEXTIN\", \"TEXTFP\", \"FP\", \"IN\", \n");
-    (void)HDfprintf(stdout, "\t      \"STR\", \"TEXTUIN\", \"UIN\"). \n");
-    (void)HDfprintf(stdout, "\t      INPUT-CLASS \"TEXTIN\" denotes an ASCII text \n");
-    (void)HDfprintf(stdout, "\t      file with signed integer data in ASCII form,\n");
-    (void)HDfprintf(stdout, "\t      INPUT-CLASS \"TEXTUIN\" denotes an ASCII text \n");
-    (void)HDfprintf(stdout, "\t      file with unsigned integer data in ASCII form,\n");
-    (void)HDfprintf(stdout, "\t      \"TEXTFP\" denotes an ASCII text file containing\n");
-    (void)HDfprintf(stdout, "\t      floating point data in the fixed notation\n");
-    (void)HDfprintf(stdout, "\t      (325.34),\n");
-    (void)HDfprintf(stdout, "\t      \"FP\" denotes a floating point binary file,\n");
-    (void)HDfprintf(stdout, "\t      \"IN\" denotes a signed integer binary file,\n");
-    (void)HDfprintf(stdout, "\t      \"UIN\" denotes an unsigned integer binary file,\n");
-    (void)HDfprintf(stdout, "\t       & \"STR\" denotes an ASCII text file the \n");
-    (void)HDfprintf(stdout, "\t      contents of which should be stored as an 1-D \n");
-    (void)HDfprintf(stdout, "\t      array of strings.\n");
-    (void)HDfprintf(stdout, "\t      If INPUT-CLASS is \"STR\", then RANK, \n");
-    (void)HDfprintf(stdout, "\t      DIMENSION-SIZES, OUTPUT-CLASS, OUTPUT-SIZE, \n");
-    (void)HDfprintf(stdout, "\t      OUTPUT-ARCHITECTURE and OUTPUT-BYTE-ORDER \n");
-    (void)HDfprintf(stdout, "\t      will be ignored.\n\n\n");
-    (void)HDfprintf(stdout, "\t    INPUT-SIZE:\n");
-    (void)HDfprintf(stdout, "\t      Integer denoting the size of the input data \n");
-    (void)HDfprintf(stdout, "\t      (8, 16, 32, 64). \n\n");
-    (void)HDfprintf(stdout, "\t      For floating point,\n");
-    (void)HDfprintf(stdout, "\t      INPUT-SIZE can be 32 or 64.\n");
-    (void)HDfprintf(stdout, "\t      For integers (signed and unsigned)\n");
-    (void)HDfprintf(stdout, "\t      INPUT-SIZE can be 8, 16, 32 or 64.\n\n");
-    (void)HDfprintf(stdout, "\t    RANK:\n");
-    (void)HDfprintf(stdout, "\t      Integer denoting the number of dimensions.\n\n");
-    (void)HDfprintf(stdout, "\t    DIMENSION-SIZES:\n");
-    (void)HDfprintf(stdout, "\t            Integers separated by spaces to denote the \n");
-    (void)HDfprintf(stdout, "\t      dimension sizes for the no. of dimensions \n");
-    (void)HDfprintf(stdout, "\t      determined by rank.\n\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-CLASS:\n");
-    (void)HDfprintf(stdout, "\t      String dentoting data type of the dataset to \n");
-    (void)HDfprintf(stdout, "\t      be written (\"IN\",\"FP\", \"UIN\")\n\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-SIZE:\n");
-    (void)HDfprintf(stdout, "\t      Integer denoting the size of the data in the \n");
-    (void)HDfprintf(stdout, "\t      output dataset to be written.\n");
-    (void)HDfprintf(stdout, "\t      If OUTPUT-CLASS is \"FP\", OUTPUT-SIZE can be \n");
-    (void)HDfprintf(stdout, "\t      32 or 64.\n");
-    (void)HDfprintf(stdout, "\t      If OUTPUT-CLASS is \"IN\" or \"UIN\", OUTPUT-SIZE\n");
-    (void)HDfprintf(stdout, "\t      can be 8, 16, 32 or 64.\n\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-ARCHITECTURE:\n");
-    (void)HDfprintf(stdout, "\t      STRING denoting the type of output \n");
-    (void)HDfprintf(stdout, "\t      architecture. Can accept the following values\n");
-    (void)HDfprintf(stdout, "\t      STD\n");
-    (void)HDfprintf(stdout, "\t      IEEE\n");
-    (void)HDfprintf(stdout, "\t      INTEL\n");
-    (void)HDfprintf(stdout, "\t      CRAY\n");
-    (void)HDfprintf(stdout, "\t      MIPS\n");
-    (void)HDfprintf(stdout, "\t      ALPHA\n");
-    (void)HDfprintf(stdout, "\t      NATIVE (default)\n");
-    (void)HDfprintf(stdout, "\t      UNIX\n\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-BYTE-ORDER:\n");
-    (void)HDfprintf(stdout, "\t      String denoting the output-byte-order. Ignored\n");
-    (void)HDfprintf(stdout, "\t      if the OUTPUT-ARCHITECTURE is not specified or\n");
-    (void)HDfprintf(stdout, "\t      if it is IEEE, UNIX or STD. Can accept the \n");
-    (void)HDfprintf(stdout, "\t      following values.\n");
-    (void)HDfprintf(stdout, "\t      BE (default)\n");
-    (void)HDfprintf(stdout, "\t      LE\n\n");
-    (void)HDfprintf(stdout, "\t    CHUNKED-DIMENSION-SIZES:\n");
-    (void)HDfprintf(stdout, "\t      Integers separated by spaces to denote the \n");
-    (void)HDfprintf(stdout, "\t      dimension sizes of the chunk for the no. of \n");
-    (void)HDfprintf(stdout, "\t      dimensions determined by rank. Required field\n");
-    (void)HDfprintf(stdout, "\t      to denote that the dataset will be stored with\n");
-    (void)HDfprintf(stdout, "\t      chunked storage. If this field is absent the\n");
-    (void)HDfprintf(stdout, "\t      dataset will be stored with contiguous storage.\n\n");
-    (void)HDfprintf(stdout, "\t    COMPRESSION-TYPE:\n");
-    (void)HDfprintf(stdout, "\t      String denoting the type of compression to be\n");
-    (void)HDfprintf(stdout, "\t      used with the chunked storage. Requires the\n");
-    (void)HDfprintf(stdout, "\t      CHUNKED-DIMENSION-SIZES to be specified. The only \n");
-    (void)HDfprintf(stdout, "\t      currently supported compression method is GZIP. \n");
-    (void)HDfprintf(stdout, "\t      Will accept the following value\n");
-    (void)HDfprintf(stdout, "\t      GZIP\n\n");
-    (void)HDfprintf(stdout, "\t    COMPRESSION-PARAM:\n");
-    (void)HDfprintf(stdout, "\t      Integer used to denote compression level and \n");
-    (void)HDfprintf(stdout, "\t      this option is to be always specified when \n");
-    (void)HDfprintf(stdout, "\t      the COMPRESSION-TYPE option is specified. The\n");
-    (void)HDfprintf(stdout, "\t      values are applicable only to GZIP \n");
-    (void)HDfprintf(stdout, "\t      compression.\n");
-    (void)HDfprintf(stdout, "\t      Value 1-9: The level of Compression. \n");
-    (void)HDfprintf(stdout, "\t        1 will result in the fastest \n");
-    (void)HDfprintf(stdout, "\t        compression while 9 will result in \n");
-    (void)HDfprintf(stdout, "\t        the best compression ratio. The default\n");
-    (void)HDfprintf(stdout, "\t        level of compression is 6.\n\n");
-    (void)HDfprintf(stdout, "\t    EXTERNAL-STORAGE:\n");
-    (void)HDfprintf(stdout, "\t      String to denote the name of the non-HDF5 file \n");
-    (void)HDfprintf(stdout, "\t      to store data to. Cannot be used if CHUNKED-\n");
-    (void)HDfprintf(stdout, "\t      DIMENSIONS or COMPRESSION-TYPE or EXTENDIBLE-\n");
-    (void)HDfprintf(stdout, "\t      DATASET is specified.\n");
-    (void)HDfprintf(stdout, "\t      Value <external-filename>: the name of the \n");
-    (void)HDfprintf(stdout, "\t      external file as a string to be used.\n\n");
-    (void)HDfprintf(stdout, "\t    MAXIMUM-DIMENSIONS:\n");
-    (void)HDfprintf(stdout, "\t      Integers separated by spaces to denote the \n");
-    (void)HDfprintf(stdout, "\t      maximum dimension sizes of all the \n");
-    (void)HDfprintf(stdout, "\t      dimensions determined by rank. Requires the\n");
-    (void)HDfprintf(stdout, "\t      CHUNKED-DIMENSION-SIZES to be specified. A value of \n");
-    (void)HDfprintf(stdout, "\t      -1 for any dimension implies UNLIMITED \n");
-    (void)HDfprintf(stdout, "\t      DIMENSION size for that particular dimension.\n\n");
-    (void)HDfprintf(stdout, "\t   EXAMPLES:\n");
-    (void)HDfprintf(stdout, "\t  1. Configuration File may look like:\n\n");
-    (void)HDfprintf(stdout, "\t    PATH work h5 pkamat First-set\n");
-    (void)HDfprintf(stdout, "\t    INPUT-CLASS TEXTFP\n");
-    (void)HDfprintf(stdout, "\t    RANK 3\n");
-    (void)HDfprintf(stdout, "\t    DIMENSION-SIZES 5 2 4\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-CLASS FP\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-SIZE 64\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-ARCHITECTURE IEEE\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-BYTE-ORDER LE\n");
-    (void)HDfprintf(stdout, "\t      CHUNKED-DIMENSION-SIZES 2 2 2 \n\n");
-    (void)HDfprintf(stdout, "\t  The above configuration will accept a floating point array \n");
-    (void)HDfprintf(stdout, "\t  (5 x 2 x 4)  in an ASCII file with the rank and dimension sizes \n");
-    (void)HDfprintf(stdout, "\t  specified and will save it in a chunked data-set (of pattern \n");
-    (void)HDfprintf(stdout, "\t  2 X 2 X 2) of 64-bit floating point in the little-endian order \n");
-    (void)HDfprintf(stdout, "\t  and IEEE architecture. The dataset will be stored at\n");
-    (void)HDfprintf(stdout, "\t  \"/work/h5/pkamat/First-set\"\n\n");
-    (void)HDfprintf(stdout, "\t  2. Another configuration could be:\n\n");
-    (void)HDfprintf(stdout, "\t    PATH Second-set\n");
-    (void)HDfprintf(stdout, "\t    INPUT-CLASS IN  \n");
-    (void)HDfprintf(stdout, "\t    RANK 5\n");
-    (void)HDfprintf(stdout, "\t    DIMENSION-SIZES 6 3 5 2 4\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-CLASS IN\n");
-    (void)HDfprintf(stdout, "\t    OUTPUT-SIZE 32\n");
-    (void)HDfprintf(stdout, "\t      CHUNKED-DIMENSION-SIZES 2 2 2 2 2\n");
-    (void)HDfprintf(stdout, "\t    EXTENDIBLE-DATASET 1 3 \n");
-    (void)HDfprintf(stdout, "\t    COMPRESSION-TYPE GZIP\n");
-    (void)HDfprintf(stdout, "\t    COMPRESSION-PARAM 7\n\n\n");
-    (void)HDfprintf(stdout, "\t  The above configuration will accept an integer array \n");
-    (void)HDfprintf(stdout, "\t  (6 X 3 X 5 x 2 x 4)  in a binary file with the rank and \n");
-    (void)HDfprintf(stdout, "\t  dimension sizes specified and will save it in a chunked data-set\n");
-    (void)HDfprintf(stdout, "\t  (of pattern 2 X 2 X 2 X 2 X 2) of 32-bit floating point in \n");
-    (void)HDfprintf(stdout, "\t  native format (as output-architecture is not specified). The \n");
-    (void)HDfprintf(stdout, "\t  first and the third dimension will be defined as unlimited. The \n");
-    (void)HDfprintf(stdout, "\t  data-set will be compressed using GZIP and a compression level \n");
-    (void)HDfprintf(stdout, "\t  of 7.\n");
-    (void)HDfprintf(stdout, "\t  The dataset will be stored at \"/Second-set\"\n\n");
+    (void)fprintf(stdout, "\t   -h[elp]:\n");
+    (void)fprintf(stdout, "\t           Prints this summary of usage, and exits.\n\n");
+    (void)fprintf(stdout, "\t   <infile(s)>:\n");
+    (void)fprintf(stdout, "\t           Name of the Input file(s), containing a \n");
+    (void)fprintf(stdout, "\t    single n-dimensional floating point or integer array \n");
+    (void)fprintf(stdout, "\t    in either ASCII text, native floating point(32-bit \n");
+    (void)fprintf(stdout, "\t    or 64-bit) or native integer(8-bit or 16-bit or \n");
+    (void)fprintf(stdout, "\t    32-bit or 64-bit). Data to be specified in the order\n");
+    (void)fprintf(stdout, "\t    of fastest changing dimensions first.\n\n");
+    (void)fprintf(stdout, "\t  -c[config] <configfile>:\n");
+    (void)fprintf(stdout, "\t    Every input file should be associated with a \n");
+    (void)fprintf(stdout, "\t    configuration file and this is done by the -c option.\n");
+    (void)fprintf(stdout, "\t    <configfile> is the name of the configuration file.\n");
+    (void)fprintf(stdout, "\t    (See Section \"CONFIGURATION FILE\")\n\n");
+    (void)fprintf(stdout, "\t   -o[utfile] <outfile>:\n");
+    (void)fprintf(stdout, "\t           Name of the HDF5 output file. Data from one or more \n");
+    (void)fprintf(stdout, "\t    input files are stored as one or more data sets in \n");
+    (void)fprintf(stdout, "\t    <outfile>. The output file may be an existing file or \n");
+    (void)fprintf(stdout, "\t    it maybe new in which case it will be created.\n\n\n");
+    (void)fprintf(stdout, "\t   CONFIGURATION FILE:\n");
+    (void)fprintf(stdout, "\t  The configuration file is an ASCII text file and must be \n");
+    (void)fprintf(stdout, "\t  the ddl formatted file (without data values) produced by h5dump \n");
+    (void)fprintf(stdout, "\t  when used with the options '-o outfilename -b' of a single dataset (-d) \n");
+    (void)fprintf(stdout, "\t  OR organized as \"CONFIG-KEYWORD VALUE\" pairs, one pair on each \n");
+    (void)fprintf(stdout, "\t  line.\n\n");
+    (void)fprintf(stdout, "\t   The configuration file may have the following keywords each \n");
+    (void)fprintf(stdout, "\t   followed by an acceptable value.\n\n");
+    (void)fprintf(stdout, "\t  Required KEYWORDS:\n");
+    (void)fprintf(stdout, "\t    PATH\n");
+    (void)fprintf(stdout, "\t    INPUT-CLASS\n");
+    (void)fprintf(stdout, "\t    INPUT-SIZE\n");
+    (void)fprintf(stdout, "\t    INPUT-BYTE-ORDER\n");
+    (void)fprintf(stdout, "\t    RANK\n");
+    (void)fprintf(stdout, "\t    DIMENSION-SIZES\n");
+    (void)fprintf(stdout, "\t    OUTPUT-CLASS\n");
+    (void)fprintf(stdout, "\t    OUTPUT-SIZE\n\n");
+    (void)fprintf(stdout, "\t  Optional KEYWORDS:\n");
+    (void)fprintf(stdout, "\t    OUTPUT-ARCHITECTURE\n");
+    (void)fprintf(stdout, "\t    OUTPUT-BYTE-ORDER\n");
+    (void)fprintf(stdout, "\t    CHUNKED-DIMENSION-SIZES\n");
+    (void)fprintf(stdout, "\t    COMPRESSION-TYPE\n");
+    (void)fprintf(stdout, "\t    COMPRESSION-PARAM\n");
+    (void)fprintf(stdout, "\t    EXTERNAL-STORAGE\n");
+    (void)fprintf(stdout, "\t    MAXIMUM-DIMENSIONS\n\n\n");
+    (void)fprintf(stdout, "\t    Values for keywords:\n");
+    (void)fprintf(stdout, "\t    PATH:\n");
+    (void)fprintf(stdout, "\t      Strings separated by spaces to represent\n");
+    (void)fprintf(stdout, "\t      the path of the data-set. If the groups in\n");
+    (void)fprintf(stdout, "\t      the path do not exist, they will be created. \n");
+    (void)fprintf(stdout, "\t      For example,\n");
+    (void)fprintf(stdout, "\t        PATH grp1/grp2/dataset1\n");
+    (void)fprintf(stdout, "\t        PATH: keyword\n");
+    (void)fprintf(stdout, "\t        grp1: group under the root. If\n");
+    (void)fprintf(stdout, "\t              non-existent will be created.\n");
+    (void)fprintf(stdout, "\t        grp2: group under grp1. If \n");
+    (void)fprintf(stdout, "\t              non-existent will be created \n");
+    (void)fprintf(stdout, "\t              under grp1.\n");
+    (void)fprintf(stdout, "\t        dataset1: the name of the data-set \n");
+    (void)fprintf(stdout, "\t            to be created.\n\n");
+    (void)fprintf(stdout, "\t               INPUT-CLASS:\n");
+    (void)fprintf(stdout, "\t      String denoting the type of input data.\n");
+    (void)fprintf(stdout, "\t      (\"TEXTIN\", \"TEXTFP\", \"FP\", \"IN\", \n");
+    (void)fprintf(stdout, "\t      \"STR\", \"TEXTUIN\", \"UIN\"). \n");
+    (void)fprintf(stdout, "\t      INPUT-CLASS \"TEXTIN\" denotes an ASCII text \n");
+    (void)fprintf(stdout, "\t      file with signed integer data in ASCII form,\n");
+    (void)fprintf(stdout, "\t      INPUT-CLASS \"TEXTUIN\" denotes an ASCII text \n");
+    (void)fprintf(stdout, "\t      file with unsigned integer data in ASCII form,\n");
+    (void)fprintf(stdout, "\t      \"TEXTFP\" denotes an ASCII text file containing\n");
+    (void)fprintf(stdout, "\t      floating point data in the fixed notation\n");
+    (void)fprintf(stdout, "\t      (325.34),\n");
+    (void)fprintf(stdout, "\t      \"FP\" denotes a floating point binary file,\n");
+    (void)fprintf(stdout, "\t      \"IN\" denotes a signed integer binary file,\n");
+    (void)fprintf(stdout, "\t      \"UIN\" denotes an unsigned integer binary file,\n");
+    (void)fprintf(stdout, "\t       & \"STR\" denotes an ASCII text file the \n");
+    (void)fprintf(stdout, "\t      contents of which should be stored as an 1-D \n");
+    (void)fprintf(stdout, "\t      array of strings.\n");
+    (void)fprintf(stdout, "\t      If INPUT-CLASS is \"STR\", then RANK, \n");
+    (void)fprintf(stdout, "\t      DIMENSION-SIZES, OUTPUT-CLASS, OUTPUT-SIZE, \n");
+    (void)fprintf(stdout, "\t      OUTPUT-ARCHITECTURE and OUTPUT-BYTE-ORDER \n");
+    (void)fprintf(stdout, "\t      will be ignored.\n\n\n");
+    (void)fprintf(stdout, "\t    INPUT-SIZE:\n");
+    (void)fprintf(stdout, "\t      Integer denoting the size of the input data \n");
+    (void)fprintf(stdout, "\t      (8, 16, 32, 64). \n\n");
+    (void)fprintf(stdout, "\t      For floating point,\n");
+    (void)fprintf(stdout, "\t      INPUT-SIZE can be 32 or 64.\n");
+    (void)fprintf(stdout, "\t      For integers (signed and unsigned)\n");
+    (void)fprintf(stdout, "\t      INPUT-SIZE can be 8, 16, 32 or 64.\n\n");
+    (void)fprintf(stdout, "\t    RANK:\n");
+    (void)fprintf(stdout, "\t      Integer denoting the number of dimensions.\n\n");
+    (void)fprintf(stdout, "\t    DIMENSION-SIZES:\n");
+    (void)fprintf(stdout, "\t            Integers separated by spaces to denote the \n");
+    (void)fprintf(stdout, "\t      dimension sizes for the no. of dimensions \n");
+    (void)fprintf(stdout, "\t      determined by rank.\n\n");
+    (void)fprintf(stdout, "\t    OUTPUT-CLASS:\n");
+    (void)fprintf(stdout, "\t      String dentoting data type of the dataset to \n");
+    (void)fprintf(stdout, "\t      be written (\"IN\",\"FP\", \"UIN\")\n\n");
+    (void)fprintf(stdout, "\t    OUTPUT-SIZE:\n");
+    (void)fprintf(stdout, "\t      Integer denoting the size of the data in the \n");
+    (void)fprintf(stdout, "\t      output dataset to be written.\n");
+    (void)fprintf(stdout, "\t      If OUTPUT-CLASS is \"FP\", OUTPUT-SIZE can be \n");
+    (void)fprintf(stdout, "\t      32 or 64.\n");
+    (void)fprintf(stdout, "\t      If OUTPUT-CLASS is \"IN\" or \"UIN\", OUTPUT-SIZE\n");
+    (void)fprintf(stdout, "\t      can be 8, 16, 32 or 64.\n\n");
+    (void)fprintf(stdout, "\t    OUTPUT-ARCHITECTURE:\n");
+    (void)fprintf(stdout, "\t      STRING denoting the type of output \n");
+    (void)fprintf(stdout, "\t      architecture. Can accept the following values\n");
+    (void)fprintf(stdout, "\t      STD\n");
+    (void)fprintf(stdout, "\t      IEEE\n");
+    (void)fprintf(stdout, "\t      INTEL\n");
+    (void)fprintf(stdout, "\t      CRAY\n");
+    (void)fprintf(stdout, "\t      MIPS\n");
+    (void)fprintf(stdout, "\t      ALPHA\n");
+    (void)fprintf(stdout, "\t      NATIVE (default)\n");
+    (void)fprintf(stdout, "\t      UNIX\n\n");
+    (void)fprintf(stdout, "\t    OUTPUT-BYTE-ORDER:\n");
+    (void)fprintf(stdout, "\t      String denoting the output-byte-order. Ignored\n");
+    (void)fprintf(stdout, "\t      if the OUTPUT-ARCHITECTURE is not specified or\n");
+    (void)fprintf(stdout, "\t      if it is IEEE, UNIX or STD. Can accept the \n");
+    (void)fprintf(stdout, "\t      following values.\n");
+    (void)fprintf(stdout, "\t      BE (default)\n");
+    (void)fprintf(stdout, "\t      LE\n\n");
+    (void)fprintf(stdout, "\t    CHUNKED-DIMENSION-SIZES:\n");
+    (void)fprintf(stdout, "\t      Integers separated by spaces to denote the \n");
+    (void)fprintf(stdout, "\t      dimension sizes of the chunk for the no. of \n");
+    (void)fprintf(stdout, "\t      dimensions determined by rank. Required field\n");
+    (void)fprintf(stdout, "\t      to denote that the dataset will be stored with\n");
+    (void)fprintf(stdout, "\t      chunked storage. If this field is absent the\n");
+    (void)fprintf(stdout, "\t      dataset will be stored with contiguous storage.\n\n");
+    (void)fprintf(stdout, "\t    COMPRESSION-TYPE:\n");
+    (void)fprintf(stdout, "\t      String denoting the type of compression to be\n");
+    (void)fprintf(stdout, "\t      used with the chunked storage. Requires the\n");
+    (void)fprintf(stdout, "\t      CHUNKED-DIMENSION-SIZES to be specified. The only \n");
+    (void)fprintf(stdout, "\t      currently supported compression method is GZIP. \n");
+    (void)fprintf(stdout, "\t      Will accept the following value\n");
+    (void)fprintf(stdout, "\t      GZIP\n\n");
+    (void)fprintf(stdout, "\t    COMPRESSION-PARAM:\n");
+    (void)fprintf(stdout, "\t      Integer used to denote compression level and \n");
+    (void)fprintf(stdout, "\t      this option is to be always specified when \n");
+    (void)fprintf(stdout, "\t      the COMPRESSION-TYPE option is specified. The\n");
+    (void)fprintf(stdout, "\t      values are applicable only to GZIP \n");
+    (void)fprintf(stdout, "\t      compression.\n");
+    (void)fprintf(stdout, "\t      Value 1-9: The level of Compression. \n");
+    (void)fprintf(stdout, "\t        1 will result in the fastest \n");
+    (void)fprintf(stdout, "\t        compression while 9 will result in \n");
+    (void)fprintf(stdout, "\t        the best compression ratio. The default\n");
+    (void)fprintf(stdout, "\t        level of compression is 6.\n\n");
+    (void)fprintf(stdout, "\t    EXTERNAL-STORAGE:\n");
+    (void)fprintf(stdout, "\t      String to denote the name of the non-HDF5 file \n");
+    (void)fprintf(stdout, "\t      to store data to. Cannot be used if CHUNKED-\n");
+    (void)fprintf(stdout, "\t      DIMENSIONS or COMPRESSION-TYPE or EXTENDIBLE-\n");
+    (void)fprintf(stdout, "\t      DATASET is specified.\n");
+    (void)fprintf(stdout, "\t      Value <external-filename>: the name of the \n");
+    (void)fprintf(stdout, "\t      external file as a string to be used.\n\n");
+    (void)fprintf(stdout, "\t    MAXIMUM-DIMENSIONS:\n");
+    (void)fprintf(stdout, "\t      Integers separated by spaces to denote the \n");
+    (void)fprintf(stdout, "\t      maximum dimension sizes of all the \n");
+    (void)fprintf(stdout, "\t      dimensions determined by rank. Requires the\n");
+    (void)fprintf(stdout, "\t      CHUNKED-DIMENSION-SIZES to be specified. A value of \n");
+    (void)fprintf(stdout, "\t      -1 for any dimension implies UNLIMITED \n");
+    (void)fprintf(stdout, "\t      DIMENSION size for that particular dimension.\n\n");
+    (void)fprintf(stdout, "\t   EXAMPLES:\n");
+    (void)fprintf(stdout, "\t  1. Configuration File may look like:\n\n");
+    (void)fprintf(stdout, "\t    PATH work h5 pkamat First-set\n");
+    (void)fprintf(stdout, "\t    INPUT-CLASS TEXTFP\n");
+    (void)fprintf(stdout, "\t    RANK 3\n");
+    (void)fprintf(stdout, "\t    DIMENSION-SIZES 5 2 4\n");
+    (void)fprintf(stdout, "\t    OUTPUT-CLASS FP\n");
+    (void)fprintf(stdout, "\t    OUTPUT-SIZE 64\n");
+    (void)fprintf(stdout, "\t    OUTPUT-ARCHITECTURE IEEE\n");
+    (void)fprintf(stdout, "\t    OUTPUT-BYTE-ORDER LE\n");
+    (void)fprintf(stdout, "\t      CHUNKED-DIMENSION-SIZES 2 2 2 \n\n");
+    (void)fprintf(stdout, "\t  The above configuration will accept a floating point array \n");
+    (void)fprintf(stdout, "\t  (5 x 2 x 4)  in an ASCII file with the rank and dimension sizes \n");
+    (void)fprintf(stdout, "\t  specified and will save it in a chunked data-set (of pattern \n");
+    (void)fprintf(stdout, "\t  2 X 2 X 2) of 64-bit floating point in the little-endian order \n");
+    (void)fprintf(stdout, "\t  and IEEE architecture. The dataset will be stored at\n");
+    (void)fprintf(stdout, "\t  \"/work/h5/pkamat/First-set\"\n\n");
+    (void)fprintf(stdout, "\t  2. Another configuration could be:\n\n");
+    (void)fprintf(stdout, "\t    PATH Second-set\n");
+    (void)fprintf(stdout, "\t    INPUT-CLASS IN  \n");
+    (void)fprintf(stdout, "\t    RANK 5\n");
+    (void)fprintf(stdout, "\t    DIMENSION-SIZES 6 3 5 2 4\n");
+    (void)fprintf(stdout, "\t    OUTPUT-CLASS IN\n");
+    (void)fprintf(stdout, "\t    OUTPUT-SIZE 32\n");
+    (void)fprintf(stdout, "\t      CHUNKED-DIMENSION-SIZES 2 2 2 2 2\n");
+    (void)fprintf(stdout, "\t    EXTENDIBLE-DATASET 1 3 \n");
+    (void)fprintf(stdout, "\t    COMPRESSION-TYPE GZIP\n");
+    (void)fprintf(stdout, "\t    COMPRESSION-PARAM 7\n\n\n");
+    (void)fprintf(stdout, "\t  The above configuration will accept an integer array \n");
+    (void)fprintf(stdout, "\t  (6 X 3 X 5 x 2 x 4)  in a binary file with the rank and \n");
+    (void)fprintf(stdout, "\t  dimension sizes specified and will save it in a chunked data-set\n");
+    (void)fprintf(stdout, "\t  (of pattern 2 X 2 X 2 X 2 X 2) of 32-bit floating point in \n");
+    (void)fprintf(stdout, "\t  native format (as output-architecture is not specified). The \n");
+    (void)fprintf(stdout, "\t  first and the third dimension will be defined as unlimited. The \n");
+    (void)fprintf(stdout, "\t  data-set will be compressed using GZIP and a compression level \n");
+    (void)fprintf(stdout, "\t  of 7.\n");
+    (void)fprintf(stdout, "\t  The dataset will be stored at \"/Second-set\"\n\n");
 }
 
 void
 usage(char *name)
 {
-    (void)HDfprintf(stdout, "\nusage:\t%s -h[elp], OR\n", name);
-    (void)HDfprintf(stdout, "\t%s <infile> -c[onfig] <configfile> \
+    (void)fprintf(stdout, "\nusage:\t%s -h[elp], OR\n", name);
+    (void)fprintf(stdout, "\t%s <infile> -c[onfig] <configfile> \
   [<infile> -c[config] <configfile>...] -o[utfile] <outfile> \n\n",
-                    name);
+                  name);
 }
diff --git a/tools/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c
index 9b3030c..2da104e 100644
--- a/tools/src/h5jam/h5jam.c
+++ b/tools/src/h5jam/h5jam.c
@@ -50,30 +50,30 @@ static void
 usage(const char *prog)
 {
     HDfflush(stdout);
-    HDfprintf(stdout, "usage: %s -i <in_file.h5> -u <in_user_file> [-o <out_file.h5>] [--clobber]\n", prog);
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "Adds user block to front of an HDF5 file and creates a new concatenated file.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "OPTIONS\n");
-    HDfprintf(stdout, "  -i in_file.h5    Specifies the input HDF5 file.\n");
-    HDfprintf(stdout, "  -u in_user_file  Specifies the file to be inserted into the user block.\n");
-    HDfprintf(stdout, "                   Can be any file format except an HDF5 format.\n");
-    HDfprintf(stdout, "  -o out_file.h5   Specifies the output HDF5 file.\n");
-    HDfprintf(stdout, "                   If not specified, the user block will be concatenated in\n");
-    HDfprintf(stdout, "                   place to the input HDF5 file.\n");
-    HDfprintf(stdout, "  --clobber        Wipes out any existing user block before concatenating\n");
-    HDfprintf(stdout, "                   the given user block.\n");
-    HDfprintf(stdout, "                   The size of the new user block will be the larger of;\n");
-    HDfprintf(stdout, "                    - the size of existing user block in the input HDF5 file\n");
-    HDfprintf(stdout, "                    - the size of user block required by new input user file\n");
-    HDfprintf(stdout, "                   (size = 512 x 2N,  N is positive integer.)\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "  -h               Prints a usage message and exits.\n");
-    HDfprintf(stdout, "  -V               Prints the HDF5 library version and exits.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "Exit Status:\n");
-    HDfprintf(stdout, "   0   Succeeded.\n");
-    HDfprintf(stdout, "   >0  An error occurred.\n");
+    fprintf(stdout, "usage: %s -i <in_file.h5> -u <in_user_file> [-o <out_file.h5>] [--clobber]\n", prog);
+    fprintf(stdout, "\n");
+    fprintf(stdout, "Adds user block to front of an HDF5 file and creates a new concatenated file.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "OPTIONS\n");
+    fprintf(stdout, "  -i in_file.h5    Specifies the input HDF5 file.\n");
+    fprintf(stdout, "  -u in_user_file  Specifies the file to be inserted into the user block.\n");
+    fprintf(stdout, "                   Can be any file format except an HDF5 format.\n");
+    fprintf(stdout, "  -o out_file.h5   Specifies the output HDF5 file.\n");
+    fprintf(stdout, "                   If not specified, the user block will be concatenated in\n");
+    fprintf(stdout, "                   place to the input HDF5 file.\n");
+    fprintf(stdout, "  --clobber        Wipes out any existing user block before concatenating\n");
+    fprintf(stdout, "                   the given user block.\n");
+    fprintf(stdout, "                   The size of the new user block will be the larger of;\n");
+    fprintf(stdout, "                    - the size of existing user block in the input HDF5 file\n");
+    fprintf(stdout, "                    - the size of user block required by new input user file\n");
+    fprintf(stdout, "                   (size = 512 x 2N,  N is positive integer.)\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "  -h               Prints a usage message and exits.\n");
+    fprintf(stdout, "  -V               Prints the HDF5 library version and exits.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "Exit Status:\n");
+    fprintf(stdout, "   0   Succeeded.\n");
+    fprintf(stdout, "   >0  An error occurred.\n");
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c
index 1c8c24a..1cda5d4 100644
--- a/tools/src/h5jam/h5unjam.c
+++ b/tools/src/h5jam/h5unjam.c
@@ -51,34 +51,33 @@ static void
 usage(const char *prog)
 {
     HDfflush(stdout);
-    HDfprintf(stdout, "usage: %s -i <in_file.h5>  [-o <out_file.h5> ] [-u <out_user_file> | --delete]\n",
-              prog);
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "Splits user file and HDF5 file into two files: user block data and HDF5 data.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "OPTIONS\n");
-    HDfprintf(stdout, "  -i in_file.h5   Specifies the HDF5 as input.  If the input HDF5 file\n");
-    HDfprintf(stdout, "                  contains no user block, exit with an error message.\n");
-    HDfprintf(stdout, "  -o out_file.h5  Specifies output HDF5 file without a user block.\n");
-    HDfprintf(stdout, "                  If not specified, the user block will be removed from the\n");
-    HDfprintf(stdout, "                  input HDF5 file.\n");
-    HDfprintf(stdout, "  -u out_user_file\n");
-    HDfprintf(stdout, "                  Specifies the output file containing the data from the\n");
-    HDfprintf(stdout, "                  user block.\n");
-    HDfprintf(stdout, "                  Cannot be used with --delete option.\n");
-    HDfprintf(stdout, "  --delete        Remove the user block from the input HDF5 file. The content\n");
-    HDfprintf(stdout, "                  of the user block is discarded.\n");
-    HDfprintf(stdout, "                  Cannot be used with the -u option.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "  -h              Prints a usage message and exits.\n");
-    HDfprintf(stdout, "  -V              Prints the HDF5 library version and exits.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "  If neither --delete nor -u is specified, the user block from the input file\n");
-    HDfprintf(stdout, "  will be displayed to stdout.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "Exit Status:\n");
-    HDfprintf(stdout, "  0      Succeeded.\n");
-    HDfprintf(stdout, "  >0    An error occurred.\n");
+    fprintf(stdout, "usage: %s -i <in_file.h5>  [-o <out_file.h5> ] [-u <out_user_file> | --delete]\n", prog);
+    fprintf(stdout, "\n");
+    fprintf(stdout, "Splits user file and HDF5 file into two files: user block data and HDF5 data.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "OPTIONS\n");
+    fprintf(stdout, "  -i in_file.h5   Specifies the HDF5 as input.  If the input HDF5 file\n");
+    fprintf(stdout, "                  contains no user block, exit with an error message.\n");
+    fprintf(stdout, "  -o out_file.h5  Specifies output HDF5 file without a user block.\n");
+    fprintf(stdout, "                  If not specified, the user block will be removed from the\n");
+    fprintf(stdout, "                  input HDF5 file.\n");
+    fprintf(stdout, "  -u out_user_file\n");
+    fprintf(stdout, "                  Specifies the output file containing the data from the\n");
+    fprintf(stdout, "                  user block.\n");
+    fprintf(stdout, "                  Cannot be used with --delete option.\n");
+    fprintf(stdout, "  --delete        Remove the user block from the input HDF5 file. The content\n");
+    fprintf(stdout, "                  of the user block is discarded.\n");
+    fprintf(stdout, "                  Cannot be used with the -u option.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "  -h              Prints a usage message and exits.\n");
+    fprintf(stdout, "  -V              Prints the HDF5 library version and exits.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "  If neither --delete nor -u is specified, the user block from the input file\n");
+    fprintf(stdout, "  will be displayed to stdout.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "Exit Status:\n");
+    fprintf(stdout, "  0      Succeeded.\n");
+    fprintf(stdout, "  >0    An error occurred.\n");
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 5d9e184..b58d7d3 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -2596,14 +2596,14 @@ is_valid_args(void)
     hbool_t ret = TRUE;
 
     if (recursive_g && grp_literal_g) {
-        HDfprintf(rawerrorstream, "Error: 'recursive' option not compatible with 'group info' option!\n\n");
+        fprintf(rawerrorstream, "Error: 'recursive' option not compatible with 'group info' option!\n\n");
         ret = FALSE;
         goto out;
     }
 
     if (no_dangling_link_g && !follow_symlink_g) {
-        HDfprintf(rawerrorstream,
-                  "Error: --no-dangling-links must be used along with --follow-symlinks option!\n\n");
+        fprintf(rawerrorstream,
+                "Error: --no-dangling-links must be used along with --follow-symlinks option!\n\n");
         ret = FALSE;
         goto out;
     }
@@ -2839,23 +2839,23 @@ main(int argc, char *argv[])
 
             start = strchr(argv[argno], '=');
             if (start == NULL) {
-                HDfprintf(rawerrorstream,
-                          "Error: Unable to parse null credentials tuple\n"
-                          "    For anonymous access, omit \"--s3-cred\" and use only \"--vfd=ros3\"\n\n");
+                fprintf(rawerrorstream,
+                        "Error: Unable to parse null credentials tuple\n"
+                        "    For anonymous access, omit \"--s3-cred\" and use only \"--vfd=ros3\"\n\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
             start++;
 
             if (h5tools_parse_ros3_fapl_tuple(start, ',', &ros3_fa) < 0) {
-                HDfprintf(rawerrorstream, "Error: failed to parse S3 VFD credential info\n\n");
+                fprintf(rawerrorstream, "Error: failed to parse S3 VFD credential info\n\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
 
             vfd_info.info = &ros3_fa;
 #else
-            HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n");
+            fprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n");
             usage();
             leave(EXIT_FAILURE);
 #endif
@@ -2871,14 +2871,14 @@ main(int argc, char *argv[])
             }
 
             if (h5tools_parse_hdfs_fapl_tuple(start, ',', &hdfs_fa) < 0) {
-                HDfprintf(rawerrorstream, "Error: failed to parse HDFS VFD configuration info\n\n");
+                fprintf(rawerrorstream, "Error: failed to parse HDFS VFD configuration info\n\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
 
             vfd_info.info = &hdfs_fa;
 #else
-            HDfprintf(rawerrorstream, "Error: The HDFS VFD is not enabled\n\n");
+            fprintf(rawerrorstream, "Error: The HDFS VFD is not enabled\n\n");
             usage();
             leave(EXIT_FAILURE);
 #endif
@@ -2955,7 +2955,7 @@ main(int argc, char *argv[])
             }     /* end for */
         }
         else {
-            HDfprintf(stderr, "Unknown argument: %s\n", argv[argno]);
+            fprintf(stderr, "Unknown argument: %s\n", argv[argno]);
             usage();
             leave(EXIT_FAILURE);
         }
@@ -3043,7 +3043,7 @@ main(int argc, char *argv[])
         } /* end while */
 
         if (file_id < 0) {
-            HDfprintf(rawerrorstream, "%s: unable to open file\n", argv[argno - 1]);
+            fprintf(rawerrorstream, "%s: unable to open file\n", argv[argno - 1]);
             HDfree(fname);
             err_exit = 1;
             continue;
@@ -3056,7 +3056,7 @@ main(int argc, char *argv[])
             iter.base_len -= oname[iter.base_len - 1] == '/';
             x = oname;
             if (NULL == (oname = HDstrdup(oname))) {
-                HDfprintf(rawerrorstream, "memory allocation failed\n");
+                fprintf(rawerrorstream, "memory allocation failed\n");
                 leave(EXIT_FAILURE);
             }
             *x = '\0';
@@ -3140,7 +3140,7 @@ main(int argc, char *argv[])
 
     if (fapl_id != H5P_DEFAULT) {
         if (0 < H5Pclose(fapl_id)) {
-            HDfprintf(rawerrorstream, "Error: Unable to set close fapl entry\n\n");
+            fprintf(rawerrorstream, "Error: Unable to set close fapl entry\n\n");
             leave(EXIT_FAILURE);
         }
     }
diff --git a/tools/src/h5perf/pio_engine.c b/tools/src/h5perf/pio_engine.c
index 2238aac..e6f0834 100644
--- a/tools/src/h5perf/pio_engine.c
+++ b/tools/src/h5perf/pio_engine.c
@@ -62,8 +62,8 @@
     }
 #define ERRMSG(mesg)                                                                                         \
     {                                                                                                        \
-        HDfprintf(stderr, "Proc %d: ", pio_mpi_rank_g);                                                      \
-        HDfprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n", mesg, (int)__LINE__, __FILE__);   \
+        fprintf(stderr, "Proc %d: ", pio_mpi_rank_g);                                                        \
+        fprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n", mesg, (int)__LINE__, __FILE__);     \
     }
 
 /* verify: if val is false (0), print mesg. */
@@ -184,7 +184,7 @@ do_pio(parameters param)
             break;
         default:
             /* unknown request */
-            HDfprintf(stderr, "Unknown IO type request (%d)\n", iot);
+            fprintf(stderr, "Unknown IO type request (%d)\n", iot);
             GOTOERROR(FAIL);
     }
 
@@ -203,66 +203,66 @@ do_pio(parameters param)
     }
 
     if (param.num_files < 0) {
-        HDfprintf(stderr, "number of files must be >= 0 (%ld)\n", param.num_files);
+        fprintf(stderr, "number of files must be >= 0 (%ld)\n", param.num_files);
         GOTOERROR(FAIL);
     }
 
     if (ndsets < 0) {
-        HDfprintf(stderr, "number of datasets per file must be >= 0 (%ld)\n", ndsets);
+        fprintf(stderr, "number of datasets per file must be >= 0 (%ld)\n", ndsets);
         GOTOERROR(FAIL);
     }
 
     if (param.num_procs <= 0) {
-        HDfprintf(stderr, "maximum number of process to use must be > 0 (%d)\n", param.num_procs);
+        fprintf(stderr, "maximum number of process to use must be > 0 (%d)\n", param.num_procs);
         GOTOERROR(FAIL);
     }
 
     /* Validate transfer buffer size & block size*/
     if (blk_size <= 0) {
-        HDfprintf(stderr, "Transfer block size (%zu) must be > 0\n", blk_size);
+        fprintf(stderr, "Transfer block size (%zu) must be > 0\n", blk_size);
         GOTOERROR(FAIL);
     }
     if (buf_size <= 0) {
-        HDfprintf(stderr, "Transfer buffer size (%zu) must be > 0\n", buf_size);
+        fprintf(stderr, "Transfer buffer size (%zu) must be > 0\n", buf_size);
         GOTOERROR(FAIL);
     }
     if ((buf_size % blk_size) != 0) {
-        HDfprintf(stderr,
-                  "Transfer buffer size (%zu) must be a multiple of the "
-                  "interleaved I/O block size (%zu)\n",
-                  buf_size, blk_size);
+        fprintf(stderr,
+                "Transfer buffer size (%zu) must be a multiple of the "
+                "interleaved I/O block size (%zu)\n",
+                buf_size, blk_size);
         GOTOERROR(FAIL);
     }
     if ((snbytes % pio_mpi_nprocs_g) != 0) {
-        HDfprintf(stderr,
-                  "Dataset size (%lld) must be a multiple of the "
-                  "number of processes (%d)\n",
-                  (long long)snbytes, pio_mpi_nprocs_g);
+        fprintf(stderr,
+                "Dataset size (%lld) must be a multiple of the "
+                "number of processes (%d)\n",
+                (long long)snbytes, pio_mpi_nprocs_g);
         GOTOERROR(FAIL);
     }
 
     if (!param.dim2d) {
         if (((size_t)(snbytes / pio_mpi_nprocs_g) % buf_size) != 0) {
-            HDfprintf(stderr,
-                      "Dataset size/process (%lld) must be a multiple of the "
-                      "transfer buffer size (%zu)\n",
-                      (long long)(snbytes / pio_mpi_nprocs_g), buf_size);
+            fprintf(stderr,
+                    "Dataset size/process (%lld) must be a multiple of the "
+                    "transfer buffer size (%zu)\n",
+                    (long long)(snbytes / pio_mpi_nprocs_g), buf_size);
             GOTOERROR(FAIL);
         }
     }
     else {
         if (((size_t)snbytes % buf_size) != 0) {
-            HDfprintf(stderr,
-                      "Dataset side size (%lld) must be a multiple of the "
-                      "transfer buffer size (%zu)\n",
-                      (long long)snbytes, buf_size);
+            fprintf(stderr,
+                    "Dataset side size (%lld) must be a multiple of the "
+                    "transfer buffer size (%zu)\n",
+                    (long long)snbytes, buf_size);
             GOTOERROR(FAIL);
         }
     }
 
     /* Allocate transfer buffer */
     if ((buffer = malloc(bsize)) == NULL) {
-        HDfprintf(stderr, "malloc for transfer buffer size (%zu) failed\n", bsize);
+        fprintf(stderr, "malloc for transfer buffer size (%zu) failed\n", bsize);
         GOTOERROR(FAIL);
     }
 
@@ -273,7 +273,7 @@ do_pio(parameters param)
 
         /* output all of the times for all iterations */
         if (myrank == 0)
-            HDfprintf(output, "Timer details:\n");
+            fprintf(output, "Timer details:\n");
     }
 
     for (nf = 1; nf <= param.num_files; nf++) {
@@ -286,7 +286,7 @@ do_pio(parameters param)
         HDsnprintf(base_name, sizeof(base_name), "#pio_tmp_%lu", nf);
         pio_create_filename(iot, base_name, fname, FILENAME_MAX);
         if (pio_debug_level > 0)
-            HDfprintf(output, "rank %d: data filename=%s\n", pio_mpi_rank_g, fname);
+            fprintf(output, "rank %d: data filename=%s\n", pio_mpi_rank_g, fname);
 
         /* Need barrier to make sure everyone starts at the same time */
         MPI_Barrier(pio_comm_g);
@@ -621,17 +621,17 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby
     if (pio_debug_level >= 4) {
         HDprint_rank(output);
         if (!parms->dim2d) {
-            HDfprintf(output,
-                      "Debug(do_write): "
-                      "buf_size=%zu, bytes_begin=%lld, bytes_count=%lld\n",
-                      buf_size, (long long)bytes_begin[0], (long long)bytes_count);
+            fprintf(output,
+                    "Debug(do_write): "
+                    "buf_size=%zu, bytes_begin=%lld, bytes_count=%lld\n",
+                    buf_size, (long long)bytes_begin[0], (long long)bytes_count);
         }
         else {
-            HDfprintf(output,
-                      "Debug(do_write): "
-                      "linear buf_size=%zu, bytes_begin=(%lld,%lld), bytes_count=%lld\n",
-                      buf_size * blk_size, (long long)bytes_begin[0], (long long)bytes_begin[1],
-                      (long long)bytes_count);
+            fprintf(output,
+                    "Debug(do_write): "
+                    "linear buf_size=%zu, bytes_begin=(%lld,%lld), bytes_count=%lld\n",
+                    buf_size * blk_size, (long long)bytes_begin[0], (long long)bytes_begin[1],
+                    (long long)bytes_count);
         }
     }
 
@@ -831,7 +831,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby
             /* Create the dataset transfer property list */
             h5dxpl = H5Pcreate(H5P_DATASET_XFER);
             if (h5dxpl < 0) {
-                HDfprintf(stderr, "HDF5 Property List Create failed\n");
+                fprintf(stderr, "HDF5 Property List Create failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -839,7 +839,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby
             if (parms->collective) {
                 hrc = H5Pset_dxpl_mpio(h5dxpl, H5FD_MPIO_COLLECTIVE);
                 if (hrc < 0) {
-                    HDfprintf(stderr, "HDF5 Property List Set failed\n");
+                    fprintf(stderr, "HDF5 Property List Set failed\n");
                     GOTOERROR(FAIL);
                 } /* end if */
             }     /* end if */
@@ -864,7 +864,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby
             case PHDF5:
                 h5dcpl = H5Pcreate(H5P_DATASET_CREATE);
                 if (h5dcpl < 0) {
-                    HDfprintf(stderr, "HDF5 Property List Create failed\n");
+                    fprintf(stderr, "HDF5 Property List Create failed\n");
                     GOTOERROR(FAIL);
                 }
                 /* 1D dataspace */
@@ -875,7 +875,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby
                         h5dims[0] = blk_size;
                         hrc       = H5Pset_chunk(h5dcpl, 1, h5dims);
                         if (hrc < 0) {
-                            HDfprintf(stderr, "HDF5 Property List Set failed\n");
+                            fprintf(stderr, "HDF5 Property List Set failed\n");
                             GOTOERROR(FAIL);
                         } /* end if */
                     }     /* end if */
@@ -888,7 +888,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby
                         h5dims[1] = blk_size;
                         hrc       = H5Pset_chunk(h5dcpl, 2, h5dims);
                         if (hrc < 0) {
-                            HDfprintf(stderr, "HDF5 Property List Set failed\n");
+                            fprintf(stderr, "HDF5 Property List Set failed\n");
                             GOTOERROR(FAIL);
                         } /* end if */
                     }     /* end if */
@@ -898,14 +898,14 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby
                 h5ds_id = H5DCREATE(fd->h5fd, dname, ELMT_H5_TYPE, h5dset_space_id, h5dcpl);
 
                 if (h5ds_id < 0) {
-                    HDfprintf(stderr, "HDF5 Dataset Create failed\n");
+                    fprintf(stderr, "HDF5 Dataset Create failed\n");
                     GOTOERROR(FAIL);
                 }
 
                 hrc = H5Pclose(h5dcpl);
                 /* verifying the close of the dcpl */
                 if (hrc < 0) {
-                    HDfprintf(stderr, "HDF5 Property List Close failed\n");
+                    fprintf(stderr, "HDF5 Property List Close failed\n");
                     GOTOERROR(FAIL);
                 }
                 break;
@@ -1407,7 +1407,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby
             hrc = H5Dclose(h5ds_id);
 
             if (hrc < 0) {
-                HDfprintf(stderr, "HDF5 Dataset Close failed\n");
+                fprintf(stderr, "HDF5 Dataset Close failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -1464,7 +1464,7 @@ done:
     if (h5dset_space_id != -1) {
         hrc = H5Sclose(h5dset_space_id);
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Dataset Space Close failed\n");
+            fprintf(stderr, "HDF5 Dataset Space Close failed\n");
             ret_code = FAIL;
         }
         else {
@@ -1475,7 +1475,7 @@ done:
     if (h5mem_space_id != -1) {
         hrc = H5Sclose(h5mem_space_id);
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Memory Space Close failed\n");
+            fprintf(stderr, "HDF5 Memory Space Close failed\n");
             ret_code = FAIL;
         }
         else {
@@ -1486,7 +1486,7 @@ done:
     if (h5dxpl != -1) {
         hrc = H5Pclose(h5dxpl);
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
+            fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
             ret_code = FAIL;
         }
         else {
@@ -1631,17 +1631,17 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt
     if (pio_debug_level >= 4) {
         HDprint_rank(output);
         if (!parms->dim2d) {
-            HDfprintf(output,
-                      "Debug(do_write): "
-                      "buf_size=%zu, bytes_begin=%lld, bytes_count=%lld\n",
-                      buf_size, (long long)bytes_begin[0], (long long)bytes_count);
+            fprintf(output,
+                    "Debug(do_write): "
+                    "buf_size=%zu, bytes_begin=%lld, bytes_count=%lld\n",
+                    buf_size, (long long)bytes_begin[0], (long long)bytes_count);
         }
         else {
-            HDfprintf(output,
-                      "Debug(do_write): "
-                      "linear buf_size=%zu, bytes_begin=(%lld,%lld), bytes_count=%lld\n",
-                      buf_size * blk_size, (long long)bytes_begin[0], (long long)bytes_begin[1],
-                      (long long)bytes_count);
+            fprintf(output,
+                    "Debug(do_write): "
+                    "linear buf_size=%zu, bytes_begin=(%lld,%lld), bytes_count=%lld\n",
+                    buf_size * blk_size, (long long)bytes_begin[0], (long long)bytes_begin[1],
+                    (long long)bytes_count);
         }
     }
 
@@ -1839,7 +1839,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt
             /* Create the dataset transfer property list */
             h5dxpl = H5Pcreate(H5P_DATASET_XFER);
             if (h5dxpl < 0) {
-                HDfprintf(stderr, "HDF5 Property List Create failed\n");
+                fprintf(stderr, "HDF5 Property List Create failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -1847,7 +1847,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt
             if (parms->collective) {
                 hrc = H5Pset_dxpl_mpio(h5dxpl, H5FD_MPIO_COLLECTIVE);
                 if (hrc < 0) {
-                    HDfprintf(stderr, "HDF5 Property List Set failed\n");
+                    fprintf(stderr, "HDF5 Property List Set failed\n");
                     GOTOERROR(FAIL);
                 } /* end if */
             }     /* end if */
@@ -1873,7 +1873,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt
                 HDsnprintf(dname, sizeof(dname), "Dataset_%ld", ndset);
                 h5ds_id = H5DOPEN(fd->h5fd, dname);
                 if (h5ds_id < 0) {
-                    HDfprintf(stderr, "HDF5 Dataset open failed\n");
+                    fprintf(stderr, "HDF5 Dataset open failed\n");
                     GOTOERROR(FAIL);
                 }
                 break;
@@ -2369,17 +2369,17 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt
                         if (++nerror < 20) {
                             /* report at most 20 errors */
                             HDprint_rank(output);
-                            HDfprintf(output,
-                                      "read data error, expected (%d), "
-                                      "got (%d)\n",
-                                      pio_mpi_rank_g + 1, (int)*(ucharptr - 1));
+                            fprintf(output,
+                                    "read data error, expected (%d), "
+                                    "got (%d)\n",
+                                    pio_mpi_rank_g + 1, (int)*(ucharptr - 1));
                         } /* end if */
                     }     /* end if */
                 }         /* end for */
                 if (nerror >= 20) {
                     HDprint_rank(output);
-                    HDfprintf(output, "...");
-                    HDfprintf(output, "total read data errors=%d\n", nerror);
+                    fprintf(output, "...");
+                    fprintf(output, "total read data errors=%d\n", nerror);
                 } /* end if */
             }     /* if (parms->verify) */
 
@@ -2395,7 +2395,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt
             hrc = H5Dclose(h5ds_id);
 
             if (hrc < 0) {
-                HDfprintf(stderr, "HDF5 Dataset Close failed\n");
+                fprintf(stderr, "HDF5 Dataset Close failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -2452,7 +2452,7 @@ done:
     if (h5dset_space_id != -1) {
         hrc = H5Sclose(h5dset_space_id);
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Dataset Space Close failed\n");
+            fprintf(stderr, "HDF5 Dataset Space Close failed\n");
             ret_code = FAIL;
         }
         else {
@@ -2463,7 +2463,7 @@ done:
     if (h5mem_space_id != -1) {
         hrc = H5Sclose(h5mem_space_id);
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Memory Space Close failed\n");
+            fprintf(stderr, "HDF5 Memory Space Close failed\n");
             ret_code = FAIL;
         }
         else {
@@ -2474,7 +2474,7 @@ done:
     if (h5dxpl != -1) {
         hrc = H5Pclose(h5dxpl);
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
+            fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
             ret_code = FAIL;
         }
         else {
@@ -2505,7 +2505,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
                 fd->posixfd = POSIXOPEN(fname, O_RDONLY);
 
             if (fd->posixfd < 0) {
-                HDfprintf(stderr, "POSIX File Open failed(%s)\n", fname);
+                fprintf(stderr, "POSIX File Open failed(%s)\n", fname);
                 GOTOERROR(FAIL);
             }
 
@@ -2528,7 +2528,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
                                     &fd->mpifd);
 
                 if (mrc != MPI_SUCCESS) {
-                    HDfprintf(stderr, "MPI File Open failed(%s)\n", fname);
+                    fprintf(stderr, "MPI File Open failed(%s)\n", fname);
                     GOTOERROR(FAIL);
                 }
 
@@ -2536,14 +2536,14 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
                 /*filesize , set size to 0 explicitedly.    */
                 mrc = MPI_File_set_size(fd->mpifd, (MPI_Offset)0);
                 if (mrc != MPI_SUCCESS) {
-                    HDfprintf(stderr, "MPI_File_set_size failed\n");
+                    fprintf(stderr, "MPI_File_set_size failed\n");
                     GOTOERROR(FAIL);
                 }
             }
             else {
                 mrc = MPI_File_open(pio_comm_g, fname, MPI_MODE_RDONLY, h5_io_info_g, &fd->mpifd);
                 if (mrc != MPI_SUCCESS) {
-                    HDfprintf(stderr, "MPI File Open failed(%s)\n", fname);
+                    fprintf(stderr, "MPI File Open failed(%s)\n", fname);
                     GOTOERROR(FAIL);
                 }
             }
@@ -2552,19 +2552,19 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
 
         case PHDF5:
             if ((acc_tpl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
-                HDfprintf(stderr, "HDF5 Property List Create failed\n");
+                fprintf(stderr, "HDF5 Property List Create failed\n");
                 GOTOERROR(FAIL);
             }
 
             /* Set the file driver to the MPI-IO driver */
             if (H5Pset_fapl_mpio(acc_tpl, pio_comm_g, h5_io_info_g) < 0) {
-                HDfprintf(stderr, "HDF5 Property List Set failed\n");
+                fprintf(stderr, "HDF5 Property List Set failed\n");
                 GOTOERROR(FAIL);
             }
 
             /* Set the alignment of objects in HDF5 file */
             if (H5Pset_alignment(acc_tpl, param->h5_thresh, param->h5_align) < 0) {
-                HDfprintf(stderr, "HDF5 Property List Set failed\n");
+                fprintf(stderr, "HDF5 Property List Set failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -2574,13 +2574,13 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
             else
                 fd->h5fd = H5Fopen(fname, H5F_ACC_RDONLY, acc_tpl);
             if (fd->h5fd < 0) {
-                HDfprintf(stderr, "HDF5 File Create failed(%s)\n", fname);
+                fprintf(stderr, "HDF5 File Create failed(%s)\n", fname);
                 GOTOERROR(FAIL);
             }
 
             /* verifying the close of the acc_tpl */
             if (H5Pclose(acc_tpl) < 0) {
-                HDfprintf(stderr, "HDF5 Property List Close failed\n");
+                fprintf(stderr, "HDF5 Property List Close failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -2611,7 +2611,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/)
             rc = POSIXCLOSE(fd->posixfd);
 
             if (rc != 0) {
-                HDfprintf(stderr, "POSIX File Close failed\n");
+                fprintf(stderr, "POSIX File Close failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -2622,7 +2622,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/)
             mrc = MPI_File_close(&fd->mpifd);
 
             if (mrc != MPI_SUCCESS) {
-                HDfprintf(stderr, "MPI File close failed\n");
+                fprintf(stderr, "MPI File close failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -2633,7 +2633,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/)
             hrc = H5Fclose(fd->h5fd);
 
             if (hrc < 0) {
-                HDfprintf(stderr, "HDF5 File Close failed\n");
+                fprintf(stderr, "HDF5 File Close failed\n");
                 GOTOERROR(FAIL);
             }
 
diff --git a/tools/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c
index d2f5a80..393a250 100644
--- a/tools/src/h5perf/pio_perf.c
+++ b/tools/src/h5perf/pio_perf.c
@@ -224,12 +224,12 @@ main(int argc, char *argv[])
     ret = MPI_Comm_size(MPI_COMM_WORLD, &comm_world_nprocs_g);
 
     if (ret != MPI_SUCCESS) {
-        HDfprintf(stderr, "%s: MPI_Comm_size call failed\n", progname);
+        fprintf(stderr, "%s: MPI_Comm_size call failed\n", progname);
 
         if (ret == MPI_ERR_COMM)
-            HDfprintf(stderr, "invalid MPI communicator\n");
+            fprintf(stderr, "invalid MPI communicator\n");
         else
-            HDfprintf(stderr, "invalid argument\n");
+            fprintf(stderr, "invalid argument\n");
 
         exit_value = EXIT_FAILURE;
         goto finish;
@@ -238,12 +238,12 @@ main(int argc, char *argv[])
     ret = MPI_Comm_rank(MPI_COMM_WORLD, &comm_world_rank_g);
 
     if (ret != MPI_SUCCESS) {
-        HDfprintf(stderr, "%s: MPI_Comm_rank call failed\n", progname);
+        fprintf(stderr, "%s: MPI_Comm_rank call failed\n", progname);
 
         if (ret == MPI_ERR_COMM)
-            HDfprintf(stderr, "invalid MPI communicator\n");
+            fprintf(stderr, "invalid MPI communicator\n");
         else
-            HDfprintf(stderr, "invalid argument\n");
+            fprintf(stderr, "invalid argument\n");
 
         exit_value = EXIT_FAILURE;
         goto finish;
@@ -261,7 +261,7 @@ main(int argc, char *argv[])
 
     if (opts->output_file) {
         if ((output = HDfopen(opts->output_file, "w")) == NULL) {
-            HDfprintf(stderr, "%s: cannot open output file\n", progname);
+            fprintf(stderr, "%s: cannot open output file\n", progname);
             perror(opts->output_file);
             goto finish;
         }
@@ -805,7 +805,7 @@ h5_set_info_object(void)
 
                 /* actually set the darned thing */
                 if (MPI_SUCCESS != MPI_Info_set(h5_io_info_g, namep, valp)) {
-                    HDprintf("MPI_Info_set failed\n");
+                    printf("MPI_Info_set failed\n");
                     ret_value = -1;
                 }
             }
@@ -834,17 +834,17 @@ h5_dump_info_object(MPI_Info info)
     int  flag;
     int  i, nkeys;
 
-    HDprintf("Dumping MPI Info Object (up to %d bytes per item):\n", MPI_MAX_INFO_VAL);
+    printf("Dumping MPI Info Object (up to %d bytes per item):\n", MPI_MAX_INFO_VAL);
     if (info == MPI_INFO_NULL) {
-        HDprintf("object is MPI_INFO_NULL\n");
+        printf("object is MPI_INFO_NULL\n");
     }
     else {
         MPI_Info_get_nkeys(info, &nkeys);
-        HDprintf("object has %d items\n", nkeys);
+        printf("object has %d items\n", nkeys);
         for (i = 0; i < nkeys; i++) {
             MPI_Info_get_nthkey(info, i, key);
             MPI_Info_get(info, key, MPI_MAX_INFO_VAL, value, &flag);
-            HDprintf("%s=%s\n", key, value);
+            printf("%s=%s\n", key, value);
         }
     }
 }
@@ -926,8 +926,8 @@ create_comm_world(int num_procs, int *doing_pio)
     MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
 
     if (num_procs > nprocs) {
-        HDfprintf(stderr, "number of process(%d) must be <= number of processes in MPI_COMM_WORLD(%d)\n",
-                  num_procs, nprocs);
+        fprintf(stderr, "number of process(%d) must be <= number of processes in MPI_COMM_WORLD(%d)\n",
+                num_procs, nprocs);
         goto error_done;
     }
 
@@ -936,7 +936,7 @@ create_comm_world(int num_procs, int *doing_pio)
     mrc   = MPI_Comm_split(MPI_COMM_WORLD, color, myrank, &pio_comm_g);
 
     if (mrc != MPI_SUCCESS) {
-        HDfprintf(stderr, "MPI_Comm_split failed\n");
+        fprintf(stderr, "MPI_Comm_split failed\n");
         goto error_done;
     }
 
@@ -1095,28 +1095,28 @@ recover_size_and_print(long long val, const char *end)
     if (val >= ONE_KB && (val % ONE_KB) == 0) {
         if (val >= ONE_MB && (val % ONE_MB) == 0) {
             if (val >= ONE_GB && (val % ONE_GB) == 0)
-                HDfprintf(output,
-                          "%lld"
-                          "GB%s",
-                          val / ONE_GB, end);
+                fprintf(output,
+                        "%lld"
+                        "GB%s",
+                        val / ONE_GB, end);
             else
-                HDfprintf(output,
-                          "%lld"
-                          "MB%s",
-                          val / ONE_MB, end);
+                fprintf(output,
+                        "%lld"
+                        "MB%s",
+                        val / ONE_MB, end);
         }
         else {
-            HDfprintf(output,
-                      "%lld"
-                      "KB%s",
-                      val / ONE_KB, end);
+            fprintf(output,
+                    "%lld"
+                    "KB%s",
+                    val / ONE_KB, end);
         }
     }
     else {
-        HDfprintf(output,
-                  "%lld"
-                  "%s",
-                  val, end);
+        fprintf(output,
+                "%lld"
+                "%s",
+                val, end);
     }
 }
 
@@ -1124,12 +1124,12 @@ static void
 print_io_api(long io_types)
 {
     if (io_types & PIO_POSIX)
-        HDfprintf(output, "posix ");
+        fprintf(output, "posix ");
     if (io_types & PIO_MPI)
-        HDfprintf(output, "mpiio ");
+        fprintf(output, "mpiio ");
     if (io_types & PIO_HDF5)
-        HDfprintf(output, "phdf5 ");
-    HDfprintf(output, "\n");
+        fprintf(output, "phdf5 ");
+    fprintf(output, "\n");
 }
 
 static void
@@ -1138,34 +1138,34 @@ report_parameters(struct options *opts)
     int rank = comm_world_rank_g;
 
     print_version("HDF5 Library"); /* print library version */
-    HDfprintf(output, "rank %d: ==== Parameters ====\n", rank);
+    fprintf(output, "rank %d: ==== Parameters ====\n", rank);
 
-    HDfprintf(output, "rank %d: IO API=", rank);
+    fprintf(output, "rank %d: IO API=", rank);
     print_io_api(opts->io_types);
 
-    HDfprintf(output, "rank %d: Number of files=%ld\n", rank, opts->num_files);
-    HDfprintf(output, "rank %d: Number of datasets=%ld\n", rank, opts->num_dsets);
-    HDfprintf(output, "rank %d: Number of iterations=%d\n", rank, opts->num_iters);
-    HDfprintf(output, "rank %d: Number of processes=%d:%d\n", rank, opts->min_num_procs, opts->max_num_procs);
+    fprintf(output, "rank %d: Number of files=%ld\n", rank, opts->num_files);
+    fprintf(output, "rank %d: Number of datasets=%ld\n", rank, opts->num_dsets);
+    fprintf(output, "rank %d: Number of iterations=%d\n", rank, opts->num_iters);
+    fprintf(output, "rank %d: Number of processes=%d:%d\n", rank, opts->min_num_procs, opts->max_num_procs);
 
     if (opts->dim2d) {
-        HDfprintf(output, "rank %d: Number of bytes per process per dataset=", rank);
+        fprintf(output, "rank %d: Number of bytes per process per dataset=", rank);
         recover_size_and_print((long long)(opts->num_bpp * opts->num_bpp * opts->min_num_procs), ":");
         recover_size_and_print((long long)(opts->num_bpp * opts->num_bpp * opts->max_num_procs), "\n");
 
-        HDfprintf(output, "rank %d: Size of dataset(s)=", rank);
+        fprintf(output, "rank %d: Size of dataset(s)=", rank);
         recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), "x");
         recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), ":");
         recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "x");
         recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "\n");
 
-        HDfprintf(output, "rank %d: File size=", rank);
+        fprintf(output, "rank %d: File size=", rank);
         recover_size_and_print((long long)(squareo(opts->num_bpp * opts->min_num_procs) * opts->num_dsets),
                                ":");
         recover_size_and_print((long long)(squareo(opts->num_bpp * opts->max_num_procs) * opts->num_dsets),
                                "\n");
 
-        HDfprintf(output, "rank %d: Transfer buffer size=", rank);
+        fprintf(output, "rank %d: Transfer buffer size=", rank);
         if (opts->interleaved) {
             recover_size_and_print((long long)opts->min_xfer_size, "x");
             recover_size_and_print((long long)opts->blk_size, ":");
@@ -1178,66 +1178,66 @@ report_parameters(struct options *opts)
             recover_size_and_print((long long)opts->blk_size, "x");
             recover_size_and_print((long long)opts->max_xfer_size, "\n");
         }
-        HDfprintf(output, "rank %d: Block size=", rank);
+        fprintf(output, "rank %d: Block size=", rank);
         recover_size_and_print((long long)opts->blk_size, "x");
         recover_size_and_print((long long)opts->blk_size, "\n");
     }
     else {
-        HDfprintf(output, "rank %d: Number of bytes per process per dataset=", rank);
+        fprintf(output, "rank %d: Number of bytes per process per dataset=", rank);
         recover_size_and_print((long long)opts->num_bpp, "\n");
 
-        HDfprintf(output, "rank %d: Size of dataset(s)=", rank);
+        fprintf(output, "rank %d: Size of dataset(s)=", rank);
         recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), ":");
         recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "\n");
 
-        HDfprintf(output, "rank %d: File size=", rank);
+        fprintf(output, "rank %d: File size=", rank);
         recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs * opts->num_dsets), ":");
         recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs * opts->num_dsets), "\n");
 
-        HDfprintf(output, "rank %d: Transfer buffer size=", rank);
+        fprintf(output, "rank %d: Transfer buffer size=", rank);
         recover_size_and_print((long long)opts->min_xfer_size, ":");
         recover_size_and_print((long long)opts->max_xfer_size, "\n");
-        HDfprintf(output, "rank %d: Block size=", rank);
+        fprintf(output, "rank %d: Block size=", rank);
         recover_size_and_print((long long)opts->blk_size, "\n");
     }
 
-    HDfprintf(output, "rank %d: Block Pattern in Dataset=", rank);
+    fprintf(output, "rank %d: Block Pattern in Dataset=", rank);
     if (opts->interleaved)
-        HDfprintf(output, "Interleaved\n");
+        fprintf(output, "Interleaved\n");
     else
-        HDfprintf(output, "Contiguous\n");
+        fprintf(output, "Contiguous\n");
 
-    HDfprintf(output, "rank %d: I/O Method for MPI and HDF5=", rank);
+    fprintf(output, "rank %d: I/O Method for MPI and HDF5=", rank);
     if (opts->collective)
-        HDfprintf(output, "Collective\n");
+        fprintf(output, "Collective\n");
     else
-        HDfprintf(output, "Independent\n");
+        fprintf(output, "Independent\n");
 
-    HDfprintf(output, "rank %d: Geometry=", rank);
+    fprintf(output, "rank %d: Geometry=", rank);
     if (opts->dim2d)
-        HDfprintf(output, "2D\n");
+        fprintf(output, "2D\n");
     else
-        HDfprintf(output, "1D\n");
+        fprintf(output, "1D\n");
 
-    HDfprintf(output, "rank %d: VFL used for HDF5 I/O=%s\n", rank, "MPI-IO driver");
+    fprintf(output, "rank %d: VFL used for HDF5 I/O=%s\n", rank, "MPI-IO driver");
 
-    HDfprintf(output, "rank %d: Data storage method in HDF5=", rank);
+    fprintf(output, "rank %d: Data storage method in HDF5=", rank);
     if (opts->h5_use_chunks)
-        HDfprintf(output, "Chunked\n");
+        fprintf(output, "Chunked\n");
     else
-        HDfprintf(output, "Contiguous\n");
+        fprintf(output, "Contiguous\n");
 
     {
         char *prefix = HDgetenv("HDF5_PARAPREFIX");
 
-        HDfprintf(output, "rank %d: Env HDF5_PARAPREFIX=%s\n", rank, (prefix ? prefix : "not set"));
+        fprintf(output, "rank %d: Env HDF5_PARAPREFIX=%s\n", rank, (prefix ? prefix : "not set"));
     }
 
-    HDfprintf(output, "rank %d: ", rank);
+    fprintf(output, "rank %d: ", rank);
     h5_dump_info_object(h5_io_info_g);
 
-    HDfprintf(output, "rank %d: ==== End of Parameters ====\n", rank);
-    HDfprintf(output, "\n");
+    fprintf(output, "rank %d: ==== End of Parameters ====\n", rank);
+    fprintf(output, "\n");
 }
 
 /*
@@ -1305,7 +1305,7 @@ parse_command_line(int argc, const char *const *argv)
                         cl_opts->io_types |= PIO_POSIX;
                     }
                     else {
-                        HDfprintf(stderr, "pio_perf: invalid --api option %s\n", buf);
+                        fprintf(stderr, "pio_perf: invalid --api option %s\n", buf);
                         HDexit(EXIT_FAILURE);
                     }
 
@@ -1353,7 +1353,7 @@ parse_command_line(int argc, const char *const *argv)
 
                         for (j = 0; j < 10 && buf[j] != '\0'; ++j)
                             if (!isdigit(buf[j])) {
-                                HDfprintf(stderr, "pio_perf: invalid --debug option %s\n", buf);
+                                fprintf(stderr, "pio_perf: invalid --debug option %s\n", buf);
                                 HDexit(EXIT_FAILURE);
                             }
 
@@ -1379,7 +1379,7 @@ parse_command_line(int argc, const char *const *argv)
                                 cl_opts->verify = TRUE;
                                 break;
                             default:
-                                HDfprintf(stderr, "pio_perf: invalid --debug option %s\n", buf);
+                                fprintf(stderr, "pio_perf: invalid --debug option %s\n", buf);
                                 HDexit(EXIT_FAILURE);
                         }
                     }
@@ -1523,7 +1523,7 @@ parse_size_directive(const char *size)
                 s *= ONE_GB;
                 break;
             default:
-                HDfprintf(stderr, "Illegal size specifier '%c'\n", *endptr);
+                fprintf(stderr, "Illegal size specifier '%c'\n", *endptr);
                 HDexit(EXIT_FAILURE);
         }
     }
@@ -1546,124 +1546,124 @@ usage(const char *prog)
 
     if (myrank == 0) {
         print_version(prog);
-        HDprintf("usage: %s [OPTIONS]\n", prog);
-        HDprintf("  OPTIONS\n");
-        HDprintf("     -h, --help                  Print a usage message and exit\n");
-        HDprintf("     -a S, --align=S             Alignment of objects in HDF5 file [default: 1]\n");
-        HDprintf("     -A AL, --api=AL             Which APIs to test [default: all of them]\n");
+        printf("usage: %s [OPTIONS]\n", prog);
+        printf("  OPTIONS\n");
+        printf("     -h, --help                  Print a usage message and exit\n");
+        printf("     -a S, --align=S             Alignment of objects in HDF5 file [default: 1]\n");
+        printf("     -A AL, --api=AL             Which APIs to test [default: all of them]\n");
 #if 0
-        HDprintf("     -b, --binary                The elusive binary option\n");
+        printf("     -b, --binary                The elusive binary option\n");
 #endif /* 0 */
-        HDprintf("     -B S, --block-size=S        Block size within transfer buffer\n");
-        HDprintf("                                 (see below for description)\n");
-        HDprintf("                                 [default: half the number of bytes per process\n");
-        HDprintf("                                           per dataset]\n");
-        HDprintf("     -c, --chunk                 Create HDF5 datasets using chunked storage\n");
-        HDprintf("                                 [default: contiguous storage]\n");
-        HDprintf("     -C, --collective            Use collective I/O for MPI and HDF5 APIs\n");
-        HDprintf("                                 [default: independent I/O)\n");
-        HDprintf("     -d N, --num-dsets=N         Number of datasets per file [default: 1]\n");
-        HDprintf("     -D DL, --debug=DL           Indicate the debugging level\n");
-        HDprintf("                                 [default: no debugging]\n");
-        HDprintf("     -e S, --num-bytes=S         Number of bytes per process per dataset\n");
-        HDprintf("                                 (see below for description)\n");
-        HDprintf("                                 [default: 256K for 1D, 8K for 2D]\n");
-        HDprintf("     -F N, --num-files=N         Number of files [default: 1]\n");
-        HDprintf("     -g, --geometry              Use 2D geometry [default: 1D geometry]\n");
-        HDprintf("     -i N, --num-iterations=N    Number of iterations to perform [default: 1]\n");
-        HDprintf("     -I, --interleaved           Interleaved access pattern\n");
-        HDprintf("                                 (see below for example)\n");
-        HDprintf("                                 [default: Contiguous access pattern]\n");
-        HDprintf("     -o F, --output=F            Output raw data into file F [default: none]\n");
-        HDprintf("     -p N, --min-num-processes=N Minimum number of processes to use [default: 1]\n");
-        HDprintf("     -P N, --max-num-processes=N Maximum number of processes to use\n");
-        HDprintf("                                 [default: all MPI_COMM_WORLD processes ]\n");
-        HDprintf("     -T S, --threshold=S         Threshold for alignment of objects in HDF5 file\n");
-        HDprintf("                                 [default: 1]\n");
-        HDprintf("     -w, --write-only            Perform write tests not the read tests\n");
-        HDprintf("     -x S, --min-xfer-size=S     Minimum transfer buffer size\n");
-        HDprintf("                                 (see below for description)\n");
-        HDprintf("                                 [default: half the number of bytes per process\n");
-        HDprintf("                                           per dataset]\n");
-        HDprintf("     -X S, --max-xfer-size=S     Maximum transfer buffer size\n");
-        HDprintf("                                 [default: the number of bytes per process per\n");
-        HDprintf("                                           dataset]\n");
-        HDprintf("\n");
-        HDprintf("  F  - is a filename.\n");
-        HDprintf("  N  - is an integer >=0.\n");
-        HDprintf("  S  - is a size specifier, an integer >=0 followed by a size indicator:\n");
-        HDprintf("          K - Kilobyte (%d)\n", ONE_KB);
-        HDprintf("          M - Megabyte (%d)\n", ONE_MB);
-        HDprintf("          G - Gigabyte (%d)\n", ONE_GB);
-        HDprintf("\n");
-        HDprintf("      Example: '37M' is 37 megabytes or %d bytes\n", 37 * ONE_MB);
-        HDprintf("\n");
-        HDprintf("  AL - is an API list. Valid values are:\n");
-        HDprintf("          phdf5 - Parallel HDF5\n");
-        HDprintf("          mpiio - MPI-I/O\n");
-        HDprintf("          posix - POSIX\n");
-        HDprintf("\n");
-        HDprintf("      Example: --api=mpiio,phdf5\n");
-        HDprintf("\n");
-        HDprintf("  Dataset size:\n");
-        HDprintf("      Depending on the selected geometry, each test dataset is either a linear\n");
-        HDprintf("      array of size bytes-per-process * num-processes, or a square array of size\n");
-        HDprintf("      (bytes-per-process * num-processes) x (bytes-per-process * num-processes).\n");
-        HDprintf("\n");
-        HDprintf("  Block size vs. Transfer buffer size:\n");
-        HDprintf("      buffer-size controls the size of the memory buffer, which is broken into\n");
-        HDprintf("      blocks and written to the file. Depending on the selected geometry, each\n");
-        HDprintf("      block can be a linear array of size block-size or a square array of size\n");
-        HDprintf("      block-size x block-size. The arrangement in which blocks are written is\n");
-        HDprintf("      determined by the access pattern.\n");
-        HDprintf("\n");
-        HDprintf("      In 1D geometry, the transfer buffer is a linear array of size buffer-size.\n");
-        HDprintf("      In 2D geometry, it is a rectangular array of size block-size x buffer-size\n");
-        HDprintf("      or buffer-size x block-size if interleaved pattern is selected.\n");
-        HDprintf("\n");
-        HDprintf("  Interleaved and Contiguous patterns in 1D geometry:\n");
-        HDprintf("      When contiguous access pattern is chosen, the dataset is evenly divided\n");
-        HDprintf("      into num-processes regions and each process writes data to its own region.\n");
-        HDprintf("      When interleaved blocks are written to a dataset, space for the first\n");
-        HDprintf("      block of the first process is allocated in the dataset, then space is\n");
-        HDprintf("      allocated for the first block of the second process, etc. until space is\n");
-        HDprintf("      allocated for the first block of each process, then space is allocated for\n");
-        HDprintf("      the second block of the first process, the second block of the second\n");
-        HDprintf("      process, etc.\n");
-        HDprintf("\n");
-        HDprintf("      For example, with a 3 process run, 512KB bytes-per-process, 256KB transfer\n");
-        HDprintf("        buffer size, and 64KB block size, each process must issue 2 transfer\n");
-        HDprintf("        requests to complete access to the dataset.\n");
-        HDprintf("          Contiguous blocks of the first transfer request are written like so:\n");
-        HDprintf("              1111----2222----3333----\n");
-        HDprintf("          Interleaved blocks of the first transfer request are written like so:\n");
-        HDprintf("              123123123123------------\n");
-        HDprintf("        The actual number of I/O operations involved in a transfer request\n");
-        HDprintf("        depends on the access pattern and communication mode.\n");
-        HDprintf("        When using independent I/O with interleaved pattern, each process\n");
-        HDprintf("        performs 4 small non-contiguous I/O operations per transfer request.\n");
-        HDprintf("        If collective I/O is turned on, the combined content of the buffers of\n");
-        HDprintf("        the 3 processes will be written using one collective I/O operation\n");
-        HDprintf("        per transfer request.\n");
-        HDprintf("\n");
-        HDprintf("      For information about access patterns in 2D geometry, please refer to the\n");
-        HDprintf("      HDF5 Reference Manual.\n");
-        HDprintf("\n");
-        HDprintf("  DL - is a list of debugging flags. Valid values are:\n");
-        HDprintf("          1 - Minimal\n");
-        HDprintf("          2 - Not quite everything\n");
-        HDprintf("          3 - Everything\n");
-        HDprintf("          4 - The kitchen sink\n");
-        HDprintf("          r - Raw data I/O throughput information\n");
-        HDprintf("          t - Times as well as throughputs\n");
-        HDprintf("          v - Verify data correctness\n");
-        HDprintf("\n");
-        HDprintf("      Example: --debug=2,r,t\n");
-        HDprintf("\n");
-        HDprintf("  Environment variables:\n");
-        HDprintf("  HDF5_NOCLEANUP   Do not remove data files if set [default remove]\n");
-        HDprintf("  HDF5_MPI_INFO    MPI INFO object key=value separated by ;\n");
-        HDprintf("  HDF5_PARAPREFIX  Parallel data files prefix\n");
+        printf("     -B S, --block-size=S        Block size within transfer buffer\n");
+        printf("                                 (see below for description)\n");
+        printf("                                 [default: half the number of bytes per process\n");
+        printf("                                           per dataset]\n");
+        printf("     -c, --chunk                 Create HDF5 datasets using chunked storage\n");
+        printf("                                 [default: contiguous storage]\n");
+        printf("     -C, --collective            Use collective I/O for MPI and HDF5 APIs\n");
+        printf("                                 [default: independent I/O)\n");
+        printf("     -d N, --num-dsets=N         Number of datasets per file [default: 1]\n");
+        printf("     -D DL, --debug=DL           Indicate the debugging level\n");
+        printf("                                 [default: no debugging]\n");
+        printf("     -e S, --num-bytes=S         Number of bytes per process per dataset\n");
+        printf("                                 (see below for description)\n");
+        printf("                                 [default: 256K for 1D, 8K for 2D]\n");
+        printf("     -F N, --num-files=N         Number of files [default: 1]\n");
+        printf("     -g, --geometry              Use 2D geometry [default: 1D geometry]\n");
+        printf("     -i N, --num-iterations=N    Number of iterations to perform [default: 1]\n");
+        printf("     -I, --interleaved           Interleaved access pattern\n");
+        printf("                                 (see below for example)\n");
+        printf("                                 [default: Contiguous access pattern]\n");
+        printf("     -o F, --output=F            Output raw data into file F [default: none]\n");
+        printf("     -p N, --min-num-processes=N Minimum number of processes to use [default: 1]\n");
+        printf("     -P N, --max-num-processes=N Maximum number of processes to use\n");
+        printf("                                 [default: all MPI_COMM_WORLD processes ]\n");
+        printf("     -T S, --threshold=S         Threshold for alignment of objects in HDF5 file\n");
+        printf("                                 [default: 1]\n");
+        printf("     -w, --write-only            Perform write tests not the read tests\n");
+        printf("     -x S, --min-xfer-size=S     Minimum transfer buffer size\n");
+        printf("                                 (see below for description)\n");
+        printf("                                 [default: half the number of bytes per process\n");
+        printf("                                           per dataset]\n");
+        printf("     -X S, --max-xfer-size=S     Maximum transfer buffer size\n");
+        printf("                                 [default: the number of bytes per process per\n");
+        printf("                                           dataset]\n");
+        printf("\n");
+        printf("  F  - is a filename.\n");
+        printf("  N  - is an integer >=0.\n");
+        printf("  S  - is a size specifier, an integer >=0 followed by a size indicator:\n");
+        printf("          K - Kilobyte (%d)\n", ONE_KB);
+        printf("          M - Megabyte (%d)\n", ONE_MB);
+        printf("          G - Gigabyte (%d)\n", ONE_GB);
+        printf("\n");
+        printf("      Example: '37M' is 37 megabytes or %d bytes\n", 37 * ONE_MB);
+        printf("\n");
+        printf("  AL - is an API list. Valid values are:\n");
+        printf("          phdf5 - Parallel HDF5\n");
+        printf("          mpiio - MPI-I/O\n");
+        printf("          posix - POSIX\n");
+        printf("\n");
+        printf("      Example: --api=mpiio,phdf5\n");
+        printf("\n");
+        printf("  Dataset size:\n");
+        printf("      Depending on the selected geometry, each test dataset is either a linear\n");
+        printf("      array of size bytes-per-process * num-processes, or a square array of size\n");
+        printf("      (bytes-per-process * num-processes) x (bytes-per-process * num-processes).\n");
+        printf("\n");
+        printf("  Block size vs. Transfer buffer size:\n");
+        printf("      buffer-size controls the size of the memory buffer, which is broken into\n");
+        printf("      blocks and written to the file. Depending on the selected geometry, each\n");
+        printf("      block can be a linear array of size block-size or a square array of size\n");
+        printf("      block-size x block-size. The arrangement in which blocks are written is\n");
+        printf("      determined by the access pattern.\n");
+        printf("\n");
+        printf("      In 1D geometry, the transfer buffer is a linear array of size buffer-size.\n");
+        printf("      In 2D geometry, it is a rectangular array of size block-size x buffer-size\n");
+        printf("      or buffer-size x block-size if interleaved pattern is selected.\n");
+        printf("\n");
+        printf("  Interleaved and Contiguous patterns in 1D geometry:\n");
+        printf("      When contiguous access pattern is chosen, the dataset is evenly divided\n");
+        printf("      into num-processes regions and each process writes data to its own region.\n");
+        printf("      When interleaved blocks are written to a dataset, space for the first\n");
+        printf("      block of the first process is allocated in the dataset, then space is\n");
+        printf("      allocated for the first block of the second process, etc. until space is\n");
+        printf("      allocated for the first block of each process, then space is allocated for\n");
+        printf("      the second block of the first process, the second block of the second\n");
+        printf("      process, etc.\n");
+        printf("\n");
+        printf("      For example, with a 3 process run, 512KB bytes-per-process, 256KB transfer\n");
+        printf("        buffer size, and 64KB block size, each process must issue 2 transfer\n");
+        printf("        requests to complete access to the dataset.\n");
+        printf("          Contiguous blocks of the first transfer request are written like so:\n");
+        printf("              1111----2222----3333----\n");
+        printf("          Interleaved blocks of the first transfer request are written like so:\n");
+        printf("              123123123123------------\n");
+        printf("        The actual number of I/O operations involved in a transfer request\n");
+        printf("        depends on the access pattern and communication mode.\n");
+        printf("        When using independent I/O with interleaved pattern, each process\n");
+        printf("        performs 4 small non-contiguous I/O operations per transfer request.\n");
+        printf("        If collective I/O is turned on, the combined content of the buffers of\n");
+        printf("        the 3 processes will be written using one collective I/O operation\n");
+        printf("        per transfer request.\n");
+        printf("\n");
+        printf("      For information about access patterns in 2D geometry, please refer to the\n");
+        printf("      HDF5 Reference Manual.\n");
+        printf("\n");
+        printf("  DL - is a list of debugging flags. Valid values are:\n");
+        printf("          1 - Minimal\n");
+        printf("          2 - Not quite everything\n");
+        printf("          3 - Everything\n");
+        printf("          4 - The kitchen sink\n");
+        printf("          r - Raw data I/O throughput information\n");
+        printf("          t - Times as well as throughputs\n");
+        printf("          v - Verify data correctness\n");
+        printf("\n");
+        printf("      Example: --debug=2,r,t\n");
+        printf("\n");
+        printf("  Environment variables:\n");
+        printf("  HDF5_NOCLEANUP   Do not remove data files if set [default remove]\n");
+        printf("  HDF5_MPI_INFO    MPI INFO object key=value separated by ;\n");
+        printf("  HDF5_PARAPREFIX  Parallel data files prefix\n");
         fflush(stdout);
     } /* end if */
 } /* end usage() */
@@ -1680,7 +1680,7 @@ usage(const char *prog)
 int
 main(void)
 {
-    HDprintf("No parallel IO performance because parallel is not configured\n");
+    printf("No parallel IO performance because parallel is not configured\n");
     return EXIT_SUCCESS;
 } /* end main */
 
diff --git a/tools/src/h5perf/pio_perf.h b/tools/src/h5perf/pio_perf.h
index 05f8d5b..54fbb52 100644
--- a/tools/src/h5perf/pio_perf.h
+++ b/tools/src/h5perf/pio_perf.h
@@ -86,10 +86,10 @@ extern int        pio_debug_level;     /* The debug level:
                                         *   4 - Even More Debugging (timer stuff)
                                         */
 
-#define HDprint_rank(f)      /* print rank in MPI_COMM_WORLD */ HDfprintf(f, "%d: ", comm_world_rank_g);
-#define HDprint_size(f)      /* print size of MPI_COMM_WORLD */ HDfprintf(f, "%d", comm_world_nprocs_g);
+#define HDprint_rank(f)      /* print rank in MPI_COMM_WORLD */ fprintf(f, "%d: ", comm_world_rank_g);
+#define HDprint_size(f)      /* print size of MPI_COMM_WORLD */ fprintf(f, "%d", comm_world_nprocs_g);
 #define HDprint_rank_size(f) /* print rank/size of MPI_COMM_WORLD */                                         \
-    HDfprintf(f, "%d/%d: ", comm_world_rank_g, comm_world_nprocs_g);
+    fprintf(f, "%d/%d: ", comm_world_rank_g, comm_world_nprocs_g);
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/tools/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c
index ca7d4ae..24c3f06 100644
--- a/tools/src/h5perf/sio_engine.c
+++ b/tools/src/h5perf/sio_engine.c
@@ -44,7 +44,7 @@
     }
 #define ERRMSG(mesg)                                                                                         \
     {                                                                                                        \
-        HDfprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n", mesg, (int)__LINE__, __FILE__);   \
+        fprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n", mesg, (int)__LINE__, __FILE__);     \
     }
 
 /* verify: if val is false (0), print mesg. */
@@ -158,7 +158,7 @@ do_sio(parameters param, results *res)
             break;
         default:
             /* unknown request */
-            HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot);
+            fprintf(stderr, "Unknown IO type request (%d)\n", (int)iot);
             GOTOERROR(FAIL);
     }
 
@@ -173,29 +173,29 @@ do_sio(parameters param, results *res)
 
         /* Validate transfer buffer size */
         if (param.buf_size[i] <= 0) {
-            HDfprintf(stderr, "Transfer buffer size[%d] (%zu) must be > 0\n", i, buf_size[i]);
+            fprintf(stderr, "Transfer buffer size[%d] (%zu) must be > 0\n", i, buf_size[i]);
             GOTOERROR(FAIL);
         }
 
         if ((param.dset_size[i] % param.buf_size[i]) != 0) {
-            HDfprintf(stderr,
-                      "Dataset size[%d] (%lld) must be a multiple of the "
-                      "transfer buffer size[%d] (%zu)\n",
-                      param.rank, (long long)param.dset_size[i], param.rank, param.buf_size[i]);
+            fprintf(stderr,
+                    "Dataset size[%d] (%lld) must be a multiple of the "
+                    "transfer buffer size[%d] (%zu)\n",
+                    param.rank, (long long)param.dset_size[i], param.rank, param.buf_size[i]);
             GOTOERROR(FAIL);
         }
     }
 
     /* Allocate transfer buffer */
     if ((buffer = (char *)malloc(linear_buf_size)) == NULL) {
-        HDfprintf(stderr, "malloc for transfer buffer size (%zu) failed\n", linear_buf_size);
+        fprintf(stderr, "malloc for transfer buffer size (%zu) failed\n", linear_buf_size);
         GOTOERROR(FAIL);
     }
 
     if (sio_debug_level >= 4)
 
         /* output all of the times for all iterations */
-        HDfprintf(output, "Timer details:\n");
+        fprintf(output, "Timer details:\n");
 
     /*
      * Write performance measurement
@@ -206,7 +206,7 @@ do_sio(parameters param, results *res)
     sio_create_filename(iot, base_name, fname, FILENAME_MAX, &param);
 
     if (sio_debug_level > 0)
-        HDfprintf(output, "data filename=%s\n", fname);
+        fprintf(output, "data filename=%s\n", fname);
 
     io_time_set(res->timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTART);
     hrc = do_fopen(&param, fname, &fd, SIO_CREATE | SIO_WRITE);
@@ -310,7 +310,7 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
             break;
         default:
             /* unknown request */
-            HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot);
+            fprintf(stderr, "Unknown IO type request (%d)\n", (int)iot);
             assert(0 && "Unknown IO type");
             break;
     }
@@ -486,14 +486,14 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
             /* Create the dataset transfer property list */
             h5dxpl = H5Pcreate(H5P_DATASET_XFER);
             if (h5dxpl < 0) {
-                HDfprintf(stderr, "HDF5 Property List Create failed\n");
+                fprintf(stderr, "HDF5 Property List Create failed\n");
                 GOTOERROR(FAIL);
             }
 
             break;
 
         default:
-            HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
+            fprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
             GOTOERROR(FAIL);
             break;
     } /* end switch */
@@ -507,7 +507,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
             h5dcpl = H5Pcreate(H5P_DATASET_CREATE);
 
             if (h5dcpl < 0) {
-                HDfprintf(stderr, "HDF5 Property List Create failed\n");
+                fprintf(stderr, "HDF5 Property List Create failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -515,7 +515,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
                 /* Set the chunk size to be the same as the buffer size */
                 hrc = H5Pset_chunk(h5dcpl, rank, h5chunk);
                 if (hrc < 0) {
-                    HDfprintf(stderr, "HDF5 Property List Set failed\n");
+                    fprintf(stderr, "HDF5 Property List Set failed\n");
                     GOTOERROR(FAIL);
                 } /* end if */
             }     /* end if */
@@ -525,21 +525,21 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
                 H5Dcreate2(fd->h5fd, dname, ELMT_H5_TYPE, h5dset_space_id, H5P_DEFAULT, h5dcpl, H5P_DEFAULT);
 
             if (h5ds_id < 0) {
-                HDfprintf(stderr, "HDF5 Dataset Create failed\n");
+                fprintf(stderr, "HDF5 Dataset Create failed\n");
                 GOTOERROR(FAIL);
             }
 
             hrc = H5Pclose(h5dcpl);
             /* verifying the close of the dcpl */
             if (hrc < 0) {
-                HDfprintf(stderr, "HDF5 Property List Close failed\n");
+                fprintf(stderr, "HDF5 Property List Close failed\n");
                 GOTOERROR(FAIL);
             }
             break;
 
         default:
             /* unknown request */
-            HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
+            fprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
             GOTOERROR(FAIL);
             break;
     }
@@ -551,7 +551,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
     hrc = dset_write(rank - 1, fd, parms, buffer);
 
     if (hrc < 0) {
-        HDfprintf(stderr, "Error in dataset write\n");
+        fprintf(stderr, "Error in dataset write\n");
         GOTOERROR(FAIL);
     }
 
@@ -565,7 +565,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
         hrc = H5Dclose(h5ds_id);
 
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Dataset Close failed\n");
+            fprintf(stderr, "HDF5 Dataset Close failed\n");
             GOTOERROR(FAIL);
         }
 
@@ -578,7 +578,7 @@ done:
     if (h5dset_space_id != -1) {
         hrc = H5Sclose(h5dset_space_id);
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Dataset Space Close failed\n");
+            fprintf(stderr, "HDF5 Dataset Space Close failed\n");
             ret_code = FAIL;
         }
         else {
@@ -589,7 +589,7 @@ done:
     if (h5mem_space_id != -1) {
         hrc = H5Sclose(h5mem_space_id);
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Memory Space Close failed\n");
+            fprintf(stderr, "HDF5 Memory Space Close failed\n");
             ret_code = FAIL;
         }
         else {
@@ -600,7 +600,7 @@ done:
     if (h5dxpl != -1) {
         hrc = H5Pclose(h5dxpl);
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
+            fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
             ret_code = FAIL;
         }
         else {
@@ -683,7 +683,7 @@ dset_write(int local_dim, file_descr *fd, parameters *parms, void *buffer)
 
                 default:
                     /* unknown request */
-                    HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
+                    fprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
                     assert(0 && "Unknown IO type");
                     break;
             } /* switch (parms->io_type) */
@@ -777,7 +777,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
 
     /* Allocate data verification buffer */
     if (NULL == (buffer2 = (char *)malloc(linear_buf_size))) {
-        HDfprintf(stderr, "malloc for data verification buffer size (%zu) failed\n", linear_buf_size);
+        fprintf(stderr, "malloc for data verification buffer size (%zu) failed\n", linear_buf_size);
         GOTOERROR(FAIL);
     } /* end if */
 
@@ -828,14 +828,14 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
             /* Create the dataset transfer property list */
             h5dxpl = H5Pcreate(H5P_DATASET_XFER);
             if (h5dxpl < 0) {
-                HDfprintf(stderr, "HDF5 Property List Create failed\n");
+                fprintf(stderr, "HDF5 Property List Create failed\n");
                 GOTOERROR(FAIL);
             }
             break;
 
         default:
             /* unknown request */
-            HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
+            fprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
             GOTOERROR(FAIL);
             break;
     } /* end switch */
@@ -849,14 +849,14 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
             HDsnprintf(dname, sizeof(dname), "Dataset_%ld", (long)parms->num_bytes);
             h5ds_id = H5Dopen2(fd->h5fd, dname, H5P_DEFAULT);
             if (h5ds_id < 0) {
-                HDfprintf(stderr, "HDF5 Dataset open failed\n");
+                fprintf(stderr, "HDF5 Dataset open failed\n");
                 GOTOERROR(FAIL);
             }
             break;
 
         default:
             /* unknown request */
-            HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
+            fprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
             GOTOERROR(FAIL);
             break;
     } /* end switch */
@@ -866,7 +866,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
     hrc = dset_read(rank - 1, fd, parms, buffer, buffer2);
 
     if (hrc < 0) {
-        HDfprintf(stderr, "Error in dataset read\n");
+        fprintf(stderr, "Error in dataset read\n");
         GOTOERROR(FAIL);
     }
 
@@ -880,7 +880,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
         hrc = H5Dclose(h5ds_id);
 
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Dataset Close failed\n");
+            fprintf(stderr, "HDF5 Dataset Close failed\n");
             GOTOERROR(FAIL);
         }
 
@@ -893,7 +893,7 @@ done:
     if (h5dset_space_id != -1) {
         hrc = H5Sclose(h5dset_space_id);
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Dataset Space Close failed\n");
+            fprintf(stderr, "HDF5 Dataset Space Close failed\n");
             ret_code = FAIL;
         }
         else {
@@ -904,7 +904,7 @@ done:
     if (h5mem_space_id != -1) {
         hrc = H5Sclose(h5mem_space_id);
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Memory Space Close failed\n");
+            fprintf(stderr, "HDF5 Memory Space Close failed\n");
             ret_code = FAIL;
         }
         else {
@@ -915,7 +915,7 @@ done:
     if (h5dxpl != -1) {
         hrc = H5Pclose(h5dxpl);
         if (hrc < 0) {
-            HDfprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
+            fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n");
             ret_code = FAIL;
         }
         else {
@@ -981,7 +981,7 @@ dset_read(int local_dim, file_descr *fd, parameters *parms, void *buffer, const
 
                 default:
                     /* unknown request */
-                    HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
+                    fprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
                     assert(0 && "Unknown IO type");
                     break;
             } /* switch (parms->io_type) */
@@ -1065,7 +1065,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
                 fd->posixfd = POSIXOPEN(fname, O_RDONLY);
 
             if (fd->posixfd < 0) {
-                HDfprintf(stderr, "POSIX File Open failed(%s)\n", fname);
+                fprintf(stderr, "POSIX File Open failed(%s)\n", fname);
                 GOTOERROR(FAIL);
             }
 
@@ -1076,7 +1076,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
             fapl = set_vfd(param);
 
             if (fapl < 0) {
-                HDfprintf(stderr, "HDF5 Property List Create failed\n");
+                fprintf(stderr, "HDF5 Property List Create failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -1097,14 +1097,14 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
             }
 
             if (fd->h5fd < 0) {
-                HDfprintf(stderr, "HDF5 File Create failed(%s)\n", fname);
+                fprintf(stderr, "HDF5 File Create failed(%s)\n", fname);
                 GOTOERROR(FAIL);
             }
             break;
 
         default:
             /* unknown request */
-            HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)param->io_type);
+            fprintf(stderr, "Unknown IO type request (%d)\n", (int)param->io_type);
             GOTOERROR(FAIL);
             break;
     }
@@ -1227,7 +1227,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/)
             rc = POSIXCLOSE(fd->posixfd);
 
             if (rc != 0) {
-                HDfprintf(stderr, "POSIX File Close failed\n");
+                fprintf(stderr, "POSIX File Close failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -1238,7 +1238,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/)
             hrc = H5Fclose(fd->h5fd);
 
             if (hrc < 0) {
-                HDfprintf(stderr, "HDF5 File Close failed\n");
+                fprintf(stderr, "HDF5 File Close failed\n");
                 GOTOERROR(FAIL);
             }
 
@@ -1247,7 +1247,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/)
 
         default:
             /* unknown request */
-            HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot);
+            fprintf(stderr, "Unknown IO type request (%d)\n", (int)iot);
             GOTOERROR(FAIL);
             break;
     }
@@ -1325,7 +1325,7 @@ do_cleanupfile(iotype iot, char *filename)
 
             default:
                 /* unknown request */
-                HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot);
+                fprintf(stderr, "Unknown IO type request (%d)\n", (int)iot);
                 assert(0 && "Unknown IO type");
                 break;
         }
diff --git a/tools/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c
index 870318e..5d88cd2 100644
--- a/tools/src/h5perf/sio_perf.c
+++ b/tools/src/h5perf/sio_perf.c
@@ -203,7 +203,7 @@ main(int argc, char *argv[])
 
     if (opts->output_file) {
         if ((output = HDfopen(opts->output_file, "w")) == NULL) {
-            HDfprintf(stderr, "%s: cannot open output file\n", progname);
+            fprintf(stderr, "%s: cannot open output file\n", progname);
             HDperror(opts->output_file);
             goto finish;
         }
@@ -327,7 +327,7 @@ run_test(iotype iot, parameters parms, struct options *opts)
             break;
         default:
             /* unknown request */
-            HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot);
+            fprintf(stderr, "Unknown IO type request (%d)\n", (int)iot);
             assert(0 && "Unknown IO tpe");
             break;
     }
@@ -662,28 +662,28 @@ recover_size_and_print(long long val, const char *end)
     if (val >= ONE_KB && (val % ONE_KB) == 0) {
         if (val >= ONE_MB && (val % ONE_MB) == 0) {
             if (val >= ONE_GB && (val % ONE_GB) == 0)
-                HDfprintf(output,
-                          "%lld"
-                          "GB%s",
-                          val / ONE_GB, end);
+                fprintf(output,
+                        "%lld"
+                        "GB%s",
+                        val / ONE_GB, end);
             else
-                HDfprintf(output,
-                          "%lld"
-                          "MB%s",
-                          val / ONE_MB, end);
+                fprintf(output,
+                        "%lld"
+                        "MB%s",
+                        val / ONE_MB, end);
         }
         else {
-            HDfprintf(output,
-                      "%lld"
-                      "KB%s",
-                      val / ONE_KB, end);
+            fprintf(output,
+                    "%lld"
+                    "KB%s",
+                    val / ONE_KB, end);
         }
     }
     else {
-        HDfprintf(output,
-                  "%lld"
-                  "%s",
-                  val, end);
+        fprintf(output,
+                "%lld"
+                "%s",
+                val, end);
     }
 }
 
@@ -691,10 +691,10 @@ static void
 print_io_api(long io_types)
 {
     if (io_types & SIO_POSIX)
-        HDfprintf(output, "posix ");
+        fprintf(output, "posix ");
     if (io_types & SIO_HDF5)
-        HDfprintf(output, "hdf5 ");
-    HDfprintf(output, "\n");
+        fprintf(output, "hdf5 ");
+    fprintf(output, "\n");
 }
 
 static void
@@ -704,95 +704,95 @@ report_parameters(struct options *opts)
     rank = opts->dset_rank;
 
     print_version("HDF5 Library"); /* print library version */
-    HDfprintf(output, "==== Parameters ====\n");
+    fprintf(output, "==== Parameters ====\n");
 
-    HDfprintf(output, "IO API=");
+    fprintf(output, "IO API=");
     print_io_api(opts->io_types);
 
-    HDfprintf(output, "Number of iterations=%d\n", opts->num_iters);
+    fprintf(output, "Number of iterations=%d\n", opts->num_iters);
 
-    HDfprintf(output, "Dataset size=");
+    fprintf(output, "Dataset size=");
 
     for (i = 0; i < rank; i++)
         recover_size_and_print((long long)opts->dset_size[i], " ");
-    HDfprintf(output, "\n");
+    fprintf(output, "\n");
 
-    HDfprintf(output, "Transfer buffer size=");
+    fprintf(output, "Transfer buffer size=");
     for (i = 0; i < rank; i++)
         recover_size_and_print((long long)opts->buf_size[i], " ");
-    HDfprintf(output, "\n");
+    fprintf(output, "\n");
 
     if (opts->page_size) {
-        HDfprintf(output, "Page Aggregation Enabled. Page size = %zu\n", opts->page_size);
+        fprintf(output, "Page Aggregation Enabled. Page size = %zu\n", opts->page_size);
         if (opts->page_buffer_size)
-            HDfprintf(output, "Page Buffering Enabled. Page Buffer size = %zu\n", opts->page_buffer_size);
+            fprintf(output, "Page Buffering Enabled. Page Buffer size = %zu\n", opts->page_buffer_size);
         else
-            HDfprintf(output, "Page Buffering Disabled\n");
+            fprintf(output, "Page Buffering Disabled\n");
     }
     else
-        HDfprintf(output, "Page Aggregation Disabled\n");
+        fprintf(output, "Page Aggregation Disabled\n");
 
-    HDfprintf(output, "Dimension access order=");
+    fprintf(output, "Dimension access order=");
     for (i = 0; i < rank; i++)
         recover_size_and_print((long long)opts->order[i], " ");
-    HDfprintf(output, "\n");
+    fprintf(output, "\n");
 
     if (opts->io_types & SIO_HDF5) {
 
-        HDfprintf(output, "HDF5 data storage method=");
+        fprintf(output, "HDF5 data storage method=");
 
         if (opts->h5_use_chunks) {
 
-            HDfprintf(output, "Chunked\n");
-            HDfprintf(output, "HDF5 chunk size=");
+            fprintf(output, "Chunked\n");
+            fprintf(output, "HDF5 chunk size=");
             for (i = 0; i < rank; i++)
                 recover_size_and_print((long long)opts->chk_size[i], " ");
-            HDfprintf(output, "\n");
+            fprintf(output, "\n");
 
-            HDfprintf(output, "HDF5 dataset dimensions=");
+            fprintf(output, "HDF5 dataset dimensions=");
             if (opts->h5_extendable) {
-                HDfprintf(output, "Extendable\n");
+                fprintf(output, "Extendable\n");
             }
             else {
-                HDfprintf(output, "Fixed\n");
+                fprintf(output, "Fixed\n");
             }
         }
         else {
-            HDfprintf(output, "Contiguous\n");
+            fprintf(output, "Contiguous\n");
         }
 
-        HDfprintf(output, "HDF5 file driver=");
+        fprintf(output, "HDF5 file driver=");
         if (opts->vfd == sec2) {
-            HDfprintf(output, "sec2\n");
+            fprintf(output, "sec2\n");
         }
         else if (opts->vfd == stdio) {
-            HDfprintf(output, "stdio\n");
+            fprintf(output, "stdio\n");
         }
         else if (opts->vfd == core) {
-            HDfprintf(output, "core\n");
+            fprintf(output, "core\n");
         }
         else if (opts->vfd == split) {
-            HDfprintf(output, "split\n");
+            fprintf(output, "split\n");
         }
         else if (opts->vfd == multi) {
-            HDfprintf(output, "multi\n");
+            fprintf(output, "multi\n");
         }
         else if (opts->vfd == family) {
-            HDfprintf(output, "family\n");
+            fprintf(output, "family\n");
         }
         else if (opts->vfd == direct) {
-            HDfprintf(output, "direct\n");
+            fprintf(output, "direct\n");
         }
     }
 
     {
         char *prefix = HDgetenv("HDF5_PREFIX");
 
-        HDfprintf(output, "Env HDF5_PREFIX=%s\n", (prefix ? prefix : "not set"));
+        fprintf(output, "Env HDF5_PREFIX=%s\n", (prefix ? prefix : "not set"));
     }
 
-    HDfprintf(output, "==== End of Parameters ====\n");
-    HDfprintf(output, "\n");
+    fprintf(output, "==== End of Parameters ====\n");
+    fprintf(output, "\n");
 }
 
 /*
@@ -872,7 +872,7 @@ parse_command_line(int argc, const char *const *argv)
                         cl_opts->io_types |= SIO_POSIX;
                     }
                     else {
-                        HDfprintf(stderr, "sio_perf: invalid --api option %s\n", buf);
+                        fprintf(stderr, "sio_perf: invalid --api option %s\n", buf);
                         HDexit(EXIT_FAILURE);
                     }
 
@@ -936,7 +936,7 @@ parse_command_line(int argc, const char *const *argv)
 
                         for (j = 0; j < 10 && buf[j] != '\0'; ++j)
                             if (!HDisdigit(buf[j])) {
-                                HDfprintf(stderr, "sio_perf: invalid --debug option %s\n", buf);
+                                fprintf(stderr, "sio_perf: invalid --debug option %s\n", buf);
                                 HDexit(EXIT_FAILURE);
                             }
 
@@ -962,7 +962,7 @@ parse_command_line(int argc, const char *const *argv)
                                 cl_opts->verify = TRUE;
                                 break;
                             default:
-                                HDfprintf(stderr, "sio_perf: invalid --debug option %s\n", buf);
+                                fprintf(stderr, "sio_perf: invalid --debug option %s\n", buf);
                                 HDexit(EXIT_FAILURE);
                         }
                     }
@@ -1034,7 +1034,7 @@ parse_command_line(int argc, const char *const *argv)
                     cl_opts->vfd = direct;
                 }
                 else {
-                    HDfprintf(stderr, "sio_perf: invalid --api option %s\n", H5_optarg);
+                    fprintf(stderr, "sio_perf: invalid --api option %s\n", H5_optarg);
                     HDexit(EXIT_FAILURE);
                 }
                 break;
@@ -1198,7 +1198,7 @@ parse_size_directive(const char *size)
                 break;
 
             default:
-                HDfprintf(stderr, "Illegal size specifier '%c'\n", *endptr);
+                fprintf(stderr, "Illegal size specifier '%c'\n", *endptr);
                 HDexit(EXIT_FAILURE);
         }
     }
@@ -1216,70 +1216,70 @@ static void
 usage(const char *prog)
 {
     print_version(prog);
-    HDprintf("usage: %s [OPTIONS]\n", prog);
-    HDprintf("  OPTIONS\n");
-    HDprintf("     -h                Print an usage message and exit\n");
-    HDprintf("     -A AL             Which APIs to test\n");
-    HDprintf("                       [default: all of them]\n");
-    HDprintf("     -c SL             Selects chunked storage and defines chunks dimensions\n");
-    HDprintf("                       and sizes\n");
-    HDprintf("                       [default: Off]\n");
-    HDprintf("     -e SL             Dimensions and sizes of dataset\n");
-    HDprintf("                       [default: 100,200]\n");
-    HDprintf("     -i N              Number of iterations to perform\n");
-    HDprintf("                       [default: 1]\n");
-    HDprintf("     -r NL             Dimension access order (see below for description)\n");
-    HDprintf("                       [default: 1,2]\n");
-    HDprintf("     -t                Selects extendable dimensions for HDF5 dataset\n");
-    HDprintf("                       [default: Off]\n");
-    HDprintf("     -v VFD            Selects file driver for HDF5 access\n");
-    HDprintf("                       [default: sec2]\n");
-    HDprintf("     -w                Perform write tests, not the read tests\n");
-    HDprintf("                       [default: Off]\n");
-    HDprintf("     -x SL             Dimensions and sizes of the transfer buffer\n");
-    HDprintf("                       [default: 10,20]\n");
-    HDprintf("\n");
-    HDprintf("  N  - is an integer > 0.\n");
-    HDprintf("\n");
-    HDprintf("  S  - is a size specifier, an integer > 0 followed by a size indicator:\n");
-    HDprintf("          K - Kilobyte (%d)\n", ONE_KB);
-    HDprintf("          M - Megabyte (%d)\n", ONE_MB);
-    HDprintf("          G - Gigabyte (%d)\n", ONE_GB);
-    HDprintf("\n");
-    HDprintf("      Example: '37M' is 37 megabytes or %d bytes\n", 37 * ONE_MB);
-    HDprintf("\n");
-    HDprintf("  AL - is an API list. Valid values are:\n");
-    HDprintf("          hdf5 - HDF5\n");
-    HDprintf("          posix - POSIX\n");
-    HDprintf("\n");
-    HDprintf("      Example: -A posix,hdf5\n");
-    HDprintf("\n");
-    HDprintf("  NL - is list of integers (N) separated by commas.\n");
-    HDprintf("\n");
-    HDprintf("      Example: 1,2,3\n");
-    HDprintf("\n");
-    HDprintf("  SL - is list of size specifiers (S) separated by commas.\n");
-    HDprintf("\n");
-    HDprintf("      Example: 2K,2K,3K\n");
-    HDprintf("\n");
-    HDprintf("      The example defines an object (dataset, transfer buffer) with three\n");
-    HDprintf("      dimensions. Be aware that as the number of dimensions increases, the\n");
-    HDprintf("      the total size of the object increases exponentially.\n");
-    HDprintf("\n");
-    HDprintf("  VFD  - is an HDF5 file driver specifier. Valid values are:\n");
-    HDprintf("          sec2, stdio, core, split, multi, family, direct\n");
-    HDprintf("\n");
-    HDprintf("  Dimension access order:\n");
-    HDprintf("      Data access starts at the cardinal origin of the dataset using the\n");
-    HDprintf("      transfer buffer. The next access occurs on a dataset region next to\n");
-    HDprintf("      the previous one. For a multidimensional dataset, there are several\n");
-    HDprintf("      directions as to where to proceed. This can be specified in the dimension\n");
-    HDprintf("      access order. For example, -r 1,2 states that the tool should traverse\n");
-    HDprintf("      dimension 1 first, and then dimension 2.\n");
-    HDprintf("\n");
-    HDprintf("  Environment variables:\n");
-    HDprintf("      HDF5_NOCLEANUP   Do not remove data files if set [default remove]\n");
-    HDprintf("      HDF5_PREFIX      Data file prefix\n");
-    HDprintf("\n");
+    printf("usage: %s [OPTIONS]\n", prog);
+    printf("  OPTIONS\n");
+    printf("     -h                Print an usage message and exit\n");
+    printf("     -A AL             Which APIs to test\n");
+    printf("                       [default: all of them]\n");
+    printf("     -c SL             Selects chunked storage and defines chunks dimensions\n");
+    printf("                       and sizes\n");
+    printf("                       [default: Off]\n");
+    printf("     -e SL             Dimensions and sizes of dataset\n");
+    printf("                       [default: 100,200]\n");
+    printf("     -i N              Number of iterations to perform\n");
+    printf("                       [default: 1]\n");
+    printf("     -r NL             Dimension access order (see below for description)\n");
+    printf("                       [default: 1,2]\n");
+    printf("     -t                Selects extendable dimensions for HDF5 dataset\n");
+    printf("                       [default: Off]\n");
+    printf("     -v VFD            Selects file driver for HDF5 access\n");
+    printf("                       [default: sec2]\n");
+    printf("     -w                Perform write tests, not the read tests\n");
+    printf("                       [default: Off]\n");
+    printf("     -x SL             Dimensions and sizes of the transfer buffer\n");
+    printf("                       [default: 10,20]\n");
+    printf("\n");
+    printf("  N  - is an integer > 0.\n");
+    printf("\n");
+    printf("  S  - is a size specifier, an integer > 0 followed by a size indicator:\n");
+    printf("          K - Kilobyte (%d)\n", ONE_KB);
+    printf("          M - Megabyte (%d)\n", ONE_MB);
+    printf("          G - Gigabyte (%d)\n", ONE_GB);
+    printf("\n");
+    printf("      Example: '37M' is 37 megabytes or %d bytes\n", 37 * ONE_MB);
+    printf("\n");
+    printf("  AL - is an API list. Valid values are:\n");
+    printf("          hdf5 - HDF5\n");
+    printf("          posix - POSIX\n");
+    printf("\n");
+    printf("      Example: -A posix,hdf5\n");
+    printf("\n");
+    printf("  NL - is list of integers (N) separated by commas.\n");
+    printf("\n");
+    printf("      Example: 1,2,3\n");
+    printf("\n");
+    printf("  SL - is list of size specifiers (S) separated by commas.\n");
+    printf("\n");
+    printf("      Example: 2K,2K,3K\n");
+    printf("\n");
+    printf("      The example defines an object (dataset, transfer buffer) with three\n");
+    printf("      dimensions. Be aware that as the number of dimensions increases, the\n");
+    printf("      the total size of the object increases exponentially.\n");
+    printf("\n");
+    printf("  VFD  - is an HDF5 file driver specifier. Valid values are:\n");
+    printf("          sec2, stdio, core, split, multi, family, direct\n");
+    printf("\n");
+    printf("  Dimension access order:\n");
+    printf("      Data access starts at the cardinal origin of the dataset using the\n");
+    printf("      transfer buffer. The next access occurs on a dataset region next to\n");
+    printf("      the previous one. For a multidimensional dataset, there are several\n");
+    printf("      directions as to where to proceed. This can be specified in the dimension\n");
+    printf("      access order. For example, -r 1,2 states that the tool should traverse\n");
+    printf("      dimension 1 first, and then dimension 2.\n");
+    printf("\n");
+    printf("  Environment variables:\n");
+    printf("      HDF5_NOCLEANUP   Do not remove data files if set [default remove]\n");
+    printf("      HDF5_PREFIX      Data file prefix\n");
+    printf("\n");
     HDfflush(stdout);
 } /* end usage() */
diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index 0bb0082..5c95b06 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -532,9 +532,9 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p, trav_table_
 
         if (options->verbose > 0) {
             if (options->verbose == 2)
-                HDprintf(FORMAT_OBJ_ATTR_TIME, "attr", read_time, write_time, name);
+                printf(FORMAT_OBJ_ATTR_TIME, "attr", read_time, write_time, name);
             else
-                HDprintf(FORMAT_OBJ_ATTR, "attr", name);
+                printf(FORMAT_OBJ_ATTR, "attr", name);
         }
 
         /*---------------------------------------------------------------------
@@ -602,7 +602,7 @@ check_options(pack_opt_t *options)
      */
     if (options->verbose > 0 && have_request(options)) {
         if (options->all_layout == 1) {
-            HDprintf("All objects to modify layout are...\n");
+            printf("All objects to modify layout are...\n");
             switch (options->layout_g) {
                 case H5D_COMPACT:
                     strcpy(slayout, "compact");
@@ -624,17 +624,17 @@ check_options(pack_opt_t *options)
                     strcpy(slayout, "invalid layout\n");
                     H5TOOLS_GOTO_DONE((-1));
             }
-            HDprintf(" Apply %s layout to all", slayout);
+            printf(" Apply %s layout to all", slayout);
             if (H5D_CHUNKED == options->layout_g) {
-                HDprintf("with dimension [ ");
+                printf("with dimension [ ");
                 for (j = 0; j < options->chunk_g.rank; j++)
-                    HDprintf("%d ", (int)options->chunk_g.chunk_lengths[j]);
-                HDprintf("]");
+                    printf("%d ", (int)options->chunk_g.chunk_lengths[j]);
+                printf("]");
             }
-            HDprintf("\n");
+            printf("\n");
         }
         else
-            HDprintf("No all objects to modify layout\n");
+            printf("No all objects to modify layout\n");
     } /* end if verbose */
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
@@ -642,16 +642,16 @@ check_options(pack_opt_t *options)
 
         if (options->op_tbl->objs[i].chunk.rank > 0) {
             if (options->verbose > 0) {
-                HDprintf(" <%s> with chunk size ", name);
+                printf(" <%s> with chunk size ", name);
                 for (k = 0; k < options->op_tbl->objs[i].chunk.rank; k++)
-                    HDprintf("%d ", (int)options->op_tbl->objs[i].chunk.chunk_lengths[k]);
-                HDprintf("\n");
+                    printf("%d ", (int)options->op_tbl->objs[i].chunk.chunk_lengths[k]);
+                printf("\n");
             }
             has_ck = 1;
         }
         else if (options->op_tbl->objs[i].chunk.rank == -2) { /* TODO: replace 'magic number' */
             if (options->verbose > 0)
-                HDprintf(" <%s> %s\n", name, "NONE (contiguous)");
+                printf(" <%s> %s\n", name, "NONE (contiguous)");
             has_ck = 1;
         }
     } /* end for each object in options */
@@ -666,34 +666,34 @@ check_options(pack_opt_t *options)
 
     if (options->verbose > 0 && have_request(options)) {
         if (options->all_filter == 1) {
-            HDprintf("All objects to apply filter are...\n");
+            printf("All objects to apply filter are...\n");
             for (k = 0; k < options->n_filter_g; k++) {
                 H5Z_filter_t filtn = options->filter_g[k].filtn;
                 if (filtn < 0) {
-                    HDprintf(" Unknown\n");
+                    printf(" Unknown\n");
                     continue;
                 }
                 switch (filtn) {
                     case H5Z_FILTER_NONE:
-                        HDprintf(" Uncompress all\n");
+                        printf(" Uncompress all\n");
                         break;
                     case H5Z_FILTER_SHUFFLE:
                     case H5Z_FILTER_FLETCHER32:
-                        HDprintf(" All with %s\n", get_sfilter(filtn));
+                        printf(" All with %s\n", get_sfilter(filtn));
                         break;
                     case H5Z_FILTER_SZIP:
                     case H5Z_FILTER_DEFLATE:
-                        HDprintf(" All with %s, parameter %d\n", get_sfilter(filtn),
-                                 options->filter_g[k].cd_values[0]);
+                        printf(" All with %s, parameter %d\n", get_sfilter(filtn),
+                               options->filter_g[k].cd_values[0]);
                         break;
                     default:
-                        HDprintf(" User Defined %d\n", filtn);
+                        printf(" User Defined %d\n", filtn);
                         break;
                 } /* end switch */
             }     /* end for each filter */
         }         /* end if options->all_filter == 1 (TODO: meaning) */
         else
-            HDprintf("No all objects to apply filter\n");
+            printf("No all objects to apply filter\n");
     } /* end if verbose */
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
@@ -704,11 +704,11 @@ check_options(pack_opt_t *options)
             if (options->verbose > 0) {
                 if (pack.filter[j].filtn >= 0) {
                     if (pack.filter[j].filtn > H5Z_FILTER_SCALEOFFSET) {
-                        HDprintf(" <%s> with %s filter %d\n", name, get_sfilter(pack.filter[j].filtn),
-                                 pack.filter[j].filtn);
+                        printf(" <%s> with %s filter %d\n", name, get_sfilter(pack.filter[j].filtn),
+                               pack.filter[j].filtn);
                     }
                     else {
-                        HDprintf(" <%s> with %s filter\n", name, get_sfilter(pack.filter[j].filtn));
+                        printf(" <%s> with %s filter\n", name, get_sfilter(pack.filter[j].filtn));
                     }
                 }
             }
@@ -740,8 +740,8 @@ check_options(pack_opt_t *options)
      */
     if (options->ublock_filename != NULL && options->ublock_size == 0) {
         if (options->verbose > 0) {
-            HDprintf("Warning: user block size missing for file %s. Assigning a default size of 1024...\n",
-                     options->ublock_filename);
+            printf("Warning: user block size missing for file %s. Assigning a default size of 1024...\n",
+                   options->ublock_filename);
             options->ublock_size = 1024;
         }
     }
@@ -813,21 +813,21 @@ check_objects(const char *fname, pack_opt_t *options)
      */
 
     if (options->verbose > 0)
-        HDprintf("Opening file. Searching %zu objects to modify ...\n", travt->nobjs);
+        printf("Opening file. Searching %zu objects to modify ...\n", travt->nobjs);
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
         pack_info_t obj  = options->op_tbl->objs[i];
         char       *name = obj.path;
 
         if (options->verbose > 0)
-            HDprintf(" <%s>", name);
+            printf(" <%s>", name);
 
         /* the input object names are present in the file and are valid */
         if (h5trav_getindext(name, travt) < 0)
             H5TOOLS_GOTO_ERROR((-1), "%s Could not find <%s> in file <%s>. Exiting...\n",
                                (options->verbose > 0 ? "\n" : ""), name, fname);
         if (options->verbose > 0)
-            HDprintf("...Found\n");
+            printf("...Found\n");
 
         for (ifil = 0; ifil < obj.nfilters; ifil++) {
             if (obj.filter[ifil].filtn < 0)
@@ -866,7 +866,7 @@ check_objects(const char *fname, pack_opt_t *options)
                     }
 
                     if (csize < ppb) {
-                        HDprintf(" <warning: SZIP settings, chunk size is smaller than pixels per block>\n");
+                        printf(" <warning: SZIP settings, chunk size is smaller than pixels per block>\n");
                         H5TOOLS_GOTO_DONE(0);
                     }
                 } /* end case SZIP */
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index 59dc59e..8b11974 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -299,7 +299,7 @@ copy_objects(const char *fnamein, const char *fnameout, pack_opt_t *options)
      *-------------------------------------------------------------------------
      */
     if (options->verbose > 0)
-        HDprintf("Making new file ...\n");
+        printf("Making new file ...\n");
 
     if ((fidout = H5Fcreate(fnameout, H5F_ACC_TRUNC, fcpl, options->fout_fapl)) < 0)
         H5TOOLS_GOTO_ERROR((-1), "H5Fcreate could not create file <%s>:", fnameout);
@@ -667,14 +667,14 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
 
     if (options->verbose > 0) {
         if (options->verbose == 2) {
-            HDprintf("-----------------------------------------------------------------\n");
-            HDprintf(" Type     Filter (Compression)        Timing read/write    Name\n");
-            HDprintf("-----------------------------------------------------------------\n");
+            printf("-----------------------------------------------------------------\n");
+            printf(" Type     Filter (Compression)        Timing read/write    Name\n");
+            printf("-----------------------------------------------------------------\n");
         }
         else {
-            HDprintf("-----------------------------------------\n");
-            HDprintf(" Type     Filter (Compression)     Name\n");
-            HDprintf("-----------------------------------------\n");
+            printf("-----------------------------------------\n");
+            printf(" Type     Filter (Compression)     Name\n");
+            printf("-----------------------------------------\n");
         }
     }
 
@@ -695,9 +695,9 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                 case H5TRAV_TYPE_GROUP:
                     if (options->verbose > 0) {
                         if (options->verbose == 2)
-                            HDprintf(FORMAT_OBJ_NOTIME, "group", travt->objs[i].name);
+                            printf(FORMAT_OBJ_NOTIME, "group", travt->objs[i].name);
                         else
-                            HDprintf(FORMAT_OBJ, "group", travt->objs[i].name);
+                            printf(FORMAT_OBJ, "group", travt->objs[i].name);
                     }
 
                     /* open input group */
@@ -991,9 +991,9 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                                 if (dset_out == H5I_INVALID_HID) {
                                     H5TOOLS_INFO("H5Dcreate2 failed");
                                     if (options->verbose > 0)
-                                        HDprintf(" warning: could not create dataset <%s>. Applying original "
-                                                 "settings\n",
-                                                 travt->objs[i].name);
+                                        printf(" warning: could not create dataset <%s>. Applying original "
+                                               "settings\n",
+                                               travt->objs[i].name);
 
                                     if ((dset_out =
                                              H5Dcreate2(fidout, travt->objs[i].name, wtype_id, f_space_id,
@@ -1221,13 +1221,13 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                                      * (in case there was a filter)
                                      */
                                     if (has_filter && apply_s == 0)
-                                        HDprintf(" <warning: filter not applied to %s. dataset smaller than "
-                                                 "%d bytes>\n",
-                                                 travt->objs[i].name, (int)options->min_comp);
+                                        printf(" <warning: filter not applied to %s. dataset smaller than "
+                                               "%d bytes>\n",
+                                               travt->objs[i].name, (int)options->min_comp);
 
                                     if (has_filter && apply_f == 0)
-                                        HDprintf(" <warning: could not apply the filter to %s>\n",
-                                                 travt->objs[i].name);
+                                        printf(" <warning: could not apply the filter to %s>\n",
+                                               travt->objs[i].name);
                                 } /* end if verbose (print compression) */
 
                                 /*-------------------------------------------------------------------------
@@ -1310,9 +1310,9 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
 
                         if (options->verbose > 0) {
                             if (options->verbose == 2)
-                                HDprintf(FORMAT_OBJ_TIME, "dset", 0.0, write_time, travt->objs[i].name);
+                                printf(FORMAT_OBJ_TIME, "dset", 0.0, write_time, travt->objs[i].name);
                             else
-                                HDprintf(FORMAT_OBJ, "dset", travt->objs[i].name);
+                                printf(FORMAT_OBJ, "dset", travt->objs[i].name);
                         }
 
                     } /* end whether we have request for filter/chunking */
@@ -1327,9 +1327,9 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                 case H5TRAV_TYPE_NAMED_DATATYPE:
                     if (options->verbose > 0) {
                         if (options->verbose == 2)
-                            HDprintf(FORMAT_OBJ_NOTIME, "type", travt->objs[i].name);
+                            printf(FORMAT_OBJ_NOTIME, "type", travt->objs[i].name);
                         else
-                            HDprintf(FORMAT_OBJ, "type", travt->objs[i].name);
+                            printf(FORMAT_OBJ, "type", travt->objs[i].name);
                     }
 
                     if ((type_in = H5Topen2(fidin, travt->objs[i].name, H5P_DEFAULT)) < 0)
@@ -1371,9 +1371,9 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                 case H5TRAV_TYPE_UDLINK:
                     if (options->verbose > 0) {
                         if (options->verbose == 2)
-                            HDprintf(FORMAT_OBJ_NOTIME, "link", travt->objs[i].name);
+                            printf(FORMAT_OBJ_NOTIME, "link", travt->objs[i].name);
                         else
-                            HDprintf(FORMAT_OBJ, "link", travt->objs[i].name);
+                            printf(FORMAT_OBJ, "link", travt->objs[i].name);
                     }
 
                     /* Check -X option. */
@@ -1381,7 +1381,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                         if (H5tools_get_symlink_info(fidin, travt->objs[i].name, &linkinfo, 1) == 0) {
                             /* dangling link */
                             if (options->prune) {
-                                HDprintf("Pruned %s.\n", travt->objs[i].name);
+                                printf("Pruned %s.\n", travt->objs[i].name);
                             }
                             else {
                                 if (H5Lcopy(fidin, travt->objs[i].name, fidout, travt->objs[i].name,
@@ -1426,7 +1426,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                     } /* options->merge */
                     else {
                         if (options->prune) {
-                            HDprintf("Pruned %s.\n", travt->objs[i].name);
+                            printf("Pruned %s.\n", travt->objs[i].name);
                         }
                         else {
                             if (H5Lcopy(fidin, travt->objs[i].name, fidout, travt->objs[i].name, H5P_DEFAULT,
@@ -1589,9 +1589,9 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr, pack_opt_
 
     if (!pr)
         if (options->verbose == 2)
-            HDprintf(FORMAT_OBJ_TIME, "dset", read_time, write_time, objname);
+            printf(FORMAT_OBJ_TIME, "dset", read_time, write_time, objname);
         else
-            HDprintf(FORMAT_OBJ, "dset", objname);
+            printf(FORMAT_OBJ, "dset", objname);
     else {
         char str[512], temp[512];
 
@@ -1600,9 +1600,9 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr, pack_opt_
         HDsnprintf(temp, sizeof(temp), "  (%.3f:1)", ratio);
         HDstrcat(str, temp);
         if (options->verbose == 2)
-            HDprintf(FORMAT_OBJ_TIME, str, read_time, write_time, objname);
+            printf(FORMAT_OBJ_TIME, str, read_time, write_time, objname);
         else
-            HDprintf(FORMAT_OBJ, str, objname);
+            printf(FORMAT_OBJ, str, objname);
     }
 } /* end print_dataset_info() */
 
@@ -1728,9 +1728,9 @@ print_user_block(const char *filename, hid_t fid)
 
         for (i = 0; i < nread; i++) {
 
-            HDprintf("%c ", rbuf[i]);
+            printf("%c ", rbuf[i]);
         }
-        HDprintf("\n");
+        printf("\n");
 
         if (nread < 0) {
             H5TOOLS_GOTO_ERROR((-1), "nread < 0");
diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c
index ca122e4..a164d6a 100644
--- a/tools/src/h5repack/h5repack_main.c
+++ b/tools/src/h5repack/h5repack_main.c
@@ -892,7 +892,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
             errno                      = 0;
             onion_fa_in_g.revision_num = HDstrtoull(in_vfd_info.info, NULL, 10);
             if (errno == ERANGE) {
-                HDprintf("Invalid onion revision specified for the input file\n");
+                printf("Invalid onion revision specified for the input file\n");
                 usage(h5tools_getprogname());
                 exit(EXIT_FAILURE);
             }
@@ -976,14 +976,14 @@ main(int argc, char **argv)
 
     /* update hyperslab buffer size from H5TOOLS_BUFSIZE env if exist */
     if (h5tools_getenv_update_hyperslab_bufsize() < 0) {
-        HDprintf("Error occurred while retrieving H5TOOLS_BUFSIZE value\n");
+        printf("Error occurred while retrieving H5TOOLS_BUFSIZE value\n");
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
 
     /* initialize options  */
     if (h5repack_init(&options, 0, FALSE) < 0) {
-        HDprintf("Error occurred while initializing repack options\n");
+        printf("Error occurred while initializing repack options\n");
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
@@ -993,7 +993,7 @@ main(int argc, char **argv)
 
     parse_ret = parse_command_line(argc, (const char *const *)argv, &options);
     if (parse_ret < 0) {
-        HDprintf("Error occurred while parsing command-line options\n");
+        printf("Error occurred while parsing command-line options\n");
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
@@ -1008,7 +1008,7 @@ main(int argc, char **argv)
 
     /* pack it */
     if (h5repack(infile, outfile, &options) < 0) {
-        HDprintf("Error occurred while repacking\n");
+        printf("Error occurred while repacking\n");
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c
index 6bc4a31..a9a5fd3 100644
--- a/tools/src/h5repack/h5repack_refs.c
+++ b/tools/src/h5repack/h5repack_refs.c
@@ -154,7 +154,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                         if (nelmts) {
                             buf = (hobj_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                             if (buf == NULL) {
-                                HDprintf("cannot read into memory\n");
+                                printf("cannot read into memory\n");
                                 H5TOOLS_GOTO_ERROR((-1), "HDmalloc failed");
                             } /* end if */
                             if (H5Dread(dset_in, mtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
@@ -162,7 +162,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
 
                             refbuf = (hobj_ref_t *)HDcalloc((unsigned)nelmts, msize);
                             if (refbuf == NULL) {
-                                HDprintf("cannot allocate memory\n");
+                                printf("cannot allocate memory\n");
                                 H5TOOLS_GOTO_ERROR((-1), "HDcalloc failed");
                             } /* end if */
                             for (u = 0; u < nelmts; u++) {
@@ -183,11 +183,11 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                                         H5TOOLS_GOTO_ERROR((-1), "H5Rcreate failed");
                                     if (options->verbose > 0) {
                                         if (options->verbose == 2)
-                                            HDprintf(FORMAT_OBJ_NOTIME, "dset", travt->objs[i].name);
+                                            printf(FORMAT_OBJ_NOTIME, "dset", travt->objs[i].name);
                                         else
-                                            HDprintf(FORMAT_OBJ, "dset", travt->objs[i].name);
-                                        HDprintf("object <%s> object reference created to <%s>\n",
-                                                 travt->objs[i].name, refname);
+                                            printf(FORMAT_OBJ, "dset", travt->objs[i].name);
+                                        printf("object <%s> object reference created to <%s>\n",
+                                               travt->objs[i].name, refname);
                                     }
                                 } /*refname*/
                                 if (H5Oclose(refobj_id) < 0)
@@ -236,7 +236,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                         if (nelmts) {
                             buf = (hdset_reg_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                             if (buf == NULL) {
-                                HDprintf("cannot read into memory\n");
+                                printf("cannot read into memory\n");
                                 H5TOOLS_GOTO_ERROR((-1), "HDmalloc failed");
                             } /* end if */
                             if (H5Dread(dset_in, mtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
@@ -249,7 +249,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                             refbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t),
                                                                  (size_t)nelmts); /*init to zero */
                             if (refbuf == NULL) {
-                                HDprintf("cannot allocate memory\n");
+                                printf("cannot allocate memory\n");
                                 H5TOOLS_GOTO_ERROR((-1), "HDcalloc failed");
                             } /* end if */
 
@@ -279,9 +279,9 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                                     if (H5Sclose(region_id) < 0)
                                         H5TOOLS_GOTO_ERROR((-1), "H5Sclose failed");
                                     if (options->verbose > 0) {
-                                        HDprintf(FORMAT_OBJ, "dset", travt->objs[i].name);
-                                        HDprintf("object <%s> region reference created to <%s>\n",
-                                                 travt->objs[i].name, refname);
+                                        printf(FORMAT_OBJ, "dset", travt->objs[i].name);
+                                        printf("object <%s> region reference created to <%s>\n",
+                                               travt->objs[i].name, refname);
                                     }
                                 } /*refname*/
                                 if (H5Oclose(refobj_id) < 0)
@@ -600,7 +600,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) /
             if ((is_ref || is_ref_array) && (H5R_OBJ_REF_BUF_SIZE == msize)) {
                 buf = (hobj_ref_t *)HDmalloc((unsigned)(nelmts * msize));
                 if (buf == NULL) {
-                    HDprintf("cannot read into memory\n");
+                    printf("cannot read into memory\n");
                     H5TOOLS_GOTO_ERROR((-1), "HDmalloc failed");
                 } /* end if */
                 if (H5Aread(attr_id, mtype_id, buf) < 0)
@@ -608,7 +608,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) /
 
                 refbuf = (hobj_ref_t *)HDcalloc((unsigned)nelmts, msize);
                 if (refbuf == NULL) {
-                    HDprintf("cannot allocate memory\n");
+                    printf("cannot allocate memory\n");
                     H5TOOLS_GOTO_ERROR((-1), "HDcalloc failed");
                 } /* end if */
 
@@ -622,7 +622,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) /
                 buf = (hdset_reg_ref_t *)HDmalloc((unsigned)(nelmts * msize));
 
                 if (buf == NULL) {
-                    HDprintf("cannot read into memory\n");
+                    printf("cannot read into memory\n");
                     H5TOOLS_GOTO_ERROR((-1), "HDmalloc failed");
                 } /* end if */
                 if (H5Aread(attr_id, mtype_id, buf) < 0)
@@ -635,7 +635,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) /
                 refbuf =
                     (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)nelmts); /*init to zero */
                 if (refbuf == NULL) {
-                    HDprintf("cannot allocate memory\n");
+                    printf("cannot allocate memory\n");
                     H5TOOLS_GOTO_ERROR((-1), "HDcalloc failed");
                 } /* end if */
 
@@ -651,7 +651,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) /
                 refbuf = buf; /* reuse the read buffer for write */
 
                 if (buf == NULL) {
-                    HDprintf("cannot read into memory\n");
+                    printf("cannot read into memory\n");
                     H5TOOLS_GOTO_ERROR((-1), "HDmalloc failed");
                 } /* end if */
 
@@ -693,7 +693,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) /
                 refbuf = buf; /* reuse the read buffer for write */
 
                 if (buf == NULL) {
-                    HDprintf("cannot read into memory\n");
+                    printf("cannot read into memory\n");
                     H5TOOLS_GOTO_ERROR((-1), "HDmalloc failed");
                 } /* end if */
 
diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c
index 021529e..9da6ba2 100644
--- a/tools/src/h5stat/h5stat.c
+++ b/tools/src/h5stat/h5stat.c
@@ -208,45 +208,44 @@ static void
 usage(const char *prog)
 {
     HDfflush(stdout);
-    HDfprintf(stdout, "usage: %s [OPTIONS] file\n", prog);
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "      ERROR\n");
-    HDfprintf(stdout, "     --enable-error-stack  Prints messages from the HDF5 error stack as they occur\n");
-    HDfprintf(stdout, "                           Optional value 2 also prints file open errors\n");
-    HDfprintf(stdout, "      OPTIONS\n");
-    HDfprintf(stdout, "     -h, --help            Print a usage message and exit\n");
-    HDfprintf(stdout, "     -V, --version         Print version number and exit\n");
-    HDfprintf(stdout, "     -f, --file            Print file information\n");
-    HDfprintf(stdout, "     -F, --filemetadata    Print file space information for file's metadata\n");
-    HDfprintf(stdout, "     -g, --group           Print group information\n");
-    HDfprintf(stdout, "     -l N, --links=N       Set the threshold for the # of links when printing\n");
-    HDfprintf(stdout, "                           information for small groups.  N is an integer greater\n");
-    HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
-    HDfprintf(stdout, "     -G, --groupmetadata   Print file space information for groups' metadata\n");
-    HDfprintf(stdout, "     -d, --dset            Print dataset information\n");
-    HDfprintf(stdout, "     -m N, --dims=N        Set the threshold for the dimension sizes when printing\n");
-    HDfprintf(stdout,
-              "                           information for small datasets.  N is an integer greater\n");
-    HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
-    HDfprintf(stdout, "     -D, --dsetmetadata    Print file space information for datasets' metadata\n");
-    HDfprintf(stdout, "     -T, --dtypemetadata   Print datasets' datatype information\n");
-    HDfprintf(stdout, "     -A, --attribute       Print attribute information\n");
-    HDfprintf(stdout, "     -a N, --numattrs=N    Set the threshold for the # of attributes when printing\n");
-    HDfprintf(stdout,
-              "                           information for small # of attributes.  N is an integer greater\n");
-    HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
-    HDfprintf(stdout, "     -s, --freespace       Print free space information\n");
-    HDfprintf(stdout, "     -S, --summary         Print summary of file space information\n");
-    HDfprintf(stdout, "     --s3-cred=<cred>      Access file on S3, using provided credential\n");
-    HDfprintf(stdout, "                           <cred> :: (region,id,key)\n");
-    HDfprintf(stdout, "                           If <cred> == \"(,,)\", no authentication is used.\n");
-    HDfprintf(stdout, "     --hdfs-attrs=<attrs>  Access a file on HDFS with given configuration\n");
-    HDfprintf(stdout, "                           attributes.\n");
-    HDfprintf(stdout, "                           <attrs> :: (<namenode name>,<namenode port>,\n");
-    HDfprintf(stdout, "                                       <kerberos cache path>,<username>,\n");
-    HDfprintf(stdout, "                                       <buffer size>)\n");
-    HDfprintf(stdout, "                           If an attribute is empty, a default value will be\n");
-    HDfprintf(stdout, "                           used.\n");
+    fprintf(stdout, "usage: %s [OPTIONS] file\n", prog);
+    fprintf(stdout, "\n");
+    fprintf(stdout, "      ERROR\n");
+    fprintf(stdout, "     --enable-error-stack  Prints messages from the HDF5 error stack as they occur\n");
+    fprintf(stdout, "                           Optional value 2 also prints file open errors\n");
+    fprintf(stdout, "      OPTIONS\n");
+    fprintf(stdout, "     -h, --help            Print a usage message and exit\n");
+    fprintf(stdout, "     -V, --version         Print version number and exit\n");
+    fprintf(stdout, "     -f, --file            Print file information\n");
+    fprintf(stdout, "     -F, --filemetadata    Print file space information for file's metadata\n");
+    fprintf(stdout, "     -g, --group           Print group information\n");
+    fprintf(stdout, "     -l N, --links=N       Set the threshold for the # of links when printing\n");
+    fprintf(stdout, "                           information for small groups.  N is an integer greater\n");
+    fprintf(stdout, "                           than 0.  The default threshold is 10.\n");
+    fprintf(stdout, "     -G, --groupmetadata   Print file space information for groups' metadata\n");
+    fprintf(stdout, "     -d, --dset            Print dataset information\n");
+    fprintf(stdout, "     -m N, --dims=N        Set the threshold for the dimension sizes when printing\n");
+    fprintf(stdout, "                           information for small datasets.  N is an integer greater\n");
+    fprintf(stdout, "                           than 0.  The default threshold is 10.\n");
+    fprintf(stdout, "     -D, --dsetmetadata    Print file space information for datasets' metadata\n");
+    fprintf(stdout, "     -T, --dtypemetadata   Print datasets' datatype information\n");
+    fprintf(stdout, "     -A, --attribute       Print attribute information\n");
+    fprintf(stdout, "     -a N, --numattrs=N    Set the threshold for the # of attributes when printing\n");
+    fprintf(stdout,
+            "                           information for small # of attributes.  N is an integer greater\n");
+    fprintf(stdout, "                           than 0.  The default threshold is 10.\n");
+    fprintf(stdout, "     -s, --freespace       Print free space information\n");
+    fprintf(stdout, "     -S, --summary         Print summary of file space information\n");
+    fprintf(stdout, "     --s3-cred=<cred>      Access file on S3, using provided credential\n");
+    fprintf(stdout, "                           <cred> :: (region,id,key)\n");
+    fprintf(stdout, "                           If <cred> == \"(,,)\", no authentication is used.\n");
+    fprintf(stdout, "     --hdfs-attrs=<attrs>  Access a file on HDFS with given configuration\n");
+    fprintf(stdout, "                           attributes.\n");
+    fprintf(stdout, "                           <attrs> :: (<namenode name>,<namenode port>,\n");
+    fprintf(stdout, "                                       <kerberos cache path>,<username>,\n");
+    fprintf(stdout, "                                       <buffer size>)\n");
+    fprintf(stdout, "                           If an attribute is empty, a default value will be\n");
+    fprintf(stdout, "                           used.\n");
 }
 
 /*-------------------------------------------------------------------------
@@ -1096,14 +1095,14 @@ iter_free(iter_t *iter)
 static herr_t
 print_file_info(const iter_t *iter)
 {
-    HDprintf("File information\n");
-    HDprintf("\t# of unique groups: %lu\n", iter->uniq_groups);
-    HDprintf("\t# of unique datasets: %lu\n", iter->uniq_dsets);
-    HDprintf("\t# of unique named datatypes: %lu\n", iter->uniq_dtypes);
-    HDprintf("\t# of unique links: %lu\n", iter->uniq_links);
-    HDprintf("\t# of unique other: %lu\n", iter->uniq_others);
-    HDprintf("\tMax. # of links to object: %lu\n", iter->max_links);
-    HDfprintf(stdout, "\tMax. # of objects in group: %" PRIuHSIZE "\n", iter->max_fanout);
+    printf("File information\n");
+    printf("\t# of unique groups: %lu\n", iter->uniq_groups);
+    printf("\t# of unique datasets: %lu\n", iter->uniq_dsets);
+    printf("\t# of unique named datatypes: %lu\n", iter->uniq_dtypes);
+    printf("\t# of unique links: %lu\n", iter->uniq_links);
+    printf("\t# of unique other: %lu\n", iter->uniq_others);
+    printf("\tMax. # of links to object: %lu\n", iter->max_links);
+    fprintf(stdout, "\tMax. # of objects in group: %" PRIuHSIZE "\n", iter->max_fanout);
 
     return 0;
 } /* print_file_info() */
@@ -1125,41 +1124,41 @@ print_file_info(const iter_t *iter)
 static herr_t
 print_file_metadata(const iter_t *iter)
 {
-    HDfprintf(stdout, "File space information for file metadata (in bytes):\n");
-    HDfprintf(stdout, "\tSuperblock: %" PRIuHSIZE "\n", iter->super_size);
-    HDfprintf(stdout, "\tSuperblock extension: %" PRIuHSIZE "\n", iter->super_ext_size);
-    HDfprintf(stdout, "\tUser block: %" PRIuHSIZE "\n", iter->ublk_size);
-
-    HDfprintf(stdout, "\tObject headers: (total/unused)\n");
-    HDfprintf(stdout, "\t\tGroups: %" PRIuHSIZE "/%" PRIuHSIZE "\n", iter->group_ohdr_info.total_size,
-              iter->group_ohdr_info.free_size);
-    HDfprintf(stdout, "\t\tDatasets(exclude compact data): %" PRIuHSIZE "/%" PRIuHSIZE "\n",
-              iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
-    HDfprintf(stdout, "\t\tDatatypes: %" PRIuHSIZE "/%" PRIuHSIZE "\n", iter->dtype_ohdr_info.total_size,
-              iter->dtype_ohdr_info.free_size);
-
-    HDfprintf(stdout, "\tGroups:\n");
-    HDfprintf(stdout, "\t\tB-tree/List: %" PRIuHSIZE "\n", iter->groups_btree_storage_size);
-    HDfprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->groups_heap_storage_size);
-
-    HDfprintf(stdout, "\tAttributes:\n");
-    HDfprintf(stdout, "\t\tB-tree/List: %" PRIuHSIZE "\n", iter->attrs_btree_storage_size);
-    HDfprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->attrs_heap_storage_size);
-
-    HDfprintf(stdout, "\tChunked datasets:\n");
-    HDfprintf(stdout, "\t\tIndex: %" PRIuHSIZE "\n", iter->datasets_index_storage_size);
-
-    HDfprintf(stdout, "\tDatasets:\n");
-    HDfprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->datasets_heap_storage_size);
-
-    HDfprintf(stdout, "\tShared Messages:\n");
-    HDfprintf(stdout, "\t\tHeader: %" PRIuHSIZE "\n", iter->SM_hdr_storage_size);
-    HDfprintf(stdout, "\t\tB-tree/List: %" PRIuHSIZE "\n", iter->SM_index_storage_size);
-    HDfprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->SM_heap_storage_size);
-
-    HDfprintf(stdout, "\tFree-space managers:\n");
-    HDfprintf(stdout, "\t\tHeader: %" PRIuHSIZE "\n", iter->free_hdr);
-    HDfprintf(stdout, "\t\tAmount of free space: %" PRIuHSIZE "\n", iter->free_space);
+    fprintf(stdout, "File space information for file metadata (in bytes):\n");
+    fprintf(stdout, "\tSuperblock: %" PRIuHSIZE "\n", iter->super_size);
+    fprintf(stdout, "\tSuperblock extension: %" PRIuHSIZE "\n", iter->super_ext_size);
+    fprintf(stdout, "\tUser block: %" PRIuHSIZE "\n", iter->ublk_size);
+
+    fprintf(stdout, "\tObject headers: (total/unused)\n");
+    fprintf(stdout, "\t\tGroups: %" PRIuHSIZE "/%" PRIuHSIZE "\n", iter->group_ohdr_info.total_size,
+            iter->group_ohdr_info.free_size);
+    fprintf(stdout, "\t\tDatasets(exclude compact data): %" PRIuHSIZE "/%" PRIuHSIZE "\n",
+            iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
+    fprintf(stdout, "\t\tDatatypes: %" PRIuHSIZE "/%" PRIuHSIZE "\n", iter->dtype_ohdr_info.total_size,
+            iter->dtype_ohdr_info.free_size);
+
+    fprintf(stdout, "\tGroups:\n");
+    fprintf(stdout, "\t\tB-tree/List: %" PRIuHSIZE "\n", iter->groups_btree_storage_size);
+    fprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->groups_heap_storage_size);
+
+    fprintf(stdout, "\tAttributes:\n");
+    fprintf(stdout, "\t\tB-tree/List: %" PRIuHSIZE "\n", iter->attrs_btree_storage_size);
+    fprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->attrs_heap_storage_size);
+
+    fprintf(stdout, "\tChunked datasets:\n");
+    fprintf(stdout, "\t\tIndex: %" PRIuHSIZE "\n", iter->datasets_index_storage_size);
+
+    fprintf(stdout, "\tDatasets:\n");
+    fprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->datasets_heap_storage_size);
+
+    fprintf(stdout, "\tShared Messages:\n");
+    fprintf(stdout, "\t\tHeader: %" PRIuHSIZE "\n", iter->SM_hdr_storage_size);
+    fprintf(stdout, "\t\tB-tree/List: %" PRIuHSIZE "\n", iter->SM_index_storage_size);
+    fprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->SM_heap_storage_size);
+
+    fprintf(stdout, "\tFree-space managers:\n");
+    fprintf(stdout, "\t\tHeader: %" PRIuHSIZE "\n", iter->free_hdr);
+    fprintf(stdout, "\t\tAmount of free space: %" PRIuHSIZE "\n", iter->free_space);
 
     return 0;
 } /* print_file_metadata() */
@@ -1185,32 +1184,31 @@ print_group_info(const iter_t *iter)
     unsigned long total; /* Total count for various statistics */
     unsigned      u;     /* Local index variable */
 
-    HDprintf("Small groups (with 0 to %u links):\n", sgroups_threshold - 1);
+    printf("Small groups (with 0 to %u links):\n", sgroups_threshold - 1);
     total = 0;
     for (u = 0; u < (unsigned)sgroups_threshold; u++) {
         if (iter->num_small_groups[u] > 0) {
-            HDprintf("\t# of groups with %u link(s): %lu\n", u, iter->num_small_groups[u]);
+            printf("\t# of groups with %u link(s): %lu\n", u, iter->num_small_groups[u]);
             total += iter->num_small_groups[u];
         } /* end if */
     }     /* end for */
-    HDprintf("\tTotal # of small groups: %lu\n", total);
+    printf("\tTotal # of small groups: %lu\n", total);
 
-    HDprintf("Group bins:\n");
+    printf("Group bins:\n");
     total = 0;
     if ((iter->group_nbins > 0) && (iter->group_bins[0] > 0)) {
-        HDprintf("\t# of groups with 0 link: %lu\n", iter->group_bins[0]);
+        printf("\t# of groups with 0 link: %lu\n", iter->group_bins[0]);
         total = iter->group_bins[0];
     } /* end if */
     power = 1;
     for (u = 1; u < iter->group_nbins; u++) {
         if (iter->group_bins[u] > 0) {
-            HDprintf("\t# of groups with %lu - %lu links: %lu\n", power, (power * 10) - 1,
-                     iter->group_bins[u]);
+            printf("\t# of groups with %lu - %lu links: %lu\n", power, (power * 10) - 1, iter->group_bins[u]);
             total += iter->group_bins[u];
         } /* end if */
         power *= 10;
     } /* end for */
-    HDprintf("\tTotal # of groups: %lu\n", total);
+    printf("\tTotal # of groups: %lu\n", total);
 
     return 0;
 } /* print_group_info() */
@@ -1230,13 +1228,13 @@ print_group_info(const iter_t *iter)
 static herr_t
 print_group_metadata(const iter_t *iter)
 {
-    HDprintf("File space information for groups' metadata (in bytes):\n");
+    printf("File space information for groups' metadata (in bytes):\n");
 
-    HDfprintf(stdout, "\tObject headers (total/unused): %" PRIuHSIZE "/%" PRIuHSIZE "\n",
-              iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size);
+    fprintf(stdout, "\tObject headers (total/unused): %" PRIuHSIZE "/%" PRIuHSIZE "\n",
+            iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size);
 
-    HDfprintf(stdout, "\tB-tree/List: %" PRIuHSIZE "\n", iter->groups_btree_storage_size);
-    HDfprintf(stdout, "\tHeap: %" PRIuHSIZE "\n", iter->groups_heap_storage_size);
+    fprintf(stdout, "\tB-tree/List: %" PRIuHSIZE "\n", iter->groups_btree_storage_size);
+    fprintf(stdout, "\tHeap: %" PRIuHSIZE "\n", iter->groups_heap_storage_size);
 
     return 0;
 } /* print_group_metadata() */
@@ -1262,69 +1260,68 @@ print_dataset_info(const iter_t *iter)
     unsigned      u;     /* Local index variable */
 
     if (iter->uniq_dsets > 0) {
-        HDprintf("Dataset dimension information:\n");
-        HDprintf("\tMax. rank of datasets: %u\n", iter->max_dset_rank);
-        HDprintf("\tDataset ranks:\n");
+        printf("Dataset dimension information:\n");
+        printf("\tMax. rank of datasets: %u\n", iter->max_dset_rank);
+        printf("\tDataset ranks:\n");
         for (u = 0; u < H5S_MAX_RANK; u++)
             if (iter->dset_rank_count[u] > 0)
-                HDprintf("\t\t# of dataset with rank %u: %lu\n", u, iter->dset_rank_count[u]);
+                printf("\t\t# of dataset with rank %u: %lu\n", u, iter->dset_rank_count[u]);
 
-        HDprintf("1-D Dataset information:\n");
-        HDfprintf(stdout, "\tMax. dimension size of 1-D datasets: %" PRIuHSIZE "\n", iter->max_dset_dims);
-        HDprintf("\tSmall 1-D datasets (with dimension sizes 0 to %u):\n", sdsets_threshold - 1);
+        printf("1-D Dataset information:\n");
+        fprintf(stdout, "\tMax. dimension size of 1-D datasets: %" PRIuHSIZE "\n", iter->max_dset_dims);
+        printf("\tSmall 1-D datasets (with dimension sizes 0 to %u):\n", sdsets_threshold - 1);
         total = 0;
         for (u = 0; u < (unsigned)sdsets_threshold; u++) {
             if (iter->small_dset_dims[u] > 0) {
-                HDprintf("\t\t# of datasets with dimension sizes %u: %lu\n", u, iter->small_dset_dims[u]);
+                printf("\t\t# of datasets with dimension sizes %u: %lu\n", u, iter->small_dset_dims[u]);
                 total += iter->small_dset_dims[u];
             } /* end if */
         }     /* end for */
-        HDprintf("\t\tTotal # of small datasets: %lu\n", total);
+        printf("\t\tTotal # of small datasets: %lu\n", total);
 
         /* Protect against no datasets in file */
         if (iter->dset_dim_nbins > 0) {
-            HDprintf("\t1-D Dataset dimension bins:\n");
+            printf("\t1-D Dataset dimension bins:\n");
             total = 0;
             if (iter->dset_dim_bins[0] > 0) {
-                HDprintf("\t\t# of datasets with dimension size 0: %lu\n", iter->dset_dim_bins[0]);
+                printf("\t\t# of datasets with dimension size 0: %lu\n", iter->dset_dim_bins[0]);
                 total = iter->dset_dim_bins[0];
             } /* end if */
             power = 1;
             for (u = 1; u < iter->dset_dim_nbins; u++) {
                 if (iter->dset_dim_bins[u] > 0) {
-                    HDprintf("\t\t# of datasets with dimension size %lu - %lu: %lu\n", power,
-                             (power * 10) - 1, iter->dset_dim_bins[u]);
+                    printf("\t\t# of datasets with dimension size %lu - %lu: %lu\n", power, (power * 10) - 1,
+                           iter->dset_dim_bins[u]);
                     total += iter->dset_dim_bins[u];
                 } /* end if */
                 power *= 10;
             } /* end for */
-            HDprintf("\t\tTotal # of datasets: %lu\n", total);
+            printf("\t\tTotal # of datasets: %lu\n", total);
         } /* end if */
 
-        HDprintf("Dataset storage information:\n");
-        HDfprintf(stdout, "\tTotal raw data size: %" PRIuHSIZE "\n", iter->dset_storage_size);
-        HDfprintf(stdout, "\tTotal external raw data size: %" PRIuHSIZE "\n",
-                  iter->dset_external_storage_size);
+        printf("Dataset storage information:\n");
+        fprintf(stdout, "\tTotal raw data size: %" PRIuHSIZE "\n", iter->dset_storage_size);
+        fprintf(stdout, "\tTotal external raw data size: %" PRIuHSIZE "\n", iter->dset_external_storage_size);
 
-        HDprintf("Dataset layout information:\n");
+        printf("Dataset layout information:\n");
         for (u = 0; u < H5D_NLAYOUTS; u++)
-            HDprintf("\tDataset layout counts[%s]: %lu\n",
-                     (u == H5D_COMPACT
-                          ? "COMPACT"
-                          : (u == H5D_CONTIGUOUS ? "CONTIG" : (u == H5D_CHUNKED ? "CHUNKED" : "VIRTUAL"))),
-                     iter->dset_layouts[u]);
-        HDprintf("\tNumber of external files : %lu\n", iter->nexternal);
-
-        HDprintf("Dataset filters information:\n");
-        HDprintf("\tNumber of datasets with:\n");
-        HDprintf("\t\tNO filter: %lu\n", iter->dset_comptype[H5Z_FILTER_ERROR + 1]);
-        HDprintf("\t\tGZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_DEFLATE]);
-        HDprintf("\t\tSHUFFLE filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SHUFFLE]);
-        HDprintf("\t\tFLETCHER32 filter: %lu\n", iter->dset_comptype[H5Z_FILTER_FLETCHER32]);
-        HDprintf("\t\tSZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SZIP]);
-        HDprintf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]);
-        HDprintf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]);
-        HDprintf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL - 1]);
+            printf("\tDataset layout counts[%s]: %lu\n",
+                   (u == H5D_COMPACT
+                        ? "COMPACT"
+                        : (u == H5D_CONTIGUOUS ? "CONTIG" : (u == H5D_CHUNKED ? "CHUNKED" : "VIRTUAL"))),
+                   iter->dset_layouts[u]);
+        printf("\tNumber of external files : %lu\n", iter->nexternal);
+
+        printf("Dataset filters information:\n");
+        printf("\tNumber of datasets with:\n");
+        printf("\t\tNO filter: %lu\n", iter->dset_comptype[H5Z_FILTER_ERROR + 1]);
+        printf("\t\tGZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_DEFLATE]);
+        printf("\t\tSHUFFLE filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SHUFFLE]);
+        printf("\t\tFLETCHER32 filter: %lu\n", iter->dset_comptype[H5Z_FILTER_FLETCHER32]);
+        printf("\t\tSZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SZIP]);
+        printf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]);
+        printf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]);
+        printf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL - 1]);
     } /* end if */
 
     return 0;
@@ -1346,13 +1343,13 @@ print_dataset_info(const iter_t *iter)
 static herr_t
 print_dset_metadata(const iter_t *iter)
 {
-    HDprintf("File space information for datasets' metadata (in bytes):\n");
+    printf("File space information for datasets' metadata (in bytes):\n");
 
-    HDfprintf(stdout, "\tObject headers (total/unused): %" PRIuHSIZE "/%" PRIuHSIZE "\n",
-              iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
+    fprintf(stdout, "\tObject headers (total/unused): %" PRIuHSIZE "/%" PRIuHSIZE "\n",
+            iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
 
-    HDfprintf(stdout, "\tIndex for Chunked datasets: %" PRIuHSIZE "\n", iter->datasets_index_storage_size);
-    HDfprintf(stdout, "\tHeap: %" PRIuHSIZE "\n", iter->datasets_heap_storage_size);
+    fprintf(stdout, "\tIndex for Chunked datasets: %" PRIuHSIZE "\n", iter->datasets_index_storage_size);
+    fprintf(stdout, "\tHeap: %" PRIuHSIZE "\n", iter->datasets_heap_storage_size);
 
     return 0;
 } /* print_dset_metadata() */
@@ -1378,20 +1375,20 @@ print_dset_dtype_meta(const iter_t *iter)
     unsigned      u;          /* Local index variable */
 
     if (iter->dset_ntypes) {
-        HDprintf("Dataset datatype information:\n");
-        HDprintf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
+        printf("Dataset datatype information:\n");
+        printf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
         total = 0;
         for (u = 0; u < iter->dset_ntypes; u++) {
             H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size);
-            HDprintf("\tDataset datatype #%u:\n", u);
-            HDprintf("\t\tCount (total/named) = (%lu/%lu)\n", iter->dset_type_info[u].count,
-                     iter->dset_type_info[u].named);
-            HDprintf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
-                     (unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
+            printf("\tDataset datatype #%u:\n", u);
+            printf("\t\tCount (total/named) = (%lu/%lu)\n", iter->dset_type_info[u].count,
+                   iter->dset_type_info[u].named);
+            printf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
+                   (unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
             H5Tclose(iter->dset_type_info[u].tid);
             total += iter->dset_type_info[u].count;
         } /* end for */
-        HDprintf("\tTotal dataset datatype count: %lu\n", total);
+        printf("\tTotal dataset datatype count: %lu\n", total);
     } /* end if */
 
     return 0;
@@ -1418,29 +1415,29 @@ print_attr_info(const iter_t *iter)
     unsigned long total; /* Total count for various statistics */
     unsigned      u;     /* Local index variable */
 
-    HDprintf("Small # of attributes (objects with 1 to %u attributes):\n", sattrs_threshold);
+    printf("Small # of attributes (objects with 1 to %u attributes):\n", sattrs_threshold);
     total = 0;
     for (u = 1; u <= (unsigned)sattrs_threshold; u++) {
         if (iter->num_small_attrs[u] > 0) {
-            HDprintf("\t# of objects with %u attributes: %lu\n", u, iter->num_small_attrs[u]);
+            printf("\t# of objects with %u attributes: %lu\n", u, iter->num_small_attrs[u]);
             total += iter->num_small_attrs[u];
         } /* end if */
     }     /* end for */
-    HDprintf("\tTotal # of objects with small # of attributes: %lu\n", total);
+    printf("\tTotal # of objects with small # of attributes: %lu\n", total);
 
-    HDprintf("Attribute bins:\n");
+    printf("Attribute bins:\n");
     total = 0;
     power = 1;
     for (u = 1; u < iter->attr_nbins; u++) {
         if (iter->attr_bins[u] > 0) {
-            HDprintf("\t# of objects with %lu - %lu attributes: %lu\n", power, (power * 10) - 1,
-                     iter->attr_bins[u]);
+            printf("\t# of objects with %lu - %lu attributes: %lu\n", power, (power * 10) - 1,
+                   iter->attr_bins[u]);
             total += iter->attr_bins[u];
         } /* end if */
         power *= 10;
     } /* end for */
-    HDprintf("\tTotal # of objects with attributes: %lu\n", total);
-    HDprintf("\tMax. # of attributes to objects: %lu\n", (unsigned long)iter->max_attrs);
+    printf("\tTotal # of objects with attributes: %lu\n", total);
+    printf("\tMax. # of attributes to objects: %lu\n", (unsigned long)iter->max_attrs);
 
     return 0;
 } /* print_attr_info() */
@@ -1465,30 +1462,30 @@ print_freespace_info(const iter_t *iter)
     unsigned long total; /* Total count for various statistics */
     unsigned      u;     /* Local index variable */
 
-    HDfprintf(stdout, "Free-space persist: %s\n", iter->fs_persist ? "TRUE" : "FALSE");
-    HDfprintf(stdout, "Free-space section threshold: %" PRIuHSIZE " bytes\n", iter->fs_threshold);
-    HDprintf("Small size free-space sections (< %u bytes):\n", (unsigned)SIZE_SMALL_SECTS);
+    fprintf(stdout, "Free-space persist: %s\n", iter->fs_persist ? "TRUE" : "FALSE");
+    fprintf(stdout, "Free-space section threshold: %" PRIuHSIZE " bytes\n", iter->fs_threshold);
+    printf("Small size free-space sections (< %u bytes):\n", (unsigned)SIZE_SMALL_SECTS);
     total = 0;
     for (u = 0; u < SIZE_SMALL_SECTS; u++) {
         if (iter->num_small_sects[u] > 0) {
-            HDprintf("\t# of sections of size %u: %lu\n", u, iter->num_small_sects[u]);
+            printf("\t# of sections of size %u: %lu\n", u, iter->num_small_sects[u]);
             total += iter->num_small_sects[u];
         } /* end if */
     }     /* end for */
-    HDprintf("\tTotal # of small size sections: %lu\n", total);
+    printf("\tTotal # of small size sections: %lu\n", total);
 
-    HDprintf("Free-space section bins:\n");
+    printf("Free-space section bins:\n");
 
     total = 0;
     power = 1;
     for (u = 1; u < iter->sect_nbins; u++) {
         if (iter->sect_bins[u] > 0) {
-            HDprintf("\t# of sections of size %lu - %lu: %lu\n", power, (power * 10) - 1, iter->sect_bins[u]);
+            printf("\t# of sections of size %lu - %lu: %lu\n", power, (power * 10) - 1, iter->sect_bins[u]);
             total += iter->sect_bins[u];
         } /* end if */
         power *= 10;
     } /* end for */
-    HDprintf("\tTotal # of sections: %lu\n", total);
+    printf("\tTotal # of sections: %lu\n", total);
 
     return 0;
 } /* print_freespace_info() */
@@ -1513,9 +1510,9 @@ print_storage_summary(const iter_t *iter)
     hsize_t unaccount  = 0;
     double  percent    = 0.0;
 
-    HDfprintf(stdout, "File space management strategy: %s\n", FS_STRATEGY_NAME[iter->fs_strategy]);
-    HDfprintf(stdout, "File space page size: %" PRIuHSIZE " bytes\n", iter->fsp_size);
-    HDprintf("Summary of file space information:\n");
+    fprintf(stdout, "File space management strategy: %s\n", FS_STRATEGY_NAME[iter->fs_strategy]);
+    fprintf(stdout, "File space page size: %" PRIuHSIZE " bytes\n", iter->fsp_size);
+    printf("Summary of file space information:\n");
     total_meta =
         iter->super_size + iter->super_ext_size + iter->ublk_size + iter->group_ohdr_info.total_size +
         iter->dset_ohdr_info.total_size + iter->dtype_ohdr_info.total_size + iter->groups_btree_storage_size +
@@ -1523,28 +1520,28 @@ print_storage_summary(const iter_t *iter)
         iter->datasets_index_storage_size + iter->datasets_heap_storage_size + iter->SM_hdr_storage_size +
         iter->SM_index_storage_size + iter->SM_heap_storage_size + iter->free_hdr;
 
-    HDfprintf(stdout, "  File metadata: %" PRIuHSIZE " bytes\n", total_meta);
-    HDfprintf(stdout, "  Raw data: %" PRIuHSIZE " bytes\n", iter->dset_storage_size);
+    fprintf(stdout, "  File metadata: %" PRIuHSIZE " bytes\n", total_meta);
+    fprintf(stdout, "  Raw data: %" PRIuHSIZE " bytes\n", iter->dset_storage_size);
 
     percent = ((double)iter->free_space / (double)iter->filesize) * 100.0;
-    HDfprintf(stdout, "  Amount/Percent of tracked free space: %" PRIuHSIZE " bytes/%3.1f%%\n",
-              iter->free_space, percent);
+    fprintf(stdout, "  Amount/Percent of tracked free space: %" PRIuHSIZE " bytes/%3.1f%%\n",
+            iter->free_space, percent);
 
     if (iter->filesize < (total_meta + iter->dset_storage_size + iter->free_space)) {
         unaccount = (total_meta + iter->dset_storage_size + iter->free_space) - iter->filesize;
-        HDfprintf(stdout, "  ??? File has %" PRIuHSIZE " more bytes accounted for than its size! ???\n",
-                  unaccount);
+        fprintf(stdout, "  ??? File has %" PRIuHSIZE " more bytes accounted for than its size! ???\n",
+                unaccount);
     }
     else {
         unaccount = iter->filesize - (total_meta + iter->dset_storage_size + iter->free_space);
-        HDfprintf(stdout, "  Unaccounted space: %" PRIuHSIZE " bytes\n", unaccount);
+        fprintf(stdout, "  Unaccounted space: %" PRIuHSIZE " bytes\n", unaccount);
     }
 
-    HDfprintf(stdout, "Total space: %" PRIuHSIZE " bytes\n",
-              total_meta + iter->dset_storage_size + iter->free_space + unaccount);
+    fprintf(stdout, "Total space: %" PRIuHSIZE " bytes\n",
+            total_meta + iter->dset_storage_size + iter->free_space + unaccount);
 
     if (iter->nexternal)
-        HDfprintf(stdout, "External raw data: %" PRIuHSIZE " bytes\n", iter->dset_external_storage_size);
+        fprintf(stdout, "External raw data: %" PRIuHSIZE " bytes\n", iter->dset_external_storage_size);
 
     return 0;
 } /* print_storage_summary() */
@@ -1622,7 +1619,7 @@ print_file_statistics(const iter_t *iter)
 static void
 print_object_statistics(const char *name)
 {
-    HDprintf("Object name %s\n", name);
+    printf("Object name %s\n", name);
 } /* print_object_statistics() */
 
 /*-------------------------------------------------------------------------
@@ -1705,7 +1702,7 @@ main(int argc, char *argv[])
         hid_t       fcpl;
         H5F_info2_t finfo;
 
-        HDprintf("Filename: %s\n", fname);
+        printf("Filename: %s\n", fname);
 
         fid = h5tools_fopen(fname, H5F_ACC_RDONLY, fapl_id, (fapl_id != H5P_DEFAULT), NULL, 0);
 
diff --git a/tools/src/misc/h5clear.c b/tools/src/misc/h5clear.c
index faf7d94..5f26ef4 100644
--- a/tools/src/misc/h5clear.c
+++ b/tools/src/misc/h5clear.c
@@ -61,39 +61,36 @@ static struct h5_long_options l_opts[] = {
 static void
 usage(const char *prog)
 {
-    HDfprintf(stdout, "usage: %s [OPTIONS] file_name\n", prog);
-    HDfprintf(stdout, "  OPTIONS\n");
-    HDfprintf(stdout, "   -h, --help                Print a usage message and exit\n");
-    HDfprintf(stdout, "   -V, --version             Print version number and exit\n");
-    HDfprintf(stdout, "   -s, --status              Clear the status_flags field in the file's superblock\n");
-    HDfprintf(stdout, "   -m, --image               Remove the metadata cache image from the file\n");
-    HDfprintf(stdout, "   --filesize                Print the file's EOA and EOF\n");
-    HDfprintf(stdout,
-              "   --increment=C             Set the file's EOA to the maximum of (EOA, EOF) + C for\n");
-    HDfprintf(stdout, "                             the file <file_name>.\n");
-    HDfprintf(stdout,
-              "                             C is >= 0; C is optional and will default to 1M when not set.\n");
-    HDfprintf(
-        stdout,
-        "                             This option helps to repair a crashed file where the stored EOA\n");
-    HDfprintf(stdout, "                             in the superblock is different from the actual EOF.\n");
-    HDfprintf(stdout,
-              "                             The file’s EOA and EOF will be the same after applying\n");
-    HDfprintf(stdout, "                             this option to the file.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "Examples of use:\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "h5clear -s file_name\n");
-    HDfprintf(stdout, "  Clear the status_flags field in the superblock of the HDF5 file <file_name>.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "h5clear -m file_name\n");
-    HDfprintf(stdout, "  Remove the metadata cache image from the HDF5 file <file_name>.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "h5clear --increment file_name\n");
-    HDfprintf(stdout, "  Set the EOA to the maximum of (EOA, EOF) + 1M for the file <file_name>.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "h5clear --increment=512 file_name\n");
-    HDfprintf(stdout, "  Set the EOA to the maximum of (EOA, EOF) + 512 for the file <file_name>.\n");
+    fprintf(stdout, "usage: %s [OPTIONS] file_name\n", prog);
+    fprintf(stdout, "  OPTIONS\n");
+    fprintf(stdout, "   -h, --help                Print a usage message and exit\n");
+    fprintf(stdout, "   -V, --version             Print version number and exit\n");
+    fprintf(stdout, "   -s, --status              Clear the status_flags field in the file's superblock\n");
+    fprintf(stdout, "   -m, --image               Remove the metadata cache image from the file\n");
+    fprintf(stdout, "   --filesize                Print the file's EOA and EOF\n");
+    fprintf(stdout, "   --increment=C             Set the file's EOA to the maximum of (EOA, EOF) + C for\n");
+    fprintf(stdout, "                             the file <file_name>.\n");
+    fprintf(stdout,
+            "                             C is >= 0; C is optional and will default to 1M when not set.\n");
+    fprintf(stdout,
+            "                             This option helps to repair a crashed file where the stored EOA\n");
+    fprintf(stdout, "                             in the superblock is different from the actual EOF.\n");
+    fprintf(stdout, "                             The file’s EOA and EOF will be the same after applying\n");
+    fprintf(stdout, "                             this option to the file.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "Examples of use:\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "h5clear -s file_name\n");
+    fprintf(stdout, "  Clear the status_flags field in the superblock of the HDF5 file <file_name>.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "h5clear -m file_name\n");
+    fprintf(stdout, "  Remove the metadata cache image from the HDF5 file <file_name>.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "h5clear --increment file_name\n");
+    fprintf(stdout, "  Set the EOA to the maximum of (EOA, EOF) + 1M for the file <file_name>.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "h5clear --increment=512 file_name\n");
+    fprintf(stdout, "  Set the EOA to the maximum of (EOA, EOF) + 512 for the file <file_name>.\n");
 } /* usage() */
 
 /*-------------------------------------------------------------------------
@@ -328,7 +325,7 @@ main(int argc, char *argv[])
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
         }
-        HDfprintf(stdout, "EOA is %" PRIuHADDR "; EOF is %" PRIuHADDR " \n", eoa, (haddr_t)st.st_size);
+        fprintf(stdout, "EOA is %" PRIuHADDR "; EOF is %" PRIuHADDR " \n", eoa, (haddr_t)st.st_size);
     }
 
     /* --increment option */
diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c
index 0d268c6..0f841a9 100644
--- a/tools/src/misc/h5debug.c
+++ b/tools/src/misc/h5debug.c
@@ -131,7 +131,7 @@ get_H5B2_class(const uint8_t *sig)
 
         case H5B2_NUM_BTREE_ID:
         default:
-            HDfprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype));
+            fprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype));
     } /* end switch */
 
     return (cls);
@@ -172,7 +172,7 @@ get_H5EA_class(const uint8_t *sig)
 
         case H5EA_NUM_CLS_ID:
         default:
-            HDfprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid));
+            fprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid));
     } /* end switch */
 
     return (cls);
@@ -213,7 +213,7 @@ get_H5FA_class(const uint8_t *sig)
 
         case H5FA_NUM_CLS_ID:
         default:
-            HDfprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid));
+            fprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid));
     } /* end switch */
 
     return (cls);
@@ -252,14 +252,14 @@ main(int argc, char *argv[])
     int            exit_value     = 0;
 
     if (argc == 1) {
-        HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]*]\n", argv[0]);
+        fprintf(stderr, "Usage: %s filename [signature-addr [extra]*]\n", argv[0]);
         exit_value = 1;
         goto done;
     } /* end if */
 
     /* Initialize the library */
     if (H5open() < 0) {
-        HDfprintf(stderr, "cannot initialize the library\n");
+        fprintf(stderr, "cannot initialize the library\n");
         exit_value = 1;
         goto done;
     } /* end if */
@@ -272,45 +272,45 @@ main(int argc, char *argv[])
      * Open the file and get the file descriptor.
      */
     if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
-        HDfprintf(stderr, "cannot create file access property list\n");
+        fprintf(stderr, "cannot create file access property list\n");
         exit_value = 1;
         goto done;
     } /* end if */
     if (HDstrchr(argv[1], '%'))
         if (H5Pset_fapl_family(fapl, (hsize_t)0, H5P_DEFAULT) < 0) {
-            HDfprintf(stderr, "cannot set file access property list\n");
+            fprintf(stderr, "cannot set file access property list\n");
             exit_value = 1;
             goto done;
         }
     if ((fid = H5Fopen(argv[1], H5F_ACC_RDONLY, fapl)) < 0) {
-        HDfprintf(stderr, "cannot open file\n");
+        fprintf(stderr, "cannot open file\n");
         exit_value = 1;
         goto done;
     } /* end if */
 
     /* Push API context */
     if (H5CX_push() < 0) {
-        HDfprintf(stderr, "cannot set API context\n");
+        fprintf(stderr, "cannot set API context\n");
         exit_value = 1;
         goto done;
     }
     api_ctx_pushed = TRUE;
 
     if (NULL == (vol_obj = (H5VL_object_t *)H5VL_vol_object(fid))) {
-        HDfprintf(stderr, "cannot obtain vol_obj pointer\n");
+        fprintf(stderr, "cannot obtain vol_obj pointer\n");
         exit_value = 2;
         goto done;
     } /* end if */
 
     if (NULL == (f = (H5F_t *)H5VL_object_data(vol_obj))) {
-        HDfprintf(stderr, "cannot obtain H5F_t pointer\n");
+        fprintf(stderr, "cannot obtain H5F_t pointer\n");
         exit_value = 2;
         goto done;
     } /* end if */
 
     /* Ignore metadata tags while using h5debug */
     if (H5AC_ignore_tags(f) < 0) {
-        HDfprintf(stderr, "cannot ignore metadata tags\n");
+        fprintf(stderr, "cannot ignore metadata tags\n");
         exit_value = 1;
         goto done;
     }
@@ -331,8 +331,8 @@ main(int argc, char *argv[])
 
         /* Range check against 'extra' array size */
         if (extra_count > (int)(sizeof(extra) / sizeof(haddr_t))) {
-            HDfprintf(stderr, "\nWARNING: Only using first %d extra parameters\n\n",
-                      (int)(sizeof(extra) / sizeof(haddr_t)));
+            fprintf(stderr, "\nWARNING: Only using first %d extra parameters\n\n",
+                    (int)(sizeof(extra) / sizeof(haddr_t)));
             extra_count = (int)(sizeof(extra) / sizeof(haddr_t));
         } /* end if */
 
@@ -343,9 +343,9 @@ main(int argc, char *argv[])
     /*
      * Read the signature at the specified file position.
      */
-    HDfprintf(stdout, "Reading signature at address %" PRIuHADDR " (rel)\n", addr);
+    fprintf(stdout, "Reading signature at address %" PRIuHADDR " (rel)\n", addr);
     if (H5F_block_read(f, H5FD_MEM_SUPER, addr, sizeof(sig), sig) < 0) {
-        HDfprintf(stderr, "cannot read signature\n");
+        fprintf(stderr, "cannot read signature\n");
         exit_value = 3;
         goto done;
     }
@@ -374,10 +374,10 @@ main(int argc, char *argv[])
 
         /* Check for extra parameters */
         if (extra_count == 0 || extra[0] == 0) {
-            HDfprintf(stderr,
-                      "\nWarning: Providing the group's local heap address will give more information\n");
-            HDfprintf(stderr, "Symbol table node usage:\n");
-            HDfprintf(stderr, "\th5debug <filename> <Symbol table node address> <address of local heap>\n\n");
+            fprintf(stderr,
+                    "\nWarning: Providing the group's local heap address will give more information\n");
+            fprintf(stderr, "Symbol table node usage:\n");
+            fprintf(stderr, "\th5debug <filename> <Symbol table node address> <address of local heap>\n\n");
         } /* end if */
 
         status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra[0]);
@@ -396,12 +396,11 @@ main(int argc, char *argv[])
             case H5B_SNODE_ID:
                 /* Check for extra parameters */
                 if (extra_count == 0 || extra[0] == 0) {
-                    HDfprintf(
+                    fprintf(
                         stderr,
                         "\nWarning: Providing the group's local heap address will give more information\n");
-                    HDfprintf(stderr, "B-tree symbol table node usage:\n");
-                    HDfprintf(stderr,
-                              "\th5debug <filename> <B-tree node address> <address of local heap>\n\n");
+                    fprintf(stderr, "B-tree symbol table node usage:\n");
+                    fprintf(stderr, "\th5debug <filename> <B-tree node address> <address of local heap>\n\n");
                     exit_value = 4;
                     goto done;
                 } /* end if */
@@ -412,12 +411,11 @@ main(int argc, char *argv[])
             case H5B_CHUNK_ID:
                 /* Check for extra parameters */
                 if (extra_count == 0 || extra[0] == 0) {
-                    HDfprintf(
-                        stderr,
-                        "ERROR: Need number of dimensions of chunk in order to dump chunk B-tree node\n");
-                    HDfprintf(stderr, "B-tree chunked storage node usage:\n");
-                    HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest "
-                                      "chunk dim>...<fastest chunk dim>\n");
+                    fprintf(stderr,
+                            "ERROR: Need number of dimensions of chunk in order to dump chunk B-tree node\n");
+                    fprintf(stderr, "B-tree chunked storage node usage:\n");
+                    fprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest "
+                                    "chunk dim>...<fastest chunk dim>\n");
                     exit_value = 4;
                     goto done;
                 } /* end if */
@@ -427,10 +425,10 @@ main(int argc, char *argv[])
 
                 /* Check for dimension error */
                 if (ndims > 9) {
-                    HDfprintf(stderr, "ERROR: Only 9 dimensions support currently (fix h5debug)\n");
-                    HDfprintf(stderr, "B-tree chunked storage node usage:\n");
-                    HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest "
-                                      "chunk dim>...<fastest chunk dim>\n");
+                    fprintf(stderr, "ERROR: Only 9 dimensions support currently (fix h5debug)\n");
+                    fprintf(stderr, "B-tree chunked storage node usage:\n");
+                    fprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest "
+                                    "chunk dim>...<fastest chunk dim>\n");
                     exit_value = 4;
                     goto done;
                 } /* end for */
@@ -442,10 +440,10 @@ main(int argc, char *argv[])
                 /* Check for dimension error */
                 for (u = 0; u < ndims; u++)
                     if (0 == dim[u]) {
-                        HDfprintf(stderr, "ERROR: Chunk dimensions should be >0\n");
-                        HDfprintf(stderr, "B-tree chunked storage node usage:\n");
-                        HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> "
-                                          "<slowest chunk dim>...<fastest chunk dim>\n");
+                        fprintf(stderr, "ERROR: Chunk dimensions should be >0\n");
+                        fprintf(stderr, "B-tree chunked storage node usage:\n");
+                        fprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> "
+                                        "<slowest chunk dim>...<fastest chunk dim>\n");
                         exit_value = 4;
                         goto done;
                     } /* end if */
@@ -458,7 +456,7 @@ main(int argc, char *argv[])
 
             case H5B_NUM_BTREE_ID:
             default:
-                HDfprintf(stderr, "Unknown v1 B-tree subtype %u\n", (unsigned)(subtype));
+                fprintf(stderr, "Unknown v1 B-tree subtype %u\n", (unsigned)(subtype));
                 exit_value = 4;
                 goto done;
         }
@@ -471,10 +469,10 @@ main(int argc, char *argv[])
         assert(cls);
 
         if ((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra_count == 0 || extra[0] == 0)) {
-            HDfprintf(stderr, "ERROR: Need v2 B-tree header address and object header address containing the "
-                              "layout message in order to dump header\n");
-            HDfprintf(stderr, "v2 B-tree hdr usage:\n");
-            HDfprintf(stderr, "\th5debug <filename> <v2 B-tree header address> <object header address>\n");
+            fprintf(stderr, "ERROR: Need v2 B-tree header address and object header address containing the "
+                            "layout message in order to dump header\n");
+            fprintf(stderr, "v2 B-tree hdr usage:\n");
+            fprintf(stderr, "\th5debug <filename> <v2 B-tree header address> <object header address>\n");
             exit_value = 4;
             goto done;
         } /* end if */
@@ -491,25 +489,25 @@ main(int argc, char *argv[])
         /* Check for enough valid parameters */
         if ((cls == H5D_BT2 || cls == H5D_BT2_FILT) &&
             (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0 || extra[3] == 0)) {
-            HDfprintf(stderr,
-                      "ERROR: Need v2 B-tree header address, the node's number of records, depth, and object "
-                      "header address containing the layout message in order to dump internal node\n");
-            HDfprintf(stderr,
-                      "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
-            HDfprintf(stderr, "v2 B-tree internal node usage:\n");
-            HDfprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> "
-                              "<number of records> <depth> <object header address>\n");
+            fprintf(stderr,
+                    "ERROR: Need v2 B-tree header address, the node's number of records, depth, and object "
+                    "header address containing the layout message in order to dump internal node\n");
+            fprintf(stderr,
+                    "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
+            fprintf(stderr, "v2 B-tree internal node usage:\n");
+            fprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> "
+                            "<number of records> <depth> <object header address>\n");
             exit_value = 4;
             goto done;
         }
         else if (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0) {
-            HDfprintf(stderr, "ERROR: Need v2 B-tree header address and the node's number of records and "
-                              "depth in order to dump internal node\n");
-            HDfprintf(stderr,
-                      "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
-            HDfprintf(stderr, "v2 B-tree internal node usage:\n");
-            HDfprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> "
-                              "<number of records> <depth>\n");
+            fprintf(stderr, "ERROR: Need v2 B-tree header address and the node's number of records and "
+                            "depth in order to dump internal node\n");
+            fprintf(stderr,
+                    "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
+            fprintf(stderr, "v2 B-tree internal node usage:\n");
+            fprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> "
+                            "<number of records> <depth>\n");
             exit_value = 4;
             goto done;
         } /* end if */
@@ -528,20 +526,20 @@ main(int argc, char *argv[])
         if ((cls == H5D_BT2 || cls == H5D_BT2_FILT) &&
             (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0)) {
 
-            HDfprintf(stderr, "ERROR: Need v2 B-tree header address, number of records, and object header "
-                              "address containing the layout message in order to dump leaf node\n");
-            HDfprintf(stderr, "v2 B-tree leaf node usage:\n");
-            HDfprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number "
-                              "of records> <object header address>\n");
+            fprintf(stderr, "ERROR: Need v2 B-tree header address, number of records, and object header "
+                            "address containing the layout message in order to dump leaf node\n");
+            fprintf(stderr, "v2 B-tree leaf node usage:\n");
+            fprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number "
+                            "of records> <object header address>\n");
             exit_value = 4;
             goto done;
         }
         else if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) {
-            HDfprintf(
+            fprintf(
                 stderr,
                 "ERROR: Need v2 B-tree header address and number of records in order to dump leaf node\n");
-            HDfprintf(stderr, "v2 B-tree leaf node usage:\n");
-            HDfprintf(
+            fprintf(stderr, "v2 B-tree leaf node usage:\n");
+            fprintf(
                 stderr,
                 "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records>\n");
             exit_value = 4;
@@ -564,10 +562,10 @@ main(int argc, char *argv[])
 
         /* Check for enough valid parameters */
         if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) {
-            HDfprintf(stderr, "ERROR: Need fractal heap header address and size of direct block in order to "
-                              "dump direct block\n");
-            HDfprintf(stderr, "Fractal heap direct block usage:\n");
-            HDfprintf(
+            fprintf(stderr, "ERROR: Need fractal heap header address and size of direct block in order to "
+                            "dump direct block\n");
+            fprintf(stderr, "Fractal heap direct block usage:\n");
+            fprintf(
                 stderr,
                 "\th5debug <filename> <direct block address> <heap header address> <size of direct block>\n");
             exit_value = 4;
@@ -583,12 +581,11 @@ main(int argc, char *argv[])
 
         /* Check for enough valid parameters */
         if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) {
-            HDfprintf(stderr, "ERROR: Need fractal heap header address and number of rows in order to dump "
-                              "indirect block\n");
-            HDfprintf(stderr, "Fractal heap indirect block usage:\n");
-            HDfprintf(
-                stderr,
-                "\th5debug <filename> <indirect block address> <heap header address> <number of rows>\n");
+            fprintf(stderr, "ERROR: Need fractal heap header address and number of rows in order to dump "
+                            "indirect block\n");
+            fprintf(stderr, "Fractal heap indirect block usage:\n");
+            fprintf(stderr,
+                    "\th5debug <filename> <indirect block address> <heap header address> <number of rows>\n");
             exit_value = 4;
             goto done;
         } /* end if */
@@ -609,11 +606,11 @@ main(int argc, char *argv[])
 
         /* Check for enough valid parameters */
         if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) {
-            HDfprintf(stderr, "ERROR: Need free space header address and client address in order to dump "
-                              "serialized sections\n");
-            HDfprintf(stderr, "Free space serialized sections usage:\n");
-            HDfprintf(stderr, "\th5debug <filename> <serialized sections address> <free space header "
-                              "address> <client address>\n");
+            fprintf(stderr, "ERROR: Need free space header address and client address in order to dump "
+                            "serialized sections\n");
+            fprintf(stderr, "Free space serialized sections usage:\n");
+            fprintf(stderr, "\th5debug <filename> <serialized sections address> <free space header "
+                            "address> <client address>\n");
             exit_value = 4;
             goto done;
         } /* end if */
@@ -634,10 +631,10 @@ main(int argc, char *argv[])
 
         /* Check for enough valid parameters */
         if (extra_count == 0 || extra[0] == 0) {
-            HDfprintf(stderr, "ERROR: Need shared message header address in order to shared message list\n");
-            HDfprintf(stderr, "Shared message list usage:\n");
-            HDfprintf(stderr,
-                      "\th5debug <filename> <shared message list address> <shared message header address>\n");
+            fprintf(stderr, "ERROR: Need shared message header address in order to shared message list\n");
+            fprintf(stderr, "Shared message list usage:\n");
+            fprintf(stderr,
+                    "\th5debug <filename> <shared message list address> <shared message header address>\n");
             exit_value = 4;
             goto done;
         } /* end if */
@@ -653,12 +650,12 @@ main(int argc, char *argv[])
 
         /* Check for enough valid parameters */
         if (extra_count == 0 || extra[0] == 0) {
-            HDfprintf(
+            fprintf(
                 stderr,
                 "ERROR: Need object header address containing the layout message in order to dump header\n");
-            HDfprintf(stderr, "Extensible array header block usage:\n");
-            HDfprintf(stderr,
-                      "\th5debug <filename> <Extensible Array header address> <object header address>\n");
+            fprintf(stderr, "Extensible array header block usage:\n");
+            fprintf(stderr,
+                    "\th5debug <filename> <Extensible Array header address> <object header address>\n");
             exit_value = 4;
             goto done;
         } /* end if */
@@ -674,10 +671,10 @@ main(int argc, char *argv[])
 
         /* Check for enough valid parameters */
         if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) {
-            HDfprintf(stderr, "ERROR: Need extensible array header address and object header address "
-                              "containing the layout message in order to dump index block\n");
-            HDfprintf(stderr, "Extensible array index block usage:\n");
-            HDfprintf(
+            fprintf(stderr, "ERROR: Need extensible array header address and object header address "
+                            "containing the layout message in order to dump index block\n");
+            fprintf(stderr, "Extensible array index block usage:\n");
+            fprintf(
                 stderr,
                 "\th5debug <filename> <index block address> <array header address> <object header address\n");
             exit_value = 4;
@@ -695,11 +692,11 @@ main(int argc, char *argv[])
 
         /* Check for enough valid parameters */
         if (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0) {
-            HDfprintf(stderr, "ERROR: Need extensible array header address, super block index and object "
-                              "header address containing the layout message in order to dump super block\n");
-            HDfprintf(stderr, "Extensible array super block usage:\n");
-            HDfprintf(stderr, "\th5debug <filename> <super block address> <array header address> <super "
-                              "block index> <object header address>\n");
+            fprintf(stderr, "ERROR: Need extensible array header address, super block index and object "
+                            "header address containing the layout message in order to dump super block\n");
+            fprintf(stderr, "Extensible array super block usage:\n");
+            fprintf(stderr, "\th5debug <filename> <super block address> <array header address> <super "
+                            "block index> <object header address>\n");
             exit_value = 4;
             goto done;
         } /* end if */
@@ -715,12 +712,12 @@ main(int argc, char *argv[])
 
         /* Check for enough valid parameters */
         if (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0) {
-            HDfprintf(stderr,
-                      "ERROR: Need extensible array header address, # of elements in data block and object "
-                      "header address containing the layout message in order to dump data block\n");
-            HDfprintf(stderr, "Extensible array data block usage:\n");
-            HDfprintf(stderr, "\th5debug <filename> <data block address> <array header address> <# of "
-                              "elements in data block> <object header address\n");
+            fprintf(stderr,
+                    "ERROR: Need extensible array header address, # of elements in data block and object "
+                    "header address containing the layout message in order to dump data block\n");
+            fprintf(stderr, "Extensible array data block usage:\n");
+            fprintf(stderr, "\th5debug <filename> <data block address> <array header address> <# of "
+                            "elements in data block> <object header address\n");
             exit_value = 4;
             goto done;
         } /* end if */
@@ -736,11 +733,11 @@ main(int argc, char *argv[])
 
         /* Check for enough valid parameters */
         if (extra_count == 0 || extra[0] == 0) {
-            HDfprintf(
+            fprintf(
                 stderr,
                 "ERROR: Need object header address containing the layout message in order to dump header\n");
-            HDfprintf(stderr, "Fixed array header block usage:\n");
-            HDfprintf(stderr, "\th5debug <filename> <Fixed Array header address> <object header address>\n");
+            fprintf(stderr, "Fixed array header block usage:\n");
+            fprintf(stderr, "\th5debug <filename> <Fixed Array header address> <object header address>\n");
             exit_value = 4;
             goto done;
         } /* end if */
@@ -756,10 +753,10 @@ main(int argc, char *argv[])
 
         /* Check for enough valid parameters */
         if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) {
-            HDfprintf(stderr, "ERROR: Need fixed array header address and object header address containing "
-                              "the layout message in order to dump data block\n");
-            HDfprintf(stderr, "fixed array data block usage:\n");
-            HDfprintf(
+            fprintf(stderr, "ERROR: Need fixed array header address and object header address containing "
+                            "the layout message in order to dump data block\n");
+            fprintf(stderr, "fixed array data block usage:\n");
+            fprintf(
                 stderr,
                 "\th5debug <filename> <data block address> <array header address> <object header address>\n");
             exit_value = 4;
@@ -786,7 +783,7 @@ main(int argc, char *argv[])
         /*
          * Got some other unrecognized signature.
          */
-        HDprintf("%-*s ", VCOL, "Signature:");
+        printf("%-*s ", VCOL, "Signature:");
         for (u = 0; u < sizeof(sig); u++) {
             if (sig[u] > ' ' && sig[u] <= '~' && '\\' != sig[u])
                 HDputchar(sig[u]);
@@ -795,18 +792,18 @@ main(int argc, char *argv[])
                 HDputchar('\\');
             }
             else
-                HDprintf("\\%03o", sig[u]);
+                printf("\\%03o", sig[u]);
         }
         HDputchar('\n');
 
-        HDfprintf(stderr, "unknown signature\n");
+        fprintf(stderr, "unknown signature\n");
         exit_value = 4;
         goto done;
     } /* end else */
 
     /* Check for an error when dumping information */
     if (status < 0) {
-        HDfprintf(stderr, "An error occurred!\n");
+        fprintf(stderr, "An error occurred!\n");
         H5Eprint2(H5E_DEFAULT, stderr);
         exit_value = 5;
         goto done;
@@ -817,7 +814,7 @@ done:
         H5Pclose(fapl);
     if (fid > 0) {
         if (H5Fclose(fid) < 0) {
-            HDfprintf(stderr, "Error in closing file!\n");
+            fprintf(stderr, "Error in closing file!\n");
             exit_value = 1;
         }
     }
diff --git a/tools/src/misc/h5delete.c b/tools/src/misc/h5delete.c
index f83b379..f996d8d 100644
--- a/tools/src/misc/h5delete.c
+++ b/tools/src/misc/h5delete.c
@@ -25,7 +25,7 @@ static void usage(void);
 static void
 usage(void)
 {
-    HDfprintf(stderr, "usage: h5delete [-f] <filename>\n");
+    fprintf(stderr, "usage: h5delete [-f] <filename>\n");
 }
 
 int
@@ -60,7 +60,7 @@ main(int argc, char *argv[])
     H5E_END_TRY
 
     if (ret < 0 && !quiet)
-        HDfprintf(stderr, "Unable to delete storage at: %s\n", name);
+        fprintf(stderr, "Unable to delete storage at: %s\n", name);
 
     return ret < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c
index c183a41..2e146c0 100644
--- a/tools/src/misc/h5mkgrp.c
+++ b/tools/src/misc/h5mkgrp.c
@@ -320,7 +320,7 @@ main(int argc, char *argv[])
 
         /* Display some output if requested */
         if (params_g.verbose)
-            HDprintf("%s: Creating groups with latest version of the format\n", h5tools_getprogname());
+            printf("%s: Creating groups with latest version of the format\n", h5tools_getprogname());
     }
 
     /* Attempt to open an existing HDF5 file first */
@@ -354,7 +354,7 @@ main(int argc, char *argv[])
 
         /* Display some output if requested */
         if (params_g.verbose)
-            HDprintf("%s: Creating parent groups\n", h5tools_getprogname());
+            printf("%s: Creating parent groups\n", h5tools_getprogname());
     }
 
     /* Loop over creating requested groups */
@@ -375,7 +375,7 @@ main(int argc, char *argv[])
 
         /* Display some output if requested */
         if (params_g.verbose)
-            HDprintf("%s: created group '%s'\n", h5tools_getprogname(), params_g.groups[curr_group]);
+            printf("%s: created group '%s'\n", h5tools_getprogname(), params_g.groups[curr_group]);
     } /* end for */
 
     /* Close link creation property list */
diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c
index e0201f9..c4ea0a6 100644
--- a/tools/src/misc/h5repart.c
+++ b/tools/src/misc/h5repart.c
@@ -50,21 +50,21 @@
 static void
 usage(const char *progname)
 {
-    HDfprintf(stderr, "usage: %s [-v] [-V] [-[b|m] N[g|m|k]] [-family_to_sec2|-family_to_single] SRC DST\n",
-              progname);
-    HDfprintf(stderr, "   -v     Produce verbose output\n");
-    HDfprintf(stderr, "   -V     Print a version number and exit\n");
-    HDfprintf(stderr, "   -b N   The I/O block size, defaults to 1kB\n");
-    HDfprintf(stderr, "   -m N   The destination member size or 1GB\n");
-    HDfprintf(stderr, "   -family_to_sec2   Deprecated version of -family_to_single (below)\n");
-    HDfprintf(stderr, "   -family_to_single   Change file driver from family to the default single-file VFD "
-                      "(windows or sec2)\n");
-    HDfprintf(stderr, "   SRC    The name of the source file\n");
-    HDfprintf(stderr, "   DST    The name of the destination files\n");
-    HDfprintf(stderr, "Sizes may be suffixed with 'g' for GB, 'm' for MB or "
-                      "'k' for kB.\n");
-    HDfprintf(stderr, "File family names include an integer printf "
-                      "format such as '%%d'\n");
+    fprintf(stderr, "usage: %s [-v] [-V] [-[b|m] N[g|m|k]] [-family_to_sec2|-family_to_single] SRC DST\n",
+            progname);
+    fprintf(stderr, "   -v     Produce verbose output\n");
+    fprintf(stderr, "   -V     Print a version number and exit\n");
+    fprintf(stderr, "   -b N   The I/O block size, defaults to 1kB\n");
+    fprintf(stderr, "   -m N   The destination member size or 1GB\n");
+    fprintf(stderr, "   -family_to_sec2   Deprecated version of -family_to_single (below)\n");
+    fprintf(stderr, "   -family_to_single   Change file driver from family to the default single-file VFD "
+                    "(windows or sec2)\n");
+    fprintf(stderr, "   SRC    The name of the source file\n");
+    fprintf(stderr, "   DST    The name of the destination files\n");
+    fprintf(stderr, "Sizes may be suffixed with 'g' for GB, 'm' for MB or "
+                    "'k' for kB.\n");
+    fprintf(stderr, "File family names include an integer printf "
+                    "format such as '%%d'\n");
     HDexit(EXIT_FAILURE);
 }
 
@@ -202,8 +202,8 @@ main(int argc, char *argv[])
             argno++;
         }
         else if (!HDstrcmp(argv[argno], "-V")) {
-            HDprintf("This is %s version %u.%u release %u\n", prog_name, H5_VERS_MAJOR, H5_VERS_MINOR,
-                     H5_VERS_RELEASE);
+            printf("This is %s version %u.%u release %u\n", prog_name, H5_VERS_MAJOR, H5_VERS_MINOR,
+                   H5_VERS_RELEASE);
             HDexit(EXIT_SUCCESS);
         }
         else if (!HDstrcmp(argv[argno], "-family_to_sec2")) {
@@ -252,7 +252,7 @@ main(int argc, char *argv[])
     }
     src_size = src_act_size = sb.st_size;
     if (verbose)
-        HDfprintf(stderr, "< %s\n", src_name);
+        fprintf(stderr, "< %s\n", src_name);
 
     /*
      * Get the name for the destination file and open the first member.
@@ -268,7 +268,7 @@ main(int argc, char *argv[])
         HDexit(EXIT_FAILURE);
     }
     if (verbose)
-        HDfprintf(stderr, "> %s\n", dst_name);
+        fprintf(stderr, "> %s\n", dst_name);
 
     /* No more arguments */
     if (argno < argc)
@@ -298,7 +298,7 @@ main(int argc, char *argv[])
                 HDexit(EXIT_FAILURE);
             }
             else if ((size_t)nio != n) {
-                HDfprintf(stderr, "%s: short read\n", src_name);
+                fprintf(stderr, "%s: short read\n", src_name);
                 HDexit(EXIT_FAILURE);
             }
             for (i = 0; i < n; i++) {
@@ -328,7 +328,7 @@ main(int argc, char *argv[])
                 HDexit(EXIT_FAILURE);
             }
             else if ((size_t)nio != n) {
-                HDfprintf(stderr, "%s: short write\n", dst_name);
+                fprintf(stderr, "%s: short write\n", dst_name);
                 HDexit(EXIT_FAILURE);
             }
             need_seek = FALSE;
@@ -367,11 +367,11 @@ main(int argc, char *argv[])
             }
             src_act_size = sb.st_size;
             if (src_act_size > src_size) {
-                HDfprintf(stderr, "%s: member truncated to %lu bytes\n", src_name, (unsigned long)src_size);
+                fprintf(stderr, "%s: member truncated to %lu bytes\n", src_name, (unsigned long)src_size);
             }
             src_offset = 0;
             if (verbose)
-                HDfprintf(stderr, "< %s\n", src_name);
+                fprintf(stderr, "< %s\n", src_name);
         }
 
         /*
@@ -408,7 +408,7 @@ main(int argc, char *argv[])
             dst_offset = 0;
             need_seek  = FALSE;
             if (verbose)
-                HDfprintf(stderr, "> %s\n", dst_name);
+                fprintf(stderr, "> %s\n", dst_name);
         }
     }
 
diff --git a/tools/test/h5copy/h5copygentest.c b/tools/test/h5copy/h5copygentest.c
index 93289ad..9fb5b74 100644
--- a/tools/test/h5copy/h5copygentest.c
+++ b/tools/test/h5copy/h5copygentest.c
@@ -512,21 +512,21 @@ gen_obj_ref(hid_t loc_id)
      * add dataset */
     sid = H5Screate_simple(1, dims1, NULL);
     if (sid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
 
     oid = H5Dcreate2(loc_id, OBJ_REF_DS, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (oid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
 
     status = H5Dwrite(oid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -538,7 +538,7 @@ gen_obj_ref(hid_t loc_id)
      * add group  */
     oid = H5Gcreate2(loc_id, OBJ_REF_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (oid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -546,34 +546,34 @@ gen_obj_ref(hid_t loc_id)
 
     status = H5Rcreate(&or_data[0], loc_id, OBJ_REF_DS, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
     status = H5Rcreate(&or_data[1], loc_id, OBJ_REF_GRP, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
 
     sid = H5Screate_simple(1, dims2, NULL);
     if (sid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
 
     oid = H5Dcreate2(loc_id, "Dset_OBJREF", H5T_STD_REF_OBJ, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (oid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
 
     status = H5Dwrite(oid, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, or_data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -612,7 +612,7 @@ gen_region_ref(hid_t loc_id)
 
     sid = H5Screate_simple(2, dims2, NULL);
     if (sid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -620,7 +620,7 @@ gen_region_ref(hid_t loc_id)
     /* create normal dataset which is referred */
     oid2 = H5Dcreate2(loc_id, REG_REF_DS2, H5T_STD_I8LE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (oid2 < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -628,7 +628,7 @@ gen_region_ref(hid_t loc_id)
     /* write values to dataset */
     status = H5Dwrite(oid2, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -636,7 +636,7 @@ gen_region_ref(hid_t loc_id)
     /* select elements space for reference */
     status = H5Sselect_elements(sid, H5S_SELECT_SET, 4, coords[0]);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -644,7 +644,7 @@ gen_region_ref(hid_t loc_id)
     /* create region reference from elements space */
     status = H5Rcreate(&rr_data[0], loc_id, REG_REF_DS2, H5R_DATASET_REGION, sid);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -652,7 +652,7 @@ gen_region_ref(hid_t loc_id)
     /* select hyperslab space for reference */
     status = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, stride, count, block);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -660,7 +660,7 @@ gen_region_ref(hid_t loc_id)
     /* create region reference from hyperslab space */
     status = H5Rcreate(&rr_data[1], loc_id, REG_REF_DS2, H5R_DATASET_REGION, sid);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -670,7 +670,7 @@ gen_region_ref(hid_t loc_id)
     /* Create dataspace. */
     sid = H5Screate_simple(1, dims1, NULL);
     if (sid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -678,7 +678,7 @@ gen_region_ref(hid_t loc_id)
     /* create region reference dataset */
     oid1 = H5Dcreate2(loc_id, REG_REF_DS1, H5T_STD_REF_DSETREG, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (oid1 < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -686,7 +686,7 @@ gen_region_ref(hid_t loc_id)
     /* write data as region references */
     status = H5Dwrite(oid1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, rr_data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -716,11 +716,11 @@ Test_Obj_Copy(void)
     unsigned new_format;                 /* New format or old format */
 
     if ((fapl_new = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
-        HDfprintf(stderr, "Error: H5Pcreate failed.\n");
+        fprintf(stderr, "Error: H5Pcreate failed.\n");
         goto out;
     }
     if (H5Pset_libver_bounds(fapl_new, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) {
-        HDfprintf(stderr, "Error: H5Pset_libver_bounds failed.\n");
+        fprintf(stderr, "Error: H5Pset_libver_bounds failed.\n");
         goto out;
     }
 
@@ -734,7 +734,7 @@ Test_Obj_Copy(void)
         else
             fid = H5Fcreate(HDF_FILE1_NEW, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
         if (fid < 0) {
-            HDfprintf(stderr, "Error: H5Fcreate failed.\n");
+            fprintf(stderr, "Error: H5Fcreate failed.\n");
             goto out;
         }
 
@@ -772,19 +772,19 @@ Test_Ref_Copy(void)
 
     fid = H5Fcreate(HDF_FILE2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_FILE2);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_FILE2);
         goto out;
     }
 
     /* add object reference */
     status = gen_obj_ref(fid);
     if (status < 0)
-        HDfprintf(stderr, "Failed to generate object reference.\n");
+        fprintf(stderr, "Failed to generate object reference.\n");
 
     /* add region reference */
     status = gen_region_ref(fid);
     if (status < 0)
-        HDfprintf(stderr, "Failed to generate region reference.\n");
+        fprintf(stderr, "Failed to generate region reference.\n");
 
 out:
     /*-----------------------------------------------------------------------
@@ -815,7 +815,7 @@ gen_extlink_trg(hid_t loc_id)
      * target file */
     gid = H5Gcreate2(loc_id, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -830,7 +830,7 @@ gen_extlink_trg(hid_t loc_id)
     tid    = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(loc_id, "datatype", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -863,7 +863,7 @@ gen_extlink_src(hid_t loc_id)
      *------------------------------------------------------------------------*/
     gid = H5Gcreate2(loc_id, "/group_ext", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -874,7 +874,7 @@ gen_extlink_src(hid_t loc_id)
     /* link to dataset */
     status = H5Lcreate_external(HDF_EXT_TRG_FILE, "/simple", gid, "extlink_dset", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -882,7 +882,7 @@ gen_extlink_src(hid_t loc_id)
     /* link to group */
     status = H5Lcreate_external(HDF_EXT_TRG_FILE, "/group", gid, "extlink_grp", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -891,7 +891,7 @@ gen_extlink_src(hid_t loc_id)
     status =
         H5Lcreate_external(HDF_EXT_TRG_FILE, "/datatype", gid, "extlink_datatype", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -899,7 +899,7 @@ gen_extlink_src(hid_t loc_id)
     /* dangling link - no obj*/
     status = H5Lcreate_external(HDF_EXT_TRG_FILE, "notyet", gid, "extlink_notyet1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -907,7 +907,7 @@ gen_extlink_src(hid_t loc_id)
     /* dangling link - no file */
     status = H5Lcreate_external("notyet_file.h5", "notyet", gid, "extlink_notyet2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -934,25 +934,25 @@ Test_Extlink_Copy(void)
 
     fid1 = H5Fcreate(HDF_EXT_SRC_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_EXT_SRC_FILE);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_EXT_SRC_FILE);
         goto out;
     }
 
     fid2 = H5Fcreate(HDF_EXT_TRG_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_EXT_TRG_FILE);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_EXT_TRG_FILE);
         goto out;
     }
 
     /* add links to source external link file */
     status = gen_extlink_src(fid1);
     if (status < 0)
-        HDfprintf(stderr, "Error: %s> gen_extlink_src failed.\n", HDF_EXT_SRC_FILE);
+        fprintf(stderr, "Error: %s> gen_extlink_src failed.\n", HDF_EXT_SRC_FILE);
 
     /* add objs to target external link file */
     status = gen_extlink_trg(fid2);
     if (status < 0)
-        HDfprintf(stderr, "Error: %s> gen_extlink_trg failed.\n", HDF_EXT_TRG_FILE);
+        fprintf(stderr, "Error: %s> gen_extlink_trg failed.\n", HDF_EXT_TRG_FILE);
 
 out:
     /*-----------------------------------------------------------------------
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index 58a8685..1700177 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -120,7 +120,7 @@ size_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
 #define ONE_DIM_SIZE            16
 
 /* Error macros */
-#define AT() HDprintf("ERROR at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);
+#define AT() printf("ERROR at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);
 #define PROGRAM_ERROR                                                                                        \
     do {                                                                                                     \
         AT();                                                                                                \
@@ -1000,11 +1000,11 @@ test_basic(const char *fname1, const char *fname2, const char *fname3)
 
     /* create the empty file */
     if ((fid1 = H5Fcreate(fname3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        HDfprintf(stderr, "empty file (%s) creation failed.\n", fname3);
+        fprintf(stderr, "empty file (%s) creation failed.\n", fname3);
         goto out;
     }
     if (H5Fclose(fid1) < 0) {
-        HDfprintf(stderr, "empty file (%s) close failed.\n", fname3);
+        fprintf(stderr, "empty file (%s) close failed.\n", fname3);
         goto out;
     }
 
@@ -1734,7 +1734,7 @@ test_attributes_verbose_level(const char *fname1, const char *fname2)
      * Create file1
      *-----------------------------------------------------------------------*/
     if ((fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1744,28 +1744,28 @@ test_attributes_verbose_level(const char *fname1, const char *fname2)
      */
     f1_gid = H5Gcreate2(fid1, "g", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f1_gid < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     f1_gid2 = H5Gcreate2(fid1, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f1_gid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     f1_gid3 = H5Gcreate2(fid1, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f1_gid3 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     f1_gid4 = H5Gcreate2(fid1, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f1_gid4 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1776,13 +1776,13 @@ test_attributes_verbose_level(const char *fname1, const char *fname2)
     f1_sid = H5Screate_simple(1, dset_dims, NULL);
     f1_did = H5Dcreate2(fid1, "dset", H5T_NATIVE_INT, f1_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f1_did == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
     status = H5Dwrite(f1_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1793,7 +1793,7 @@ test_attributes_verbose_level(const char *fname1, const char *fname2)
     f1_tid = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(fid1, "ntype", f1_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -1802,7 +1802,7 @@ test_attributes_verbose_level(const char *fname1, const char *fname2)
      * Create file2
      *-----------------------------------------------------------------------*/
     if ((fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1812,28 +1812,28 @@ test_attributes_verbose_level(const char *fname1, const char *fname2)
      */
     f2_gid = H5Gcreate2(fid2, "g", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f2_gid < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     f2_gid2 = H5Gcreate2(fid2, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f2_gid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     f2_gid3 = H5Gcreate2(fid2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f2_gid3 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     f2_gid4 = H5Gcreate2(fid2, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f2_gid4 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1844,13 +1844,13 @@ test_attributes_verbose_level(const char *fname1, const char *fname2)
     f2_sid = H5Screate_simple(1, dset_dims, NULL);
     f2_did = H5Dcreate2(fid2, "dset", H5T_NATIVE_INT, f2_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (f2_did == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
     status = H5Dwrite(f2_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -1861,7 +1861,7 @@ test_attributes_verbose_level(const char *fname1, const char *fname2)
     f2_tid = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(fid2, "ntype", f2_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2093,7 +2093,7 @@ test_link_name(const char *fname1)
      *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2103,14 +2103,14 @@ test_link_name(const char *fname1)
      *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid1, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
     gid2 = H5Gcreate2(fid1, "group_longname", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     if (gid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2120,14 +2120,14 @@ test_link_name(const char *fname1)
      *------------------------------------------------------------------------*/
     status = H5Lcreate_soft("group", fid1, "link_g1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("group_longname", fid1, "link_g2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2168,7 +2168,7 @@ test_soft_links(const char *fname1)
      *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2178,7 +2178,7 @@ test_soft_links(const char *fname1)
      *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid1, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2189,21 +2189,21 @@ test_soft_links(const char *fname1)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid1, 2, dims2, "target_dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2214,42 +2214,42 @@ test_soft_links(const char *fname1)
     /* file 1 */
     status = H5Lcreate_soft("/target_dset1", fid1, "softlink_dset1_1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_dset1", fid1, "softlink_dset1_2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_dset2", fid1, "softlink_dset2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_group", fid1, "softlink_group1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_group", fid1, "softlink_group2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/no_obj", fid1, "softlink_noexist", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2290,7 +2290,7 @@ test_linked_softlinks(const char *fname1)
      *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2300,21 +2300,21 @@ test_linked_softlinks(const char *fname1)
      *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid1, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fid1, "target_group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid3 = H5Gcreate2(fid1, "target_group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid3 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2325,20 +2325,20 @@ test_linked_softlinks(const char *fname1)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid1, 2, dims2, "target_dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
     status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2350,84 +2350,84 @@ test_linked_softlinks(const char *fname1)
      * file 1 */
     status = H5Lcreate_soft("/target_dset1", fid1, "softlink1_to_dset1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink1_to_dset1", fid1, "softlink1_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink1_to_slink1", fid1, "softlink1_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/target_dset2", fid1, "softlink2_to_dset2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink2_to_dset2", fid1, "softlink2_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink2_to_slink1", fid1, "softlink2_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("target_group1", fid1, "softlink3_to_group1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink3_to_group1", fid1, "softlink3_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink3_to_slink1", fid1, "softlink3_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("target_group2", fid1, "softlink4_to_group2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink4_to_group2", fid1, "softlink4_to_slink1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("softlink4_to_slink1", fid1, "softlink4_to_slink2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2473,7 +2473,7 @@ test_external_links(const char *fname1, const char *fname2)
     /* source file */
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2481,7 +2481,7 @@ test_external_links(const char *fname1, const char *fname2)
     /* target file */
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2493,14 +2493,14 @@ test_external_links(const char *fname1, const char *fname2)
      * target file */
     gid1 = H5Gcreate2(fid2, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fid2, "target_group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2511,21 +2511,21 @@ test_external_links(const char *fname1, const char *fname2)
      * target file */
     status = write_dset(fid2, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid1, 2, dims2, "x_dset", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid2, 2, dims2, "x_dset", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2538,7 +2538,7 @@ test_external_links(const char *fname1, const char *fname2)
     status =
         H5Lcreate_external(fname2, "/target_group/x_dset", fid1, "ext_link_dset1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2546,35 +2546,35 @@ test_external_links(const char *fname1, const char *fname2)
     status =
         H5Lcreate_external(fname2, "/target_group2/x_dset", fid1, "ext_link_dset2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/target_group", fid1, "/ext_link_grp1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/target_group2", fid1, "/ext_link_grp2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link_noexist1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external("no_file.h5", "no_obj", fid1, "ext_link_noexist2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2620,7 +2620,7 @@ test_ext2soft_links(const char *fname1, const char *fname2)
     /* source file */
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2628,7 +2628,7 @@ test_ext2soft_links(const char *fname1, const char *fname2)
     /* target file */
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2639,7 +2639,7 @@ test_ext2soft_links(const char *fname1, const char *fname2)
     /* target file */
     gid2 = H5Gcreate2(fid2, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2651,14 +2651,14 @@ test_ext2soft_links(const char *fname1, const char *fname2)
      * target file */
     status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2670,14 +2670,14 @@ test_ext2soft_links(const char *fname1, const char *fname2)
      * target file */
     status = H5Lcreate_soft("/dset1", fid2, "softlink_to_dset1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/dset2", fid2, "softlink_to_dset2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2689,7 +2689,7 @@ test_ext2soft_links(const char *fname1, const char *fname2)
      * source file */
     status = H5Lcreate_external(fname2, "/target_group", fid1, "ext_link", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2697,7 +2697,7 @@ test_ext2soft_links(const char *fname1, const char *fname2)
     status = H5Lcreate_external(fname2, "/softlink_to_dset1", fid1, "ext_link_to_slink1", H5P_DEFAULT,
                                 H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2705,7 +2705,7 @@ test_ext2soft_links(const char *fname1, const char *fname2)
     status = H5Lcreate_external(fname2, "/softlink_to_dset2", fid1, "ext_link_to_slink2", H5P_DEFAULT,
                                 H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2838,14 +2838,14 @@ test_dangle_links(const char *fname1, const char *fname2)
      *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2856,14 +2856,14 @@ test_dangle_links(const char *fname1, const char *fname2)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2871,14 +2871,14 @@ test_dangle_links(const char *fname1, const char *fname2)
     /* file2 */
     status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2889,28 +2889,28 @@ test_dangle_links(const char *fname1, const char *fname2)
     /* file 1 */
     status = H5Lcreate_soft("no_obj", fid1, "soft_link1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/dset1", fid1, "soft_link2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj", fid1, "soft_link3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj1", fid1, "soft_link4", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2918,28 +2918,28 @@ test_dangle_links(const char *fname1, const char *fname2)
     /* file 2 */
     status = H5Lcreate_soft("no_obj", fid2, "soft_link1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj", fid2, "soft_link2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/dset2", fid2, "soft_link3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("no_obj2", fid2, "soft_link4", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -2950,28 +2950,28 @@ test_dangle_links(const char *fname1, const char *fname2)
     /* file1 */
     status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/dset1", fid1, "ext_link2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external("no_file.h5", "no_obj", fid1, "ext_link4", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -2979,28 +2979,28 @@ test_dangle_links(const char *fname1, const char *fname2)
     /* file2 */
     status = H5Lcreate_external(fname1, "no_obj", fid2, "ext_link1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "no_obj", fid2, "ext_link2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "/dset2", fid2, "ext_link3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external("no_file.h5", "no_obj", fid2, "ext_link4", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3044,14 +3044,14 @@ test_group_recurse(const char *fname1, const char *fname2)
      *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3062,28 +3062,28 @@ test_group_recurse(const char *fname1, const char *fname2)
     /* file1 */
     gid1_f1 = H5Gcreate2(fid1, "/grp1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1_f1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid2_f1 = H5Gcreate2(fid1, "/grp1/grp2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2_f1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid3_f1 = H5Gcreate2(fid1, "/grp1/grp2/grp3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid3_f1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     gid10_f1 = H5Gcreate2(fid1, "/grp10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid10_f1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3091,28 +3091,28 @@ test_group_recurse(const char *fname1, const char *fname2)
     /* file2 */
     gid1_f2 = H5Gcreate2(fid2, "/grp1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1_f2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid2_f2 = H5Gcreate2(fid2, "/grp1/grp2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2_f2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid3_f2 = H5Gcreate2(fid2, "/grp1/grp2/grp3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid3_f2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     gid11_f2 = H5Gcreate2(fid2, "/grp11", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid11_f2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3123,21 +3123,21 @@ test_group_recurse(const char *fname1, const char *fname2)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid1, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3145,21 +3145,21 @@ test_group_recurse(const char *fname1, const char *fname2)
     /* file2 */
     status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid2, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3170,54 +3170,54 @@ test_group_recurse(const char *fname1, const char *fname2)
     /* file1 */
     status = write_dset(gid1_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid2_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
     status = write_dset(gid2_f1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid3_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
     status = write_dset(gid3_f1, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid3_f1, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid10_f1, 2, dims2, "dset4", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid10_f1, 2, dims2, "dset5", H5T_NATIVE_INT, data3);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3225,54 +3225,54 @@ test_group_recurse(const char *fname1, const char *fname2)
     /* file2 */
     status = write_dset(gid1_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid2_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
     status = write_dset(gid2_f2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid3_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
     status = write_dset(gid3_f2, 2, dims2, "dset2", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid3_f2, 2, dims2, "dset3", H5T_NATIVE_INT, data3);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid11_f2, 2, dims2, "dset4", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid11_f2, 2, dims2, "dset5", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3283,28 +3283,28 @@ test_group_recurse(const char *fname1, const char *fname2)
     /* file 1 */
     status = H5Lcreate_soft("/grp1", fid1, "slink_grp1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2", fid1, "slink_grp2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2/grp3", fid1, "slink_grp3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp10", fid1, "slink_grp10", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3312,28 +3312,28 @@ test_group_recurse(const char *fname1, const char *fname2)
     /* file 2 */
     status = H5Lcreate_soft("/grp1", fid2, "slink_grp1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2", fid2, "slink_grp2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp1/grp2/grp3", fid2, "slink_grp3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_soft("/grp11", fid2, "slink_grp11", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3344,21 +3344,21 @@ test_group_recurse(const char *fname1, const char *fname2)
     /* file1 */
     status = H5Lcreate_external(fname2, "/grp1", fid1, "elink_grp1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/grp1/grp2", fid1, "elink_grp2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname2, "/grp1/grp2/grp3", fid1, "elink_grp3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3366,21 +3366,21 @@ test_group_recurse(const char *fname1, const char *fname2)
     /* file2 */
     status = H5Lcreate_external(fname1, "/grp1", fid2, "elink_grp1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "/grp1/grp2", fid2, "elink_grp2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = H5Lcreate_external(fname1, "/grp1/grp2/grp3", fid2, "elink_grp3", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3392,14 +3392,14 @@ test_group_recurse(const char *fname1, const char *fname2)
     /* file1 */
     status = H5Lcreate_external(fname2, "/grp11", gid10_f1, "elink_grp_circle", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1);
         status = FAIL;
         goto out;
     }
     /* file2 */
     status = H5Lcreate_external(fname1, "/grp10", gid11_f2, "elink_grp_circle", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3474,28 +3474,28 @@ test_group_recurse2(void)
      *------------------------------------------------------------------------*/
     grp1 = H5Gcreate2(fileid1, "/g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     grp2 = H5Gcreate2(grp1, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     grp3 = H5Gcreate2(grp2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp3 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
 
     grp4 = H5Gcreate2(grp3, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp4 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
@@ -3570,7 +3570,7 @@ test_group_recurse2(void)
     /* link to dset1 */
     status = H5Lcreate_soft(GRP_R_DSETNAME1, fileid1, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE1_EXT);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
@@ -3594,7 +3594,7 @@ test_group_recurse2(void)
      */
     grp4 = H5Gcreate2(fileid4, "/g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp4 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT3);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT3);
         status = FAIL;
         goto out;
     }
@@ -3628,14 +3628,14 @@ test_group_recurse2(void)
      */
     grp2 = H5Gcreate2(fileid3, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2);
         status = FAIL;
         goto out;
     }
 
     grp3 = H5Gcreate2(grp2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp3 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2);
         status = FAIL;
         goto out;
     }
@@ -3659,7 +3659,7 @@ test_group_recurse2(void)
      */
     status = H5Lcreate_external(GRP_RECURSE2_EXT3, "/g4", fileid3, "/g2/g3/g4", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT2);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT2);
         status = FAIL;
         goto out;
     }
@@ -3680,7 +3680,7 @@ test_group_recurse2(void)
      */
     grp1 = H5Gcreate2(fileid2, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (grp1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT);
         status = FAIL;
         goto out;
     }
@@ -3704,7 +3704,7 @@ test_group_recurse2(void)
     /* link to dset1 */
     status = H5Lcreate_soft(GRP_R_DSETNAME1, fileid2, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE2_EXT1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE2_EXT1);
         status = FAIL;
         goto out;
     }
@@ -3714,7 +3714,7 @@ test_group_recurse2(void)
      */
     status = H5Lcreate_external(GRP_RECURSE2_EXT2, "/g2", fileid2, "/g1/g2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT1);
+        fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT1);
         status = FAIL;
         goto out;
     }
@@ -3768,14 +3768,14 @@ test_exclude_obj1(const char *fname1, const char *fname2)
      *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3786,7 +3786,7 @@ test_exclude_obj1(const char *fname1, const char *fname2)
     /* file1 */
     gid1 = H5Gcreate2(fid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3795,7 +3795,7 @@ test_exclude_obj1(const char *fname1, const char *fname2)
     gid2 = H5Gcreate2(fid2, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     if (gid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3806,21 +3806,21 @@ test_exclude_obj1(const char *fname1, const char *fname2)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid1, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid1, 2, dims2, "dset3", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3828,21 +3828,21 @@ test_exclude_obj1(const char *fname1, const char *fname2)
     /* file2 */
     status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid2, 2, dims2, "dset3", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3890,14 +3890,14 @@ test_exclude_obj2(const char *fname1, const char *fname2)
      *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3908,7 +3908,7 @@ test_exclude_obj2(const char *fname1, const char *fname2)
     /* file1 */
     gid1 = H5Gcreate2(fid1, "group10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3916,7 +3916,7 @@ test_exclude_obj2(const char *fname1, const char *fname2)
     /* file2 */
     gid2 = H5Gcreate2(fid2, "group10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3925,7 +3925,7 @@ test_exclude_obj2(const char *fname1, const char *fname2)
     gid3 = H5Gcreate2(fid2, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     if (gid3 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -3936,21 +3936,21 @@ test_exclude_obj2(const char *fname1, const char *fname2)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "dset10", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid1, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -3958,21 +3958,21 @@ test_exclude_obj2(const char *fname1, const char *fname2)
     /* file2 */
     status = write_dset(fid2, 2, dims2, "dset10", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid3, 2, dims2, "dset3", H5T_NATIVE_INT, data2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -4019,14 +4019,14 @@ test_exclude_obj3(const char *fname1, const char *fname2)
      *------------------------------------------------------------------------*/
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         status = FAIL;
         goto out;
     }
 
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -4037,7 +4037,7 @@ test_exclude_obj3(const char *fname1, const char *fname2)
     /* file1 */
     gid1 = H5Gcreate2(fid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4048,14 +4048,14 @@ test_exclude_obj3(const char *fname1, const char *fname2)
     /* file1 */
     status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
 
     status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4063,7 +4063,7 @@ test_exclude_obj3(const char *fname1, const char *fname2)
     /* file2 */
     status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname2);
         status = FAIL;
         goto out;
     }
@@ -4374,7 +4374,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     if (is_file_new == 1) {
         fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
         if (fid1 < 0) {
-            HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+            fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
             status = FAIL;
             goto out;
         }
@@ -4382,7 +4382,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     else {
         fid1 = H5Fopen(fname1, H5F_ACC_RDWR, H5P_DEFAULT);
         if (fid1 < 0) {
-            HDfprintf(stderr, "Error: %s> H5Fopen failed.\n", fname1);
+            fprintf(stderr, "Error: %s> H5Fopen failed.\n", fname1);
             status = FAIL;
             goto out;
         }
@@ -4393,7 +4393,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
      *------------------------------------------------------------------------*/
     gid = H5Gcreate2(fid1, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4403,7 +4403,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
      *------------------------------------------------------------------------*/
     sid_vlen_str = H5Screate_simple(STR_RANK, dims_vlen_str, NULL);
     if (sid_vlen_str < 0) {
-        HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4411,7 +4411,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     tid_vlen_str = H5Tcopy(H5T_C_S1);
     status       = H5Tset_size(tid_vlen_str, H5T_VARIABLE);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4421,7 +4421,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
      *------------------------------------------------------------------------*/
     sid_fixlen_str = H5Screate_simple(STR_RANK, dims_fixlen_str, NULL);
     if (sid_fixlen_str < 0) {
-        HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4429,7 +4429,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     tid_fixlen_str = H5Tcopy(H5T_C_S1);
     status         = H5Tset_size(tid_fixlen_str, FIXLEN_STR_SIZE);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4439,7 +4439,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
      *------------------------------------------------------------------------*/
     sid_vlen_str_array = H5Screate_simple(STR_RANK, dims_vlen_str_array, NULL);
     if (sid_vlen_str_array < 0) {
-        HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4447,7 +4447,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     tid_vlen_str_array_pre = H5Tcopy(H5T_C_S1);
     status                 = H5Tset_size(tid_vlen_str_array_pre, H5T_VARIABLE);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4455,7 +4455,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     /* Create the array data type for the string array                */
     tid_vlen_str_array = H5Tarray_create2(tid_vlen_str_array_pre, COMP_RANK, dims_vlen_str_array);
     if (tid_vlen_str_array < 0) {
-        HDfprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4465,7 +4465,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
      *------------------------------------------------------------------------*/
     sid_fixlen_str_array = H5Screate_simple(STR_RANK, dims_fixlen_str_array, NULL);
     if (sid_fixlen_str_array < 0) {
-        HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4473,14 +4473,14 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     tid_fixlen_str_array_pre = H5Tcopy(H5T_C_S1);
     status                   = H5Tset_size(tid_fixlen_str_array_pre, FIXLEN_STR_ARRY_SIZE);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1);
         status = FAIL;
         goto out;
     }
     /* Create the array data type for the string array                */
     tid_fixlen_str_array = H5Tarray_create2(tid_fixlen_str_array_pre, COMP_RANK, dims_fixlen_str_array);
     if (tid_fixlen_str_array < 0) {
-        HDfprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4490,7 +4490,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
      *------------------------------------------------------------------------*/
     sid_comp = H5Screate_simple(COMP_RANK, dims_comp, NULL);
     if (sid_comp < 0) {
-        HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4604,7 +4604,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     did_comp = H5Dcreate2(gid, "Compound_dset1", tid1_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status   = H5Dwrite(did_comp, tid1_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp1_buf);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4614,7 +4614,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     did_comp = H5Dcreate2(gid, "Compound_dset2", tid2_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status   = H5Dwrite(did_comp, tid2_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp2_buf);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4624,7 +4624,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     did_comp = H5Dcreate2(gid, "Compound_dset3", tid3_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status   = H5Dwrite(did_comp, tid3_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp3_buf);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4634,7 +4634,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     did_comp = H5Dcreate2(gid, "Compound_dset4", tid4_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status   = H5Dwrite(did_comp, tid4_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp4_buf);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4644,7 +4644,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     did_comp = H5Dcreate2(gid, "Compound_dset5", tid5_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status   = H5Dwrite(did_comp, tid5_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp5_buf);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4654,7 +4654,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     did_comp = H5Dcreate2(gid, "Compound_dset6", tid6_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status   = H5Dwrite(did_comp, tid6_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp6_buf);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4664,7 +4664,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     did_comp = H5Dcreate2(gid, "Compound_dset7", tid7_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status   = H5Dwrite(did_comp, tid7_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp7_buf);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4674,7 +4674,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     did_comp = H5Dcreate2(gid, "Compound_dset8", tid8_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status   = H5Dwrite(did_comp, tid8_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp8_buf);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4690,7 +4690,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
 
     status = H5Dwrite(did_comp, tid9_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp9_buf);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1);
         status = FAIL;
         goto out;
     }
@@ -4813,14 +4813,14 @@ test_enums(const char *fname)
     enum_val = 0;
     status   = H5Tenum_insert(tid, "YIN", &enum_val);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname);
+        fprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname);
         status = FAIL;
         goto out;
     }
     enum_val = 1;
     status   = H5Tenum_insert(tid, "YANG", &enum_val);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname);
+        fprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname);
         status = FAIL;
         goto out;
     }
@@ -4831,13 +4831,13 @@ test_enums(const char *fname)
 
     status = write_dset(fid, 1, &dims, "dset1", tid, data1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> write_dset failed.\n", fname);
+        fprintf(stderr, "Error: %s> write_dset failed.\n", fname);
         status = FAIL;
         goto out;
     }
     status = write_dset(fid, 1, &dims, "dset2", tid, data2);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> write_dset failed.\n", fname);
+        fprintf(stderr, "Error: %s> write_dset failed.\n", fname);
         status = FAIL;
         goto out;
     }
@@ -5470,7 +5470,7 @@ test_data_nocomparables(const char *fname, int make_diffs)
      *------------------------------------------------------------------------*/
     fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname);
         status = FAIL;
         goto out;
     }
@@ -5480,14 +5480,14 @@ test_data_nocomparables(const char *fname, int make_diffs)
      *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fid, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname);
         status = FAIL;
         goto out;
     }
@@ -5500,13 +5500,13 @@ test_data_nocomparables(const char *fname, int make_diffs)
 
     /*  dset1 */
     if ((did1 = H5Dcreate2(gid1, "dset1", tid_dset1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1");
+        fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
 
     if (H5Dwrite(did1, tid_dset1, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr1) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1");
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
@@ -5515,7 +5515,7 @@ test_data_nocomparables(const char *fname, int make_diffs)
     /*  dset2 */
     status = write_dset(gid1, 1, dims1_1, "dset2", H5T_NATIVE_INT, dset_data_ptr2);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname);
         goto out;
     }
 
@@ -5525,13 +5525,13 @@ test_data_nocomparables(const char *fname, int make_diffs)
     /* ---------
      *  dset1 */
     if ((did2 = H5Dcreate2(gid2, "dset1", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1");
+        fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
 
     if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr3) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1");
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1");
         status = FAIL;
         goto out;
     }
@@ -5551,7 +5551,7 @@ test_data_nocomparables(const char *fname, int make_diffs)
      * dset2 */
     status = write_dset(gid2, 1, dims1_1, "dset2", H5T_NATIVE_INT, dset_data_ptr3);
     if (status == FAIL) {
-        HDfprintf(stderr, "Error: %s> write_dset failed\n", fname);
+        fprintf(stderr, "Error: %s> write_dset failed\n", fname);
         goto out;
     }
 
@@ -5755,14 +5755,14 @@ test_objs_strings(const char *fname1, const char *fname2)
     /* file1 */
     fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1);
         goto out;
     }
 
     /* file2 */
     fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2);
         goto out;
     }
 
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 2341a04..82ac178 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -683,7 +683,7 @@ gent_softlink2(void)
     /* Create a new file */
     fileid1 = H5Fcreate(FILE4_1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     if (fileid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Fcreate failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -693,14 +693,14 @@ gent_softlink2(void)
      *------------------------------------------------------------------------*/
     gid1 = H5Gcreate2(fileid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
 
     gid2 = H5Gcreate2(fileid1, "group_empty", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -711,7 +711,7 @@ gent_softlink2(void)
     datatype = H5Tcopy(H5T_NATIVE_INT);
     status   = H5Tcommit2(fileid1, "dtype", datatype, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -737,14 +737,14 @@ gent_softlink2(void)
     /* Create a new dataset as sample object */
     dset1 = H5Dcreate2(fileid1, "/dset1", H5T_NATIVE_INT, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (dset1 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
 
     status = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -755,14 +755,14 @@ gent_softlink2(void)
     /* Create a new dataset as sample object */
     dset2 = H5Dcreate2(fileid1, "/dset2", H5T_NATIVE_INT, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (dset2 < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
 
     status = H5Dwrite(dset2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data2);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Dwrite failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -776,7 +776,7 @@ gent_softlink2(void)
     /* link to dset1 */
     status = H5Lcreate_soft("/dset1", fileid1, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -784,7 +784,7 @@ gent_softlink2(void)
     /* link to data type */
     status = H5Lcreate_soft("/dtype", fileid1, "soft_dtype", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -792,7 +792,7 @@ gent_softlink2(void)
     /* link to group1 */
     status = H5Lcreate_soft("/group1", fileid1, "soft_group1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -800,7 +800,7 @@ gent_softlink2(void)
     /* link to empty group */
     status = H5Lcreate_soft("/group_empty", fileid1, "soft_empty_grp", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -808,7 +808,7 @@ gent_softlink2(void)
     /* dangling link */
     status = H5Lcreate_soft("not_yet", fileid1, "soft_dangle", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -819,7 +819,7 @@ gent_softlink2(void)
     /* link to dset1 */
     status = H5Lcreate_soft("/dset1", gid1, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -827,7 +827,7 @@ gent_softlink2(void)
     /* link to dset2 */
     status = H5Lcreate_soft("/dset2", gid1, "soft_dset2", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -835,7 +835,7 @@ gent_softlink2(void)
     /* link to data type */
     status = H5Lcreate_soft("/dtype", gid1, "soft_dtype", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -843,7 +843,7 @@ gent_softlink2(void)
     /* link to empty group */
     status = H5Lcreate_soft("/group_empty", gid1, "soft_empty_grp", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -851,7 +851,7 @@ gent_softlink2(void)
     /* dangling link  */
     status = H5Lcreate_soft("not_yet", gid1, "soft_dangle", H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1);
         status = FAIL;
         goto out;
     }
@@ -861,31 +861,31 @@ out:
      * Close/release resources.
      */
     if (dataspace >= 0 && H5Sclose(dataspace) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Sclose failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Sclose failed.\n", FILE4_1);
         status = FAIL;
     }
     if (gid1 >= 0 && H5Gclose(gid1) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gclose failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Gclose failed.\n", FILE4_1);
         status = FAIL;
     }
     if (gid2 >= 0 && H5Gclose(gid2) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Gclose failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Gclose failed.\n", FILE4_1);
         status = FAIL;
     }
     if (datatype >= 0 && H5Tclose(datatype) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Tclose failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Tclose failed.\n", FILE4_1);
         status = FAIL;
     }
     if (dset1 >= 0 && H5Dclose(dset1) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dclose failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Dclose failed.\n", FILE4_1);
         status = FAIL;
     }
     if (dset2 >= 0 && H5Dclose(dset2) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Dclose failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Dclose failed.\n", FILE4_1);
         status = FAIL;
     }
     if (fileid1 >= 0 && H5Fclose(fileid1) < 0) {
-        HDfprintf(stderr, "Error: %s> H5Fclose failed.\n", FILE4_1);
+        fprintf(stderr, "Error: %s> H5Fclose failed.\n", FILE4_1);
         status = FAIL;
     }
 
@@ -2560,7 +2560,7 @@ gent_nestcomp(void)
      */
     status = H5Dwrite(dataset, s2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s1);
     if (status < 0)
-        HDfprintf(stderr, "gent_nestcomp H5Dwrite failed\n");
+        fprintf(stderr, "gent_nestcomp H5Dwrite failed\n");
 
     /*
      * Release resources
@@ -2788,14 +2788,14 @@ gent_vldatatypes2(void)
     for (i = 0; i < SPACE1_DIM1; i++) {
         wdata[i].p = (hvl_t *)HDmalloc((i + 1) * sizeof(hvl_t));
         if (wdata[i].p == NULL) {
-            HDprintf("Cannot allocate memory for VL data! i=%u\n", i);
+            printf("Cannot allocate memory for VL data! i=%u\n", i);
             return;
         } /* end if */
         wdata[i].len = i + 1;
         for (t1 = (hvl_t *)wdata[i].p, j = 0; j < (i + 1); j++, t1++) {
             t1->p = (unsigned *)HDmalloc((j + 1) * sizeof(unsigned));
             if (t1->p == NULL) {
-                HDprintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j);
+                printf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j);
                 return;
             } /* end if */
             t1->len = j + 1;
@@ -3888,7 +3888,7 @@ gent_multi(void)
         memb_map[mt]  = mt;
         HDsprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]);
         memb_name[mt] = sv[mt];
-        /*HDprintf("memb_name[%d]=%s, memb_map[%d]=%d; ", mt, memb_name[mt], mt, memb_map[mt]);*/
+        /*printf("memb_name[%d]=%s, memb_map[%d]=%d; ", mt, memb_name[mt], mt, memb_map[mt]);*/
         memb_addr[mt] = (haddr_t)MAX(mt - 1, 0) * (HADDR_MAX / 10);
     }
     memb_map[H5FD_MEM_DEFAULT] = H5FD_MEM_SUPER;
@@ -6349,7 +6349,7 @@ gent_ldouble(void)
     return 0;
 
 error:
-    HDprintf("error !\n");
+    printf("error !\n");
     return -1;
 }
 
@@ -6400,7 +6400,7 @@ gent_ldouble_scalar(void)
     return 0;
 
 error:
-    HDprintf("error !\n");
+    printf("error !\n");
     return -1;
 }
 
@@ -6557,7 +6557,7 @@ gent_bigdims(void)
     return;
 
 out:
-    HDprintf("Error.....\n");
+    printf("Error.....\n");
     H5E_BEGIN_TRY
     {
         H5Pclose(dcpl);
@@ -6744,7 +6744,7 @@ gent_group_creation_order(void)
     return;
 
 out:
-    HDprintf("Error.....\n");
+    printf("Error.....\n");
     H5E_BEGIN_TRY
     {
         H5Gclose(gid);
@@ -7000,7 +7000,7 @@ gent_attr_creation_order(void)
     return;
 
 out:
-    HDprintf("Error.....\n");
+    printf("Error.....\n");
     H5E_BEGIN_TRY
     {
         H5Gclose(gid);
@@ -10930,7 +10930,7 @@ gent_compound_complex2(void)
                 }
 
                 if (H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-                    HDfprintf(stderr, "gent_tcompound_complex2 H5Dwrite failed\n");
+                    fprintf(stderr, "gent_tcompound_complex2 H5Dwrite failed\n");
 
                 H5Dclose(dset);
             }
@@ -11061,7 +11061,7 @@ gent_vlenstr_array(void)
             if ((dset = H5Dcreate2(file, F83_DATASETNAME, type, space, H5P_DEFAULT, H5P_DEFAULT,
                                    H5P_DEFAULT)) >= 0) {
                 if (H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer) < 0)
-                    HDfprintf(stderr, "gent_vlenstr_array H5Dwrite failed\n");
+                    fprintf(stderr, "gent_vlenstr_array H5Dwrite failed\n");
 
                 H5Dclose(dset);
             }
@@ -11083,7 +11083,7 @@ gent_vlenstr_array(void)
             if ((dset = H5Dcreate2(file, F83_DATASETNAME2, type, space, H5P_DEFAULT, H5P_DEFAULT,
                                    H5P_DEFAULT)) >= 0) {
                 if (H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-                    HDfprintf(stderr, "gent_vlenstr_array H5Dwrite failed\n");
+                    fprintf(stderr, "gent_vlenstr_array H5Dwrite failed\n");
 
                 H5Dclose(dset);
             }
diff --git a/tools/test/h5format_convert/h5fc_chk_idx.c b/tools/test/h5format_convert/h5fc_chk_idx.c
index 97688ad..ffa3327 100644
--- a/tools/test/h5format_convert/h5fc_chk_idx.c
+++ b/tools/test/h5format_convert/h5fc_chk_idx.c
@@ -25,7 +25,7 @@ static void usage(void);
 static void
 usage(void)
 {
-    HDfprintf(stdout, "Usage: h5fc_chk_idx file_name dataset_pathname\n");
+    fprintf(stdout, "Usage: h5fc_chk_idx file_name dataset_pathname\n");
 } /* usage() */
 
 /*-------------------------------------------------------------------------
@@ -60,31 +60,31 @@ main(int argc, char *argv[])
 
     /* Try opening the file */
     if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) {
-        HDfprintf(stderr, "h5fc_chk_idx: unable to open the file\n");
+        fprintf(stderr, "h5fc_chk_idx: unable to open the file\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Open the dataset */
     if ((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0) {
-        HDfprintf(stderr, "h5fc_chk_idx: unable to open the dataset\n");
+        fprintf(stderr, "h5fc_chk_idx: unable to open the dataset\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Get the dataset's chunk indexing type */
     if (H5Dget_chunk_index_type(did, &idx_type) < 0) {
-        HDfprintf(stderr, "h5fc_chk_idx: unable to get chunk index type for the dataset\n");
+        fprintf(stderr, "h5fc_chk_idx: unable to get chunk index type for the dataset\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Close the dataset */
     if (H5Dclose(did) < 0) {
-        HDfprintf(stderr, "h5fc_chk_idx: unable to close the dataset\n");
+        fprintf(stderr, "h5fc_chk_idx: unable to close the dataset\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Close the file */
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "h5fc_chk_idx_type: cannot close the file\n");
+        fprintf(stderr, "h5fc_chk_idx_type: cannot close the file\n");
         HDexit(EXIT_FAILURE);
     } /* end if */
 
@@ -92,7 +92,7 @@ main(int argc, char *argv[])
     if (idx_type == H5D_CHUNK_IDX_BTREE)
         HDexit(EXIT_SUCCESS);
     else {
-        HDfprintf(stderr, "Error: chunk indexing type is %d\n", idx_type);
+        fprintf(stderr, "Error: chunk indexing type is %d\n", idx_type);
         HDexit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/tools/test/h5import/h5importtest.c b/tools/test/h5import/h5importtest.c
index b05ea82..96da5c8 100644
--- a/tools/test/h5import/h5importtest.c
+++ b/tools/test/h5import/h5importtest.c
@@ -163,8 +163,8 @@ main(void)
     for (k = 0; k < npln; k++) {
         for (i = 0; i < nrow; i++) {
             for (j = 0; j < ncol; j++)
-                (void)HDfprintf(sp, "%10u", b8i3[k][i][j]);
-            (void)HDfprintf(sp, "\n");
+                (void)fprintf(sp, "%10u", b8i3[k][i][j]);
+            (void)fprintf(sp, "\n");
         }
     }
     (void)HDfclose(sp);
@@ -178,8 +178,8 @@ main(void)
     for (k = 0; k < npln; k++) {
         for (i = 0; i < nrow; i++) {
             for (j = 0; j < ncol; j++)
-                (void)HDfprintf(sp, "%10u", b16i3[k][i][j]);
-            (void)HDfprintf(sp, "\n");
+                (void)fprintf(sp, "%10u", b16i3[k][i][j]);
+            (void)fprintf(sp, "\n");
         }
     }
     (void)HDfclose(sp);
@@ -193,8 +193,8 @@ main(void)
     for (k = 0; k < npln; k++) {
         for (i = 0; i < nrow; i++) {
             for (j = 0; j < ncol; j++)
-                (void)HDfprintf(sp, "%10d", b32i3[k][i][j]);
-            (void)HDfprintf(sp, "\n");
+                (void)fprintf(sp, "%10d", b32i3[k][i][j]);
+            (void)fprintf(sp, "\n");
         }
     }
     (void)HDfclose(sp);
@@ -216,16 +216,16 @@ main(void)
     (void)HDfclose(sp);
 
     sp = HDfopen("binin32.conf", "w");
-    (void)HDfprintf(sp, "PATH /int/bin/32-bit\n");
-    (void)HDfprintf(sp, "INPUT-CLASS IN\n");
-    (void)HDfprintf(sp, "INPUT-SIZE    32\n");
-    (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-    (void)HDfprintf(sp, "RANK 3\n");
-    (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
-    (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
-    (void)HDfprintf(sp, "DIMENSION-SIZES 5 3 4\n");
-    (void)HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 1 2 1\n");
-    (void)HDfprintf(sp, "\n");
+    (void)fprintf(sp, "PATH /int/bin/32-bit\n");
+    (void)fprintf(sp, "INPUT-CLASS IN\n");
+    (void)fprintf(sp, "INPUT-SIZE    32\n");
+    (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void)fprintf(sp, "RANK 3\n");
+    (void)fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void)fprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
+    (void)fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 1 2 1\n");
+    (void)fprintf(sp, "\n");
     (void)HDfclose(sp);
 
     /*-------------------------------------------------------------------------
@@ -244,15 +244,15 @@ main(void)
     (void)HDfclose(sp);
 
     sp = HDfopen("binuin32.conf", "w");
-    (void)HDfprintf(sp, "PATH /int/buin/32-bit\n");
-    (void)HDfprintf(sp, "INPUT-CLASS UIN\n");
-    (void)HDfprintf(sp, "INPUT-SIZE    32\n");
-    (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-    (void)HDfprintf(sp, "RANK 3\n");
-    (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
-    (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
-    (void)HDfprintf(sp, "DIMENSION-SIZES 5 3 4\n");
-    (void)HDfprintf(sp, "\n");
+    (void)fprintf(sp, "PATH /int/buin/32-bit\n");
+    (void)fprintf(sp, "INPUT-CLASS UIN\n");
+    (void)fprintf(sp, "INPUT-SIZE    32\n");
+    (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void)fprintf(sp, "RANK 3\n");
+    (void)fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void)fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void)fprintf(sp, "\n");
     (void)HDfclose(sp);
 
     /*-------------------------------------------------------------------------
@@ -271,17 +271,17 @@ main(void)
     (void)HDfclose(sp);
 
     sp = HDfopen("binin16.conf", "w");
-    (void)HDfprintf(sp, "PATH /int/bin/16-bit\n");
-    (void)HDfprintf(sp, "INPUT-CLASS IN\n");
-    (void)HDfprintf(sp, "INPUT-SIZE    16\n");
-    (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-    (void)HDfprintf(sp, "RANK 3\n");
-    (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
-    (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
-    (void)HDfprintf(sp, "DIMENSION-SIZES 2 3 4\n");
-    (void)HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
-    (void)HDfprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
-    (void)HDfprintf(sp, "\n");
+    (void)fprintf(sp, "PATH /int/bin/16-bit\n");
+    (void)fprintf(sp, "INPUT-CLASS IN\n");
+    (void)fprintf(sp, "INPUT-SIZE    16\n");
+    (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void)fprintf(sp, "RANK 3\n");
+    (void)fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void)fprintf(sp, "DIMENSION-SIZES 2 3 4\n");
+    (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
+    (void)fprintf(sp, "\n");
     (void)HDfclose(sp);
 
     /*-------------------------------------------------------------------------
@@ -299,17 +299,17 @@ main(void)
     (void)HDfclose(sp);
 
     sp = HDfopen("binuin16.conf", "w");
-    (void)HDfprintf(sp, "PATH /int/buin/16-bit\n");
-    (void)HDfprintf(sp, "INPUT-CLASS UIN\n");
-    (void)HDfprintf(sp, "INPUT-SIZE    16\n");
-    (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-    (void)HDfprintf(sp, "RANK 3\n");
-    (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
-    (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
-    (void)HDfprintf(sp, "DIMENSION-SIZES 2 3 4\n");
-    (void)HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
-    (void)HDfprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
-    (void)HDfprintf(sp, "\n");
+    (void)fprintf(sp, "PATH /int/buin/16-bit\n");
+    (void)fprintf(sp, "INPUT-CLASS UIN\n");
+    (void)fprintf(sp, "INPUT-SIZE    16\n");
+    (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void)fprintf(sp, "RANK 3\n");
+    (void)fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void)fprintf(sp, "OUTPUT-BYTE-ORDER BE\n");
+    (void)fprintf(sp, "DIMENSION-SIZES 2 3 4\n");
+    (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n");
+    (void)fprintf(sp, "\n");
     (void)HDfclose(sp);
 
     /*-------------------------------------------------------------------------
@@ -328,20 +328,20 @@ main(void)
     (void)HDfclose(sp);
 
     sp = HDfopen("binin8.conf", "w");
-    (void)HDfprintf(sp, "PATH /int/bin/8-bit\n");
-    (void)HDfprintf(sp, "INPUT-CLASS IN\n");
-    (void)HDfprintf(sp, "INPUT-SIZE    8\n");
-    (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-    (void)HDfprintf(sp, "RANK 3\n");
-    (void)HDfprintf(sp, "OUTPUT-CLASS IN\n");
-    (void)HDfprintf(sp, "OUTPUT-SIZE    16\n");
-    (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
-    (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
-    (void)HDfprintf(sp, "DIMENSION-SIZES 5 3 4\n");
-    (void)HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
-    (void)HDfprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 -1\n");
-    (void)HDfprintf(sp, "COMPRESSION-PARAM 3\n");
-    (void)HDfprintf(sp, "\n");
+    (void)fprintf(sp, "PATH /int/bin/8-bit\n");
+    (void)fprintf(sp, "INPUT-CLASS IN\n");
+    (void)fprintf(sp, "INPUT-SIZE    8\n");
+    (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void)fprintf(sp, "RANK 3\n");
+    (void)fprintf(sp, "OUTPUT-CLASS IN\n");
+    (void)fprintf(sp, "OUTPUT-SIZE    16\n");
+    (void)fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+    (void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void)fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 -1\n");
+    (void)fprintf(sp, "COMPRESSION-PARAM 3\n");
+    (void)fprintf(sp, "\n");
     (void)HDfclose(sp);
 
 #endif /* UNICOS */
@@ -366,18 +366,18 @@ main(void)
     (void)HDfclose(sp);
 
     sp = HDfopen("binfp64.conf", "w");
-    (void)HDfprintf(sp, "PATH /fp/bin/64-bit\n");
-    (void)HDfprintf(sp, "INPUT-CLASS FP\n");
-    (void)HDfprintf(sp, "INPUT-SIZE    64\n");
-    (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-    (void)HDfprintf(sp, "RANK 3\n");
-    (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE IEEE\n");
-    (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
-    (void)HDfprintf(sp, "DIMENSION-SIZES 5 3 4\n");
-    (void)HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
-    (void)HDfprintf(sp, "MAXIMUM-DIMENSIONS -1 6 7\n");
-    (void)HDfprintf(sp, "COMPRESSION-PARAM 8\n");
-    (void)HDfprintf(sp, "\n");
+    (void)fprintf(sp, "PATH /fp/bin/64-bit\n");
+    (void)fprintf(sp, "INPUT-CLASS FP\n");
+    (void)fprintf(sp, "INPUT-SIZE    64\n");
+    (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+    (void)fprintf(sp, "RANK 3\n");
+    (void)fprintf(sp, "OUTPUT-ARCHITECTURE IEEE\n");
+    (void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+    (void)fprintf(sp, "DIMENSION-SIZES 5 3 4\n");
+    (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n");
+    (void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 6 7\n");
+    (void)fprintf(sp, "COMPRESSION-PARAM 8\n");
+    (void)fprintf(sp, "\n");
     (void)HDfclose(sp);
 
     /*-------------------------------------------------------------------------
@@ -393,21 +393,21 @@ main(void)
         for (i = 0; i < 4; i++) {
             char c = bin8w[i];
             if (HDfwrite(&c, sizeof(char), 1, sp) != 1)
-                HDprintf("error writing file\n");
+                printf("error writing file\n");
         }
         HDfclose(sp);
 
         sp = HDfopen("binin8w.conf", "w");
-        (void)HDfprintf(sp, "INPUT-CLASS IN\n");
-        (void)HDfprintf(sp, "INPUT-SIZE    8\n");
-        (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
-        (void)HDfprintf(sp, "RANK 1\n");
-        (void)HDfprintf(sp, "OUTPUT-CLASS IN\n");
-        (void)HDfprintf(sp, "OUTPUT-SIZE    8\n");
-        (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
-        (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
-        (void)HDfprintf(sp, "DIMENSION-SIZES 4\n");
-        (void)HDfprintf(sp, "\n");
+        (void)fprintf(sp, "INPUT-CLASS IN\n");
+        (void)fprintf(sp, "INPUT-SIZE    8\n");
+        (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order);
+        (void)fprintf(sp, "RANK 1\n");
+        (void)fprintf(sp, "OUTPUT-CLASS IN\n");
+        (void)fprintf(sp, "OUTPUT-SIZE    8\n");
+        (void)fprintf(sp, "OUTPUT-ARCHITECTURE STD\n");
+        (void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n");
+        (void)fprintf(sp, "DIMENSION-SIZES 4\n");
+        (void)fprintf(sp, "\n");
         (void)HDfclose(sp);
     }
     return (EXIT_SUCCESS);
diff --git a/tools/test/h5jam/getub.c b/tools/test/h5jam/getub.c
index 8928ee8..192371d 100644
--- a/tools/test/h5jam/getub.c
+++ b/tools/test/h5jam/getub.c
@@ -36,8 +36,8 @@ static void
 usage(const char *prog)
 {
     HDfflush(stdout);
-    HDfprintf(stdout, "usage: %s -c nb file] \n", prog);
-    HDfprintf(stdout, "           print first 'nb' byts of file to stdoug.\n");
+    fprintf(stdout, "usage: %s -c nb file] \n", prog);
+    fprintf(stdout, "           print first 'nb' byts of file to stdoug.\n");
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c
index 1376e78..a9df43b 100644
--- a/tools/test/h5jam/h5jamgentest.c
+++ b/tools/test/h5jam/h5jamgentest.c
@@ -420,6 +420,6 @@ main(void)
     return EXIT_SUCCESS;
 
 error:
-    HDfprintf(stderr, "h5jam test generator FAILED\n");
+    fprintf(stderr, "h5jam test generator FAILED\n");
     return EXIT_FAILURE;
 }
diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c
index d0e717a..ba0457b 100644
--- a/tools/test/h5jam/tellub.c
+++ b/tools/test/h5jam/tellub.c
@@ -38,10 +38,10 @@ static void
 usage(const char *prog)
 {
     HDfflush(stdout);
-    HDfprintf(stdout, "usage: %s h5_file\n", prog);
-    HDfprintf(stdout, "           Check that h5_fil is HDF5 file and print size of user block \n");
-    HDfprintf(stdout, "       %s -h\n", prog);
-    HDfprintf(stdout, "           Print a usage message and exit\n");
+    fprintf(stdout, "usage: %s h5_file\n", prog);
+    fprintf(stdout, "           Check that h5_fil is HDF5 file and print size of user block \n");
+    fprintf(stdout, "       %s -h\n", prog);
+    fprintf(stdout, "           Print a usage message and exit\n");
 } /* end usage() */
 
 /*-------------------------------------------------------------------------
@@ -156,7 +156,7 @@ main(int argc, char *argv[])
         goto done;
     }
 
-    HDprintf("%ld\n", (long)usize);
+    printf("%ld\n", (long)usize);
 
 done:
     H5Pclose(plist);
diff --git a/tools/test/h5repack/h5repackgentest.c b/tools/test/h5repack/h5repackgentest.c
index bc22e8d..8910abb 100644
--- a/tools/test/h5repack/h5repackgentest.c
+++ b/tools/test/h5repack/h5repackgentest.c
@@ -329,19 +329,19 @@ main(void)
     for (i = 0; i < 2; i++) {
         hbool_t external = (i & 1) ? TRUE : FALSE;
         if (generate_int32le_1d(external) < 0)
-            HDprintf("A generate_int32le_1d failed!\n");
+            printf("A generate_int32le_1d failed!\n");
 
         if (generate_int32le_2d(external) < 0)
-            HDprintf("A generate_int32le_2d failed!\n");
+            printf("A generate_int32le_2d failed!\n");
 
         if (generate_int32le_3d(external) < 0)
-            HDprintf("A generate_int32le_3d failed!\n");
+            printf("A generate_int32le_3d failed!\n");
 
         if (generate_uint8be(external) < 0)
-            HDprintf("A generate_uint8be failed!\n");
+            printf("A generate_uint8be failed!\n");
 
         if (generate_f32le(external) < 0)
-            HDprintf("A generate_f32le failed!\n");
+            printf("A generate_f32le failed!\n");
 
     } /* end for external data storage or not */
 
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index 35b6b07..ca56c79 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -4179,8 +4179,8 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
         size = (TEST_BUFSIZE / sizeof(double) + 1) * sizeof(double);
         dbuf = (double *)HDmalloc(size);
         if (NULL == dbuf) {
-            HDprintf("\nError: Cannot allocate memory for \"arrayd\" data buffer size %dMB.\n",
-                     (int)size / 1000000);
+            printf("\nError: Cannot allocate memory for \"arrayd\" data buffer size %dMB.\n",
+                   (int)size / 1000000);
             goto out;
         }
 
@@ -6214,7 +6214,7 @@ add_attr_with_objref(hid_t file_id, hid_t obj_id)
     /* ref to dset */
     status = H5Rcreate(&data_attr_objref[0], file_id, NAME_OBJ_DS1, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6222,7 +6222,7 @@ add_attr_with_objref(hid_t file_id, hid_t obj_id)
     /* ref to group */
     status = H5Rcreate(&data_attr_objref[1], file_id, NAME_OBJ_GRP, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6230,7 +6230,7 @@ add_attr_with_objref(hid_t file_id, hid_t obj_id)
     /* ref to datatype */
     status = H5Rcreate(&data_attr_objref[2], file_id, NAME_OBJ_NDTYPE, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6238,7 +6238,7 @@ add_attr_with_objref(hid_t file_id, hid_t obj_id)
     /* create attr with obj ref type */
     status = make_attr(obj_id, 1, dim_attr_objref, "Attr_OBJREF", H5T_STD_REF_OBJ, data_attr_objref);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> make_attr failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> make_attr failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6278,7 +6278,7 @@ add_attr_with_regref(hid_t file_id, hid_t obj_id)
      */
     sid_regrefed_dset = H5Screate_simple(2, dim_regrefed_dset, NULL);
     if (sid_regrefed_dset < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6286,7 +6286,7 @@ add_attr_with_regref(hid_t file_id, hid_t obj_id)
     /* select elements space for reference */
     status = H5Sselect_elements(sid_regrefed_dset, H5S_SELECT_SET, (size_t)3, coords_regrefed_dset[0]);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6294,7 +6294,7 @@ add_attr_with_regref(hid_t file_id, hid_t obj_id)
     /* create region reference from elements space */
     status = H5Rcreate(&data_attr_regref[0], file_id, NAME_OBJ_DS2, H5R_DATASET_REGION, sid_regrefed_dset);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6302,7 +6302,7 @@ add_attr_with_regref(hid_t file_id, hid_t obj_id)
     /* create attr with region ref type */
     status = make_attr(obj_id, 1, dim_attr_regref, "Attr_REGREF", H5T_STD_REF_DSETREG, data_attr_regref);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> make_attr failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> make_attr failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6347,21 +6347,21 @@ gen_refered_objs(hid_t loc_id)
      */
     sid = H5Screate_simple(1, dims1, NULL);
     if (sid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
 
     did1 = H5Dcreate2(loc_id, NAME_OBJ_DS1, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (did1 < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
 
     status = H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6372,7 +6372,7 @@ gen_refered_objs(hid_t loc_id)
      */
     gid = H5Gcreate2(loc_id, NAME_OBJ_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (gid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6384,7 +6384,7 @@ gen_refered_objs(hid_t loc_id)
     tid    = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(loc_id, NAME_OBJ_NDTYPE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6395,7 +6395,7 @@ gen_refered_objs(hid_t loc_id)
      */
     sid2 = H5Screate_simple(2, dims2, NULL);
     if (sid2 < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6403,7 +6403,7 @@ gen_refered_objs(hid_t loc_id)
     /* create normal dataset which is referred */
     did2 = H5Dcreate2(loc_id, NAME_OBJ_DS2, H5T_STD_I8LE, sid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (did2 < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6411,7 +6411,7 @@ gen_refered_objs(hid_t loc_id)
     /* write values to dataset */
     status = H5Dwrite(did2, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, data2);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6467,7 +6467,7 @@ gen_obj_ref(hid_t loc_id)
     /* obj ref to dataset */
     status = H5Rcreate(&objref_buf[0], loc_id, NAME_OBJ_DS1, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6475,7 +6475,7 @@ gen_obj_ref(hid_t loc_id)
     /* obj ref to group */
     status = H5Rcreate(&objref_buf[1], loc_id, NAME_OBJ_GRP, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6483,7 +6483,7 @@ gen_obj_ref(hid_t loc_id)
     /* obj ref to named-datatype */
     status = H5Rcreate(&objref_buf[2], loc_id, NAME_OBJ_NDTYPE, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6493,21 +6493,21 @@ gen_obj_ref(hid_t loc_id)
      */
     sid = H5Screate_simple(1, dims_dset_objref, NULL);
     if (sid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
 
     oid = H5Dcreate2(loc_id, "Dset_OBJREF", H5T_STD_REF_OBJ, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (oid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
 
     status = H5Dwrite(oid, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, objref_buf);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6519,7 +6519,7 @@ gen_obj_ref(hid_t loc_id)
     /* add attribute with obj ref */
     status = add_attr_with_objref(loc_id, oid);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6527,7 +6527,7 @@ gen_obj_ref(hid_t loc_id)
     /* add attribute with region ref */
     status = add_attr_with_regref(loc_id, oid);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6579,7 +6579,7 @@ gen_region_ref(hid_t loc_id)
 
     sid_trg = H5Screate_simple(2, dims_trg, NULL);
     if (sid_trg < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6587,7 +6587,7 @@ gen_region_ref(hid_t loc_id)
     /* select elements space for reference */
     status = H5Sselect_elements(sid_trg, H5S_SELECT_SET, (size_t)4, coords[0]);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6595,7 +6595,7 @@ gen_region_ref(hid_t loc_id)
     /* create region reference from elements space */
     status = H5Rcreate(&rr_data[0], loc_id, NAME_OBJ_DS2, H5R_DATASET_REGION, sid_trg);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6603,7 +6603,7 @@ gen_region_ref(hid_t loc_id)
     /* select hyperslab space for reference */
     status = H5Sselect_hyperslab(sid_trg, H5S_SELECT_SET, start, stride, count, block);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6611,7 +6611,7 @@ gen_region_ref(hid_t loc_id)
     /* create region reference from hyperslab space */
     status = H5Rcreate(&rr_data[1], loc_id, NAME_OBJ_DS2, H5R_DATASET_REGION, sid_trg);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6619,7 +6619,7 @@ gen_region_ref(hid_t loc_id)
     /* Create dataspace. */
     sid_ref = H5Screate_simple(1, dims1, NULL);
     if (sid_ref < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6628,7 +6628,7 @@ gen_region_ref(hid_t loc_id)
     oid_ref =
         H5Dcreate2(loc_id, REG_REF_DS1, H5T_STD_REF_DSETREG, sid_ref, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (oid_ref < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6636,7 +6636,7 @@ gen_region_ref(hid_t loc_id)
     /* write data as region references */
     status = H5Dwrite(oid_ref, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, rr_data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6648,7 +6648,7 @@ gen_region_ref(hid_t loc_id)
     /* add attribute with obj ref */
     status = add_attr_with_objref(loc_id, oid_ref);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6656,7 +6656,7 @@ gen_region_ref(hid_t loc_id)
     /* add attribute with region ref */
     status = add_attr_with_regref(loc_id, oid_ref);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6689,21 +6689,21 @@ make_references(hid_t loc_id)
     /* add target objects */
     status = gen_refered_objs(loc_id);
     if (status == FAIL) {
-        HDfprintf(stderr, "Failed to generate referenced object.\n");
+        fprintf(stderr, "Failed to generate referenced object.\n");
         ret = FAIL;
     }
 
     /* add object reference */
     status = gen_obj_ref(loc_id);
     if (status == FAIL) {
-        HDfprintf(stderr, "Failed to generate object reference.\n");
+        fprintf(stderr, "Failed to generate object reference.\n");
         ret = FAIL;
     }
 
     /* add region reference */
     status = gen_region_ref(loc_id);
     if (status == FAIL) {
-        HDfprintf(stderr, "Failed to generate region reference.\n");
+        fprintf(stderr, "Failed to generate region reference.\n");
         ret = FAIL;
     }
 
@@ -6823,7 +6823,7 @@ make_complex_attr_references(hid_t loc_id)
     objdid = H5Dcreate2(loc_id, NAME_OBJ_DS1, H5T_NATIVE_INT, objsid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Dwrite(objdid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_data[0]);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6832,7 +6832,7 @@ make_complex_attr_references(hid_t loc_id)
     objtid = H5Tcopy(H5T_NATIVE_INT);
     status = H5Tcommit2(loc_id, NAME_OBJ_NDTYPE, objtid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6843,7 +6843,7 @@ make_complex_attr_references(hid_t loc_id)
      * compound type which contain obj and region reference */
     main_gid = H5Gcreate2(loc_id, "group_main", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     if (main_gid < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6858,7 +6858,7 @@ make_complex_attr_references(hid_t loc_id)
 
     status = H5Dwrite(main_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_data[0]);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6881,7 +6881,7 @@ make_complex_attr_references(hid_t loc_id)
     /* references to dataset */
     status = H5Rcreate(&(comp_objref_data[0].val_objref), loc_id, NAME_OBJ_DS1, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6890,7 +6890,7 @@ make_complex_attr_references(hid_t loc_id)
     /* references to group */
     status = H5Rcreate(&(comp_objref_data[1].val_objref), loc_id, NAME_OBJ_GRP, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6899,7 +6899,7 @@ make_complex_attr_references(hid_t loc_id)
     /* references to datatype */
     status = H5Rcreate(&(comp_objref_data[2].val_objref), loc_id, NAME_OBJ_NDTYPE, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6913,7 +6913,7 @@ make_complex_attr_references(hid_t loc_id)
         H5Acreate2(main_did, "Comp_OBJREF", comp_objref_tid, comp_objref_attr_sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(comp_objref_aid, comp_objref_tid, comp_objref_data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6934,13 +6934,13 @@ make_complex_attr_references(hid_t loc_id)
      */
     status = H5Sselect_elements(objsid, H5S_SELECT_SET, (size_t)4, coords[0]);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
     status = H5Rcreate(&(comp_regref_data[0].val_regref), loc_id, NAME_OBJ_DS1, H5R_DATASET_REGION, objsid);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6954,7 +6954,7 @@ make_complex_attr_references(hid_t loc_id)
         H5Acreate2(main_did, "Comp_REGREF", comp_regref_tid, comp_regref_attr_sid, H5P_DEFAULT, H5P_DEFAULT);
     status = H5Awrite(comp_regref_aid, comp_regref_tid, comp_regref_data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6979,7 +6979,7 @@ make_complex_attr_references(hid_t loc_id)
     status =
         H5Rcreate(&((hobj_ref_t *)vlen_objref_data[0].p)[0], loc_id, NAME_OBJ_DS1, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6987,7 +6987,7 @@ make_complex_attr_references(hid_t loc_id)
     status =
         H5Rcreate(&((hobj_ref_t *)vlen_objref_data[1].p)[0], loc_id, NAME_OBJ_GRP, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -6995,7 +6995,7 @@ make_complex_attr_references(hid_t loc_id)
     status =
         H5Rcreate(&((hobj_ref_t *)vlen_objref_data[2].p)[0], loc_id, NAME_OBJ_NDTYPE, H5R_OBJECT, (hid_t)-1);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -7013,7 +7013,7 @@ make_complex_attr_references(hid_t loc_id)
                                      H5P_DEFAULT, H5P_DEFAULT);
     status              = H5Awrite(vlen_objref_attr_id, vlen_objref_attr_tid, vlen_objref_data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -7021,7 +7021,7 @@ make_complex_attr_references(hid_t loc_id)
     /* close resource for vlen data */
     status = H5Treclaim(vlen_objref_attr_tid, vlen_objref_attr_sid, H5P_DEFAULT, vlen_objref_data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Treclaim failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Treclaim failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -7041,14 +7041,14 @@ make_complex_attr_references(hid_t loc_id)
      */
     status = H5Sselect_elements(objsid, H5S_SELECT_SET, (size_t)4, coords[0]);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
     status = H5Rcreate(&((hdset_reg_ref_t *)vlen_regref_data[0].p)[0], loc_id, NAME_OBJ_DS1,
                        H5R_DATASET_REGION, objsid);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -7066,7 +7066,7 @@ make_complex_attr_references(hid_t loc_id)
                                      H5P_DEFAULT, H5P_DEFAULT);
     status              = H5Awrite(vlen_regref_attr_id, vlen_regref_attr_tid, vlen_regref_data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
@@ -7074,7 +7074,7 @@ make_complex_attr_references(hid_t loc_id)
     /* close resource for vlen data */
     status = H5Treclaim(vlen_regref_attr_tid, vlen_regref_attr_sid, H5P_DEFAULT, vlen_regref_data);
     if (status < 0) {
-        HDfprintf(stderr, "Error: %s %d> H5Treclaim failed.\n", __func__, __LINE__);
+        fprintf(stderr, "Error: %s %d> H5Treclaim failed.\n", __func__, __LINE__);
         ret = FAIL;
         goto out;
     }
diff --git a/tools/test/h5repack/testh5repack_detect_szip.c b/tools/test/h5repack/testh5repack_detect_szip.c
index b2be484..02a6d2b 100644
--- a/tools/test/h5repack/testh5repack_detect_szip.c
+++ b/tools/test/h5repack/testh5repack_detect_szip.c
@@ -44,10 +44,10 @@ main(void)
 
 #ifdef H5_HAVE_FILTER_SZIP
     if (h5tools_can_encode(H5Z_FILTER_SZIP) == 1) {
-        HDprintf("yes\n");
+        printf("yes\n");
         return (1);
     }
 #endif /* H5_HAVE_FILTER_SZIP */
-    HDprintf("no\n");
+    printf("no\n");
     return (0);
 }
diff --git a/tools/test/h5stat/h5stat_gentest.c b/tools/test/h5stat/h5stat_gentest.c
index 47c06ad..44428fe 100644
--- a/tools/test/h5stat/h5stat_gentest.c
+++ b/tools/test/h5stat/h5stat_gentest.c
@@ -626,6 +626,6 @@ main(void)
     return EXIT_SUCCESS;
 
 error:
-    HDfprintf(stderr, "h5stat test generator FAILED\n");
+    fprintf(stderr, "h5stat test generator FAILED\n");
     return EXIT_FAILURE;
 }
diff --git a/tools/test/misc/clear_open_chk.c b/tools/test/misc/clear_open_chk.c
index 37e7307..ac31375 100644
--- a/tools/test/misc/clear_open_chk.c
+++ b/tools/test/misc/clear_open_chk.c
@@ -18,9 +18,9 @@ static void usage(void);
 static void
 usage(void)
 {
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "Usage error!\n");
-    HDfprintf(stdout, "Usage: clear_open_chk filename\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "Usage error!\n");
+    fprintf(stdout, "Usage: clear_open_chk filename\n");
 } /* usage() */
 
 /*-------------------------------------------------------------------------
@@ -53,7 +53,7 @@ main(int argc, char *argv[])
 
     /* Try opening the file */
     if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) {
-        HDfprintf(stderr, "clear_open_chk: unable to open the file\n");
+        fprintf(stderr, "clear_open_chk: unable to open the file\n");
         HDfree(fname);
         HDexit(EXIT_FAILURE);
     }
@@ -61,7 +61,7 @@ main(int argc, char *argv[])
 
     /* Close the file */
     if (H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "clear_open_chk: cannot close the file\n");
+        fprintf(stderr, "clear_open_chk: cannot close the file\n");
         HDexit(EXIT_FAILURE);
     }
 
diff --git a/tools/test/misc/h5perf_gentest.c b/tools/test/misc/h5perf_gentest.c
index 5b898db..cf91c79 100644
--- a/tools/test/misc/h5perf_gentest.c
+++ b/tools/test/misc/h5perf_gentest.c
@@ -85,20 +85,20 @@ main(int argc, char *argv[])
         else if (strcmp(argv[i], "-z") == 0)
             z = 1;
         else if (strcmp(argv[i], "-h") == 0) {
-            HDprintf("\nOPTONS:\n");
-            HDprintf("\t-f F:\tname of the test file (default: %s).\n", FNAME);
-            HDprintf("\t-g N:\tnumber of top level groups (default: %d).\n", NGROUPS);
-            HDprintf("\t-d N:\tnumber of datasets (default: %d).\n", NDSETS);
-            HDprintf("\t-a N:\tnumber of attributes (default: %d).\n", NATTRS);
-            HDprintf("\t-r N:\tnumber of rows in the large compound dataset (default: %d).\n", NROWS);
-            HDprintf("\t-s N:\tsize of dim0 in datasets (default: %d).\n", DIM0);
-            HDprintf("\t-c N:\tchunk size of dim0 (default: %d).\n", (DIM0 / 10 + 1));
-            HDprintf("\t-v N:\tmax vlen size (default: %d).\n", MAXVLEN);
-            HDprintf("\t-l:\tuse latest format (default: no).\n");
-            HDprintf("\t-z:\tuse gzip compression (default: no).\n");
-            HDprintf("\t-h:\tthis help information.\n");
-            HDprintf("Example:\n");
-            HDprintf("\t./a.out -f test.h5 -g 10000 -d 5000 -a 500 -r 10000 -s 200 -c 20 -v 40 -l -z\n\n");
+            printf("\nOPTONS:\n");
+            printf("\t-f F:\tname of the test file (default: %s).\n", FNAME);
+            printf("\t-g N:\tnumber of top level groups (default: %d).\n", NGROUPS);
+            printf("\t-d N:\tnumber of datasets (default: %d).\n", NDSETS);
+            printf("\t-a N:\tnumber of attributes (default: %d).\n", NATTRS);
+            printf("\t-r N:\tnumber of rows in the large compound dataset (default: %d).\n", NROWS);
+            printf("\t-s N:\tsize of dim0 in datasets (default: %d).\n", DIM0);
+            printf("\t-c N:\tchunk size of dim0 (default: %d).\n", (DIM0 / 10 + 1));
+            printf("\t-v N:\tmax vlen size (default: %d).\n", MAXVLEN);
+            printf("\t-l:\tuse latest format (default: no).\n");
+            printf("\t-z:\tuse gzip compression (default: no).\n");
+            printf("\t-h:\tthis help information.\n");
+            printf("Example:\n");
+            printf("\t./a.out -f test.h5 -g 10000 -d 5000 -a 500 -r 10000 -s 200 -c 20 -v 40 -l -z\n\n");
             exit(0);
         }
     }
diff --git a/tools/test/misc/repart_test.c b/tools/test/misc/repart_test.c
index 9359015..1ff6230 100644
--- a/tools/test/misc/repart_test.c
+++ b/tools/test/misc/repart_test.c
@@ -146,6 +146,6 @@ main(void)
 
 error:
     nerrors = MAX(1, nerrors);
-    HDprintf("***** %d FAMILY FILE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
+    printf("***** %d FAMILY FILE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
     HDexit(EXIT_FAILURE);
 } /* end main() */
diff --git a/tools/test/misc/talign.c b/tools/test/misc/talign.c
index 4c145ba..72b98ed 100644
--- a/tools/test/misc/talign.c
+++ b/tools/test/misc/talign.c
@@ -51,7 +51,7 @@ main(void)
     int    result = 0;
     herr_t error  = 1;
 
-    HDprintf("%-70s", "Testing alignment in compound datatypes");
+    printf("%-70s", "Testing alignment in compound datatypes");
 
     HDstrcpy(string5, "Hi!");
     HDunlink(fname);
@@ -146,39 +146,39 @@ out:
 
         result = 1;
         mname  = H5Tget_member_name(fix, 0);
-        HDprintf("%14s (%2d) %6s = %s\n", mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 0),
-                 string5, (char *)(data + H5Tget_member_offset(fix, 0)));
+        printf("%14s (%2d) %6s = %s\n", mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 0), string5,
+               (char *)(data + H5Tget_member_offset(fix, 0)));
         if (mname)
             H5free_memory(mname);
 
         fptr  = (float *)((void *)(data + H5Tget_member_offset(fix, 1)));
         mname = H5Tget_member_name(fix, 1);
-        HDprintf("Data comparison:\n"
-                 "%14s (%2d) %6f = %f\n"
-                 "                    %6f = %f\n",
-                 mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 1), (double)fok[0], (double)fptr[0],
-                 (double)fok[1], (double)fptr[1]);
+        printf("Data comparison:\n"
+               "%14s (%2d) %6f = %f\n"
+               "                    %6f = %f\n",
+               mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 1), (double)fok[0], (double)fptr[0],
+               (double)fok[1], (double)fptr[1]);
         if (mname)
             H5free_memory(mname);
 
         fptr  = (float *)((void *)(data + H5Tget_member_offset(fix, 2)));
         mname = H5Tget_member_name(fix, 2);
-        HDprintf("%14s (%2d) %6f = %f\n"
-                 "                    %6f = %6f\n",
-                 mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 2), (double)fnok[0],
-                 (double)fptr[0], (double)fnok[1], (double)fptr[1]);
+        printf("%14s (%2d) %6f = %f\n"
+               "                    %6f = %6f\n",
+               mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 2), (double)fnok[0], (double)fptr[0],
+               (double)fnok[1], (double)fptr[1]);
         if (mname)
             H5free_memory(mname);
 
         fptr = (float *)((void *)(data + H5Tget_member_offset(fix, 1)));
-        HDprintf("\n"
-                 "Short circuit\n"
-                 "                    %6f = %f\n"
-                 "                    %6f = %f\n"
-                 "                    %6f = %f\n"
-                 "                    %6f = %f\n",
-                 (double)fok[0], (double)fptr[0], (double)fok[1], (double)fptr[1], (double)fnok[0],
-                 (double)fptr[2], (double)fnok[1], (double)fptr[3]);
+        printf("\n"
+               "Short circuit\n"
+               "                    %6f = %f\n"
+               "                    %6f = %f\n"
+               "                    %6f = %f\n"
+               "                    %6f = %f\n",
+               (double)fok[0], (double)fptr[0], (double)fok[1], (double)fptr[1], (double)fnok[0],
+               (double)fptr[2], (double)fnok[1], (double)fptr[3]);
         HDputs("*FAILED - compound type alignmnent problem*");
     }
     else {
diff --git a/tools/test/perform/chunk_cache.c b/tools/test/perform/chunk_cache.c
index 13d7a12..33ea706 100644
--- a/tools/test/perform/chunk_cache.c
+++ b/tools/test/perform/chunk_cache.c
@@ -264,13 +264,12 @@ check_partial_chunks_perf(hid_t file)
     end_t = H5_get_time();
 
     if ((end_t - start_t) > 0.0)
-        HDprintf("1. Partial chunks: total read time is %lf; number of bytes being read from file is %zu\n",
-                 (end_t - start_t), nbytes_global);
+        printf("1. Partial chunks: total read time is %lf; number of bytes being read from file is %zu\n",
+               (end_t - start_t), nbytes_global);
     else
-        HDprintf(
-            "1. Partial chunks: no total read time because timer is not available; number of bytes being "
-            "read from file is %zu\n",
-            nbytes_global);
+        printf("1. Partial chunks: no total read time because timer is not available; number of bytes being "
+               "read from file is %zu\n",
+               nbytes_global);
 
     H5Dclose(dataset);
     H5Sclose(filespace);
@@ -343,13 +342,12 @@ check_hash_value_perf(hid_t file)
     end_t = H5_get_time();
 
     if ((end_t - start_t) > 0.0)
-        HDprintf("2. Hash value: total read time is %lf; number of bytes being read from file is %zu\n",
-                 (end_t - start_t), nbytes_global);
+        printf("2. Hash value: total read time is %lf; number of bytes being read from file is %zu\n",
+               (end_t - start_t), nbytes_global);
     else
-        HDprintf(
-            "2. Hash value: no total read time because timer is not available; number of bytes being read "
-            "from file is %zu\n",
-            nbytes_global);
+        printf("2. Hash value: no total read time because timer is not available; number of bytes being read "
+               "from file is %zu\n",
+               nbytes_global);
 
     H5Dclose(dataset);
     H5Sclose(filespace);
@@ -407,6 +405,6 @@ main(void)
     return 0;
 
 error:
-    HDfprintf(stderr, "*** ERRORS DETECTED ***\n");
+    fprintf(stderr, "*** ERRORS DETECTED ***\n");
     return 1;
 }
diff --git a/tools/test/perform/direct_write_perf.c b/tools/test/perform/direct_write_perf.c
index 1308fec..be9d583 100644
--- a/tools/test/perform/direct_write_perf.c
+++ b/tools/test/perform/direct_write_perf.c
@@ -693,7 +693,7 @@ main(void)
 int
 main(void)
 {
-    HDfprintf(stdout, "No compression IO performance because zlib was not configured\n");
+    fprintf(stdout, "No compression IO performance because zlib was not configured\n");
     return EXIT_SUCCESS;
 }
 
diff --git a/tools/test/perform/iopipe.c b/tools/test/perform/iopipe.c
index b815939..fb62f16 100644
--- a/tools/test/perform/iopipe.c
+++ b/tools/test/perform/iopipe.c
@@ -73,9 +73,9 @@ print_stats(const char *prefix,
     H5_bandwidth(bw, sizeof(bw), (double)nbytes, e_time);
 
 #ifdef H5_HAVE_GETRUSAGE
-    HDprintf(HEADING "%1.2fuser %1.2fsystem %1.2felapsed %s\n", prefix, u_time, s_time, e_time, bw);
+    printf(HEADING "%1.2fuser %1.2fsystem %1.2felapsed %s\n", prefix, u_time, s_time, e_time, bw);
 #else
-    HDprintf(HEADING "%1.2felapsed %s\n", prefix, e_time, bw);
+    printf(HEADING "%1.2felapsed %s\n", prefix, e_time, bw);
 #endif
 }
 
@@ -146,7 +146,7 @@ main(void)
      * Win32 version 5.0 compiler.
      * 1998-11-06 ptl
      */
-    HDprintf("I/O request size is %1.1fMB\n", (double)(hssize_t)(size[0] * size[1]) / 1024.0 * 1024.0);
+    printf("I/O request size is %1.1fMB\n", (double)(hssize_t)(size[0] * size[1]) / 1024.0 * 1024.0);
 
     /* Open the files */
     file = H5Fcreate(HDF5_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -170,7 +170,7 @@ main(void)
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
     t_start = H5_get_time();
-    HDfprintf(stderr, HEADING, "fill raw");
+    fprintf(stderr, HEADING, "fill raw");
     for (u = 0; u < nwrite; u++) {
         HDputc(PROGRESS, stderr);
         HDfflush(stderr);
@@ -193,7 +193,7 @@ main(void)
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
     t_start = H5_get_time();
-    HDfprintf(stderr, HEADING, "fill hdf5");
+    fprintf(stderr, HEADING, "fill hdf5");
     for (u = 0; u < nread; u++) {
         HDputc(PROGRESS, stderr);
         HDfflush(stderr);
@@ -217,7 +217,7 @@ main(void)
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
     t_start = H5_get_time();
-    HDfprintf(stderr, HEADING, "out raw");
+    fprintf(stderr, HEADING, "out raw");
     for (u = 0; u < nwrite; u++) {
         HDputc(PROGRESS, stderr);
         HDfflush(stderr);
@@ -243,7 +243,7 @@ main(void)
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
     t_start = H5_get_time();
-    HDfprintf(stderr, HEADING, "out hdf5");
+    fprintf(stderr, HEADING, "out hdf5");
     for (u = 0; u < nwrite; u++) {
         HDputc(PROGRESS, stderr);
         HDfflush(stderr);
@@ -267,7 +267,7 @@ main(void)
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
     t_start = H5_get_time();
-    HDfprintf(stderr, HEADING, "in raw");
+    fprintf(stderr, HEADING, "in raw");
     for (u = 0; u < nread; u++) {
         HDputc(PROGRESS, stderr);
         HDfflush(stderr);
@@ -293,7 +293,7 @@ main(void)
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
     t_start = H5_get_time();
-    HDfprintf(stderr, HEADING, "in hdf5");
+    fprintf(stderr, HEADING, "in hdf5");
     for (u = 0; u < nread; u++) {
         HDputc(PROGRESS, stderr);
         HDfflush(stderr);
@@ -322,7 +322,7 @@ main(void)
     HDgetrusage(RUSAGE_SELF, &r_start);
 #endif
     t_start = H5_get_time();
-    HDfprintf(stderr, HEADING, "in hdf5 partial");
+    fprintf(stderr, HEADING, "in hdf5 partial");
     for (u = 0; u < nread; u++) {
         HDputc(PROGRESS, stderr);
         HDfflush(stderr);
diff --git a/tools/test/perform/overhead.c b/tools/test/perform/overhead.c
index 257d3ec..82c7131 100644
--- a/tools/test/perform/overhead.c
+++ b/tools/test/perform/overhead.c
@@ -67,8 +67,8 @@ typedef enum fill_t { FILL_ALL, FILL_FORWARD, FILL_REVERSE, FILL_INWARD, FILL_OU
 static void
 usage(const char *prog)
 {
-    HDfprintf(stderr, "usage: %s [STYLE|cache] [LEFT [MIDDLE [RIGHT]]]\n", prog);
-    HDfprintf(stderr, "\
+    fprintf(stderr, "usage: %s [STYLE|cache] [LEFT [MIDDLE [RIGHT]]]\n", prog);
+    fprintf(stderr, "\
     STYLE is the order that the dataset is filled and should be one of:\n\
         forward   --  Fill the dataset from lowest address to highest\n\
                       address. This style tests the right split ratio.\n\
@@ -230,7 +230,7 @@ test(fill_t fill_style, const double splits[], hbool_t verbose, hbool_t use_rdcc
                 abort();
             default:
                 /* unknown request */
-                HDfprintf(stderr, "Unknown fill style\n");
+                fprintf(stderr, "Unknown fill style\n");
                 goto error;
                 break;
         }
@@ -286,7 +286,7 @@ test(fill_t fill_style, const double splits[], hbool_t verbose, hbool_t use_rdcc
                 abort();
             default:
                 /* unknown request */
-                HDfprintf(stderr, "Unknown fill style\n");
+                fprintf(stderr, "Unknown fill style\n");
                 goto error;
                 break;
         }
@@ -394,6 +394,6 @@ main(int argc, char *argv[])
     return 0;
 
 error:
-    HDfprintf(stderr, "*** ERRORS DETECTED ***\n");
+    fprintf(stderr, "*** ERRORS DETECTED ***\n");
     return 1;
 }
diff --git a/tools/test/perform/perf_meta.c b/tools/test/perform/perf_meta.c
index 5fe3631..5f1bbbe 100644
--- a/tools/test/perform/perf_meta.c
+++ b/tools/test/perform/perf_meta.c
@@ -399,8 +399,7 @@ create_attrs_1(void)
             attr_t.avg = attr_t.total / (NUM_ATTRS * NUM_DSETS);
 
         /* Print out the performance result */
-        HDfprintf(stderr, "1.  Create %d attributes for each of %d existing datasets\n", NUM_ATTRS,
-                  NUM_DSETS);
+        fprintf(stderr, "1.  Create %d attributes for each of %d existing datasets\n", NUM_ATTRS, NUM_DSETS);
         print_perf(open_t, close_t, attr_t);
     }
 
@@ -500,7 +499,7 @@ create_attrs_2(void)
             attr_t.avg = attr_t.total / (NUM_ATTRS * NUM_DSETS);
 
         /* Print out the performance result */
-        HDfprintf(stderr, "2.  Create %d attributes for each of %d new datasets\n", NUM_ATTRS, NUM_DSETS);
+        fprintf(stderr, "2.  Create %d attributes for each of %d new datasets\n", NUM_ATTRS, NUM_DSETS);
         print_perf(create_t, close_t, attr_t);
     }
 
@@ -608,8 +607,8 @@ create_attrs_3(void)
         attr_t.avg  = attr_t.total / (NUM_ATTRS * NUM_DSETS);
 
         /* Print out the performance result */
-        HDfprintf(stderr, "3.  Create %d attributes for each of %d existing datasets for %d times\n",
-                  BATCH_ATTRS, NUM_DSETS, loop_num);
+        fprintf(stderr, "3.  Create %d attributes for each of %d existing datasets for %d times\n",
+                BATCH_ATTRS, NUM_DSETS, loop_num);
         print_perf(open_t, close_t, attr_t);
     }
 
@@ -715,13 +714,13 @@ perf(p_time *perf_t, double start_t, double end_t)
 void
 print_perf(p_time open_t, p_time close_t, p_time attr_t)
 {
-    HDfprintf(stderr, "\t%s:\t\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n", open_t.func, open_t.avg, open_t.max,
-              open_t.min);
-    HDfprintf(stderr, "\tH5Dclose:\t\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n", close_t.avg, close_t.max,
-              close_t.min);
+    fprintf(stderr, "\t%s:\t\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n", open_t.func, open_t.avg, open_t.max,
+            open_t.min);
+    fprintf(stderr, "\tH5Dclose:\t\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n", close_t.avg, close_t.max,
+            close_t.min);
     if (NUM_ATTRS)
-        HDfprintf(stderr, "\tH5A(create & close):\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n", attr_t.avg,
-                  attr_t.max, attr_t.min);
+        fprintf(stderr, "\tH5A(create & close):\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n", attr_t.avg, attr_t.max,
+                attr_t.min);
 }
 
 /*-------------------------------------------------------------------------
@@ -761,7 +760,7 @@ main(int argc, char **argv)
 #ifdef H5_HAVE_PARALLEL
     if (facc_type == FACC_DEFAULT || (facc_type != FACC_DEFAULT && MAINPROCESS))
 #endif /*H5_HAVE_PARALLEL*/
-        HDfprintf(stderr, "\t\tPerformance result of metadata for datasets and attributes\n\n");
+        fprintf(stderr, "\t\tPerformance result of metadata for datasets and attributes\n\n");
 
     fapl = H5Pcreate(H5P_FILE_ACCESS);
 #ifdef H5_HAVE_PARALLEL
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index 256289c..abd1649 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -84,11 +84,11 @@ error(const char *fmt, ...)
     va_list ap;
 
     va_start(ap, fmt);
-    HDfprintf(stderr, "%s: error: ", prog);
+    fprintf(stderr, "%s: error: ", prog);
     H5_GCC_CLANG_DIAG_OFF("format-nonliteral")
     HDvfprintf(stderr, fmt, ap);
     H5_GCC_CLANG_DIAG_ON("format-nonliteral")
-    HDfprintf(stderr, "\n");
+    fprintf(stderr, "\n");
     va_end(ap);
     HDexit(EXIT_FAILURE);
 }
@@ -130,7 +130,7 @@ write_file(Bytef *source, uLongf sourceLen)
                         ((double)timer_start.tv_sec + ((double)timer_start.tv_usec) / MICROSECOND);
 
     if (report_once_flag) {
-        HDfprintf(stdout, "\tCompression Ratio: %g\n", ((double)destLen) / (double)sourceLen);
+        fprintf(stdout, "\tCompression Ratio: %g\n", ((double)destLen) / (double)sourceLen);
         report_once_flag = 0;
     }
 
@@ -235,29 +235,29 @@ get_unique_name(void)
 static void
 usage(void)
 {
-    HDfprintf(stdout, "usage: %s [OPTIONS]\n", prog);
-    HDfprintf(stdout, "  OPTIONS\n");
-    HDfprintf(stdout, "     -h, --help                 Print this usage message and exit\n");
-    HDfprintf(stdout, "     -1...-9                    Level of compression, from 1 to 9\n");
-    HDfprintf(stdout, "     -c P, --compressability=P  Percentage of compressability of the random\n");
-    HDfprintf(stdout, "                                data you want [default: 0]");
-    HDfprintf(stdout, "     -s S, --file-size=S        Maximum size of uncompressed file [default: 64M]\n");
-    HDfprintf(stdout, "     -B S, --max-buffer_size=S  Maximum size of buffer [default: 1M]\n");
-    HDfprintf(stdout, "     -b S, --min-buffer_size=S  Minimum size of buffer [default: 128K]\n");
-    HDfprintf(stdout, "     -p D, --prefix=D           The directory prefix to place the file\n");
-    HDfprintf(stdout, "     -r, --random-test          Use random data to write to the file\n");
-    HDfprintf(stdout, "                                [default: no]\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "  D  - a directory which exists\n");
-    HDfprintf(stdout, "  P  - a number between 0 and 100\n");
-    HDfprintf(stdout, "  S  - is a size specifier, an integer >=0 followed by a size indicator:\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "          K - Kilobyte (%d)\n", ONE_KB);
-    HDfprintf(stdout, "          M - Megabyte (%d)\n", ONE_MB);
-    HDfprintf(stdout, "          G - Gigabyte (%d)\n", ONE_GB);
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "      Example: 37M = 37 Megabytes = %d bytes\n", 37 * ONE_MB);
-    HDfprintf(stdout, "\n");
+    fprintf(stdout, "usage: %s [OPTIONS]\n", prog);
+    fprintf(stdout, "  OPTIONS\n");
+    fprintf(stdout, "     -h, --help                 Print this usage message and exit\n");
+    fprintf(stdout, "     -1...-9                    Level of compression, from 1 to 9\n");
+    fprintf(stdout, "     -c P, --compressability=P  Percentage of compressability of the random\n");
+    fprintf(stdout, "                                data you want [default: 0]");
+    fprintf(stdout, "     -s S, --file-size=S        Maximum size of uncompressed file [default: 64M]\n");
+    fprintf(stdout, "     -B S, --max-buffer_size=S  Maximum size of buffer [default: 1M]\n");
+    fprintf(stdout, "     -b S, --min-buffer_size=S  Minimum size of buffer [default: 128K]\n");
+    fprintf(stdout, "     -p D, --prefix=D           The directory prefix to place the file\n");
+    fprintf(stdout, "     -r, --random-test          Use random data to write to the file\n");
+    fprintf(stdout, "                                [default: no]\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "  D  - a directory which exists\n");
+    fprintf(stdout, "  P  - a number between 0 and 100\n");
+    fprintf(stdout, "  S  - is a size specifier, an integer >=0 followed by a size indicator:\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "          K - Kilobyte (%d)\n", ONE_KB);
+    fprintf(stdout, "          M - Megabyte (%d)\n", ONE_MB);
+    fprintf(stdout, "          G - Gigabyte (%d)\n", ONE_GB);
+    fprintf(stdout, "\n");
+    fprintf(stdout, "      Example: 37M = 37 Megabytes = %d bytes\n", 37 * ONE_MB);
+    fprintf(stdout, "\n");
     HDfflush(stdout);
 }
 
@@ -319,7 +319,7 @@ fill_with_random_data(Bytef *src, uLongf src_len)
         Bytef *buf = src;
         int    fd  = HDopen("/dev/urandom", O_RDONLY, 0);
 
-        HDfprintf(stdout, "Using /dev/urandom for random data\n");
+        fprintf(stdout, "Using /dev/urandom for random data\n");
 
         if (fd < 0)
             error(HDstrerror(errno));
@@ -339,7 +339,7 @@ fill_with_random_data(Bytef *src, uLongf src_len)
         HDclose(fd);
     }
     else {
-        HDfprintf(stdout, "Using random() for random data\n");
+        fprintf(stdout, "Using random() for random data\n");
 
         for (u = 0; u < src_len; ++u)
             src[u] = (Bytef)(0xff & HDrandom());
@@ -376,21 +376,21 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long
         if (random_test)
             fill_with_random_data(src, src_len);
 
-        HDfprintf(stdout, "Buffer size == ");
+        fprintf(stdout, "Buffer size == ");
 
         if (src_len >= ONE_KB && (src_len % ONE_KB) == 0) {
             if (src_len >= ONE_MB && (src_len % ONE_MB) == 0) {
-                HDfprintf(stdout, "%ldMB", src_len / ONE_MB);
+                fprintf(stdout, "%ldMB", src_len / ONE_MB);
             }
             else {
-                HDfprintf(stdout, "%ldKB", src_len / ONE_KB);
+                fprintf(stdout, "%ldKB", src_len / ONE_KB);
             }
         }
         else {
-            HDfprintf(stdout, "%ld", src_len);
+            fprintf(stdout, "%ld", src_len);
         }
 
-        HDfprintf(stdout, "\n");
+        fprintf(stdout, "\n");
 
         /* do uncompressed data write */
         HDgettimeofday(&timer_start, NULL);
@@ -424,8 +424,8 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long
         total_time = ((double)timer_stop.tv_sec + ((double)timer_stop.tv_usec) / (double)MICROSECOND) -
                      ((double)timer_start.tv_sec + ((double)timer_start.tv_usec) / (double)MICROSECOND);
 
-        HDfprintf(stdout, "\tUncompressed Write Time: %.2fs\n", total_time);
-        HDfprintf(stdout, "\tUncompressed Write Throughput: %.2fMB/s\n", MB_PER_SEC(file_size, total_time));
+        fprintf(stdout, "\tUncompressed Write Time: %.2fs\n", total_time);
+        fprintf(stdout, "\tUncompressed Write Throughput: %.2fMB/s\n", MB_PER_SEC(file_size, total_time));
 
         HDunlink(filename);
 
@@ -447,9 +447,9 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long
         total_time = ((double)timer_stop.tv_sec + ((double)timer_stop.tv_usec) / (double)MICROSECOND) -
                      ((double)timer_start.tv_sec + ((double)timer_start.tv_usec) / (double)MICROSECOND);
 
-        HDfprintf(stdout, "\tCompressed Write Time: %.2fs\n", total_time);
-        HDfprintf(stdout, "\tCompressed Write Throughput: %.2fMB/s\n", MB_PER_SEC(file_size, total_time));
-        HDfprintf(stdout, "\tCompression Time: %gs\n", compression_time);
+        fprintf(stdout, "\tCompressed Write Time: %.2fs\n", total_time);
+        fprintf(stdout, "\tCompressed Write Throughput: %.2fMB/s\n", MB_PER_SEC(file_size, total_time));
+        fprintf(stdout, "\tCompression Time: %gs\n", compression_time);
 
         HDunlink(filename);
         HDfree(src);
@@ -527,12 +527,12 @@ main(int argc, char *argv[])
     if (min_buf_size > max_buf_size)
         error("minimum buffer size (%d) exceeds maximum buffer size (%d)", min_buf_size, max_buf_size);
 
-    HDfprintf(stdout, "Filesize: %ld\n", file_size);
+    fprintf(stdout, "Filesize: %ld\n", file_size);
 
     if (compress_level == Z_DEFAULT_COMPRESSION)
-        HDfprintf(stdout, "Compression Level: 6\n");
+        fprintf(stdout, "Compression Level: 6\n");
     else
-        HDfprintf(stdout, "Compression Level: %d\n", compress_level);
+        fprintf(stdout, "Compression Level: %d\n", compress_level);
 
     get_unique_name();
     do_write_test(file_size, min_buf_size, max_buf_size);
@@ -552,7 +552,7 @@ main(int argc, char *argv[])
 int
 main(void)
 {
-    HDfprintf(stdout, "No compression IO performance because zlib was not configured\n");
+    fprintf(stdout, "No compression IO performance because zlib was not configured\n");
     return EXIT_SUCCESS;
 }
 
diff --git a/utils/mirror_vfd/mirror_remote.c b/utils/mirror_vfd/mirror_remote.c
index a2cf95c..065f2c8 100644
--- a/utils/mirror_vfd/mirror_remote.c
+++ b/utils/mirror_vfd/mirror_remote.c
@@ -43,15 +43,15 @@ mirror_log(struct mirror_log_info *info, unsigned int level, const char *format,
     }
     else if (level <= verbosity) {
         if (custom == true && info->prefix[0] != '\0') {
-            HDfprintf(stream, "%s", info->prefix);
+            fprintf(stream, "%s", info->prefix);
         }
 
         switch (level) {
             case (V_ERR):
-                HDfprintf(stream, "ERROR ");
+                fprintf(stream, "ERROR ");
                 break;
             case (V_WARN):
-                HDfprintf(stream, "WARNING ");
+                fprintf(stream, "WARNING ");
                 break;
             default:
                 break;
@@ -64,7 +64,7 @@ mirror_log(struct mirror_log_info *info, unsigned int level, const char *format,
             va_end(args);
         }
 
-        HDfprintf(stream, "\n");
+        fprintf(stream, "\n");
         HDfflush(stream);
     } /* end if sufficiently verbose to print */
 } /* end mirror_log() */
@@ -98,41 +98,41 @@ mirror_log_bytes(struct mirror_log_info *info, unsigned int level, size_t n_byte
         /* print whole lines */
         while ((n_bytes - bytes_written) >= 32) {
             b = buf + bytes_written; /* point to region in buffer */
-            HDfprintf(stream,
-                      "%04zX  %02X%02X%02X%02X %02X%02X%02X%02X"
-                      " %02X%02X%02X%02X %02X%02X%02X%02X"
-                      " %02X%02X%02X%02X %02X%02X%02X%02X"
-                      " %02X%02X%02X%02X %02X%02X%02X%02X\n",
-                      bytes_written, b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8], b[9], b[10], b[11],
-                      b[12], b[13], b[14], b[15], b[16], b[17], b[18], b[19], b[20], b[21], b[22], b[23],
-                      b[24], b[25], b[26], b[27], b[28], b[29], b[30], b[31]);
+            fprintf(stream,
+                    "%04zX  %02X%02X%02X%02X %02X%02X%02X%02X"
+                    " %02X%02X%02X%02X %02X%02X%02X%02X"
+                    " %02X%02X%02X%02X %02X%02X%02X%02X"
+                    " %02X%02X%02X%02X %02X%02X%02X%02X\n",
+                    bytes_written, b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7], b[8], b[9], b[10], b[11],
+                    b[12], b[13], b[14], b[15], b[16], b[17], b[18], b[19], b[20], b[21], b[22], b[23], b[24],
+                    b[25], b[26], b[27], b[28], b[29], b[30], b[31]);
             bytes_written += 32;
         }
 
         /* start partial line */
         if (n_bytes > bytes_written) {
-            HDfprintf(stream, "%04zX ", bytes_written);
+            fprintf(stream, "%04zX ", bytes_written);
         }
 
         /* partial line blocks */
         while ((n_bytes - bytes_written) >= 4) {
-            HDfprintf(stream, " %02X%02X%02X%02X", buf[bytes_written], buf[bytes_written + 1],
-                      buf[bytes_written + 2], buf[bytes_written + 3]);
+            fprintf(stream, " %02X%02X%02X%02X", buf[bytes_written], buf[bytes_written + 1],
+                    buf[bytes_written + 2], buf[bytes_written + 3]);
             bytes_written += 4;
         }
 
         /* block separator before partial block */
         if (n_bytes > bytes_written) {
-            HDfprintf(stream, " ");
+            fprintf(stream, " ");
         }
 
         /* partial block individual bytes */
         while (n_bytes > bytes_written) {
-            HDfprintf(stream, "%02X", buf[bytes_written++]);
+            fprintf(stream, "%02X", buf[bytes_written++]);
         }
 
         /* end partial line */
-        HDfprintf(stream, "\n");
+        fprintf(stream, "\n");
     } /* end if suitably verbose to log */
 } /* end mirror_log_bytes() */
 
@@ -165,8 +165,8 @@ mirror_log_init(char *path, const char *prefix, unsigned int verbosity)
             FILE *f = NULL;
             f       = HDfopen(path, "w");
             if (NULL == f) {
-                HDfprintf(MIRROR_LOG_DEFAULT_STREAM, "WARN custom logging path could not be opened: %s\n",
-                          path);
+                fprintf(MIRROR_LOG_DEFAULT_STREAM, "WARN custom logging path could not be opened: %s\n",
+                        path);
                 info->magic += 1;
                 HDfree(info);
             }
diff --git a/utils/mirror_vfd/mirror_server.c b/utils/mirror_vfd/mirror_server.c
index 03c72a4..83d6f20 100644
--- a/utils/mirror_vfd/mirror_server.c
+++ b/utils/mirror_vfd/mirror_server.c
@@ -139,22 +139,22 @@ struct server_run {
 static void
 usage(void)
 {
-    HDfprintf(stdout,
-              "mirror_server [options]\n"
-              "\n"
-              "Application for providing Mirror Writer process to "
-              " Mirror VFD on file-open.\n"
-              "Listens on a dedicated socket; forks as a Writer upon receipt"
-              " of a valid OPEN xmit.\n"
-              "\n"
-              "Options:\n"
-              "--help [-h]         : Print this help message and quit.\n"
-              "--logpath=PATH      : File path for logging output "
-              "(default none, to stdout).\n"
-              "--port=PORT         : Primary port (default %d).\n"
-              "--verbosity=NUM     : Debug printing level "
-              "0..4, (default %d).\n",
-              DEFAULT_PORT, MIRROR_LOG_DEFAULT_VERBOSITY);
+    fprintf(stdout,
+            "mirror_server [options]\n"
+            "\n"
+            "Application for providing Mirror Writer process to "
+            " Mirror VFD on file-open.\n"
+            "Listens on a dedicated socket; forks as a Writer upon receipt"
+            " of a valid OPEN xmit.\n"
+            "\n"
+            "Options:\n"
+            "--help [-h]         : Print this help message and quit.\n"
+            "--logpath=PATH      : File path for logging output "
+            "(default none, to stdout).\n"
+            "--port=PORT         : Primary port (default %d).\n"
+            "--verbosity=NUM     : Debug printing level "
+            "0..4, (default %d).\n",
+            DEFAULT_PORT, MIRROR_LOG_DEFAULT_VERBOSITY);
 } /* end usage() */
 
 /* ---------------------------------------------------------------------------
@@ -562,10 +562,10 @@ handle_requests(struct server_run *run)
             else if (pid == 0) { /* child process (writer side of fork) */
                 mirror_log(run->loginfo, V_INFO, "executing writer");
                 if (run_writer(connfd, xopen) < 0) {
-                    HDprintf("can't run writer\n");
+                    printf("can't run writer\n");
                 }
                 else {
-                    HDprintf("writer OK\n");
+                    printf("writer OK\n");
                 }
                 HDclose(connfd);
 
@@ -634,7 +634,7 @@ main(int argc, char **argv)
 int
 main(void)
 {
-    HDprintf("Mirror VFD was not built -- cannot launch server.\n");
+    printf("Mirror VFD was not built -- cannot launch server.\n");
     HDexit(EXIT_FAILURE);
 }
 
diff --git a/utils/mirror_vfd/mirror_server_stop.c b/utils/mirror_vfd/mirror_server_stop.c
index f54b210..1546d70 100644
--- a/utils/mirror_vfd/mirror_server_stop.c
+++ b/utils/mirror_vfd/mirror_server_stop.c
@@ -60,15 +60,15 @@ struct mshs_opts {
 static void
 usage(void)
 {
-    HDprintf("mirror_server_stop [options]\n"
-             "System-independent Mirror Server shutdown program.\n"
-             "Sends shutdown message to Mirror Server at given IP:port\n"
-             "\n"
-             "Options:\n"
-             "    -h | --help Print this usage message and exit.\n"
-             "    --ip=ADDR   IP Address of remote server (default %s)\n"
-             "    --port=PORT Handshake port of remote server (default %d)\n",
-             MSHS_DEFAULT_IP, MSHS_DEFAULT_PORTNO);
+    printf("mirror_server_stop [options]\n"
+           "System-independent Mirror Server shutdown program.\n"
+           "Sends shutdown message to Mirror Server at given IP:port\n"
+           "\n"
+           "Options:\n"
+           "    -h | --help Print this usage message and exit.\n"
+           "    --ip=ADDR   IP Address of remote server (default %s)\n"
+           "    --port=PORT Handshake port of remote server (default %d)\n",
+           MSHS_DEFAULT_IP, MSHS_DEFAULT_PORTNO);
 } /* end usage() */
 
 /* ----------------------------------------------------------------------------
@@ -102,7 +102,7 @@ parse_args(int argc, char **argv, struct mshs_opts *opts)
             opts->portno = HDatoi(argv[i] + 7);
         }
         else {
-            HDprintf("Unrecognized option: '%s'\n", argv[i]);
+            printf("Unrecognized option: '%s'\n", argv[i]);
             usage();
             opts->magic++; /* invalidate for sanity */
             return -1;
@@ -133,13 +133,13 @@ send_shutdown(struct mshs_opts *opts)
     struct sockaddr_in target_addr;
 
     if (opts->magic != MSHS_OPTS_MAGIC) {
-        HDprintf("invalid options structure\n");
+        printf("invalid options structure\n");
         return -1;
     }
 
     live_socket = socket(AF_INET, SOCK_STREAM, 0);
     if (live_socket < 0) {
-        HDprintf("ERROR socket()\n");
+        printf("ERROR socket()\n");
         return -1;
     }
 
@@ -149,27 +149,27 @@ send_shutdown(struct mshs_opts *opts)
     HDmemset(target_addr.sin_zero, 0, sizeof(target_addr.sin_zero));
 
     if (connect(live_socket, (struct sockaddr *)&target_addr, (socklen_t)sizeof(target_addr)) < 0) {
-        HDprintf("ERROR connect() (%d)\n%s\n", errno, HDstrerror(errno));
+        printf("ERROR connect() (%d)\n%s\n", errno, HDstrerror(errno));
         return -1;
     }
 
     if (HDwrite(live_socket, "SHUTDOWN", 9) == -1) {
-        HDprintf("ERROR write() (%d)\n%s\n", errno, HDstrerror(errno));
+        printf("ERROR write() (%d)\n%s\n", errno, HDstrerror(errno));
         return -1;
     }
 
     /* Read & verify response from port connection.  */
     if (HDread(live_socket, &mybuf, sizeof(mybuf)) == -1) {
-        HDprintf("ERROR read() can't receive data\n");
+        printf("ERROR read() can't receive data\n");
         return -1;
     }
     if (HDstrncmp("CLOSING", mybuf, 8)) {
-        HDprintf("ERROR read() didn't receive data from server\n");
+        printf("ERROR read() didn't receive data from server\n");
         return -1;
     }
 
     if (HDclose(live_socket) < 0) {
-        HDprintf("ERROR close() can't close socket\n");
+        printf("ERROR close() can't close socket\n");
         return -1;
     }
 
@@ -183,7 +183,7 @@ main(int argc, char **argv)
     struct mshs_opts opts;
 
     if (parse_args(argc, argv, &opts) < 0) {
-        HDprintf("Unable to parse arguments\n");
+        printf("Unable to parse arguments\n");
         HDexit(EXIT_FAILURE);
     }
 
@@ -193,7 +193,7 @@ main(int argc, char **argv)
     }
 
     if (send_shutdown(&opts) < 0) {
-        HDprintf("Unable to send shutdown command\n");
+        printf("Unable to send shutdown command\n");
         HDexit(EXIT_FAILURE);
     }
 
@@ -206,7 +206,7 @@ main(int argc, char **argv)
 int
 main(void)
 {
-    HDprintf("Mirror VFD not built -- unable to perform shutdown.\n");
+    printf("Mirror VFD not built -- unable to perform shutdown.\n");
     HDexit(EXIT_FAILURE);
 }
 
diff --git a/utils/tools/h5dwalk/h5dwalk.c b/utils/tools/h5dwalk/h5dwalk.c
index acb1724..ba7374d 100644
--- a/utils/tools/h5dwalk/h5dwalk.c
+++ b/utils/tools/h5dwalk/h5dwalk.c
@@ -120,7 +120,7 @@ create_default_separators(struct distribute_option *option, mfu_flist *flist, ui
     double      max_size_tmp;
     const char *max_size_units;
     mfu_format_bytes(*global_max_file_size, &max_size_tmp, &max_size_units);
-    HDprintf("Max File Size: %.3lf %s\n", max_size_tmp, max_size_units);
+    printf("Max File Size: %.3lf %s\n", max_size_tmp, max_size_units);
 
     /* round next_pow_2 to next multiple of 10 */
     uint64_t max_magnitude_bin = (uint64_t)((ceil(log2((double)(*global_max_file_size)) / 10)) * 10);
@@ -213,15 +213,15 @@ print_flist_distribution(int file_histogram, struct distribute_option *option, m
         uint64_t    number;
         double      size_tmp;
         const char *size_units;
-        HDprintf("%-27s %s\n", "Range", "Number");
+        printf("%-27s %s\n", "Range", "Number");
         for (size_t i = 0; i <= separators; i++) {
-            HDprintf("%s", "[ ");
+            printf("%s", "[ ");
             if (i == 0) {
-                HDprintf("%7.3lf %3s", 0.000, "B");
+                printf("%7.3lf %3s", 0.000, "B");
             }
             else {
                 mfu_format_bytes((uint64_t)option->separators[i - 1], &size_tmp, &size_units);
-                HDprintf("%7.3lf %3s", size_tmp, size_units);
+                printf("%7.3lf %3s", size_tmp, size_units);
             }
 
             printf("%s", " - ");
@@ -230,17 +230,17 @@ print_flist_distribution(int file_histogram, struct distribute_option *option, m
                 mfu_format_bytes((uint64_t)option->separators[i], &size_tmp, &size_units);
                 number = disttotal[i];
                 mfu_format_bytes((uint64_t)option->separators[i], &size_tmp, &size_units);
-                HDprintf("%7.3lf %3s ) %" PRIu64 "\n", size_tmp, size_units, number);
+                printf("%7.3lf %3s ) %" PRIu64 "\n", size_tmp, size_units, number);
             }
             else {
                 if (i == separators) {
                     number = disttotal[i];
-                    HDprintf("%10s ) %" PRIu64 "\n", "MAX", number);
+                    printf("%10s ) %" PRIu64 "\n", "MAX", number);
                 }
                 else {
                     number = disttotal[i];
                     mfu_format_bytes((uint64_t)option->separators[i], &size_tmp, &size_units);
-                    HDprintf("%7.3lf %3s ) %" PRIu64 "\n", size_tmp, size_units, number);
+                    printf("%7.3lf %3s ) %" PRIu64 "\n", size_tmp, size_units, number);
                 }
             }
         }
@@ -268,7 +268,7 @@ distribute_separator_add(struct distribute_option *option, uint64_t separator)
     count = option->separator_number;
     option->separator_number++;
     if (option->separator_number > MAX_DISTRIBUTE_SEPARATORS) {
-        HDprintf("Too many separators");
+        printf("Too many separators");
         return -1;
     }
 
@@ -340,13 +340,13 @@ distribution_parse(struct distribute_option *option, const char *string)
         }
 
         if (mfu_abtoull(ptr, &separator) != MFU_SUCCESS) {
-            HDprintf("Invalid separator \"%s\"\n", ptr);
+            printf("Invalid separator \"%s\"\n", ptr);
             status = -1;
             goto out;
         }
 
         if (distribute_separator_add(option, separator)) {
-            HDprintf("Duplicated separator \"%llu\"\n", separator);
+            printf("Duplicated separator \"%llu\"\n", separator);
             status = -1;
             goto out;
         }
@@ -450,8 +450,8 @@ print_file(mfu_flist flist, uint64_t idx)
         const char *size_units;
         mfu_format_bytes(size, &size_tmp, &size_units);
 
-        HDprintf("%s %s %s %7.3f %3s %s %s\n", mode_format, username, groupname, size_tmp, size_units,
-                 modify_s, file);
+        printf("%s %s %s %7.3f %3s %s %s\n", mode_format, username, groupname, size_tmp, size_units, modify_s,
+               file);
     }
     else {
         /* get type */
@@ -467,7 +467,7 @@ print_file(mfu_flist flist, uint64_t idx)
             type_str = type_str_link;
         }
 
-        HDprintf("Type=%s File=%s\n", type_str, file);
+        printf("Type=%s File=%s\n", type_str, file);
     }
 }
 
@@ -521,8 +521,8 @@ print_file_text(mfu_flist flist, uint64_t idx, char *buffer, size_t bufsize)
         const char *size_units;
         mfu_format_bytes(size, &size_tmp, &size_units);
 
-        numbytes = (size_t)snHDprintf(buffer, bufsize, "%s %s %s %7.3f %3s %s %s\n", mode_format, username,
-                                      groupname, size_tmp, size_units, modify_s, file);
+        numbytes = (size_t)snprintf(buffer, bufsize, "%s %s %s %7.3f %3s %s %s\n", mode_format, username,
+                                    groupname, size_tmp, size_units, modify_s, file);
     }
     else {
         /* get type */
@@ -538,7 +538,7 @@ print_file_text(mfu_flist flist, uint64_t idx, char *buffer, size_t bufsize)
             type_str = type_str_link;
         }
 
-        numbytes = (size_t)snHDprintf(buffer, bufsize, "Type=%s File=%s\n", type_str, file);
+        numbytes = (size_t)snprintf(buffer, bufsize, "Type=%s File=%s\n", type_str, file);
     }
 
     return numbytes;
@@ -606,7 +606,7 @@ dh5tool_flist_write_text(const char *name, mfu_flist bflist)
 
     /* change number of ranks to string to pass to MPI_Info */
     char str_buf[12];
-    HDprintf(str_buf, "%d", ranks);
+    printf(str_buf, "%d", ranks);
 
     /* no. of I/O devices for lustre striping is number of ranks */
     MPI_Info_set(info, "striping_factor", str_buf);
@@ -924,7 +924,7 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const
     int   use_stdout = 0;
 
 #ifdef H5_HAVE_WINDOWS
-    HDprintf("ERROR: %s %s: Unable to support fork/exec on WINDOWS\n", PROGRAMNAME, __func__);
+    printf("ERROR: %s %s: Unable to support fork/exec on WINDOWS\n", PROGRAMNAME, __func__);
     h5dwalk_exit(EXIT_FAILURE);
 #else
 
@@ -943,7 +943,7 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const
             buf_cache = bufs;
 #ifdef VERBOSE
             if (buft_count == 0) {
-                HDprintf("[%d] Initial buf_cache allocation: buft_count=%d\n", sg_mpi_rank, buft_count);
+                printf("[%d] Initial buf_cache allocation: buft_count=%d\n", sg_mpi_rank, buft_count);
             }
 #endif
             bufs[buft_count++] = thisbuft = (buf_t *)MFU_CALLOC(1, sizeof(buf_t));
@@ -1006,7 +1006,7 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const
 
                 /* Create a new read buffer */
 #ifdef VERBOSE
-                HDprintf("[%d] Allocate-1 a new read buffer:: buft_count=%d\n", sg_mpi_rank, buft_count);
+                printf("[%d] Allocate-1 a new read buffer:: buft_count=%d\n", sg_mpi_rank, buft_count);
 #endif
                 bufs[buft_count++] = thisbuft = (buf_t *)MFU_CALLOC(1, sizeof(buf_t));
                 assert(thisbuft != NULL);
@@ -1033,8 +1033,8 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const
                         thisbuft->count = 0;
                         thisbuft->chars += read_bytes;
 #ifdef VERBOSE
-                        HDprintf("[%d] Allocate-2 a new read buffer:: buft_count=%d\n", sg_mpi_rank,
-                                 buft_count);
+                        printf("[%d] Allocate-2 a new read buffer:: buft_count=%d\n", sg_mpi_rank,
+                               buft_count);
 #endif
                         bufs[buft_count++] = thisbuft = (buf_t *)MFU_CALLOC(1, sizeof(buf_t));
                         assert(thisbuft != NULL);
@@ -1109,7 +1109,7 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const
             HDstrcpy(&logErrors[log_len - 3], "err");
         }
         if (mfu_debug_level == MFU_LOG_VERBOSE) {
-            HDprintf("\tCreating logfile: %s\n", logpath);
+            printf("\tCreating logfile: %s\n", logpath);
             fflush(stdout);
         }
         pid = fork();
@@ -1191,8 +1191,8 @@ MFU_PRED_EXEC(mfu_flist flist, uint64_t idx, void *arg)
             buf += sizeof(mfu_flist *) + 2;
             fname_arg = mfu_flist_file_get_name(flist_arg, idx);
             if (fname_arg == NULL) {
-                HDprintf("[%d] Warning: Unable to resolve file_substitution %d (idx=%ld)\n", sg_mpi_rank,
-                         file_substituted, idx);
+                printf("[%d] Warning: Unable to resolve file_substitution %d (idx=%ld)\n", sg_mpi_rank,
+                       file_substituted, idx);
                 argv[k] = HDstrdup(fname);
             }
             else {
@@ -1224,7 +1224,7 @@ int
 MFU_PRED_PRINT(mfu_flist flist, uint64_t idx, void *arg __attribute__((unused)))
 {
     const char *name = mfu_flist_file_get_name(flist, idx);
-    HDprintf("%s\n", name);
+    printf("%s\n", name);
     return 1;
 }
 
@@ -1517,7 +1517,7 @@ main(int argc, char *argv[])
             }
         }
         if (count1 != count2) {
-            HDprintf("config files have different file counts: (1) %d and (2) %d\n", count1, count2);
+            printf("config files have different file counts: (1) %d and (2) %d\n", count1, count2);
         }
     }
     else if (numpaths > 0) {