diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index 949c8161c01..9d4ceb4af0c 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -1451,7 +1451,7 @@ test_read_string(H5File &file)
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_dset(const void *params)
+test_dset(void *params)
 {
     hid_t fapl_id;
     fapl_id     = h5_fileaccess(); // in h5test.c, returns a file access template
diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h
index ad95be47cd7..49c3fda73a6 100644
--- a/c++/test/h5cpputil.h
+++ b/c++/test/h5cpputil.h
@@ -138,20 +138,20 @@ verify_val(Type1 x, Type2 value, float epsilon, const char *msg, int line, const
 #ifdef __cplusplus
 extern "C" {
 #endif
-void test_array(const void *params);
-void test_attr(const void *params);
-void test_compound(const void *params);
-void test_dsproplist(const void *params);
-void test_file(const void *params);
-void test_filters(const void *params);
-void test_links(const void *params);
-void test_h5s(const void *params);
-void test_iterate(const void *params);
-void test_object(const void *params);
-void test_reference(const void *params);
-void test_types(const void *params);
-void test_vlstrings(const void *params);
-void test_dset(const void *params);
+void test_array(void *params);
+void test_attr(void *params);
+void test_compound(void *params);
+void test_dsproplist(void *params);
+void test_file(void *params);
+void test_filters(void *params);
+void test_links(void *params);
+void test_h5s(void *params);
+void test_iterate(void *params);
+void test_object(void *params);
+void test_reference(void *params);
+void test_types(void *params);
+void test_vlstrings(void *params);
+void test_dset(void *params);
 
 /* Prototypes for the cleanup routines */
 void cleanup_array(void *params);
diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp
index 4fbc8c91776..926e6b47899 100644
--- a/c++/test/tarray.cpp
+++ b/c++/test/tarray.cpp
@@ -477,7 +477,7 @@ test_array_info()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_array(const void *params)
+test_array(void *params)
 {
     (void)params;
 
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index 51932f2674f..9c473bfe4a2 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -1956,7 +1956,7 @@ test_attr_corder_create_basic(FileCreatPropList &fcpl, FileAccPropList &fapl)
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_attr(const void *params)
+test_attr(void *params)
 {
     (void)params;
 
diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
index 5e73d42a7b0..e4049e5843e 100644
--- a/c++/test/tcompound.cpp
+++ b/c++/test/tcompound.cpp
@@ -729,7 +729,7 @@ test_compound_set_size()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_compound(const void *params)
+test_compound(void *params)
 {
     (void)params;
 
diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp
index 0982b304134..fa39f6f99b7 100644
--- a/c++/test/tdspl.cpp
+++ b/c++/test/tdspl.cpp
@@ -114,7 +114,7 @@ test_transfplist()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_dsproplist(const void *params)
+test_dsproplist(void *params)
 {
     (void)params;
 
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index 250be27e1d3..003f220bdcb 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -968,7 +968,7 @@ test_file_info()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_file(const void *params)
+test_file(void *params)
 {
     (void)params;
 
diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
index c46a2217ef2..15aa202a997 100644
--- a/c++/test/tfilter.cpp
+++ b/c++/test/tfilter.cpp
@@ -227,7 +227,7 @@ test_szip_filter(H5File &file1)
  */
 const H5std_string FILE1("tfilters.h5");
 extern "C" void
-test_filters(const void *params)
+test_filters(void *params)
 {
     (void)params;
 
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index 2953a4c08d2..9276a7c330e 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -471,7 +471,7 @@ test_h5s_compound_scalar_read()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_h5s(const void *params)
+test_h5s(void *params)
 {
     (void)params;
 
diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp
index de27a9eaaaf..4409d9f9998 100644
--- a/c++/test/titerate.cpp
+++ b/c++/test/titerate.cpp
@@ -440,7 +440,7 @@ test_HDFFV_9920()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_iterate(const void *params)
+test_iterate(void *params)
 {
     (void)params;
 
diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp
index c76291d742f..63274041e9d 100644
--- a/c++/test/tlinks.cpp
+++ b/c++/test/tlinks.cpp
@@ -709,7 +709,7 @@ test_visit(hid_t fapl_id, hbool_t new_format)
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_links(const void *params)
+test_links(void *params)
 {
     hid_t    fapl_id, fapl2_id; /* File access property lists */
     unsigned new_format;        /* Whether to use the new format or not */
diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp
index 5b29df38c3f..105ae3e2cdf 100644
--- a/c++/test/tobject.cpp
+++ b/c++/test/tobject.cpp
@@ -712,7 +712,7 @@ test_intermediate_groups()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_object(const void *params)
+test_object(void *params)
 {
     (void)params;
 
diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
index 83224eb3186..ca00c3ac392 100644
--- a/c++/test/trefer.cpp
+++ b/c++/test/trefer.cpp
@@ -827,7 +827,7 @@ test_reference_region_1D()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_reference(const void *params)
+test_reference(void *params)
 {
     (void)params;
 
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index 5bac64cb379..a1ba990bbe3 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -1093,7 +1093,7 @@ test_operators()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_types(const void *params)
+test_types(void *params)
 {
     (void)params;
 
diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
index cfd37632eea..44d5cfc41ed 100644
--- a/c++/test/tvlstr.cpp
+++ b/c++/test/tvlstr.cpp
@@ -934,7 +934,7 @@ test_vl_rewrite()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_vlstrings(const void *params)
+test_vlstrings(void *params)
 {
     (void)params;
 
diff --git a/release_docs/USING_CMake_Examples.txt b/release_docs/USING_CMake_Examples.txt
index 514e300b393..ca87906cad2 100644
--- a/release_docs/USING_CMake_Examples.txt
+++ b/release_docs/USING_CMake_Examples.txt
@@ -9,7 +9,7 @@ Notes: This short instruction is written for users who want to quickly
        installations.
        For more information, see the USING_HDF5_CMake.txt file.
 
-       More information about using CMake can be found at the KitWare
+       More information about using CMake can be found at the Kitware
        site, www.cmake.org.
 
        CMake uses the command line and these instructions use the script
diff --git a/test/API/H5_api_async_test.c b/test/API/H5_api_async_test.c
index 04b604f0761..35a97baf3a2 100644
--- a/test/API/H5_api_async_test.c
+++ b/test/API/H5_api_async_test.c
@@ -12,10 +12,10 @@
 
 #include "H5_api_async_test.h"
 
-static void print_async_test_header(const void *params);
+static void print_async_test_header(void *params);
 
 static void
-print_async_test_header(const void H5_ATTR_UNUSED *params)
+print_async_test_header(void H5_ATTR_UNUSED *params)
 {
     printf("\n");
     printf("**********************************************\n");
@@ -31,20 +31,20 @@ print_async_test_header(const void H5_ATTR_UNUSED *params)
 
 #ifdef H5_API_TEST_HAVE_ASYNC
 
-static void test_one_dataset_io(const void *params);
-static void test_multi_dataset_io(const void *params);
-static void test_multi_file_dataset_io(const void *params);
-static void test_multi_file_grp_dset_io(const void *params);
-static void test_set_extent(const void *params);
-static void test_attribute_exists(const void *params);
-static void test_attribute_io(const void *params);
-static void test_attribute_io_tconv(const void *params);
-static void test_attribute_io_compound(const void *params);
-static void test_group(const void *params);
-static void test_link(const void *params);
-static void test_ocopy_orefresh(const void *params);
-static void test_file_reopen(const void *params);
-static void test_file_cleanup(const void *params);
+static void test_one_dataset_io(void *params);
+static void test_multi_dataset_io(void *params);
+static void test_multi_file_dataset_io(void *params);
+static void test_multi_file_grp_dset_io(void *params);
+static void test_set_extent(void *params);
+static void test_attribute_exists(void *params);
+static void test_attribute_io(void *params);
+static void test_attribute_io_tconv(void *params);
+static void test_attribute_io_compound(void *params);
+static void test_group(void *params);
+static void test_link(void *params);
+static void test_ocopy_orefresh(void *params);
+static void test_file_reopen(void *params);
+static void test_file_cleanup(void *params);
 
 /* Highest "printf" file created (starting at 0) */
 int max_printf_file = -1;
@@ -53,7 +53,7 @@ int max_printf_file = -1;
  * Create file and dataset, write to dataset
  */
 static void
-test_one_dataset_io(const void H5_ATTR_UNUSED *params)
+test_one_dataset_io(void H5_ATTR_UNUSED *params)
 {
     hid_t   file_id  = H5I_INVALID_HID;
     hid_t   dset_id  = H5I_INVALID_HID;
@@ -320,7 +320,7 @@ test_one_dataset_io(const void H5_ATTR_UNUSED *params)
  * Create file and multiple datasets, write to them and read from them
  */
 static void
-test_multi_dataset_io(const void H5_ATTR_UNUSED *params)
+test_multi_dataset_io(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id    = H5I_INVALID_HID;
     hid_t dset_id[5] = {H5I_INVALID_HID, H5I_INVALID_HID, H5I_INVALID_HID, H5I_INVALID_HID, H5I_INVALID_HID};
@@ -575,7 +575,7 @@ test_multi_dataset_io(const void H5_ATTR_UNUSED *params)
  * from them
  */
 static void
-test_multi_file_dataset_io(const void H5_ATTR_UNUSED *params)
+test_multi_file_dataset_io(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id[5] = {H5I_INVALID_HID, H5I_INVALID_HID, H5I_INVALID_HID, H5I_INVALID_HID, H5I_INVALID_HID};
     hid_t dset_id[5] = {H5I_INVALID_HID, H5I_INVALID_HID, H5I_INVALID_HID, H5I_INVALID_HID, H5I_INVALID_HID};
@@ -885,7 +885,7 @@ test_multi_file_dataset_io(const void H5_ATTR_UNUSED *params)
  * and read from them
  */
 static void
-test_multi_file_grp_dset_io(const void H5_ATTR_UNUSED *params)
+test_multi_file_grp_dset_io(void H5_ATTR_UNUSED *params)
 {
     hid_t   file_id  = H5I_INVALID_HID;
     hid_t   grp_id   = H5I_INVALID_HID;
@@ -1193,7 +1193,7 @@ test_multi_file_grp_dset_io(const void H5_ATTR_UNUSED *params)
  * Create file and dataset, write to dataset
  */
 static void
-test_set_extent(const void H5_ATTR_UNUSED *params)
+test_set_extent(void H5_ATTR_UNUSED *params)
 {
     hid_t   file_id       = H5I_INVALID_HID;
     hid_t   dset_id       = H5I_INVALID_HID;
@@ -1408,7 +1408,7 @@ test_set_extent(const void H5_ATTR_UNUSED *params)
  * Test H5Aexists()
  */
 static void
-test_attribute_exists(const void H5_ATTR_UNUSED *params)
+test_attribute_exists(void H5_ATTR_UNUSED *params)
 {
     hid_t   file_id  = H5I_INVALID_HID;
     hid_t   dset_id  = H5I_INVALID_HID;
@@ -1529,7 +1529,7 @@ test_attribute_exists(const void H5_ATTR_UNUSED *params)
  * Create file, dataset, and attribute, write to attribute
  */
 static void
-test_attribute_io(const void H5_ATTR_UNUSED *params)
+test_attribute_io(void H5_ATTR_UNUSED *params)
 {
     hid_t   file_id  = H5I_INVALID_HID;
     hid_t   dset_id  = H5I_INVALID_HID;
@@ -1673,7 +1673,7 @@ test_attribute_io(const void H5_ATTR_UNUSED *params)
  * Create file, dataset, and attribute, write to attribute with type conversion
  */
 static void
-test_attribute_io_tconv(const void H5_ATTR_UNUSED *params)
+test_attribute_io_tconv(void H5_ATTR_UNUSED *params)
 {
     hid_t   file_id  = H5I_INVALID_HID;
     hid_t   attr_id  = H5I_INVALID_HID;
@@ -1814,7 +1814,7 @@ typedef struct tattr_cmpd_t {
 } tattr_cmpd_t;
 
 static void
-test_attribute_io_compound(const void H5_ATTR_UNUSED *params)
+test_attribute_io_compound(void H5_ATTR_UNUSED *params)
 {
     hid_t        file_id   = H5I_INVALID_HID;
     hid_t        attr_id   = H5I_INVALID_HID;
@@ -2124,7 +2124,7 @@ test_attribute_io_compound(const void H5_ATTR_UNUSED *params)
  * Test group interfaces
  */
 static void
-test_group(const void H5_ATTR_UNUSED *params)
+test_group(void H5_ATTR_UNUSED *params)
 {
     hid_t      file_id         = H5I_INVALID_HID;
     hid_t      parent_group_id = H5I_INVALID_HID;
@@ -2292,7 +2292,7 @@ test_group(const void H5_ATTR_UNUSED *params)
  * Test link interfaces
  */
 static void
-test_link(const void H5_ATTR_UNUSED *params)
+test_link(void H5_ATTR_UNUSED *params)
 {
     hid_t  file_id         = H5I_INVALID_HID;
     hid_t  parent_group_id = H5I_INVALID_HID;
@@ -2489,7 +2489,7 @@ test_link(const void H5_ATTR_UNUSED *params)
  * Test H5Ocopy() and H5Orefresh()
  */
 static void
-test_ocopy_orefresh(const void H5_ATTR_UNUSED *params)
+test_ocopy_orefresh(void H5_ATTR_UNUSED *params)
 {
     hid_t   file_id         = H5I_INVALID_HID;
     hid_t   parent_group_id = H5I_INVALID_HID;
@@ -2604,7 +2604,7 @@ test_ocopy_orefresh(const void H5_ATTR_UNUSED *params)
  * Test H5Freopen()
  */
 static void
-test_file_reopen(const void H5_ATTR_UNUSED *params)
+test_file_reopen(void H5_ATTR_UNUSED *params)
 {
     hid_t  file_id          = H5I_INVALID_HID;
     hid_t  reopened_file_id = H5I_INVALID_HID;
@@ -2676,7 +2676,7 @@ test_file_reopen(const void H5_ATTR_UNUSED *params)
  * Cleanup temporary test files
  */
 static void
-test_file_cleanup(const void H5_ATTR_UNUSED *params)
+test_file_cleanup(void H5_ATTR_UNUSED *params)
 {
     char file_name[64];
     int  i;
diff --git a/test/API/H5_api_attribute_test.c b/test/API/H5_api_attribute_test.c
index d508889ae31..f44355f3bcb 100644
--- a/test/API/H5_api_attribute_test.c
+++ b/test/API/H5_api_attribute_test.c
@@ -20,48 +20,48 @@
  *         order value gets reset when all attributes are removed.
  */
 
-static void print_attribute_test_header(const void *params);
-static void test_create_attribute_on_root(const void *params);
-static void test_create_attribute_on_dataset(const void *params);
-static void test_create_attribute_on_datatype(const void *params);
-static void test_create_attribute_with_null_space(const void *params);
-static void test_create_attribute_with_scalar_space(const void *params);
-static void test_create_attribute_with_space_in_name(const void *params);
-static void test_create_attribute_invalid_params(const void *params);
-static void test_open_attribute(const void *params);
-static void test_open_attribute_invalid_params(const void *params);
-static void test_write_attribute(const void *params);
-static void test_write_attribute_invalid_params(const void *params);
-static void test_read_attribute(const void *params);
-static void test_read_attribute_invalid_params(const void *params);
-static void test_read_empty_attribute(const void *params);
-static void test_close_attribute_invalid_id(const void *params);
-static void test_get_attribute_space_and_type(const void *params);
-static void test_get_attribute_space_and_type_invalid_params(const void *params);
-static void test_attribute_property_lists(const void *params);
-static void test_get_attribute_name(const void *params);
-static void test_get_attribute_name_invalid_params(const void *params);
-static void test_get_attribute_storage_size(const void *params);
-static void test_get_attribute_info(const void *params);
-static void test_get_attribute_info_invalid_params(const void *params);
-static void test_rename_attribute(const void *params);
-static void test_rename_attribute_invalid_params(const void *params);
-static void test_attribute_iterate_group(const void *params);
-static void test_attribute_iterate_dataset(const void *params);
-static void test_attribute_iterate_datatype(const void *params);
-static void test_attribute_iterate_index_saving(const void *params);
-static void test_attribute_iterate_invalid_params(const void *params);
-static void test_attribute_iterate_0_attributes(const void *params);
-static void test_attribute_compound_subset(const void *params);
-static void test_attribute_string_encodings(const void *params);
-static void test_delete_attribute(const void *params);
-static void test_delete_attribute_invalid_params(const void *params);
-static void test_attribute_exists(const void *params);
-static void test_attribute_exists_invalid_params(const void *params);
-static void test_attribute_many(const void *params);
-static void test_attribute_duplicate_id(const void *params);
-static void test_get_number_attributes(const void *params);
-static void test_attr_shared_dtype(const void *params);
+static void print_attribute_test_header(void *params);
+static void test_create_attribute_on_root(void *params);
+static void test_create_attribute_on_dataset(void *params);
+static void test_create_attribute_on_datatype(void *params);
+static void test_create_attribute_with_null_space(void *params);
+static void test_create_attribute_with_scalar_space(void *params);
+static void test_create_attribute_with_space_in_name(void *params);
+static void test_create_attribute_invalid_params(void *params);
+static void test_open_attribute(void *params);
+static void test_open_attribute_invalid_params(void *params);
+static void test_write_attribute(void *params);
+static void test_write_attribute_invalid_params(void *params);
+static void test_read_attribute(void *params);
+static void test_read_attribute_invalid_params(void *params);
+static void test_read_empty_attribute(void *params);
+static void test_close_attribute_invalid_id(void *params);
+static void test_get_attribute_space_and_type(void *params);
+static void test_get_attribute_space_and_type_invalid_params(void *params);
+static void test_attribute_property_lists(void *params);
+static void test_get_attribute_name(void *params);
+static void test_get_attribute_name_invalid_params(void *params);
+static void test_get_attribute_storage_size(void *params);
+static void test_get_attribute_info(void *params);
+static void test_get_attribute_info_invalid_params(void *params);
+static void test_rename_attribute(void *params);
+static void test_rename_attribute_invalid_params(void *params);
+static void test_attribute_iterate_group(void *params);
+static void test_attribute_iterate_dataset(void *params);
+static void test_attribute_iterate_datatype(void *params);
+static void test_attribute_iterate_index_saving(void *params);
+static void test_attribute_iterate_invalid_params(void *params);
+static void test_attribute_iterate_0_attributes(void *params);
+static void test_attribute_compound_subset(void *params);
+static void test_attribute_string_encodings(void *params);
+static void test_delete_attribute(void *params);
+static void test_delete_attribute_invalid_params(void *params);
+static void test_attribute_exists(void *params);
+static void test_attribute_exists_invalid_params(void *params);
+static void test_attribute_many(void *params);
+static void test_attribute_duplicate_id(void *params);
+static void test_get_number_attributes(void *params);
+static void test_attr_shared_dtype(void *params);
 
 static herr_t attr_iter_callback1(hid_t location_id, const char *attr_name, const H5A_info_t *ainfo,
                                   void *op_data);
@@ -69,7 +69,7 @@ static herr_t attr_iter_callback2(hid_t location_id, const char *attr_name, cons
                                   void *op_data);
 
 static void
-print_attribute_test_header(const void H5_ATTR_UNUSED *params)
+print_attribute_test_header(void H5_ATTR_UNUSED *params)
 {
     printf("\n");
     printf("**********************************************\n");
@@ -84,7 +84,7 @@ print_attribute_test_header(const void H5_ATTR_UNUSED *params)
  * the root group.
  */
 static void
-test_create_attribute_on_root(const void H5_ATTR_UNUSED *params)
+test_create_attribute_on_root(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     hid_t  file_id = H5I_INVALID_HID;
@@ -221,7 +221,7 @@ test_create_attribute_on_root(const void H5_ATTR_UNUSED *params)
  * a dataset.
  */
 static void
-test_create_attribute_on_dataset(const void H5_ATTR_UNUSED *params)
+test_create_attribute_on_dataset(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -406,7 +406,7 @@ test_create_attribute_on_dataset(const void H5_ATTR_UNUSED *params)
  * a committed datatype.
  */
 static void
-test_create_attribute_on_datatype(const void H5_ATTR_UNUSED *params)
+test_create_attribute_on_datatype(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -581,7 +581,7 @@ test_create_attribute_on_datatype(const void H5_ATTR_UNUSED *params)
  * NULL dataspace is not problematic.
  */
 static void
-test_create_attribute_with_null_space(const void H5_ATTR_UNUSED *params)
+test_create_attribute_with_null_space(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -692,7 +692,7 @@ test_create_attribute_with_null_space(const void H5_ATTR_UNUSED *params)
  * scalar dataspace is not problematic.
  */
 static void
-test_create_attribute_with_scalar_space(const void H5_ATTR_UNUSED *params)
+test_create_attribute_with_scalar_space(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -803,7 +803,7 @@ test_create_attribute_with_scalar_space(const void H5_ATTR_UNUSED *params)
  * is not problematic.
  */
 static void
-test_create_attribute_with_space_in_name(const void H5_ATTR_UNUSED *params)
+test_create_attribute_with_space_in_name(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -909,7 +909,7 @@ test_create_attribute_with_space_in_name(const void H5_ATTR_UNUSED *params)
  * H5Acreate is passed invalid parameters.
  */
 static void
-test_create_attribute_invalid_params(const void H5_ATTR_UNUSED *params)
+test_create_attribute_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -1352,7 +1352,7 @@ test_create_attribute_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Aopen(_by_idx).
  */
 static void
-test_open_attribute(const void H5_ATTR_UNUSED *params)
+test_open_attribute(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -1756,7 +1756,7 @@ test_open_attribute(const void H5_ATTR_UNUSED *params)
  * H5Aopen(_by_name/_by_idx) is passed invalid parameters.
  */
 static void
-test_open_attribute_invalid_params(const void H5_ATTR_UNUSED *params)
+test_open_attribute_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -2271,7 +2271,7 @@ test_open_attribute_invalid_params(const void H5_ATTR_UNUSED *params)
  * can be made.
  */
 static void
-test_write_attribute(const void H5_ATTR_UNUSED *params)
+test_write_attribute(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[ATTRIBUTE_WRITE_TEST_SPACE_RANK];
     size_t  i, data_size;
@@ -2400,7 +2400,7 @@ test_write_attribute(const void H5_ATTR_UNUSED *params)
  * H5Awrite is passed invalid parameters.
  */
 static void
-test_write_attribute_invalid_params(const void H5_ATTR_UNUSED *params)
+test_write_attribute_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_SPACE_RANK];
     size_t  i, data_size;
@@ -2590,7 +2590,7 @@ test_write_attribute_invalid_params(const void H5_ATTR_UNUSED *params)
  * attribute.
  */
 static void
-test_read_attribute(const void H5_ATTR_UNUSED *params)
+test_read_attribute(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[ATTRIBUTE_READ_TEST_SPACE_RANK];
     size_t  i, data_size;
@@ -2745,7 +2745,7 @@ test_read_attribute(const void H5_ATTR_UNUSED *params)
  * H5Aread is passed invalid parameters.
  */
 static void
-test_read_attribute_invalid_params(const void H5_ATTR_UNUSED *params)
+test_read_attribute_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[ATTRIBUTE_READ_INVALID_PARAMS_TEST_SPACE_RANK];
     size_t  i, data_size;
@@ -2958,7 +2958,7 @@ test_read_attribute_invalid_params(const void H5_ATTR_UNUSED *params)
  * Test reading an empty attribute is ok
  */
 static void
-test_read_empty_attribute(const void H5_ATTR_UNUSED *params)
+test_read_empty_attribute(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[ATTRIBUTE_READ_EMPTY_SPACE_RANK];
     size_t  i, data_size;
@@ -3085,7 +3085,7 @@ test_read_empty_attribute(const void H5_ATTR_UNUSED *params)
  * an invalid attribute ID.
  */
 static void
-test_close_attribute_invalid_id(const void H5_ATTR_UNUSED *params)
+test_close_attribute_invalid_id(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     hid_t  file_id = H5I_INVALID_HID;
@@ -3140,7 +3140,7 @@ test_close_attribute_invalid_id(const void H5_ATTR_UNUSED *params)
  * H5Aget_space and H5Aget_type, respectively.
  */
 static void
-test_get_attribute_space_and_type(const void H5_ATTR_UNUSED *params)
+test_get_attribute_space_and_type(void H5_ATTR_UNUSED *params)
 {
     hsize_t attr_dims[ATTRIBUTE_GET_SPACE_TYPE_TEST_SPACE_RANK];
     size_t  i;
@@ -3445,7 +3445,7 @@ test_get_attribute_space_and_type(const void H5_ATTR_UNUSED *params)
  * invalid parameters, respectively.
  */
 static void
-test_get_attribute_space_and_type_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_attribute_space_and_type_invalid_params(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -3606,7 +3606,7 @@ test_get_attribute_space_and_type_invalid_params(const void H5_ATTR_UNUSED *para
  * be retrieved later with a call to H5Aget_create_plist.
  */
 static void
-test_attribute_property_lists(const void H5_ATTR_UNUSED *params)
+test_attribute_property_lists(void H5_ATTR_UNUSED *params)
 {
     H5T_cset_t encoding = H5T_CSET_UTF8;
     htri_t     attr_exists;
@@ -3891,7 +3891,7 @@ test_attribute_property_lists(const void H5_ATTR_UNUSED *params)
  * H5Aget_name_by_idx.
  */
 static void
-test_get_attribute_name(const void H5_ATTR_UNUSED *params)
+test_get_attribute_name(void H5_ATTR_UNUSED *params)
 {
     ssize_t name_buf_size;
     htri_t  attr_exists;
@@ -4388,7 +4388,7 @@ test_get_attribute_name(const void H5_ATTR_UNUSED *params)
  * parameters.
  */
 static void
-test_get_attribute_name_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_attribute_name_invalid_params(void H5_ATTR_UNUSED *params)
 {
     ssize_t name_buf_size;
     htri_t  attr_exists;
@@ -4744,7 +4744,7 @@ test_get_attribute_name_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Aget_storage_size.
  */
 static void
-test_get_attribute_storage_size(const void H5_ATTR_UNUSED *params)
+test_get_attribute_storage_size(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Aget_storage_size");
 
@@ -4757,7 +4757,7 @@ test_get_attribute_storage_size(const void H5_ATTR_UNUSED *params)
  * A test to check the functionality of H5Aget_info(_by_idx).
  */
 static void
-test_get_attribute_info(const void H5_ATTR_UNUSED *params)
+test_get_attribute_info(void H5_ATTR_UNUSED *params)
 {
     H5A_info_t attr_info;
     htri_t     attr_exists;
@@ -5405,7 +5405,7 @@ test_get_attribute_info(const void H5_ATTR_UNUSED *params)
  * doesn't succeed when passed invalid parameters.
  */
 static void
-test_get_attribute_info_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_attribute_info_invalid_params(void H5_ATTR_UNUSED *params)
 {
     H5A_info_t attr_info;
     htri_t     attr_exists;
@@ -5867,7 +5867,7 @@ test_get_attribute_info_invalid_params(const void H5_ATTR_UNUSED *params)
  * with H5Arename and H5Arename_by_name.
  */
 static void
-test_rename_attribute(const void H5_ATTR_UNUSED *params)
+test_rename_attribute(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -6084,7 +6084,7 @@ test_rename_attribute(const void H5_ATTR_UNUSED *params)
  * when H5Arename(_by_name) is passed invalid parameters.
  */
 static void
-test_rename_attribute_invalid_params(const void H5_ATTR_UNUSED *params)
+test_rename_attribute_invalid_params(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     herr_t err_ret         = -1;
@@ -6456,7 +6456,7 @@ test_rename_attribute_invalid_params(const void H5_ATTR_UNUSED *params)
  * creation order.
  */
 static void
-test_attribute_iterate_group(const void H5_ATTR_UNUSED *params)
+test_attribute_iterate_group(void H5_ATTR_UNUSED *params)
 {
     size_t link_counter;
     size_t i;
@@ -6848,7 +6848,7 @@ test_attribute_iterate_group(const void H5_ATTR_UNUSED *params)
  * creation order.
  */
 static void
-test_attribute_iterate_dataset(const void H5_ATTR_UNUSED *params)
+test_attribute_iterate_dataset(void H5_ATTR_UNUSED *params)
 {
     size_t link_counter;
     size_t i;
@@ -7272,7 +7272,7 @@ test_attribute_iterate_dataset(const void H5_ATTR_UNUSED *params)
  * creation order.
  */
 static void
-test_attribute_iterate_datatype(const void H5_ATTR_UNUSED *params)
+test_attribute_iterate_datatype(void H5_ATTR_UNUSED *params)
 {
     size_t link_counter;
     size_t i;
@@ -7687,7 +7687,7 @@ test_attribute_iterate_datatype(const void H5_ATTR_UNUSED *params)
  * creation order.
  */
 static void
-test_attribute_iterate_index_saving(const void H5_ATTR_UNUSED *params)
+test_attribute_iterate_index_saving(void H5_ATTR_UNUSED *params)
 {
     TESTING("attribute iteration index saving capability");
 
@@ -7702,7 +7702,7 @@ test_attribute_iterate_index_saving(const void H5_ATTR_UNUSED *params)
  * passed invalid parameters.
  */
 static void
-test_attribute_iterate_invalid_params(const void H5_ATTR_UNUSED *params)
+test_attribute_iterate_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     htri_t attr_exists;
@@ -8123,7 +8123,7 @@ test_attribute_iterate_invalid_params(const void H5_ATTR_UNUSED *params)
  * not problematic.
  */
 static void
-test_attribute_iterate_0_attributes(const void H5_ATTR_UNUSED *params)
+test_attribute_iterate_0_attributes(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -8315,7 +8315,7 @@ typedef struct attribute_compound_io_t {
  * been written, using subsets of compound datatypes
  */
 static void
-test_attribute_compound_subset(const void H5_ATTR_UNUSED *params)
+test_attribute_compound_subset(void H5_ATTR_UNUSED *params)
 {
     hsize_t                 dims[1] = {ATTRIBUTE_COMPOUND_IO_ATTR_DIMS};
     size_t                  i;
@@ -8572,7 +8572,7 @@ test_attribute_compound_subset(const void H5_ATTR_UNUSED *params)
  * correctness for strings with ASCII or UTF-8 char sets
  */
 static void
-test_attribute_string_encodings(const void H5_ATTR_UNUSED *params)
+test_attribute_string_encodings(void H5_ATTR_UNUSED *params)
 {
     hid_t   file_id                               = H5I_INVALID_HID;
     hid_t   container_group                       = H5I_INVALID_HID;
@@ -8836,7 +8836,7 @@ test_attribute_string_encodings(const void H5_ATTR_UNUSED *params)
  * using H5Adelete(_by_idx).
  */
 static void
-test_delete_attribute(const void H5_ATTR_UNUSED *params)
+test_delete_attribute(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -10069,7 +10069,7 @@ test_delete_attribute(const void H5_ATTR_UNUSED *params)
  * parameters.
  */
 static void
-test_delete_attribute_invalid_params(const void H5_ATTR_UNUSED *params)
+test_delete_attribute_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     htri_t attr_exists;
@@ -10487,7 +10487,7 @@ test_delete_attribute_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Aexists and H5Aexists_by_name.
  */
 static void
-test_attribute_exists(const void H5_ATTR_UNUSED *params)
+test_attribute_exists(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -10628,7 +10628,7 @@ test_attribute_exists(const void H5_ATTR_UNUSED *params)
  * given invalid parameters.
  */
 static void
-test_attribute_exists_invalid_params(const void H5_ATTR_UNUSED *params)
+test_attribute_exists_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     htri_t attr_exists;
@@ -10905,7 +10905,7 @@ test_attribute_exists_invalid_params(const void H5_ATTR_UNUSED *params)
  * to the file
  */
 static void
-test_attribute_many(const void H5_ATTR_UNUSED *params)
+test_attribute_many(void H5_ATTR_UNUSED *params)
 {
     unsigned u;
     htri_t   attr_exists;
@@ -11015,7 +11015,7 @@ test_attribute_many(const void H5_ATTR_UNUSED *params)
  * a second time
  */
 static void
-test_attribute_duplicate_id(const void H5_ATTR_UNUSED *params)
+test_attribute_duplicate_id(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -11130,7 +11130,7 @@ test_attribute_duplicate_id(const void H5_ATTR_UNUSED *params)
  * XXX: Cover all of the cases and move to H5O tests.
  */
 static void
-test_get_number_attributes(const void H5_ATTR_UNUSED *params)
+test_get_number_attributes(void H5_ATTR_UNUSED *params)
 {
     H5O_info2_t obj_info;
     htri_t      attr_exists;
@@ -11309,7 +11309,7 @@ test_get_number_attributes(const void H5_ATTR_UNUSED *params)
  * XXX: May move to H5O tests.
  */
 static void
-test_attr_shared_dtype(const void H5_ATTR_UNUSED *params)
+test_attr_shared_dtype(void H5_ATTR_UNUSED *params)
 {
     H5O_info2_t obj_info;
     htri_t      attr_exists;
diff --git a/test/API/H5_api_dataset_test.c b/test/API/H5_api_dataset_test.c
index c88288bfd01..bc4efe60d25 100644
--- a/test/API/H5_api_dataset_test.c
+++ b/test/API/H5_api_dataset_test.c
@@ -16,91 +16,91 @@
  * XXX: H5Dread_chunk/H5Dwrite_chunk, H5Dfill/scatter/gather
  */
 
-static void print_dataset_test_header(const void *params);
-static void test_create_dataset_under_root(const void *params);
-static void test_create_dataset_under_existing_group(const void *params);
-static void test_create_dataset_invalid_params(const void *params);
-static void test_create_anonymous_dataset(const void *params);
-static void test_create_anonymous_dataset_invalid_params(const void *params);
-static void test_create_dataset_null_space(const void *params);
-static void test_create_dataset_scalar_space(const void *params);
-static void test_create_zero_dim_dset(const void *params);
-static void test_create_dataset_random_shapes(const void *params);
-static void test_create_dataset_predefined_types(const void *params);
-static void test_create_dataset_string_types(const void *params);
-static void test_create_dataset_compound_types(const void *params);
-static void test_create_dataset_enum_types(const void *params);
-static void test_create_dataset_array_types(const void *params);
-static void test_create_dataset_creation_properties(const void *params);
-static void test_create_many_dataset(const void *params);
-static void test_open_dataset(const void *params);
-static void test_open_dataset_invalid_params(const void *params);
-static void test_close_dataset_invalid_params(const void *params);
-static void test_get_dataset_space_and_type(const void *params);
-static void test_get_dataset_space_and_type_invalid_params(const void *params);
-static void test_get_dataset_space_status(const void *params);
-static void test_get_dataset_space_status_invalid_params(const void *params);
-static void test_dataset_property_lists(const void *params);
-static void test_get_dataset_storage_size(const void *params);
-static void test_get_dataset_storage_size_invalid_params(const void *params);
-static void test_get_dataset_chunk_storage_size(const void *params);
-static void test_get_dataset_chunk_storage_size_invalid_params(const void *params);
-static void test_get_dataset_offset(const void *params);
-static void test_get_dataset_offset_invalid_params(const void *params);
-static void test_read_dataset_small_all(const void *params);
-static void test_read_dataset_small_hyperslab(const void *params);
-static void test_read_dataset_small_point_selection(const void *params);
-static void test_read_multi_dataset_small_all(const void *params);
-static void test_read_multi_dataset_small_hyperslab(const void *params);
-static void test_read_multi_dataset_small_point_selection(const void *params);
-static void test_dataset_io_point_selections(const void *params);
-static void test_read_dataset_invalid_params(const void *params);
-static void test_write_dataset_small_all(const void *params);
-static void test_write_dataset_small_hyperslab(const void *params);
-static void test_write_dataset_small_point_selection(const void *params);
-static void test_write_dataset_data_verification(const void *params);
-static void test_write_multi_dataset_small_all(const void *params);
-static void test_write_multi_dataset_small_hyperslab(const void *params);
-static void test_write_multi_dataset_small_point_selection(const void *params);
-static void test_write_multi_dataset_data_verification(const void *params);
-static void test_write_dataset_invalid_params(const void *params);
-static void test_dataset_string_encodings(const void *params);
-static void test_dataset_builtin_type_conversion(const void *params);
-static void test_dataset_real_to_int_conversion(const void *params);
-static void test_dataset_compound_partial_io(const void *params);
-static void test_dataset_vlen_io(const void *params);
-static void test_dataset_set_extent_chunked_unlimited(const void *params);
-static void test_dataset_set_extent_chunked_fixed(const void *params);
-static void test_dataset_set_extent_data(const void *params);
-static void test_dataset_set_extent_double_handles(const void *params);
-static void test_dataset_set_extent_invalid_params(const void *params);
-static void test_flush_dataset(const void *params);
-static void test_flush_dataset_invalid_params(const void *params);
-static void test_refresh_dataset(const void *params);
-static void test_refresh_dataset_invalid_params(const void *params);
+static void print_dataset_test_header(void *params);
+static void test_create_dataset_under_root(void *params);
+static void test_create_dataset_under_existing_group(void *params);
+static void test_create_dataset_invalid_params(void *params);
+static void test_create_anonymous_dataset(void *params);
+static void test_create_anonymous_dataset_invalid_params(void *params);
+static void test_create_dataset_null_space(void *params);
+static void test_create_dataset_scalar_space(void *params);
+static void test_create_zero_dim_dset(void *params);
+static void test_create_dataset_random_shapes(void *params);
+static void test_create_dataset_predefined_types(void *params);
+static void test_create_dataset_string_types(void *params);
+static void test_create_dataset_compound_types(void *params);
+static void test_create_dataset_enum_types(void *params);
+static void test_create_dataset_array_types(void *params);
+static void test_create_dataset_creation_properties(void *params);
+static void test_create_many_dataset(void *params);
+static void test_open_dataset(void *params);
+static void test_open_dataset_invalid_params(void *params);
+static void test_close_dataset_invalid_params(void *params);
+static void test_get_dataset_space_and_type(void *params);
+static void test_get_dataset_space_and_type_invalid_params(void *params);
+static void test_get_dataset_space_status(void *params);
+static void test_get_dataset_space_status_invalid_params(void *params);
+static void test_dataset_property_lists(void *params);
+static void test_get_dataset_storage_size(void *params);
+static void test_get_dataset_storage_size_invalid_params(void *params);
+static void test_get_dataset_chunk_storage_size(void *params);
+static void test_get_dataset_chunk_storage_size_invalid_params(void *params);
+static void test_get_dataset_offset(void *params);
+static void test_get_dataset_offset_invalid_params(void *params);
+static void test_read_dataset_small_all(void *params);
+static void test_read_dataset_small_hyperslab(void *params);
+static void test_read_dataset_small_point_selection(void *params);
+static void test_read_multi_dataset_small_all(void *params);
+static void test_read_multi_dataset_small_hyperslab(void *params);
+static void test_read_multi_dataset_small_point_selection(void *params);
+static void test_dataset_io_point_selections(void *params);
+static void test_read_dataset_invalid_params(void *params);
+static void test_write_dataset_small_all(void *params);
+static void test_write_dataset_small_hyperslab(void *params);
+static void test_write_dataset_small_point_selection(void *params);
+static void test_write_dataset_data_verification(void *params);
+static void test_write_multi_dataset_small_all(void *params);
+static void test_write_multi_dataset_small_hyperslab(void *params);
+static void test_write_multi_dataset_small_point_selection(void *params);
+static void test_write_multi_dataset_data_verification(void *params);
+static void test_write_dataset_invalid_params(void *params);
+static void test_dataset_string_encodings(void *params);
+static void test_dataset_builtin_type_conversion(void *params);
+static void test_dataset_real_to_int_conversion(void *params);
+static void test_dataset_compound_partial_io(void *params);
+static void test_dataset_vlen_io(void *params);
+static void test_dataset_set_extent_chunked_unlimited(void *params);
+static void test_dataset_set_extent_chunked_fixed(void *params);
+static void test_dataset_set_extent_data(void *params);
+static void test_dataset_set_extent_double_handles(void *params);
+static void test_dataset_set_extent_invalid_params(void *params);
+static void test_flush_dataset(void *params);
+static void test_flush_dataset_invalid_params(void *params);
+static void test_refresh_dataset(void *params);
+static void test_refresh_dataset_invalid_params(void *params);
 
 /*
  * Chunking tests
  */
-static void test_create_single_chunk_dataset(const void *params);
-static void test_write_single_chunk_dataset(const void *params);
-static void test_create_multi_chunk_dataset(const void *params);
-static void test_write_multi_chunk_dataset_same_shape_read(const void *params);
-static void test_write_multi_chunk_dataset_diff_shape_read(const void *params);
-static void test_overwrite_multi_chunk_dataset_same_shape_read(const void *params);
-static void test_overwrite_multi_chunk_dataset_diff_shape_read(const void *params);
-static void test_read_partial_chunk_all_selection(const void *params);
-static void test_read_partial_chunk_hyperslab_selection(const void *params);
-static void test_read_partial_chunk_point_selection(const void *params);
-
-static void test_get_vlen_buf_size(const void *params);
+static void test_create_single_chunk_dataset(void *params);
+static void test_write_single_chunk_dataset(void *params);
+static void test_create_multi_chunk_dataset(void *params);
+static void test_write_multi_chunk_dataset_same_shape_read(void *params);
+static void test_write_multi_chunk_dataset_diff_shape_read(void *params);
+static void test_overwrite_multi_chunk_dataset_same_shape_read(void *params);
+static void test_overwrite_multi_chunk_dataset_diff_shape_read(void *params);
+static void test_read_partial_chunk_all_selection(void *params);
+static void test_read_partial_chunk_hyperslab_selection(void *params);
+static void test_read_partial_chunk_point_selection(void *params);
+
+static void test_get_vlen_buf_size(void *params);
 
 static size_t filter(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts,
                      const unsigned int H5_ATTR_UNUSED cd_values[], size_t nbytes,
                      size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf);
 
 static void
-print_dataset_test_header(const void H5_ATTR_UNUSED *params)
+print_dataset_test_header(void H5_ATTR_UNUSED *params)
 {
     printf("\n");
     printf("**********************************************\n");
@@ -115,7 +115,7 @@ print_dataset_test_header(const void H5_ATTR_UNUSED *params)
  * created under the root group.
  */
 static void
-test_create_dataset_under_root(const void H5_ATTR_UNUSED *params)
+test_create_dataset_under_root(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id    = H5I_INVALID_HID;
     hid_t dset_id    = H5I_INVALID_HID;
@@ -182,7 +182,7 @@ test_create_dataset_under_root(const void H5_ATTR_UNUSED *params)
  * under a group that is not the root group.
  */
 static void
-test_create_dataset_under_existing_group(const void H5_ATTR_UNUSED *params)
+test_create_dataset_under_existing_group(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -270,7 +270,7 @@ test_create_dataset_under_existing_group(const void H5_ATTR_UNUSED *params)
  * when H5Dcreate is passed invalid parameters.
  */
 static void
-test_create_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
+test_create_dataset_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -526,7 +526,7 @@ test_create_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test to check that an anonymous dataset can be created.
  */
 static void
-test_create_anonymous_dataset(const void H5_ATTR_UNUSED *params)
+test_create_anonymous_dataset(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -613,7 +613,7 @@ test_create_anonymous_dataset(const void H5_ATTR_UNUSED *params)
  * parameters.
  */
 static void
-test_create_anonymous_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
+test_create_anonymous_dataset_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -808,7 +808,7 @@ test_create_anonymous_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
  * dataspace is not problematic.
  */
 static void
-test_create_dataset_null_space(const void H5_ATTR_UNUSED *params)
+test_create_dataset_null_space(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -905,7 +905,7 @@ test_create_dataset_null_space(const void H5_ATTR_UNUSED *params)
  * dataspace is not problematic.
  */
 static void
-test_create_dataset_scalar_space(const void H5_ATTR_UNUSED *params)
+test_create_dataset_scalar_space(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -1002,7 +1002,7 @@ test_create_dataset_scalar_space(const void H5_ATTR_UNUSED *params)
  * which contains a 0-sized dimension is not problematic.
  */
 static void
-test_create_zero_dim_dset(const void H5_ATTR_UNUSED *params)
+test_create_zero_dim_dset(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[ZERO_DIM_DSET_TEST_SPACE_RANK] = {0};
     hid_t   file_id                             = H5I_INVALID_HID;
@@ -1105,7 +1105,7 @@ test_create_zero_dim_dset(const void H5_ATTR_UNUSED *params)
  * a variety of different dataspace shapes.
  */
 static void
-test_create_dataset_random_shapes(const void H5_ATTR_UNUSED *params)
+test_create_dataset_random_shapes(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -1204,7 +1204,7 @@ test_create_dataset_random_shapes(const void H5_ATTR_UNUSED *params)
  * datatypes.
  */
 static void
-test_create_dataset_predefined_types(const void H5_ATTR_UNUSED *params)
+test_create_dataset_predefined_types(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -1310,7 +1310,7 @@ test_create_dataset_predefined_types(const void H5_ATTR_UNUSED *params)
  * string datatypes.
  */
 static void
-test_create_dataset_string_types(const void H5_ATTR_UNUSED *params)
+test_create_dataset_string_types(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -1479,7 +1479,7 @@ test_create_dataset_string_types(const void H5_ATTR_UNUSED *params)
  * a variety of compound datatypes.
  */
 static void
-test_create_dataset_compound_types(const void H5_ATTR_UNUSED *params)
+test_create_dataset_compound_types(void H5_ATTR_UNUSED *params)
 {
     size_t i, j;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -1649,7 +1649,7 @@ test_create_dataset_compound_types(const void H5_ATTR_UNUSED *params)
  * enum datatypes.
  */
 static void
-test_create_dataset_enum_types(const void H5_ATTR_UNUSED *params)
+test_create_dataset_enum_types(void H5_ATTR_UNUSED *params)
 {
     size_t      i;
     hid_t       file_id         = H5I_INVALID_HID;
@@ -1791,7 +1791,7 @@ test_create_dataset_enum_types(const void H5_ATTR_UNUSED *params)
  * array datatypes.
  */
 static void
-test_create_dataset_array_types(const void H5_ATTR_UNUSED *params)
+test_create_dataset_array_types(void H5_ATTR_UNUSED *params)
 {
     hsize_t array_dims1[DATASET_ARRAY_TYPE_TEST_RANK1];
     hsize_t array_dims2[DATASET_ARRAY_TYPE_TEST_RANK2];
@@ -2002,7 +2002,7 @@ filter(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
  * dataset creation properties.
  */
 static void
-test_create_dataset_creation_properties(const void H5_ATTR_UNUSED *params)
+test_create_dataset_creation_properties(void H5_ATTR_UNUSED *params)
 {
     hsize_t      dims[DATASET_CREATION_PROPERTIES_TEST_SHAPE_RANK];
     hsize_t      chunk_dims[DATASET_CREATION_PROPERTIES_TEST_SHAPE_RANK];
@@ -3088,7 +3088,7 @@ test_create_dataset_creation_properties(const void H5_ATTR_UNUSED *params)
  * A test to create many small datasets (100,000)
  */
 static void
-test_create_many_dataset(const void H5_ATTR_UNUSED *params)
+test_create_many_dataset(void H5_ATTR_UNUSED *params)
 {
     hid_t         file_id         = H5I_INVALID_HID;
     hid_t         container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -3191,7 +3191,7 @@ test_create_many_dataset(const void H5_ATTR_UNUSED *params)
  * H5Dopen succeeds.
  */
 static void
-test_open_dataset(const void H5_ATTR_UNUSED *params)
+test_open_dataset(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Dopen");
 
@@ -3205,7 +3205,7 @@ test_open_dataset(const void H5_ATTR_UNUSED *params)
  * passed invalid parameters.
  */
 static void
-test_open_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
+test_open_dataset_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -3380,7 +3380,7 @@ test_open_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
  * passed an invalid dataset ID.
  */
 static void
-test_close_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
+test_close_dataset_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     hid_t  file_id = H5I_INVALID_HID;
@@ -3435,7 +3435,7 @@ test_close_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
  * H5Dget_type, respectively.
  */
 static void
-test_get_dataset_space_and_type(const void H5_ATTR_UNUSED *params)
+test_get_dataset_space_and_type(void H5_ATTR_UNUSED *params)
 {
     hsize_t dset_dims[DATASET_GET_SPACE_TYPE_TEST_SPACE_RANK];
     size_t  i;
@@ -3725,7 +3725,7 @@ test_get_dataset_space_and_type(const void H5_ATTR_UNUSED *params)
  * invalid parameters, respectively.
  */
 static void
-test_get_dataset_space_and_type_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_dataset_space_and_type_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID;
@@ -3868,7 +3868,7 @@ test_get_dataset_space_and_type_invalid_params(const void H5_ATTR_UNUSED *params
  * A test for H5Dget_space_status.
  */
 static void
-test_get_dataset_space_status(const void H5_ATTR_UNUSED *params)
+test_get_dataset_space_status(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Dget_space_status");
 
@@ -3883,7 +3883,7 @@ test_get_dataset_space_status(const void H5_ATTR_UNUSED *params)
  * it is passed invalid parameters.
  */
 static void
-test_get_dataset_space_status_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_dataset_space_status_invalid_params(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Dget_space_status with invalid parameters");
 
@@ -3900,7 +3900,7 @@ test_get_dataset_space_status_invalid_params(const void H5_ATTR_UNUSED *params)
  * access can be retrieved with a call to H5Dget_access_plist.
  */
 static void
-test_dataset_property_lists(const void H5_ATTR_UNUSED *params)
+test_dataset_property_lists(void H5_ATTR_UNUSED *params)
 {
     const char *path_prefix = "/test_prefix";
     hsize_t     dims[DATASET_PROPERTY_LIST_TEST_SPACE_RANK];
@@ -4304,7 +4304,7 @@ test_dataset_property_lists(const void H5_ATTR_UNUSED *params)
  * A test for H5Dget_storage_size.
  */
 static void
-test_get_dataset_storage_size(const void H5_ATTR_UNUSED *params)
+test_get_dataset_storage_size(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Dget_storage_size");
 
@@ -4319,7 +4319,7 @@ test_get_dataset_storage_size(const void H5_ATTR_UNUSED *params)
  * invalid parameters.
  */
 static void
-test_get_dataset_storage_size_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_dataset_storage_size_invalid_params(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Dget_storage_size with invalid parameters");
 
@@ -4332,7 +4332,7 @@ test_get_dataset_storage_size_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Dget_chunk_storage_size.
  */
 static void
-test_get_dataset_chunk_storage_size(const void H5_ATTR_UNUSED *params)
+test_get_dataset_chunk_storage_size(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Dget_chunk_storage_size");
 
@@ -4347,7 +4347,7 @@ test_get_dataset_chunk_storage_size(const void H5_ATTR_UNUSED *params)
  * is passed invalid parameters.
  */
 static void
-test_get_dataset_chunk_storage_size_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_dataset_chunk_storage_size_invalid_params(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Dget_chunk_storage_size with invalid parameters");
 
@@ -4360,7 +4360,7 @@ test_get_dataset_chunk_storage_size_invalid_params(const void H5_ATTR_UNUSED *pa
  * A test for H5Dget_offset.
  */
 static void
-test_get_dataset_offset(const void H5_ATTR_UNUSED *params)
+test_get_dataset_offset(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Dget_offset");
 
@@ -4375,7 +4375,7 @@ test_get_dataset_offset(const void H5_ATTR_UNUSED *params)
  * parameters.
  */
 static void
-test_get_dataset_offset_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_dataset_offset_invalid_params(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Dget_offset with invalid parameters");
 
@@ -4389,7 +4389,7 @@ test_get_dataset_offset_invalid_params(const void H5_ATTR_UNUSED *params)
  * read back from a dataset using an H5S_ALL selection.
  */
 static void
-test_read_dataset_small_all(const void H5_ATTR_UNUSED *params)
+test_read_dataset_small_all(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[DATASET_SMALL_READ_TEST_ALL_DSET_SPACE_RANK] = {10, 5, 3};
     size_t  i, data_size;
@@ -4494,7 +4494,7 @@ test_read_dataset_small_all(const void H5_ATTR_UNUSED *params)
  * read back from a dataset using a hyperslab selection.
  */
 static void
-test_read_dataset_small_hyperslab(const void H5_ATTR_UNUSED *params)
+test_read_dataset_small_hyperslab(void H5_ATTR_UNUSED *params)
 {
     hsize_t start[DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_SPACE_RANK];
     hsize_t stride[DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_SPACE_RANK];
@@ -4621,7 +4621,7 @@ test_read_dataset_small_hyperslab(const void H5_ATTR_UNUSED *params)
  * read back from a dataset using a point selection.
  */
 static void
-test_read_dataset_small_point_selection(const void H5_ATTR_UNUSED *params)
+test_read_dataset_small_point_selection(void H5_ATTR_UNUSED *params)
 {
     hsize_t points[DATASET_SMALL_READ_TEST_POINT_SELECTION_NUM_POINTS *
                    DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_SPACE_RANK];
@@ -4750,7 +4750,7 @@ test_read_dataset_small_point_selection(const void H5_ATTR_UNUSED *params)
  * read back from multiple datasets using H5S_ALL selections.
  */
 static void
-test_read_multi_dataset_small_all(const void H5_ATTR_UNUSED *params)
+test_read_multi_dataset_small_all(void H5_ATTR_UNUSED *params)
 {
 
     hsize_t dims[DATASET_SMALL_READ_TEST_ALL_DSET_SPACE_RANK] = {10, 5, 3};
@@ -4876,7 +4876,7 @@ test_read_multi_dataset_small_all(const void H5_ATTR_UNUSED *params)
  * read back from datasets using hyperslab selections.
  */
 static void
-test_read_multi_dataset_small_hyperslab(const void H5_ATTR_UNUSED *params)
+test_read_multi_dataset_small_hyperslab(void H5_ATTR_UNUSED *params)
 {
     hsize_t start[DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_SPACE_RANK];
     hsize_t stride[DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_SPACE_RANK];
@@ -5029,7 +5029,7 @@ test_read_multi_dataset_small_hyperslab(const void H5_ATTR_UNUSED *params)
  * read back from datasets using point selections.
  */
 static void
-test_read_multi_dataset_small_point_selection(const void H5_ATTR_UNUSED *params)
+test_read_multi_dataset_small_point_selection(void H5_ATTR_UNUSED *params)
 {
     hsize_t points[DATASET_SMALL_READ_TEST_POINT_SELECTION_NUM_POINTS *
                    DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_SPACE_RANK];
@@ -5199,7 +5199,7 @@ test_read_multi_dataset_small_point_selection(const void H5_ATTR_UNUSED *params)
             } while ((J) < (I));                                                                             \
     }
 static void
-test_dataset_io_point_selections(const void H5_ATTR_UNUSED *params)
+test_dataset_io_point_selections(void H5_ATTR_UNUSED *params)
 {
     hid_t   file_id         = H5I_INVALID_HID;
     hid_t   dset_id         = H5I_INVALID_HID;
@@ -5680,7 +5680,7 @@ test_dataset_io_point_selections(const void H5_ATTR_UNUSED *params)
  * dataset when H5Dread is passed invalid parameters.
  */
 static void
-test_read_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
+test_read_dataset_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[DATASET_READ_INVALID_PARAMS_TEST_DSET_SPACE_RANK] = {10, 5, 3};
     herr_t  err_ret                                                = -1;
@@ -5914,7 +5914,7 @@ test_read_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
  * made to a dataset using an H5S_ALL selection.
  */
 static void
-test_write_dataset_small_all(const void H5_ATTR_UNUSED *params)
+test_write_dataset_small_all(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t  dims[DATASET_SMALL_WRITE_TEST_ALL_DSET_SPACE_RANK] = {10, 5, 3};
@@ -6042,7 +6042,7 @@ test_write_dataset_small_all(const void H5_ATTR_UNUSED *params)
  * to a dataset using a hyperslab selection.
  */
 static void
-test_write_dataset_small_hyperslab(const void H5_ATTR_UNUSED *params)
+test_write_dataset_small_hyperslab(void H5_ATTR_UNUSED *params)
 {
     hsize_t start[DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_SPACE_RANK];
     hsize_t stride[DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_SPACE_RANK];
@@ -6173,7 +6173,7 @@ test_write_dataset_small_hyperslab(const void H5_ATTR_UNUSED *params)
  * to a dataset using a point selection.
  */
 static void
-test_write_dataset_small_point_selection(const void H5_ATTR_UNUSED *params)
+test_write_dataset_small_point_selection(void H5_ATTR_UNUSED *params)
 {
     hsize_t points[DATASET_SMALL_WRITE_TEST_POINT_SELECTION_NUM_POINTS *
                    DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_SPACE_RANK];
@@ -6305,7 +6305,7 @@ test_write_dataset_small_point_selection(const void H5_ATTR_UNUSED *params)
  * a dataset after it has been written.
  */
 static void
-test_write_dataset_data_verification(const void H5_ATTR_UNUSED *params)
+test_write_dataset_data_verification(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t  dims[DATASET_DATA_VERIFY_WRITE_TEST_DSET_SPACE_RANK] = {10, 10, 10};
@@ -6820,7 +6820,7 @@ test_write_dataset_data_verification(const void H5_ATTR_UNUSED *params)
  * made to a dataset using an H5S_ALL selection.
  */
 static void
-test_write_multi_dataset_small_all(const void H5_ATTR_UNUSED *params)
+test_write_multi_dataset_small_all(void H5_ATTR_UNUSED *params)
 {
     hssize_t    space_npoints;
     hsize_t     dims[DATASET_SMALL_WRITE_TEST_ALL_DSET_SPACE_RANK] = {10, 5, 3};
@@ -6983,7 +6983,7 @@ test_write_multi_dataset_small_all(const void H5_ATTR_UNUSED *params)
  * to a dataset using a hyperslab selection.
  */
 static void
-test_write_multi_dataset_small_hyperslab(const void H5_ATTR_UNUSED *params)
+test_write_multi_dataset_small_hyperslab(void H5_ATTR_UNUSED *params)
 {
     hsize_t     start[DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_SPACE_RANK];
     hsize_t     stride[DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_SPACE_RANK];
@@ -7144,7 +7144,7 @@ test_write_multi_dataset_small_hyperslab(const void H5_ATTR_UNUSED *params)
  * to a dataset using a point selection.
  */
 static void
-test_write_multi_dataset_small_point_selection(const void H5_ATTR_UNUSED *params)
+test_write_multi_dataset_small_point_selection(void H5_ATTR_UNUSED *params)
 {
     hsize_t     points[DATASET_SMALL_WRITE_TEST_POINT_SELECTION_NUM_POINTS *
                    DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_SPACE_RANK];
@@ -7307,7 +7307,7 @@ test_write_multi_dataset_small_point_selection(const void H5_ATTR_UNUSED *params
  * multiple datasets after it has been written.
  */
 static void
-test_write_multi_dataset_data_verification(const void H5_ATTR_UNUSED *params)
+test_write_multi_dataset_data_verification(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints[DATASET_MULTI_COUNT];
     hsize_t  dims[DATASET_DATA_VERIFY_WRITE_TEST_DSET_SPACE_RANK] = {10, 10, 10};
@@ -7910,7 +7910,7 @@ test_write_multi_dataset_data_verification(const void H5_ATTR_UNUSED *params)
  * when H5Dwrite is passed invalid parameters.
  */
 static void
-test_write_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
+test_write_dataset_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t  dims[DATASET_WRITE_INVALID_PARAMS_TEST_DSET_SPACE_RANK] = {10, 5, 3};
@@ -8151,7 +8151,7 @@ test_write_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
  * can be written to and read from a dataset
  */
 static void
-test_dataset_string_encodings(const void H5_ATTR_UNUSED *params)
+test_dataset_string_encodings(void H5_ATTR_UNUSED *params)
 {
     hid_t   file_id                             = H5I_INVALID_HID;
     hid_t   container_group                     = H5I_INVALID_HID;
@@ -8396,7 +8396,7 @@ test_dataset_string_encodings(const void H5_ATTR_UNUSED *params)
  * been written, using type conversion with builtin types.
  */
 static void
-test_dataset_builtin_type_conversion(const void H5_ATTR_UNUSED *params)
+test_dataset_builtin_type_conversion(void H5_ATTR_UNUSED *params)
 {
     hssize_t    space_npoints;
     hsize_t     dims[DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_SPACE_RANK] = {10, 10, 10};
@@ -8930,7 +8930,7 @@ test_dataset_builtin_type_conversion(const void H5_ATTR_UNUSED *params)
 }
 
 static void
-test_dataset_real_to_int_conversion(const void H5_ATTR_UNUSED *params)
+test_dataset_real_to_int_conversion(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t  dims[DATASET_DATA_REAL_CONVERSION_TEST_DSET_SPACE_RANK] = {10, 10, 10};
@@ -9481,7 +9481,7 @@ typedef struct dataset_compount_partial_io_t {
 } dataset_compount_partial_io_t;
 
 static void
-test_dataset_compound_partial_io(const void H5_ATTR_UNUSED *params)
+test_dataset_compound_partial_io(void H5_ATTR_UNUSED *params)
 {
     hsize_t                       dims[1] = {DATASET_COMPOUND_PARTIAL_IO_DSET_DIMS};
     size_t                        i;
@@ -9736,7 +9736,7 @@ test_dataset_compound_partial_io(const void H5_ATTR_UNUSED *params)
 /* A test to check that vlen sequences can be written and read back
  * with basic parent types and selections */
 static void
-test_dataset_vlen_io(const void H5_ATTR_UNUSED *params)
+test_dataset_vlen_io(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID;
@@ -10399,7 +10399,7 @@ test_dataset_vlen_io(const void H5_ATTR_UNUSED *params)
  * dataset may both shrink and grow.
  */
 static void
-test_dataset_set_extent_chunked_unlimited(const void H5_ATTR_UNUSED *params)
+test_dataset_set_extent_chunked_unlimited(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_SPACE_RANK];
     hsize_t max_dims[DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_SPACE_RANK];
@@ -10632,7 +10632,7 @@ test_dataset_set_extent_chunked_unlimited(const void H5_ATTR_UNUSED *params)
  * dataset may only shrink.
  */
 static void
-test_dataset_set_extent_chunked_fixed(const void H5_ATTR_UNUSED *params)
+test_dataset_set_extent_chunked_fixed(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK];
     hsize_t dims2[DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK];
@@ -10910,7 +10910,7 @@ test_dataset_set_extent_chunked_fixed(const void H5_ATTR_UNUSED *params)
  * and shrinking the dataset with H5Dset_extent
  */
 static void
-test_dataset_set_extent_data(const void H5_ATTR_UNUSED *params)
+test_dataset_set_extent_data(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims_origin[DATASET_SET_EXTENT_DATA_TEST_SPACE_RANK] = {DATASET_SET_EXTENT_DATA_TEST_SPACE_DIM,
                                                                     DATASET_SET_EXTENT_DATA_TEST_SPACE_DIM};
@@ -11250,7 +11250,7 @@ test_dataset_set_extent_data(const void H5_ATTR_UNUSED *params)
  * return the new size when queried.
  */
 static void
-test_dataset_set_extent_double_handles(const void H5_ATTR_UNUSED *params)
+test_dataset_set_extent_double_handles(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims_origin[DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_SPACE_RANK] = {
         DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_SPACE_DIM, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_SPACE_DIM};
@@ -11391,7 +11391,7 @@ test_dataset_set_extent_double_handles(const void H5_ATTR_UNUSED *params)
  * changed when H5Dset_extent is passed invalid parameters.
  */
 static void
-test_dataset_set_extent_invalid_params(const void H5_ATTR_UNUSED *params)
+test_dataset_set_extent_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[DATASET_SET_EXTENT_INVALID_PARAMS_TEST_SPACE_RANK];
     hsize_t chunk_dims[DATASET_SET_EXTENT_INVALID_PARAMS_TEST_SPACE_RANK];
@@ -11653,7 +11653,7 @@ test_dataset_set_extent_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Dflush.
  */
 static void
-test_flush_dataset(const void H5_ATTR_UNUSED *params)
+test_flush_dataset(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Dflush");
 
@@ -11667,7 +11667,7 @@ test_flush_dataset(const void H5_ATTR_UNUSED *params)
  * passed invalid parameters.
  */
 static void
-test_flush_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
+test_flush_dataset_invalid_params(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Dflush with invalid parameters");
 
@@ -11680,7 +11680,7 @@ test_flush_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Drefresh.
  */
 static void
-test_refresh_dataset(const void H5_ATTR_UNUSED *params)
+test_refresh_dataset(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Drefresh");
 
@@ -11694,7 +11694,7 @@ test_refresh_dataset(const void H5_ATTR_UNUSED *params)
  * passed invalid parameters.
  */
 static void
-test_refresh_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
+test_refresh_dataset_invalid_params(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Drefresh with invalid parameters");
 
@@ -11707,7 +11707,7 @@ test_refresh_dataset_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test to create a dataset composed of a single chunk.
  */
 static void
-test_create_single_chunk_dataset(const void H5_ATTR_UNUSED *params)
+test_create_single_chunk_dataset(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[DATASET_SINGLE_CHUNK_TEST_SPACE_RANK];
     hsize_t retrieved_chunk_dims[DATASET_SINGLE_CHUNK_TEST_SPACE_RANK];
@@ -11885,7 +11885,7 @@ test_create_single_chunk_dataset(const void H5_ATTR_UNUSED *params)
  * and read correctly.
  */
 static void
-test_write_single_chunk_dataset(const void H5_ATTR_UNUSED *params)
+test_write_single_chunk_dataset(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t  dims[DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_SPACE_RANK];
@@ -12105,7 +12105,7 @@ test_write_single_chunk_dataset(const void H5_ATTR_UNUSED *params)
  * A test to create a dataset composed of multiple chunks.
  */
 static void
-test_create_multi_chunk_dataset(const void H5_ATTR_UNUSED *params)
+test_create_multi_chunk_dataset(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[DATASET_MULTI_CHUNK_TEST_SPACE_RANK]       = {100, 100};
     hsize_t chunk_dims[DATASET_MULTI_CHUNK_TEST_SPACE_RANK] = {10, 10};
@@ -12286,7 +12286,7 @@ test_create_multi_chunk_dataset(const void H5_ATTR_UNUSED *params)
  * used are the same shape.
  */
 static void
-test_write_multi_chunk_dataset_same_shape_read(const void H5_ATTR_UNUSED *params)
+test_write_multi_chunk_dataset_same_shape_read(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK]       = {100, 100};
     hsize_t chunk_dims[DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK] = {10, 10};
@@ -12613,7 +12613,7 @@ test_write_multi_chunk_dataset_same_shape_read(const void H5_ATTR_UNUSED *params
  * used are differently shaped.
  */
 static void
-test_write_multi_chunk_dataset_diff_shape_read(const void H5_ATTR_UNUSED *params)
+test_write_multi_chunk_dataset_diff_shape_read(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK]       = {100, 100};
     hsize_t chunk_dims[DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK] = {10, 10};
@@ -12950,7 +12950,7 @@ test_write_multi_chunk_dataset_diff_shape_read(const void H5_ATTR_UNUSED *params
  * dataspace and memory dataspace used are the same shape.
  */
 static void
-test_overwrite_multi_chunk_dataset_same_shape_read(const void H5_ATTR_UNUSED *params)
+test_overwrite_multi_chunk_dataset_same_shape_read(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK]       = {100, 100};
     hsize_t chunk_dims[DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK] = {10, 10};
@@ -13285,7 +13285,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(const void H5_ATTR_UNUSED *pa
  * dataspace and memory dataspace used are differently shaped.
  */
 static void
-test_overwrite_multi_chunk_dataset_diff_shape_read(const void H5_ATTR_UNUSED *params)
+test_overwrite_multi_chunk_dataset_diff_shape_read(void H5_ATTR_UNUSED *params)
 {
     hsize_t dims[DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK]       = {100, 100};
     hsize_t chunk_dims[DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK] = {10, 10};
@@ -13633,7 +13633,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(const void H5_ATTR_UNUSED *pa
 #define FIXED_DIMSIZE       25
 #define FIXED_CHUNK_DIMSIZE 10
 static void
-test_read_partial_chunk_all_selection(const void H5_ATTR_UNUSED *params)
+test_read_partial_chunk_all_selection(void H5_ATTR_UNUSED *params)
 {
     DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_CTYPE write_buf[FIXED_DIMSIZE][FIXED_DIMSIZE];
     DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_CTYPE read_buf[FIXED_DIMSIZE][FIXED_DIMSIZE];
@@ -13819,7 +13819,7 @@ test_read_partial_chunk_all_selection(const void H5_ATTR_UNUSED *params)
 #define FIXED_CHUNK_DIMSIZE 10
 #define FIXED_NCHUNKS       9 /* For convenience - make sure to adjust this as necessary */
 static void
-test_read_partial_chunk_hyperslab_selection(const void H5_ATTR_UNUSED *params)
+test_read_partial_chunk_hyperslab_selection(void H5_ATTR_UNUSED *params)
 {
     DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_CTYPE write_buf[FIXED_CHUNK_DIMSIZE][FIXED_CHUNK_DIMSIZE];
     DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_CTYPE read_buf[FIXED_CHUNK_DIMSIZE][FIXED_CHUNK_DIMSIZE];
@@ -14112,7 +14112,7 @@ test_read_partial_chunk_hyperslab_selection(const void H5_ATTR_UNUSED *params)
 /* #define FIXED_DIMSIZE       25 */
 /* #define FIXED_CHUNK_DIMSIZE 10 */
 static void
-test_read_partial_chunk_point_selection(const void H5_ATTR_UNUSED *params)
+test_read_partial_chunk_point_selection(void H5_ATTR_UNUSED *params)
 {
     TESTING("reading a partial chunk using a point selection in file dataspace");
     SKIPPED();
@@ -14127,7 +14127,7 @@ test_read_partial_chunk_point_selection(const void H5_ATTR_UNUSED *params)
  * correct size
  */
 static void
-test_get_vlen_buf_size(const void H5_ATTR_UNUSED *params)
+test_get_vlen_buf_size(void H5_ATTR_UNUSED *params)
 {
     hvl_t    wdata[DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM]; /* Information to write */
     hid_t    file_id         = H5I_INVALID_HID;
diff --git a/test/API/H5_api_datatype_test.c b/test/API/H5_api_datatype_test.c
index 968729df33e..6eca4abe089 100644
--- a/test/API/H5_api_datatype_test.c
+++ b/test/API/H5_api_datatype_test.c
@@ -17,35 +17,35 @@
  */
 #define PROBLEMATIC_TESTS
 
-static void print_datatype_test_header(const void *params);
-static void test_create_committed_datatype(const void *params);
-static void test_create_committed_datatype_invalid_params(const void *params);
-static void test_create_anonymous_committed_datatype(const void *params);
-static void test_create_anonymous_committed_datatype_invalid_params(const void *params);
+static void print_datatype_test_header(void *params);
+static void test_create_committed_datatype(void *params);
+static void test_create_committed_datatype_invalid_params(void *params);
+static void test_create_anonymous_committed_datatype(void *params);
+static void test_create_anonymous_committed_datatype_invalid_params(void *params);
 #ifndef PROBLEMATIC_TESTS
-static void test_create_committed_datatype_empty_types(const void *params);
+static void test_create_committed_datatype_empty_types(void *params);
 #endif
-static void test_recommit_committed_type(const void *params);
-static void test_open_committed_datatype(const void *params);
-static void test_open_committed_datatype_invalid_params(const void *params);
-static void test_reopen_committed_datatype_indirect(const void *params);
-static void test_close_committed_datatype_invalid_id(const void *params);
-static void test_datatype_property_lists(const void *params);
-static void test_create_dataset_with_committed_type(const void *params);
-static void test_create_attribute_with_committed_type(const void *params);
-static void test_delete_committed_type(const void *params);
-static void test_resurrect_datatype(const void *params);
-static void test_flush_committed_datatype(const void *params);
-static void test_flush_committed_datatype_invalid_params(const void *params);
-static void test_refresh_committed_datatype(const void *params);
-static void test_refresh_committed_datatype_invalid_params(const void *params);
+static void test_recommit_committed_type(void *params);
+static void test_open_committed_datatype(void *params);
+static void test_open_committed_datatype_invalid_params(void *params);
+static void test_reopen_committed_datatype_indirect(void *params);
+static void test_close_committed_datatype_invalid_id(void *params);
+static void test_datatype_property_lists(void *params);
+static void test_create_dataset_with_committed_type(void *params);
+static void test_create_attribute_with_committed_type(void *params);
+static void test_delete_committed_type(void *params);
+static void test_resurrect_datatype(void *params);
+static void test_flush_committed_datatype(void *params);
+static void test_flush_committed_datatype_invalid_params(void *params);
+static void test_refresh_committed_datatype(void *params);
+static void test_refresh_committed_datatype_invalid_params(void *params);
 #ifndef PROBLEMATIC_TESTS
-static void test_cant_commit_predefined(const void *params);
+static void test_cant_commit_predefined(void *params);
 #endif
-static void test_cant_modify_committed_type(const void *params);
+static void test_cant_modify_committed_type(void *params);
 
 static void
-print_datatype_test_header(const void H5_ATTR_UNUSED *params)
+print_datatype_test_header(void H5_ATTR_UNUSED *params)
 {
     printf("\n");
     printf("**********************************************\n");
@@ -59,7 +59,7 @@ print_datatype_test_header(const void H5_ATTR_UNUSED *params)
  * A test to check that a committed datatype can be created.
  */
 static void
-test_create_committed_datatype(const void H5_ATTR_UNUSED *params)
+test_create_committed_datatype(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -139,7 +139,7 @@ test_create_committed_datatype(const void H5_ATTR_UNUSED *params)
  * created when H5Tcommit2 is passed invalid parameters.
  */
 static void
-test_create_committed_datatype_invalid_params(const void H5_ATTR_UNUSED *params)
+test_create_committed_datatype_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret         = -1;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -361,7 +361,7 @@ test_create_committed_datatype_invalid_params(const void H5_ATTR_UNUSED *params)
  * can be created with H5Tcommit_anon.
  */
 static void
-test_create_anonymous_committed_datatype(const void H5_ATTR_UNUSED *params)
+test_create_anonymous_committed_datatype(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -440,7 +440,7 @@ test_create_anonymous_committed_datatype(const void H5_ATTR_UNUSED *params)
  * created when H5Tcommit_anon is passed invalid parameters.
  */
 static void
-test_create_anonymous_committed_datatype_invalid_params(const void H5_ATTR_UNUSED *params)
+test_create_anonymous_committed_datatype_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret         = -1;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -606,7 +606,7 @@ test_create_anonymous_committed_datatype_invalid_params(const void H5_ATTR_UNUSE
  */
 #ifndef PROBLEMATIC_TESTS
 static void
-test_create_committed_datatype_empty_types(const void H5_ATTR_UNUSED *params)
+test_create_committed_datatype_empty_types(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret         = FAIL;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -780,7 +780,7 @@ test_create_committed_datatype_empty_types(const void H5_ATTR_UNUSED *params)
  * A test to check that a committed datatype can't be re-committed.
  */
 static void
-test_recommit_committed_type(const void H5_ATTR_UNUSED *params)
+test_recommit_committed_type(void H5_ATTR_UNUSED *params)
 {
     htri_t is_committed = false;
     herr_t err_ret;
@@ -887,7 +887,7 @@ test_recommit_committed_type(const void H5_ATTR_UNUSED *params)
  * can be opened using H5Topen2.
  */
 static void
-test_open_committed_datatype(const void H5_ATTR_UNUSED *params)
+test_open_committed_datatype(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -976,7 +976,7 @@ test_open_committed_datatype(const void H5_ATTR_UNUSED *params)
  * be opened when H5Topen2 is passed invalid parameters.
  */
 static void
-test_open_committed_datatype_invalid_params(const void H5_ATTR_UNUSED *params)
+test_open_committed_datatype_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -1144,7 +1144,7 @@ test_open_committed_datatype_invalid_params(const void H5_ATTR_UNUSED *params)
  * through H5Dget_type without causing problems.
  */
 static void
-test_reopen_committed_datatype_indirect(const void H5_ATTR_UNUSED *params)
+test_reopen_committed_datatype_indirect(void H5_ATTR_UNUSED *params)
 {
     size_t dt_size         = 0;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -1616,7 +1616,7 @@ test_reopen_committed_datatype_indirect(const void H5_ATTR_UNUSED *params)
  * it is passed an invalid datatype ID.
  */
 static void
-test_close_committed_datatype_invalid_id(const void H5_ATTR_UNUSED *params)
+test_close_committed_datatype_invalid_id(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     hid_t  file_id = H5I_INVALID_HID;
@@ -1672,7 +1672,7 @@ test_close_committed_datatype_invalid_id(const void H5_ATTR_UNUSED *params)
  * be retrieved later with a call to H5Tget_create_plist.
  */
 static void
-test_datatype_property_lists(const void H5_ATTR_UNUSED *params)
+test_datatype_property_lists(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -1887,7 +1887,7 @@ test_datatype_property_lists(const void H5_ATTR_UNUSED *params)
  * a committed datatype.
  */
 static void
-test_create_dataset_with_committed_type(const void H5_ATTR_UNUSED *params)
+test_create_dataset_with_committed_type(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -2030,7 +2030,7 @@ test_create_dataset_with_committed_type(const void H5_ATTR_UNUSED *params)
  * using a committed datatype.
  */
 static void
-test_create_attribute_with_committed_type(const void H5_ATTR_UNUSED *params)
+test_create_attribute_with_committed_type(void H5_ATTR_UNUSED *params)
 {
     htri_t attr_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -2163,7 +2163,7 @@ test_create_attribute_with_committed_type(const void H5_ATTR_UNUSED *params)
  * be deleted.
  */
 static void
-test_delete_committed_type(const void H5_ATTR_UNUSED *params)
+test_delete_committed_type(void H5_ATTR_UNUSED *params)
 {
     htri_t type_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -2275,7 +2275,7 @@ test_delete_committed_type(const void H5_ATTR_UNUSED *params)
  * the link to the datatype is deleted and then a new one is created.
  */
 static void
-test_resurrect_datatype(const void H5_ATTR_UNUSED *params)
+test_resurrect_datatype(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID;
@@ -2412,7 +2412,7 @@ test_resurrect_datatype(const void H5_ATTR_UNUSED *params)
 }
 
 static void
-test_flush_committed_datatype(const void H5_ATTR_UNUSED *params)
+test_flush_committed_datatype(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Tflush");
 
@@ -2422,7 +2422,7 @@ test_flush_committed_datatype(const void H5_ATTR_UNUSED *params)
 }
 
 static void
-test_flush_committed_datatype_invalid_params(const void H5_ATTR_UNUSED *params)
+test_flush_committed_datatype_invalid_params(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Tflush with invalid parameters");
 
@@ -2432,7 +2432,7 @@ test_flush_committed_datatype_invalid_params(const void H5_ATTR_UNUSED *params)
 }
 
 static void
-test_refresh_committed_datatype(const void H5_ATTR_UNUSED *params)
+test_refresh_committed_datatype(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Trefresh");
 
@@ -2442,7 +2442,7 @@ test_refresh_committed_datatype(const void H5_ATTR_UNUSED *params)
 }
 
 static void
-test_refresh_committed_datatype_invalid_params(const void H5_ATTR_UNUSED *params)
+test_refresh_committed_datatype_invalid_params(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Trefresh with invalid parameters");
 
@@ -2458,7 +2458,7 @@ test_refresh_committed_datatype_invalid_params(const void H5_ATTR_UNUSED *params
  */
 #ifndef PROBLEMATIC_TESTS
 static void
-test_cant_commit_predefined(const void H5_ATTR_UNUSED *params)
+test_cant_commit_predefined(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -2536,7 +2536,7 @@ test_cant_commit_predefined(const void H5_ATTR_UNUSED *params)
  * A test to check that a datatype cannot be modified once it has been committed.
  */
 static void
-test_cant_modify_committed_type(const void H5_ATTR_UNUSED *params)
+test_cant_modify_committed_type(void H5_ATTR_UNUSED *params)
 {
     htri_t is_committed = false;
     herr_t err_ret;
diff --git a/test/API/H5_api_file_test.c b/test/API/H5_api_file_test.c
index bdcb9e8f9a7..a57a7dd231c 100644
--- a/test/API/H5_api_file_test.c
+++ b/test/API/H5_api_file_test.c
@@ -12,27 +12,27 @@
 
 #include "H5_api_file_test.h"
 
-static void print_file_test_header(const void *params);
-static void test_create_file(const void *params);
-static void test_create_file_invalid_params(const void *params);
-static void test_create_file_excl(const void *params);
-static void test_open_file(const void *params);
-static void test_open_file_invalid_params(const void *params);
-static void test_open_nonexistent_file(const void *params);
-static void test_file_open_overlap(const void *params);
-static void test_file_permission(const void *params);
-static void test_reopen_file(const void *params);
-static void test_close_file_invalid_id(const void *params);
-static void test_flush_file(const void *params);
-static void test_file_is_accessible(const void *params);
-static void test_file_property_lists(const void *params);
-static void test_get_file_intent(const void *params);
-static void test_get_file_obj_count(const void *params);
-static void test_file_mounts(const void *params);
-static void test_get_file_name(const void *params);
+static void print_file_test_header(void *params);
+static void test_create_file(void *params);
+static void test_create_file_invalid_params(void *params);
+static void test_create_file_excl(void *params);
+static void test_open_file(void *params);
+static void test_open_file_invalid_params(void *params);
+static void test_open_nonexistent_file(void *params);
+static void test_file_open_overlap(void *params);
+static void test_file_permission(void *params);
+static void test_reopen_file(void *params);
+static void test_close_file_invalid_id(void *params);
+static void test_flush_file(void *params);
+static void test_file_is_accessible(void *params);
+static void test_file_property_lists(void *params);
+static void test_get_file_intent(void *params);
+static void test_get_file_obj_count(void *params);
+static void test_file_mounts(void *params);
+static void test_get_file_name(void *params);
 
 static void
-print_file_test_header(const void H5_ATTR_UNUSED *params)
+print_file_test_header(void H5_ATTR_UNUSED *params)
 {
     printf("\n");
     printf("**********************************************\n");
@@ -46,7 +46,7 @@ print_file_test_header(const void H5_ATTR_UNUSED *params)
  * Tests that a file can be created.
  */
 static void
-test_create_file(const void H5_ATTR_UNUSED *params)
+test_create_file(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id           = H5I_INVALID_HID;
     char *prefixed_filename = NULL;
@@ -103,7 +103,7 @@ test_create_file(const void H5_ATTR_UNUSED *params)
  * invalid parameters.
  */
 static void
-test_create_file_invalid_params(const void H5_ATTR_UNUSED *params)
+test_create_file_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id           = H5I_INVALID_HID;
     char *prefixed_filename = NULL;
@@ -254,7 +254,7 @@ test_create_file_invalid_params(const void H5_ATTR_UNUSED *params)
  * using the H5F_ACC_EXCL flag while the file already exists.
  */
 static void
-test_create_file_excl(const void H5_ATTR_UNUSED *params)
+test_create_file_excl(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id           = H5I_INVALID_HID;
     hid_t file_id2          = H5I_INVALID_HID;
@@ -338,7 +338,7 @@ test_create_file_excl(const void H5_ATTR_UNUSED *params)
  * Tests that a file can be opened.
  */
 static void
-test_open_file(const void H5_ATTR_UNUSED *params)
+test_open_file(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id = H5I_INVALID_HID;
 
@@ -422,7 +422,7 @@ test_open_file(const void H5_ATTR_UNUSED *params)
  * invalid parameters.
  */
 static void
-test_open_file_invalid_params(const void H5_ATTR_UNUSED *params)
+test_open_file_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id = H5I_INVALID_HID;
 
@@ -523,7 +523,7 @@ test_open_file_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test to ensure that opening a file which doesn't exist will fail.
  */
 static void
-test_open_nonexistent_file(const void H5_ATTR_UNUSED *params)
+test_open_nonexistent_file(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id           = H5I_INVALID_HID;
     char *prefixed_filename = NULL;
@@ -586,7 +586,7 @@ test_open_nonexistent_file(const void H5_ATTR_UNUSED *params)
  * and things are handled appropriately.
  */
 static void
-test_file_permission(const void H5_ATTR_UNUSED *params)
+test_file_permission(void H5_ATTR_UNUSED *params)
 {
     hid_t  file_id           = H5I_INVALID_HID;
     hid_t  dset_id           = H5I_INVALID_HID;
@@ -825,7 +825,7 @@ test_file_permission(const void H5_ATTR_UNUSED *params)
  * A test to check that a file can be re-opened with H5Freopen.
  */
 static void
-test_reopen_file(const void H5_ATTR_UNUSED *params)
+test_reopen_file(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id  = H5I_INVALID_HID;
     hid_t file_id2 = H5I_INVALID_HID;
@@ -875,7 +875,7 @@ test_reopen_file(const void H5_ATTR_UNUSED *params)
  * A test to check that H5Fclose doesn't succeed for an
  * invalid file ID */
 static void
-test_close_file_invalid_id(const void H5_ATTR_UNUSED *params)
+test_close_file_invalid_id(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
 
@@ -912,7 +912,7 @@ test_close_file_invalid_id(const void H5_ATTR_UNUSED *params)
  * A test to check that a file can be flushed using H5Fflush.
  */
 static void
-test_flush_file(const void H5_ATTR_UNUSED *params)
+test_flush_file(void H5_ATTR_UNUSED *params)
 {
     hid_t    file_id           = H5I_INVALID_HID;
     hid_t    dspace_id         = H5I_INVALID_HID;
@@ -1037,7 +1037,7 @@ test_flush_file(const void H5_ATTR_UNUSED *params)
  * A test for H5Fis_accessible.
  */
 static void
-test_file_is_accessible(const void H5_ATTR_UNUSED *params)
+test_file_is_accessible(void H5_ATTR_UNUSED *params)
 {
     const char *const fake_filename     = "nonexistent_file.h5";
     char             *prefixed_filename = NULL;
@@ -1125,7 +1125,7 @@ test_file_is_accessible(const void H5_ATTR_UNUSED *params)
  * can be retrieved with a call to H5Fget_access_plist.
  */
 static void
-test_file_property_lists(const void H5_ATTR_UNUSED *params)
+test_file_property_lists(void H5_ATTR_UNUSED *params)
 {
     hsize_t prop_val           = 0;
     hid_t   file_id1           = H5I_INVALID_HID;
@@ -1435,7 +1435,7 @@ test_file_property_lists(const void H5_ATTR_UNUSED *params)
  * A test to check that the file intent flags can be retrieved.
  */
 static void
-test_get_file_intent(const void H5_ATTR_UNUSED *params)
+test_get_file_intent(void H5_ATTR_UNUSED *params)
 {
     unsigned file_intent;
     hid_t    file_id           = H5I_INVALID_HID;
@@ -1598,7 +1598,7 @@ test_get_file_intent(const void H5_ATTR_UNUSED *params)
  * can be retrieved.
  */
 static void
-test_get_file_obj_count(const void H5_ATTR_UNUSED *params)
+test_get_file_obj_count(void H5_ATTR_UNUSED *params)
 {
     ssize_t obj_count;
     hid_t   file_id            = H5I_INVALID_HID;
@@ -1951,7 +1951,7 @@ test_get_file_obj_count(const void H5_ATTR_UNUSED *params)
  * works correctly.
  */
 static void
-test_file_open_overlap(const void H5_ATTR_UNUSED *params)
+test_file_open_overlap(void H5_ATTR_UNUSED *params)
 {
     ssize_t obj_count;
     hid_t   file_id           = H5I_INVALID_HID;
@@ -2093,7 +2093,7 @@ test_file_open_overlap(const void H5_ATTR_UNUSED *params)
  * correctly.
  */
 static void
-test_file_mounts(const void H5_ATTR_UNUSED *params)
+test_file_mounts(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id           = H5I_INVALID_HID;
     hid_t child_fid         = H5I_INVALID_HID;
@@ -2185,7 +2185,7 @@ test_file_mounts(const void H5_ATTR_UNUSED *params)
  * A test to ensure that a file's name can be retrieved.
  */
 static void
-test_get_file_name(const void H5_ATTR_UNUSED *params)
+test_get_file_name(void H5_ATTR_UNUSED *params)
 {
     ssize_t file_name_buf_len = 0;
     hid_t   file_id           = H5I_INVALID_HID;
diff --git a/test/API/H5_api_group_test.c b/test/API/H5_api_group_test.c
index ce784e0c04f..6bc490dbb53 100644
--- a/test/API/H5_api_group_test.c
+++ b/test/API/H5_api_group_test.c
@@ -12,29 +12,29 @@
 
 #include "H5_api_group_test.h"
 
-static void print_group_test_header(const void *params);
-static void test_create_group_under_root(const void *params);
-static void test_create_group_under_existing_group(const void *params);
-static void test_create_many_groups(const void *params);
-static void test_create_deep_groups(const void *params);
-static void test_create_intermediate_group(const void *params);
-static void test_create_group_invalid_params(const void *params);
-static void test_create_anonymous_group(const void *params);
-static void test_create_anonymous_group_invalid_params(const void *params);
-static void test_open_nonexistent_group(const void *params);
-static void test_open_group_invalid_params(const void *params);
-static void test_close_group_invalid_id(const void *params);
-static void test_group_property_lists(const void *params);
-static void test_get_group_info(const void *params);
-static void test_get_group_info_invalid_params(const void *params);
-static void test_flush_group(const void *params);
-static void test_flush_group_invalid_params(const void *params);
-static void test_refresh_group(const void *params);
-static void test_refresh_group_invalid_params(const void *params);
+static void print_group_test_header(void *params);
+static void test_create_group_under_root(void *params);
+static void test_create_group_under_existing_group(void *params);
+static void test_create_many_groups(void *params);
+static void test_create_deep_groups(void *params);
+static void test_create_intermediate_group(void *params);
+static void test_create_group_invalid_params(void *params);
+static void test_create_anonymous_group(void *params);
+static void test_create_anonymous_group_invalid_params(void *params);
+static void test_open_nonexistent_group(void *params);
+static void test_open_group_invalid_params(void *params);
+static void test_close_group_invalid_id(void *params);
+static void test_group_property_lists(void *params);
+static void test_get_group_info(void *params);
+static void test_get_group_info_invalid_params(void *params);
+static void test_flush_group(void *params);
+static void test_flush_group_invalid_params(void *params);
+static void test_refresh_group(void *params);
+static void test_refresh_group_invalid_params(void *params);
 static int  create_group_recursive(hid_t parent_gid, unsigned counter);
 
 static void
-print_group_test_header(const void H5_ATTR_UNUSED *params)
+print_group_test_header(void H5_ATTR_UNUSED *params)
 {
     printf("\n");
     printf("**********************************************\n");
@@ -48,7 +48,7 @@ print_group_test_header(const void H5_ATTR_UNUSED *params)
  * A test to check that a group can be created under the root group.
  */
 static void
-test_create_group_under_root(const void H5_ATTR_UNUSED *params)
+test_create_group_under_root(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id    = H5I_INVALID_HID;
     hid_t parent_gid = H5I_INVALID_HID;
@@ -101,7 +101,7 @@ test_create_group_under_root(const void H5_ATTR_UNUSED *params)
  * group which is not the root group.
  */
 static void
-test_create_group_under_existing_group(const void H5_ATTR_UNUSED *params)
+test_create_group_under_existing_group(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t parent_group_id = H5I_INVALID_HID, child_group_id = H5I_INVALID_HID,
@@ -177,7 +177,7 @@ test_create_group_under_existing_group(const void H5_ATTR_UNUSED *params)
  * A test to create many (one million) groups
  */
 static void
-test_create_many_groups(const void H5_ATTR_UNUSED *params)
+test_create_many_groups(void H5_ATTR_UNUSED *params)
 {
     hid_t    file_id         = H5I_INVALID_HID;
     hid_t    container_group = H5I_INVALID_HID;
@@ -257,7 +257,7 @@ test_create_many_groups(const void H5_ATTR_UNUSED *params)
  * A test to create groups of the depth GROUP_DEPTH.
  */
 static void
-test_create_deep_groups(const void H5_ATTR_UNUSED *params)
+test_create_deep_groups(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID;
@@ -365,7 +365,7 @@ create_group_recursive(hid_t parent_gid, unsigned counter)
  * A test to create groups automatically using H5Pset_create_intermediate_group
  */
 static void
-test_create_intermediate_group(const void H5_ATTR_UNUSED *params)
+test_create_intermediate_group(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id           = H5I_INVALID_HID;
     hid_t container_group   = H5I_INVALID_HID;
@@ -514,7 +514,7 @@ test_create_intermediate_group(const void H5_ATTR_UNUSED *params)
  * is passed invalid parameters.
  */
 static void
-test_create_group_invalid_params(const void H5_ATTR_UNUSED *params)
+test_create_group_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id  = H5I_INVALID_HID;
     hid_t group_id = H5I_INVALID_HID;
@@ -689,7 +689,7 @@ test_create_group_invalid_params(const void H5_ATTR_UNUSED *params)
  * H5Gcreate_anon.
  */
 static void
-test_create_anonymous_group(const void H5_ATTR_UNUSED *params)
+test_create_anonymous_group(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, new_group_id = H5I_INVALID_HID;
@@ -749,7 +749,7 @@ test_create_anonymous_group(const void H5_ATTR_UNUSED *params)
  * when H5Gcreate_anon is passed invalid parameters.
  */
 static void
-test_create_anonymous_group_invalid_params(const void H5_ATTR_UNUSED *params)
+test_create_anonymous_group_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, new_group_id = H5I_INVALID_HID;
@@ -874,7 +874,7 @@ test_create_anonymous_group_invalid_params(const void H5_ATTR_UNUSED *params)
  * be opened.
  */
 static void
-test_open_nonexistent_group(const void H5_ATTR_UNUSED *params)
+test_open_nonexistent_group(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id  = H5I_INVALID_HID;
     hid_t group_id = H5I_INVALID_HID;
@@ -929,7 +929,7 @@ test_open_nonexistent_group(const void H5_ATTR_UNUSED *params)
  * is passed invalid parameters.
  */
 static void
-test_open_group_invalid_params(const void H5_ATTR_UNUSED *params)
+test_open_group_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id  = H5I_INVALID_HID;
     hid_t group_id = H5I_INVALID_HID;
@@ -1058,7 +1058,7 @@ test_open_group_invalid_params(const void H5_ATTR_UNUSED *params)
  * invalid group ID.
  */
 static void
-test_close_group_invalid_id(const void H5_ATTR_UNUSED *params)
+test_close_group_invalid_id(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
 
@@ -1097,7 +1097,7 @@ test_close_group_invalid_id(const void H5_ATTR_UNUSED *params)
  * retrieved later with a call to H5Gget_create_plist.
  */
 static void
-test_group_property_lists(const void H5_ATTR_UNUSED *params)
+test_group_property_lists(void H5_ATTR_UNUSED *params)
 {
     unsigned dummy_prop_val  = GROUP_PROPERTY_LIST_TEST_DUMMY_VAL;
     hid_t    file_id         = H5I_INVALID_HID;
@@ -1367,7 +1367,7 @@ test_group_property_lists(const void H5_ATTR_UNUSED *params)
  * A test for the functionality of H5Gget_info(_by_idx).
  */
 static void
-test_get_group_info(const void H5_ATTR_UNUSED *params)
+test_get_group_info(void H5_ATTR_UNUSED *params)
 {
     H5G_info_t group_info;
     unsigned   i;
@@ -1802,7 +1802,7 @@ test_get_group_info(const void H5_ATTR_UNUSED *params)
  * H5Gget_info(_by_name/_by_idx) is passed invalid parameters.
  */
 static void
-test_get_group_info_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_group_info_invalid_params(void H5_ATTR_UNUSED *params)
 {
     H5G_info_t group_info;
     herr_t     err_ret = -1;
@@ -2158,7 +2158,7 @@ test_get_group_info_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Gflush.
  */
 static void
-test_flush_group(const void H5_ATTR_UNUSED *params)
+test_flush_group(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID;
@@ -2229,7 +2229,7 @@ test_flush_group(const void H5_ATTR_UNUSED *params)
  * is passed invalid parameters.
  */
 static void
-test_flush_group_invalid_params(const void H5_ATTR_UNUSED *params)
+test_flush_group_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t status;
 
@@ -2266,7 +2266,7 @@ test_flush_group_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Grefresh.
  */
 static void
-test_refresh_group(const void H5_ATTR_UNUSED *params)
+test_refresh_group(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID;
@@ -2337,7 +2337,7 @@ test_refresh_group(const void H5_ATTR_UNUSED *params)
  * is passed invalid parameters.
  */
 static void
-test_refresh_group_invalid_params(const void H5_ATTR_UNUSED *params)
+test_refresh_group_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t status;
 
diff --git a/test/API/H5_api_link_test.c b/test/API/H5_api_link_test.c
index 25249976a53..b3bcf871b3f 100644
--- a/test/API/H5_api_link_test.c
+++ b/test/API/H5_api_link_test.c
@@ -16,63 +16,63 @@
  * TODO: add link tests for short-circuit success in operator callback
  */
 
-static void print_link_test_header(const void *params);
-static void test_create_hard_link(const void *params);
-static void test_create_hard_link_long_name(const void *params);
-static void test_create_hard_link_many(const void *params);
-static void test_create_hard_link_same_loc(const void *params);
-static void test_create_hard_link_invalid_params(const void *params);
-static void test_create_soft_link_existing_relative(const void *params);
-static void test_create_soft_link_existing_absolute(const void *params);
-static void test_create_soft_link_dangling_relative(const void *params);
-static void test_create_soft_link_dangling_absolute(const void *params);
-static void test_create_soft_link_long_name(const void *params);
-static void test_create_soft_link_many(const void *params);
-static void test_create_soft_link_invalid_params(const void *params);
-static void test_create_external_link(const void *params);
-static void test_create_external_link_dangling(const void *params);
-static void test_create_external_link_multi(const void *params);
-static void test_create_external_link_ping_pong(const void *params);
-static void test_create_external_link_invalid_params(const void *params);
-static void test_create_user_defined_link(const void *params);
-static void test_create_user_defined_link_invalid_params(const void *params);
-static void test_delete_link(const void *params);
-static void test_delete_link_reset_grp_max_crt_order(const void *params);
-static void test_delete_link_invalid_params(const void *params);
-static void test_copy_link(const void *params);
-static void test_copy_links_into_group_with_links(const void *params);
-static void test_copy_link_across_files(const void *params);
-static void test_copy_link_invalid_params(const void *params);
-static void test_move_link(const void *params);
-static void test_move_links_into_group_with_links(const void *params);
-static void test_move_link_across_files(const void *params);
-static void test_move_link_reset_grp_max_crt_order(const void *params);
-static void test_move_link_invalid_params(const void *params);
-static void test_get_link_val(const void *params);
-static void test_get_link_val_invalid_params(const void *params);
-static void test_get_link_info(const void *params);
-static void test_get_link_info_invalid_params(const void *params);
-static void test_get_link_name(const void *params);
-static void test_get_link_name_invalid_params(const void *params);
-static void test_link_iterate_hard_links(const void *params);
-static void test_link_iterate_soft_links(const void *params);
-static void test_link_iterate_external_links(const void *params);
-static void test_link_iterate_ud_links(const void *params);
-static void test_link_iterate_mixed_links(const void *params);
-static void test_link_iterate_invalid_params(const void *params);
-static void test_link_iterate_0_links(const void *params);
-static void test_link_visit_hard_links_no_cycles(const void *params);
-static void test_link_visit_soft_links_no_cycles(const void *params);
-static void test_link_visit_external_links_no_cycles(const void *params);
-static void test_link_visit_ud_links_no_cycles(const void *params);
-static void test_link_visit_mixed_links_no_cycles(const void *params);
-static void test_link_visit_hard_links_cycles(const void *params);
-static void test_link_visit_soft_links_cycles(const void *params);
-static void test_link_visit_external_links_cycles(const void *params);
-static void test_link_visit_ud_links_cycles(const void *params);
-static void test_link_visit_mixed_links_cycles(const void *params);
-static void test_link_visit_invalid_params(const void *params);
-static void test_link_visit_0_links(const void *params);
+static void print_link_test_header(void *params);
+static void test_create_hard_link(void *params);
+static void test_create_hard_link_long_name(void *params);
+static void test_create_hard_link_many(void *params);
+static void test_create_hard_link_same_loc(void *params);
+static void test_create_hard_link_invalid_params(void *params);
+static void test_create_soft_link_existing_relative(void *params);
+static void test_create_soft_link_existing_absolute(void *params);
+static void test_create_soft_link_dangling_relative(void *params);
+static void test_create_soft_link_dangling_absolute(void *params);
+static void test_create_soft_link_long_name(void *params);
+static void test_create_soft_link_many(void *params);
+static void test_create_soft_link_invalid_params(void *params);
+static void test_create_external_link(void *params);
+static void test_create_external_link_dangling(void *params);
+static void test_create_external_link_multi(void *params);
+static void test_create_external_link_ping_pong(void *params);
+static void test_create_external_link_invalid_params(void *params);
+static void test_create_user_defined_link(void *params);
+static void test_create_user_defined_link_invalid_params(void *params);
+static void test_delete_link(void *params);
+static void test_delete_link_reset_grp_max_crt_order(void *params);
+static void test_delete_link_invalid_params(void *params);
+static void test_copy_link(void *params);
+static void test_copy_links_into_group_with_links(void *params);
+static void test_copy_link_across_files(void *params);
+static void test_copy_link_invalid_params(void *params);
+static void test_move_link(void *params);
+static void test_move_links_into_group_with_links(void *params);
+static void test_move_link_across_files(void *params);
+static void test_move_link_reset_grp_max_crt_order(void *params);
+static void test_move_link_invalid_params(void *params);
+static void test_get_link_val(void *params);
+static void test_get_link_val_invalid_params(void *params);
+static void test_get_link_info(void *params);
+static void test_get_link_info_invalid_params(void *params);
+static void test_get_link_name(void *params);
+static void test_get_link_name_invalid_params(void *params);
+static void test_link_iterate_hard_links(void *params);
+static void test_link_iterate_soft_links(void *params);
+static void test_link_iterate_external_links(void *params);
+static void test_link_iterate_ud_links(void *params);
+static void test_link_iterate_mixed_links(void *params);
+static void test_link_iterate_invalid_params(void *params);
+static void test_link_iterate_0_links(void *params);
+static void test_link_visit_hard_links_no_cycles(void *params);
+static void test_link_visit_soft_links_no_cycles(void *params);
+static void test_link_visit_external_links_no_cycles(void *params);
+static void test_link_visit_ud_links_no_cycles(void *params);
+static void test_link_visit_mixed_links_no_cycles(void *params);
+static void test_link_visit_hard_links_cycles(void *params);
+static void test_link_visit_soft_links_cycles(void *params);
+static void test_link_visit_external_links_cycles(void *params);
+static void test_link_visit_ud_links_cycles(void *params);
+static void test_link_visit_mixed_links_cycles(void *params);
+static void test_link_visit_invalid_params(void *params);
+static void test_link_visit_0_links(void *params);
 
 static herr_t link_iter_hard_links_cb(hid_t group_id, const char *name, const H5L_info2_t *info,
                                       void *op_data);
@@ -108,7 +108,7 @@ static herr_t link_visit_invalid_params_cb(hid_t group_id, const char *name, con
 static herr_t link_visit_0_links_cb(hid_t group_id, const char *name, const H5L_info2_t *info, void *op_data);
 
 static void
-print_link_test_header(const void H5_ATTR_UNUSED *params)
+print_link_test_header(void H5_ATTR_UNUSED *params)
 {
     printf("\n");
     printf("**********************************************\n");
@@ -123,7 +123,7 @@ print_link_test_header(const void H5_ATTR_UNUSED *params)
  * using H5Lcreate_hard.
  */
 static void
-test_create_hard_link(const void H5_ATTR_UNUSED *params)
+test_create_hard_link(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -206,7 +206,7 @@ test_create_hard_link(const void H5_ATTR_UNUSED *params)
  * using H5Lcreate_hard.
  */
 static void
-test_create_hard_link_long_name(const void H5_ATTR_UNUSED *params)
+test_create_hard_link_long_name(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id = H5I_INVALID_HID;
@@ -314,7 +314,7 @@ test_create_hard_link_long_name(const void H5_ATTR_UNUSED *params)
  * using H5Lcreate_hard.
  */
 static void
-test_create_hard_link_many(const void H5_ATTR_UNUSED *params)
+test_create_hard_link_many(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -511,7 +511,7 @@ test_create_hard_link_many(const void H5_ATTR_UNUSED *params)
  * the H5L_SAME_LOC macro for H5Lcreate_hard().
  */
 static void
-test_create_hard_link_same_loc(const void H5_ATTR_UNUSED *params)
+test_create_hard_link_same_loc(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -642,7 +642,7 @@ test_create_hard_link_same_loc(const void H5_ATTR_UNUSED *params)
  * H5Lcreate_hard is passed invalid parameters.
  */
 static void
-test_create_hard_link_invalid_params(const void H5_ATTR_UNUSED *params)
+test_create_hard_link_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     htri_t link_exists;
@@ -966,7 +966,7 @@ test_create_hard_link_invalid_params(const void H5_ATTR_UNUSED *params)
  * existing object with a relative path, can be created.
  */
 static void
-test_create_soft_link_existing_relative(const void H5_ATTR_UNUSED *params)
+test_create_soft_link_existing_relative(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -1073,7 +1073,7 @@ test_create_soft_link_existing_relative(const void H5_ATTR_UNUSED *params)
  * existing object using an absolute path, can be created.
  */
 static void
-test_create_soft_link_existing_absolute(const void H5_ATTR_UNUSED *params)
+test_create_soft_link_existing_absolute(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -1169,7 +1169,7 @@ test_create_soft_link_existing_absolute(const void H5_ATTR_UNUSED *params)
  * path, can be created.
  */
 static void
-test_create_soft_link_dangling_relative(const void H5_ATTR_UNUSED *params)
+test_create_soft_link_dangling_relative(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -1290,7 +1290,7 @@ test_create_soft_link_dangling_relative(const void H5_ATTR_UNUSED *params)
  * can be created.
  */
 static void
-test_create_soft_link_dangling_absolute(const void H5_ATTR_UNUSED *params)
+test_create_soft_link_dangling_absolute(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -1411,7 +1411,7 @@ test_create_soft_link_dangling_absolute(const void H5_ATTR_UNUSED *params)
  * using H5Lcreate_soft.
  */
 static void
-test_create_soft_link_long_name(const void H5_ATTR_UNUSED *params)
+test_create_soft_link_long_name(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id = H5I_INVALID_HID;
@@ -1519,7 +1519,7 @@ test_create_soft_link_long_name(const void H5_ATTR_UNUSED *params)
  * using H5Lcreate_soft.
  */
 static void
-test_create_soft_link_many(const void H5_ATTR_UNUSED *params)
+test_create_soft_link_many(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists        = FAIL;
     bool   valid_name_matched = false;
@@ -1727,7 +1727,7 @@ test_create_soft_link_many(const void H5_ATTR_UNUSED *params)
  * when H5Lcreate_soft is passed invalid parameters.
  */
 static void
-test_create_soft_link_invalid_params(const void H5_ATTR_UNUSED *params)
+test_create_soft_link_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     htri_t link_exists;
@@ -1961,7 +1961,7 @@ test_create_soft_link_invalid_params(const void H5_ATTR_UNUSED *params)
  * using H5Lcreate_external.
  */
 static void
-test_create_external_link(const void H5_ATTR_UNUSED *params)
+test_create_external_link(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -2073,7 +2073,7 @@ test_create_external_link(const void H5_ATTR_UNUSED *params)
  * be created.
  */
 static void
-test_create_external_link_dangling(const void H5_ATTR_UNUSED *params)
+test_create_external_link_dangling(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id = H5I_INVALID_HID, ext_file_id = H5I_INVALID_HID;
@@ -2209,7 +2209,7 @@ test_create_external_link_dangling(const void H5_ATTR_UNUSED *params)
  * that crosses several files using H5Lcreate_external.
  */
 static void
-test_create_external_link_multi(const void H5_ATTR_UNUSED *params)
+test_create_external_link_multi(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -2590,7 +2590,7 @@ test_create_external_link_multi(const void H5_ATTR_UNUSED *params)
  *       file2:/link6    -> file1: /final
  */
 static void
-test_create_external_link_ping_pong(const void H5_ATTR_UNUSED *params)
+test_create_external_link_ping_pong(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id                                             = H5I_INVALID_HID;
     hid_t group_id                                            = H5I_INVALID_HID;
@@ -2875,7 +2875,7 @@ test_create_external_link_ping_pong(const void H5_ATTR_UNUSED *params)
  * when H5Lcreate_external is passed invalid parameters.
  */
 static void
-test_create_external_link_invalid_params(const void H5_ATTR_UNUSED *params)
+test_create_external_link_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     htri_t link_exists;
@@ -3166,7 +3166,7 @@ test_create_external_link_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test to check that a user-defined link can be created.
  */
 static void
-test_create_user_defined_link(const void H5_ATTR_UNUSED *params)
+test_create_user_defined_link(void H5_ATTR_UNUSED *params)
 {
     ssize_t udata_size;
     htri_t  link_exists;
@@ -3256,7 +3256,7 @@ test_create_user_defined_link(const void H5_ATTR_UNUSED *params)
  * it is given invalid parameters.
  */
 static void
-test_create_user_defined_link_invalid_params(const void H5_ATTR_UNUSED *params)
+test_create_user_defined_link_invalid_params(void H5_ATTR_UNUSED *params)
 {
     ssize_t udata_size;
     htri_t  link_exists;
@@ -3504,7 +3504,7 @@ test_create_user_defined_link_invalid_params(const void H5_ATTR_UNUSED *params)
  * using H5Ldelete and H5Ldelete_by_idx.
  */
 static void
-test_delete_link(const void H5_ATTR_UNUSED *params)
+test_delete_link(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id = H5I_INVALID_HID, ext_file_id = H5I_INVALID_HID;
@@ -7072,7 +7072,7 @@ test_delete_link(const void H5_ATTR_UNUSED *params)
  * all the links have been deleted from the group.
  */
 static void
-test_delete_link_reset_grp_max_crt_order(const void H5_ATTR_UNUSED *params)
+test_delete_link_reset_grp_max_crt_order(void H5_ATTR_UNUSED *params)
 {
     H5G_info_t grp_info;
     size_t     i;
@@ -7323,7 +7323,7 @@ test_delete_link_reset_grp_max_crt_order(const void H5_ATTR_UNUSED *params)
 }
 
 static void
-test_delete_link_invalid_params(const void H5_ATTR_UNUSED *params)
+test_delete_link_invalid_params(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     herr_t err_ret         = -1;
@@ -7653,7 +7653,7 @@ test_delete_link_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test to check that a link can be copied using H5Lcopy.
  */
 static void
-test_copy_link(const void H5_ATTR_UNUSED *params)
+test_copy_link(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id = H5I_INVALID_HID, ext_file_id = H5I_INVALID_HID;
@@ -8948,7 +8948,7 @@ test_copy_link(const void H5_ATTR_UNUSED *params)
  * creation order values.
  */
 static void
-test_copy_links_into_group_with_links(const void H5_ATTR_UNUSED *params)
+test_copy_links_into_group_with_links(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Lcopy adjusting creation order values for copied links");
 
@@ -8967,7 +8967,7 @@ test_copy_links_into_group_with_links(const void H5_ATTR_UNUSED *params)
  *       links.
  */
 static void
-test_copy_link_across_files(const void H5_ATTR_UNUSED *params)
+test_copy_link_across_files(void H5_ATTR_UNUSED *params)
 {
     TESTING("link copying across files");
 
@@ -8983,7 +8983,7 @@ test_copy_link_across_files(const void H5_ATTR_UNUSED *params)
  * when H5Lcopy is passed invalid parameters.
  */
 static void
-test_copy_link_invalid_params(const void H5_ATTR_UNUSED *params)
+test_copy_link_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     htri_t link_exists;
@@ -9328,7 +9328,7 @@ test_copy_link_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test to check that a link can be moved with H5Lmove.
  */
 static void
-test_move_link(const void H5_ATTR_UNUSED *params)
+test_move_link(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -10897,7 +10897,7 @@ test_move_link(const void H5_ATTR_UNUSED *params)
  * creation order values.
  */
 static void
-test_move_links_into_group_with_links(const void H5_ATTR_UNUSED *params)
+test_move_links_into_group_with_links(void H5_ATTR_UNUSED *params)
 {
     H5L_info2_t link_info;
     size_t      i;
@@ -11083,7 +11083,7 @@ test_move_links_into_group_with_links(const void H5_ATTR_UNUSED *params)
  *       moved links retain their original properties.
  */
 static void
-test_move_link_across_files(const void H5_ATTR_UNUSED *params)
+test_move_link_across_files(void H5_ATTR_UNUSED *params)
 {
     TESTING("link moving across files");
 
@@ -11100,7 +11100,7 @@ test_move_link_across_files(const void H5_ATTR_UNUSED *params)
  * all the links have been moved out of the group.
  */
 static void
-test_move_link_reset_grp_max_crt_order(const void H5_ATTR_UNUSED *params)
+test_move_link_reset_grp_max_crt_order(void H5_ATTR_UNUSED *params)
 {
     H5G_info_t grp_info;
     size_t     i;
@@ -11283,7 +11283,7 @@ test_move_link_reset_grp_max_crt_order(const void H5_ATTR_UNUSED *params)
  * invalid parameters.
  */
 static void
-test_move_link_invalid_params(const void H5_ATTR_UNUSED *params)
+test_move_link_invalid_params(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     herr_t err_ret         = -1;
@@ -11691,7 +11691,7 @@ test_move_link_invalid_params(const void H5_ATTR_UNUSED *params)
  * be retrieved by using H5Lget_val and H5Lget_val_by_idx.
  */
 static void
-test_get_link_val(const void H5_ATTR_UNUSED *params)
+test_get_link_val(void H5_ATTR_UNUSED *params)
 {
     H5L_info2_t link_info;
     const char *ext_link_filepath;
@@ -13848,7 +13848,7 @@ test_get_link_val(const void H5_ATTR_UNUSED *params)
  * retrieved when H5Lget_val(_by_idx) is passed invalid parameters.
  */
 static void
-test_get_link_val_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_link_val_invalid_params(void H5_ATTR_UNUSED *params)
 {
     H5L_info2_t link_info;
     htri_t      link_exists;
@@ -14195,7 +14195,7 @@ test_get_link_val_invalid_params(const void H5_ATTR_UNUSED *params)
  * H5Lget_info_by_idx2.
  */
 static void
-test_get_link_info(const void H5_ATTR_UNUSED *params)
+test_get_link_info(void H5_ATTR_UNUSED *params)
 {
     H5L_info2_t link_info;
     const char *ext_objname = "/";
@@ -16923,7 +16923,7 @@ test_get_link_info(const void H5_ATTR_UNUSED *params)
  * when H5Lget_info(_by_idx)2 is passed invalid parameters.
  */
 static void
-test_get_link_info_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_link_info_invalid_params(void H5_ATTR_UNUSED *params)
 {
     H5L_info2_t link_info;
     herr_t      err_ret = -1;
@@ -17255,7 +17255,7 @@ test_get_link_info_invalid_params(const void H5_ATTR_UNUSED *params)
  * retrieved by using H5Lget_name_by_idx.
  */
 static void
-test_get_link_name(const void H5_ATTR_UNUSED *params)
+test_get_link_name(void H5_ATTR_UNUSED *params)
 {
     ssize_t link_name_buf_size = 0;
     htri_t  link_exists;
@@ -19516,7 +19516,7 @@ test_get_link_name(const void H5_ATTR_UNUSED *params)
  * when H5Lget_name_by_idx is passed invalid parameters.
  */
 static void
-test_get_link_name_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_link_name_invalid_params(void H5_ATTR_UNUSED *params)
 {
     ssize_t ret;
     htri_t  link_exists;
@@ -19782,7 +19782,7 @@ test_get_link_name_invalid_params(const void H5_ATTR_UNUSED *params)
  * name and link creation order.
  */
 static void
-test_link_iterate_hard_links(const void H5_ATTR_UNUSED *params)
+test_link_iterate_hard_links(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     htri_t link_exists;
@@ -20163,7 +20163,7 @@ test_link_iterate_hard_links(const void H5_ATTR_UNUSED *params)
  * name and link creation order.
  */
 static void
-test_link_iterate_soft_links(const void H5_ATTR_UNUSED *params)
+test_link_iterate_soft_links(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     htri_t link_exists;
@@ -20516,7 +20516,7 @@ test_link_iterate_soft_links(const void H5_ATTR_UNUSED *params)
  * name and link creation order.
  */
 static void
-test_link_iterate_external_links(const void H5_ATTR_UNUSED *params)
+test_link_iterate_external_links(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     htri_t link_exists;
@@ -20921,7 +20921,7 @@ test_link_iterate_external_links(const void H5_ATTR_UNUSED *params)
  * actually test the order that objects were created in.
  */
 static void
-test_link_iterate_ud_links(const void H5_ATTR_UNUSED *params)
+test_link_iterate_ud_links(void H5_ATTR_UNUSED *params)
 {
     TESTING("link iteration (only user-defined links)");
 
@@ -20945,7 +20945,7 @@ test_link_iterate_ud_links(const void H5_ATTR_UNUSED *params)
  * TODO refactor link saving portion into its own test
  */
 static void
-test_link_iterate_mixed_links(const void H5_ATTR_UNUSED *params)
+test_link_iterate_mixed_links(void H5_ATTR_UNUSED *params)
 {
     hsize_t saved_idx;
     size_t  i;
@@ -21483,7 +21483,7 @@ test_link_iterate_mixed_links(const void H5_ATTR_UNUSED *params)
  * when given invalid parameters.
  */
 static void
-test_link_iterate_invalid_params(const void H5_ATTR_UNUSED *params)
+test_link_iterate_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     size_t i;
@@ -21896,7 +21896,7 @@ test_link_iterate_invalid_params(const void H5_ATTR_UNUSED *params)
  * group with no links in it is not problematic.
  */
 static void
-test_link_iterate_0_links(const void H5_ATTR_UNUSED *params)
+test_link_iterate_0_links(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -22138,7 +22138,7 @@ test_link_iterate_0_links(const void H5_ATTR_UNUSED *params)
  * creation order.
  */
 static void
-test_link_visit_hard_links_no_cycles(const void H5_ATTR_UNUSED *params)
+test_link_visit_hard_links_no_cycles(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     htri_t link_exists;
@@ -22538,7 +22538,7 @@ test_link_visit_hard_links_no_cycles(const void H5_ATTR_UNUSED *params)
  * creation order.
  */
 static void
-test_link_visit_soft_links_no_cycles(const void H5_ATTR_UNUSED *params)
+test_link_visit_soft_links_no_cycles(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     htri_t link_exists;
@@ -22918,7 +22918,7 @@ test_link_visit_soft_links_no_cycles(const void H5_ATTR_UNUSED *params)
  * creation order.
  */
 static void
-test_link_visit_external_links_no_cycles(const void H5_ATTR_UNUSED *params)
+test_link_visit_external_links_no_cycles(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     htri_t link_exists;
@@ -23319,7 +23319,7 @@ test_link_visit_external_links_no_cycles(const void H5_ATTR_UNUSED *params)
  * actually test the order that objects were created in.
  */
 static void
-test_link_visit_ud_links_no_cycles(const void H5_ATTR_UNUSED *params)
+test_link_visit_ud_links_no_cycles(void H5_ATTR_UNUSED *params)
 {
     TESTING("link visiting without cycles (only user-defined links)");
 
@@ -23344,7 +23344,7 @@ test_link_visit_ud_links_no_cycles(const void H5_ATTR_UNUSED *params)
  * TODO refactor test to create a macroed number of subgroups
  */
 static void
-test_link_visit_mixed_links_no_cycles(const void H5_ATTR_UNUSED *params)
+test_link_visit_mixed_links_no_cycles(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     htri_t link_exists;
@@ -23832,7 +23832,7 @@ test_link_visit_mixed_links_no_cycles(const void H5_ATTR_UNUSED *params)
  * order of both link name and link creation order.
  */
 static void
-test_link_visit_hard_links_cycles(const void H5_ATTR_UNUSED *params)
+test_link_visit_hard_links_cycles(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     htri_t link_exists;
@@ -24205,7 +24205,7 @@ test_link_visit_hard_links_cycles(const void H5_ATTR_UNUSED *params)
  * order of both link name and link creation order.
  */
 static void
-test_link_visit_soft_links_cycles(const void H5_ATTR_UNUSED *params)
+test_link_visit_soft_links_cycles(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     htri_t link_exists;
@@ -24585,7 +24585,7 @@ test_link_visit_soft_links_cycles(const void H5_ATTR_UNUSED *params)
  * creation order.
  */
 static void
-test_link_visit_external_links_cycles(const void H5_ATTR_UNUSED *params)
+test_link_visit_external_links_cycles(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     htri_t link_exists;
@@ -24973,7 +24973,7 @@ test_link_visit_external_links_cycles(const void H5_ATTR_UNUSED *params)
  * actually test the order that objects were created in.
  */
 static void
-test_link_visit_ud_links_cycles(const void H5_ATTR_UNUSED *params)
+test_link_visit_ud_links_cycles(void H5_ATTR_UNUSED *params)
 {
     TESTING("link visiting with cycles (only user-defined links)");
 
@@ -24993,7 +24993,7 @@ test_link_visit_ud_links_cycles(const void H5_ATTR_UNUSED *params)
  * actually test the order that objects were created in.
  */
 static void
-test_link_visit_mixed_links_cycles(const void H5_ATTR_UNUSED *params)
+test_link_visit_mixed_links_cycles(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     size_t i;
@@ -25433,7 +25433,7 @@ test_link_visit_mixed_links_cycles(const void H5_ATTR_UNUSED *params)
  * it is given invalid parameters.
  */
 static void
-test_link_visit_invalid_params(const void H5_ATTR_UNUSED *params)
+test_link_visit_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     htri_t link_exists;
@@ -25899,7 +25899,7 @@ test_link_visit_invalid_params(const void H5_ATTR_UNUSED *params)
  * not problematic.
  */
 static void
-test_link_visit_0_links(const void H5_ATTR_UNUSED *params)
+test_link_visit_0_links(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
diff --git a/test/API/H5_api_misc_test.c b/test/API/H5_api_misc_test.c
index 14611a001eb..07b5af8d387 100644
--- a/test/API/H5_api_misc_test.c
+++ b/test/API/H5_api_misc_test.c
@@ -12,16 +12,16 @@
 
 #include "H5_api_misc_test.h"
 
-static void print_misc_test_header(const void *params);
-static void test_open_link_without_leading_slash(const void *params);
-static void test_object_creation_by_absolute_path(const void *params);
-static void test_absolute_vs_relative_path(const void *params);
-static void test_dot_for_object_name(const void *params);
-static void test_symbols_in_compound_field_name(const void *params);
-static void test_double_init_term(const void *params);
+static void print_misc_test_header(void *params);
+static void test_open_link_without_leading_slash(void *params);
+static void test_object_creation_by_absolute_path(void *params);
+static void test_absolute_vs_relative_path(void *params);
+static void test_dot_for_object_name(void *params);
+static void test_symbols_in_compound_field_name(void *params);
+static void test_double_init_term(void *params);
 
 static void
-print_misc_test_header(const void H5_ATTR_UNUSED *params)
+print_misc_test_header(void H5_ATTR_UNUSED *params)
 {
     printf("\n");
     printf("**********************************************\n");
@@ -32,7 +32,7 @@ print_misc_test_header(const void H5_ATTR_UNUSED *params)
 }
 
 static void
-test_open_link_without_leading_slash(const void H5_ATTR_UNUSED *params)
+test_open_link_without_leading_slash(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID;
@@ -134,7 +134,7 @@ test_open_link_without_leading_slash(const void H5_ATTR_UNUSED *params)
 }
 
 static void
-test_object_creation_by_absolute_path(const void H5_ATTR_UNUSED *params)
+test_object_creation_by_absolute_path(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -369,7 +369,7 @@ test_object_creation_by_absolute_path(const void H5_ATTR_UNUSED *params)
 
 /* XXX: Add testing for groups */
 static void
-test_absolute_vs_relative_path(const void H5_ATTR_UNUSED *params)
+test_absolute_vs_relative_path(void H5_ATTR_UNUSED *params)
 {
     htri_t link_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -714,7 +714,7 @@ test_absolute_vs_relative_path(const void H5_ATTR_UNUSED *params)
  * A test to check creating/opening objects with the "." as the name
  */
 static void
-test_dot_for_object_name(const void H5_ATTR_UNUSED *params)
+test_dot_for_object_name(void H5_ATTR_UNUSED *params)
 {
     hid_t  file_id         = H5I_INVALID_HID;
     hid_t  container_group = H5I_INVALID_HID, subgroup_id = H5I_INVALID_HID;
@@ -886,7 +886,7 @@ test_dot_for_object_name(const void H5_ATTR_UNUSED *params)
  * at the moment.
  */
 static void
-test_double_init_term(const void H5_ATTR_UNUSED *params)
+test_double_init_term(void H5_ATTR_UNUSED *params)
 {
     TESTING("double init/term correctness");
 
@@ -901,7 +901,7 @@ test_double_init_term(const void H5_ATTR_UNUSED *params)
 }
 
 static void
-test_symbols_in_compound_field_name(const void H5_ATTR_UNUSED *params)
+test_symbols_in_compound_field_name(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     size_t total_type_size;
diff --git a/test/API/H5_api_object_test.c b/test/API/H5_api_object_test.c
index 85714f2ed1f..1e1bad38192 100644
--- a/test/API/H5_api_object_test.c
+++ b/test/API/H5_api_object_test.c
@@ -12,37 +12,37 @@
 
 #include "H5_api_object_test.h"
 
-static void print_object_test_header(const void *params);
-static void test_open_object(const void *params);
-static void test_open_object_invalid_params(const void *params);
-static void test_object_exists(const void *params);
-static void test_object_exists_invalid_params(const void *params);
-static void test_get_object_info(const void *params);
-static void test_get_object_info_invalid_params(const void *params);
-static void test_link_object(const void *params);
-static void test_link_object_invalid_params(const void *params);
-static void test_incr_decr_object_refcount(const void *params);
-static void test_incr_decr_object_refcount_invalid_params(const void *params);
-static void test_object_copy_basic(const void *params);
-static void test_object_copy_already_existing(const void *params);
-static void test_object_copy_shallow_group_copy(const void *params);
-static void test_object_copy_no_attributes(const void *params);
-static void test_object_copy_by_soft_link(const void *params);
-static void test_object_copy_group_with_soft_links(const void *params);
-static void test_object_copy_between_files(const void *params);
-static void test_object_copy_invalid_params(const void *params);
-static void test_object_comments(const void *params);
-static void test_object_comments_invalid_params(const void *params);
-static void test_object_visit(const void *params);
-static void test_object_visit_soft_link(const void *params);
-static void test_object_visit_invalid_params(const void *params);
-static void test_close_object(const void *params);
-static void test_close_object_invalid_params(const void *params);
-static void test_close_invalid_objects(const void *params);
-static void test_flush_object(const void *params);
-static void test_flush_object_invalid_params(const void *params);
-static void test_refresh_object(const void *params);
-static void test_refresh_object_invalid_params(const void *params);
+static void print_object_test_header(void *params);
+static void test_open_object(void *params);
+static void test_open_object_invalid_params(void *params);
+static void test_object_exists(void *params);
+static void test_object_exists_invalid_params(void *params);
+static void test_get_object_info(void *params);
+static void test_get_object_info_invalid_params(void *params);
+static void test_link_object(void *params);
+static void test_link_object_invalid_params(void *params);
+static void test_incr_decr_object_refcount(void *params);
+static void test_incr_decr_object_refcount_invalid_params(void *params);
+static void test_object_copy_basic(void *params);
+static void test_object_copy_already_existing(void *params);
+static void test_object_copy_shallow_group_copy(void *params);
+static void test_object_copy_no_attributes(void *params);
+static void test_object_copy_by_soft_link(void *params);
+static void test_object_copy_group_with_soft_links(void *params);
+static void test_object_copy_between_files(void *params);
+static void test_object_copy_invalid_params(void *params);
+static void test_object_comments(void *params);
+static void test_object_comments_invalid_params(void *params);
+static void test_object_visit(void *params);
+static void test_object_visit_soft_link(void *params);
+static void test_object_visit_invalid_params(void *params);
+static void test_close_object(void *params);
+static void test_close_object_invalid_params(void *params);
+static void test_close_invalid_objects(void *params);
+static void test_flush_object(void *params);
+static void test_flush_object_invalid_params(void *params);
+static void test_refresh_object(void *params);
+static void test_refresh_object_invalid_params(void *params);
 
 static herr_t object_copy_attribute_iter_callback(hid_t location_id, const char *attr_name,
                                                   const H5A_info_t *ainfo, void *op_data);
@@ -64,7 +64,7 @@ static herr_t object_visit_noop_callback(hid_t o_id, const char *name, const H5O
                                          void *op_data);
 
 static void
-print_object_test_header(const void H5_ATTR_UNUSED *params)
+print_object_test_header(void H5_ATTR_UNUSED *params)
 {
     printf("\n");
     printf("**********************************************\n");
@@ -85,7 +85,7 @@ print_object_test_header(const void H5_ATTR_UNUSED *params)
  * XXX: test opening through dangling and resolving soft links.
  */
 static void
-test_open_object(const void H5_ATTR_UNUSED *params)
+test_open_object(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -399,7 +399,7 @@ test_open_object(const void H5_ATTR_UNUSED *params)
  * are passed invalid parameters.
  */
 static void
-test_open_object_invalid_params(const void H5_ATTR_UNUSED *params)
+test_open_object_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -769,7 +769,7 @@ test_open_object_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Oexists_by_name.
  */
 static void
-test_object_exists(const void H5_ATTR_UNUSED *params)
+test_object_exists(void H5_ATTR_UNUSED *params)
 {
     htri_t object_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -1035,7 +1035,7 @@ test_object_exists(const void H5_ATTR_UNUSED *params)
  * when it is passed invalid parameters.
  */
 static void
-test_object_exists_invalid_params(const void H5_ATTR_UNUSED *params)
+test_object_exists_invalid_params(void H5_ATTR_UNUSED *params)
 {
     htri_t object_exists;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -1194,7 +1194,7 @@ test_object_exists_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Oget_info(_by_name/_by_idx).
  */
 static void
-test_get_object_info(const void H5_ATTR_UNUSED *params)
+test_get_object_info(void H5_ATTR_UNUSED *params)
 {
     TESTING("object info retrieval");
 
@@ -1209,7 +1209,7 @@ test_get_object_info(const void H5_ATTR_UNUSED *params)
  * parameters.
  */
 static void
-test_get_object_info_invalid_params(const void H5_ATTR_UNUSED *params)
+test_get_object_info_invalid_params(void H5_ATTR_UNUSED *params)
 {
     TESTING("object info retrieval with invalid parameters");
 
@@ -1222,7 +1222,7 @@ test_get_object_info_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Olink.
  */
 static void
-test_link_object(const void H5_ATTR_UNUSED *params)
+test_link_object(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -1381,7 +1381,7 @@ test_link_object(const void H5_ATTR_UNUSED *params)
  * parameters.
  */
 static void
-test_link_object_invalid_params(const void H5_ATTR_UNUSED *params)
+test_link_object_invalid_params(void H5_ATTR_UNUSED *params)
 {
     hid_t  file_id         = H5I_INVALID_HID;
     hid_t  container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -1579,7 +1579,7 @@ test_link_object_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Oincr_refcount/H5Odecr_refcount.
  */
 static void
-test_incr_decr_object_refcount(const void H5_ATTR_UNUSED *params)
+test_incr_decr_object_refcount(void H5_ATTR_UNUSED *params)
 {
     H5O_info2_t oinfo; /* Object info struct */
     hid_t       file_id         = H5I_INVALID_HID;
@@ -1878,7 +1878,7 @@ test_incr_decr_object_refcount(const void H5_ATTR_UNUSED *params)
  * fail when passed invalid parameters.
  */
 static void
-test_incr_decr_object_refcount_invalid_params(const void H5_ATTR_UNUSED *params)
+test_incr_decr_object_refcount_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t status;
 
@@ -1945,7 +1945,7 @@ test_incr_decr_object_refcount_invalid_params(const void H5_ATTR_UNUSED *params)
  * Basic tests for H5Ocopy.
  */
 static void
-test_object_copy_basic(const void H5_ATTR_UNUSED *params)
+test_object_copy_basic(void H5_ATTR_UNUSED *params)
 {
     H5O_info2_t object_info;
     H5G_info_t  group_info;
@@ -2522,7 +2522,7 @@ test_object_copy_basic(const void H5_ATTR_UNUSED *params)
  * an object to a destination where the object already exists.
  */
 static void
-test_object_copy_already_existing(const void H5_ATTR_UNUSED *params)
+test_object_copy_already_existing(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -2720,7 +2720,7 @@ test_object_copy_already_existing(const void H5_ATTR_UNUSED *params)
  * for H5Ocopy.
  */
 static void
-test_object_copy_shallow_group_copy(const void H5_ATTR_UNUSED *params)
+test_object_copy_shallow_group_copy(void H5_ATTR_UNUSED *params)
 {
     H5G_info_t group_info;
     htri_t     object_link_exists;
@@ -2947,7 +2947,7 @@ test_object_copy_shallow_group_copy(const void H5_ATTR_UNUSED *params)
  * of H5Ocopy.
  */
 static void
-test_object_copy_no_attributes(const void H5_ATTR_UNUSED *params)
+test_object_copy_no_attributes(void H5_ATTR_UNUSED *params)
 {
     H5O_info2_t object_info;
     htri_t      object_link_exists;
@@ -3460,7 +3460,7 @@ test_object_copy_no_attributes(const void H5_ATTR_UNUSED *params)
  * object specified is a soft link or dangling soft link.
  */
 static void
-test_object_copy_by_soft_link(const void H5_ATTR_UNUSED *params)
+test_object_copy_by_soft_link(void H5_ATTR_UNUSED *params)
 {
     H5O_info2_t object_info;
     H5G_info_t  group_info;
@@ -3793,7 +3793,7 @@ test_object_copy_by_soft_link(const void H5_ATTR_UNUSED *params)
  * flag.
  */
 static void
-test_object_copy_group_with_soft_links(const void H5_ATTR_UNUSED *params)
+test_object_copy_group_with_soft_links(void H5_ATTR_UNUSED *params)
 {
     H5G_info_t group_info;
     htri_t     object_link_exists;
@@ -4151,7 +4151,7 @@ test_object_copy_group_with_soft_links(const void H5_ATTR_UNUSED *params)
  * H5Ocopy.
  */
 static void
-test_object_copy_between_files(const void H5_ATTR_UNUSED *params)
+test_object_copy_between_files(void H5_ATTR_UNUSED *params)
 {
     H5O_info2_t object_info;
     H5G_info_t  group_info;
@@ -4763,7 +4763,7 @@ test_object_copy_between_files(const void H5_ATTR_UNUSED *params)
  * is passed invalid parameters.
  */
 static void
-test_object_copy_invalid_params(const void H5_ATTR_UNUSED *params)
+test_object_copy_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret         = -1;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -4999,7 +4999,7 @@ test_object_copy_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Oset_comment(_by_name)/H5Oget_comment(_by_name).
  */
 static void
-test_object_comments(const void H5_ATTR_UNUSED *params)
+test_object_comments(void H5_ATTR_UNUSED *params)
 {
     TESTING("object comments");
 
@@ -5013,7 +5013,7 @@ test_object_comments(const void H5_ATTR_UNUSED *params)
  * fail when passed invalid parameters.
  */
 static void
-test_object_comments_invalid_params(const void H5_ATTR_UNUSED *params)
+test_object_comments_invalid_params(void H5_ATTR_UNUSED *params)
 {
     TESTING("object comments with invalid parameters");
 
@@ -5028,7 +5028,7 @@ test_object_comments_invalid_params(const void H5_ATTR_UNUSED *params)
  * XXX: Should have test for checking nested object's names/paths.
  */
 static void
-test_object_visit(const void H5_ATTR_UNUSED *params)
+test_object_visit(void H5_ATTR_UNUSED *params)
 {
     size_t   i;
     hid_t    file_id         = H5I_INVALID_HID;
@@ -5729,7 +5729,7 @@ test_object_visit(const void H5_ATTR_UNUSED *params)
  * do not get visited.
  */
 static void
-test_object_visit_soft_link(const void H5_ATTR_UNUSED *params)
+test_object_visit_soft_link(void H5_ATTR_UNUSED *params)
 {
     size_t i;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -6214,7 +6214,7 @@ test_object_visit_soft_link(const void H5_ATTR_UNUSED *params)
  * it is passed invalid parameters.
  */
 static void
-test_object_visit_invalid_params(const void H5_ATTR_UNUSED *params)
+test_object_visit_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret         = -1;
     hid_t  file_id         = H5I_INVALID_HID;
@@ -6531,7 +6531,7 @@ test_object_visit_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Oclose.
  */
 static void
-test_close_object(const void H5_ATTR_UNUSED *params)
+test_close_object(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id         = H5I_INVALID_HID;
     hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -6731,7 +6731,7 @@ test_close_object(const void H5_ATTR_UNUSED *params)
  * is passed invalid parameters.
  */
 static void
-test_close_object_invalid_params(const void H5_ATTR_UNUSED *params)
+test_close_object_invalid_params(void H5_ATTR_UNUSED *params)
 {
     herr_t err_ret = -1;
     hid_t  file_id = H5I_INVALID_HID;
@@ -6785,7 +6785,7 @@ test_close_object_invalid_params(const void H5_ATTR_UNUSED *params)
  * and attribute) can't be closed with H5Oclose.
  */
 static void
-test_close_invalid_objects(const void H5_ATTR_UNUSED *params)
+test_close_invalid_objects(void H5_ATTR_UNUSED *params)
 {
     hid_t  file_id         = H5I_INVALID_HID;
     hid_t  container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID;
@@ -6968,7 +6968,7 @@ test_close_invalid_objects(const void H5_ATTR_UNUSED *params)
  * A test for H5Oflush.
  */
 static void
-test_flush_object(const void H5_ATTR_UNUSED *params)
+test_flush_object(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Oflush");
 
@@ -6982,7 +6982,7 @@ test_flush_object(const void H5_ATTR_UNUSED *params)
  * it is passed invalid parameters.
  */
 static void
-test_flush_object_invalid_params(const void H5_ATTR_UNUSED *params)
+test_flush_object_invalid_params(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Oflush with invalid parameters");
 
@@ -6995,7 +6995,7 @@ test_flush_object_invalid_params(const void H5_ATTR_UNUSED *params)
  * A test for H5Orefresh.
  */
 static void
-test_refresh_object(const void H5_ATTR_UNUSED *params)
+test_refresh_object(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Orefresh");
 
@@ -7009,7 +7009,7 @@ test_refresh_object(const void H5_ATTR_UNUSED *params)
  * it is passed invalid parameters.
  */
 static void
-test_refresh_object_invalid_params(const void H5_ATTR_UNUSED *params)
+test_refresh_object_invalid_params(void H5_ATTR_UNUSED *params)
 {
     TESTING("H5Orefresh with invalid parameters");
 
diff --git a/test/tarray.c b/test/tarray.c
index 6a1e3d68ecc..ace3929a222 100644
--- a/test/tarray.c
+++ b/test/tarray.c
@@ -2375,7 +2375,7 @@ test_compat(void)
  *-------------------------------------------------------------------------
  */
 void
-test_array(const void H5_ATTR_UNUSED *params)
+test_array(void H5_ATTR_UNUSED *params)
 {
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Array Datatypes\n"));
diff --git a/test/tattr.c b/test/tattr.c
index 2d1aeed77c2..e06694622cd 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -11937,7 +11937,7 @@ test_attr_delete_last_dense(hid_t fcpl, hid_t fapl)
 **
 ****************************************************************/
 void
-test_attr(const void H5_ATTR_UNUSED *params)
+test_attr(void H5_ATTR_UNUSED *params)
 {
     hid_t    fapl = (H5I_INVALID_HID), fapl2 = (H5I_INVALID_HID); /* File access property lists */
     hid_t    fcpl = (H5I_INVALID_HID), fcpl2 = (H5I_INVALID_HID); /* File creation property lists */
diff --git a/test/tchecksum.c b/test/tchecksum.c
index 9b55f5ec902..d0cb7de25b0 100644
--- a/test/tchecksum.c
+++ b/test/tchecksum.c
@@ -216,7 +216,7 @@ test_chksum_large(void)
 **
 ****************************************************************/
 void
-test_checksum(const void H5_ATTR_UNUSED *params)
+test_checksum(void H5_ATTR_UNUSED *params)
 {
     /* Output message about test being performed */
     MESSAGE(5, ("Testing checksum algorithms\n"));
diff --git a/test/tconfig.c b/test/tconfig.c
index 97a0b6385bc..c36620e6dec 100644
--- a/test/tconfig.c
+++ b/test/tconfig.c
@@ -59,7 +59,7 @@ void test_exit_definitions(void);
  *-------------------------------------------------------------------------
  */
 void
-test_configure(const void H5_ATTR_UNUSED *params)
+test_configure(void H5_ATTR_UNUSED *params)
 {
     /* Output message about test being performed */
     MESSAGE(5, ("Testing configure definitions\n"));
diff --git a/test/tcoords.c b/test/tcoords.c
index 52561317253..d41081404ae 100644
--- a/test/tcoords.c
+++ b/test/tcoords.c
@@ -678,7 +678,7 @@ test_multiple_ends(hid_t file, bool is_chunked)
 **
 ****************************************************************/
 void
-test_coords(const void H5_ATTR_UNUSED *params)
+test_coords(void H5_ATTR_UNUSED *params)
 {
     hid_t  fid;
     bool   is_chunk[2] = {true, false};
diff --git a/test/testframe.c b/test/testframe.c
index b960781d153..9eb76e2f282 100644
--- a/test/testframe.c
+++ b/test/testframe.c
@@ -24,7 +24,7 @@
 typedef struct TestStruct {
     char Name[MAXTESTNAME];
     char Description[MAXTESTDESC];
-    void (*TestFunc)(const void *);
+    void (*TestFunc)(void *);
     void (*TestSetupFunc)(void *);
     void (*TestCleanupFunc)(void *);
     void *TestParameters;
@@ -60,7 +60,7 @@ int TestVerbosity_g          = VERBO_DEF; /* Default Verbosity is Low */
  * Add a new test to the list of tests to be executed
  */
 herr_t
-AddTest(const char *TestName, void (*TestFunc)(const void *), void (*TestSetupFunc)(void *),
+AddTest(const char *TestName, void (*TestFunc)(void *), void (*TestSetupFunc)(void *),
         void (*TestCleanupFunc)(void *), const void *TestData, size_t TestDataSize, const char *TestDescr)
 {
     void *new_test_data = NULL;
diff --git a/test/testframe.h b/test/testframe.h
index f90e05fb717..9047d20b6ee 100644
--- a/test/testframe.h
+++ b/test/testframe.h
@@ -340,7 +340,7 @@ H5TEST_DLL void TestInfo(FILE *stream);
  * \see PerformTests()
  *
  */
-H5TEST_DLL herr_t AddTest(const char *TestName, void (*TestFunc)(const void *), void (*TestSetupFunc)(void *),
+H5TEST_DLL herr_t AddTest(const char *TestName, void (*TestFunc)(void *), void (*TestSetupFunc)(void *),
                           void (*TestCleanupFunc)(void *), const void *TestData, size_t TestDataSize,
                           const char *TestDescr);
 
diff --git a/test/testhdf5.h b/test/testhdf5.h
index 16ec9b4b055..9af0517241c 100644
--- a/test/testhdf5.h
+++ b/test/testhdf5.h
@@ -179,32 +179,32 @@ extern "C" {
 #endif
 
 /* Prototypes for the test routines */
-void test_metadata(const void *params);
-void test_checksum(const void *params);
-void test_refstr(const void *params);
-void test_file(const void *params);
-void test_h5o(const void *params);
-void test_h5t(const void *params);
-void test_h5s(const void *params);
-void test_coords(const void *params);
-void test_h5d(const void *params);
-void test_attr(const void *params);
-void test_select(const void *params);
-void test_time(const void *params);
-void test_reference(const void *params);
-void test_reference_deprec(const void *params);
-void test_vltypes(const void *params);
-void test_vlstrings(const void *params);
-void test_iterate(const void *params);
-void test_array(const void *params);
-void test_genprop(const void *params);
-void test_configure(const void *params);
-void test_h5_system(const void *params);
-void test_misc(const void *params);
-void test_ids(const void *params);
-void test_skiplist(const void *params);
-void test_sohm(const void *params);
-void test_unicode(const void *params);
+void test_metadata(void *params);
+void test_checksum(void *params);
+void test_refstr(void *params);
+void test_file(void *params);
+void test_h5o(void *params);
+void test_h5t(void *params);
+void test_h5s(void *params);
+void test_coords(void *params);
+void test_h5d(void *params);
+void test_attr(void *params);
+void test_select(void *params);
+void test_time(void *params);
+void test_reference(void *params);
+void test_reference_deprec(void *params);
+void test_vltypes(void *params);
+void test_vlstrings(void *params);
+void test_iterate(void *params);
+void test_array(void *params);
+void test_genprop(void *params);
+void test_configure(void *params);
+void test_h5_system(void *params);
+void test_misc(void *params);
+void test_ids(void *params);
+void test_skiplist(void *params);
+void test_sohm(void *params);
+void test_unicode(void *params);
 
 /* Prototypes for the cleanup routines */
 void cleanup_metadata(void *params);
diff --git a/test/tfile.c b/test/tfile.c
index 2d5e71b5135..493e5de2f6d 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -8346,7 +8346,7 @@ test_deprec(const char *driver_name)
 **
 ****************************************************************/
 void
-test_file(const void H5_ATTR_UNUSED *params)
+test_file(void H5_ATTR_UNUSED *params)
 {
     const char *driver_name;               /* File Driver value from environment */
     hid_t       fapl_id = H5I_INVALID_HID; /* VFD-dependent fapl ID */
diff --git a/test/tgenprop.c b/test/tgenprop.c
index 4fa5f84e7af..22495f54382 100644
--- a/test/tgenprop.c
+++ b/test/tgenprop.c
@@ -2219,7 +2219,7 @@ test_genprop_deprec_list(void)
 **
 ****************************************************************/
 void
-test_genprop(const void H5_ATTR_UNUSED *params)
+test_genprop(void H5_ATTR_UNUSED *params)
 {
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Generic Properties\n"));
diff --git a/test/th5_system.c b/test/th5_system.c
index 9980e6a788f..bbbe0e47753 100644
--- a/test/th5_system.c
+++ b/test/th5_system.c
@@ -551,7 +551,7 @@ test_h5_strndup(void)
 }
 
 void
-test_h5_system(const void H5_ATTR_UNUSED *params)
+test_h5_system(void H5_ATTR_UNUSED *params)
 {
     MESSAGE(5, ("Testing H5system routines\n"));
 
diff --git a/test/th5o.c b/test/th5o.c
index e605d4e6f84..beda55c0d59 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -2045,7 +2045,7 @@ test_h5o_visit2(void)
 **
 ****************************************************************/
 void
-test_h5o(const void H5_ATTR_UNUSED *params)
+test_h5o(void H5_ATTR_UNUSED *params)
 {
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Objects\n"));
diff --git a/test/th5s.c b/test/th5s.c
index 4835e1f0e03..061af06a53f 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -3480,7 +3480,7 @@ test_versionbounds(void)
 **
 ****************************************************************/
 void
-test_h5s(const void H5_ATTR_UNUSED *params)
+test_h5s(void H5_ATTR_UNUSED *params)
 {
     H5F_libver_t low, high; /* Low and high bounds */
 
diff --git a/test/tid.c b/test/tid.c
index f287f4e00d2..f0edd810d3e 100644
--- a/test/tid.c
+++ b/test/tid.c
@@ -1714,7 +1714,7 @@ test_appropriate_ids(void)
 }
 
 void
-test_ids(const void H5_ATTR_UNUSED *params)
+test_ids(void H5_ATTR_UNUSED *params)
 {
     /* Set the random # seed */
     srand((unsigned)time(NULL));
diff --git a/test/titerate.c b/test/titerate.c
index 0450500bd38..7efae347247 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -1243,7 +1243,7 @@ test_links_deprec(hid_t fapl)
 **
 ****************************************************************/
 void
-test_iterate(const void H5_ATTR_UNUSED *params)
+test_iterate(void H5_ATTR_UNUSED *params)
 {
     hid_t    fapl, fapl2; /* File access property lists */
     unsigned new_format;  /* Whether to use the new format or not */
diff --git a/test/tmeta.c b/test/tmeta.c
index 5a48836bf9d..f9c7fa79088 100644
--- a/test/tmeta.c
+++ b/test/tmeta.c
@@ -53,7 +53,7 @@ static uint8_t encode_buffer[sizeof(compar_buffer)];
 **
 ****************************************************************/
 void
-test_metadata(const void H5_ATTR_UNUSED *params)
+test_metadata(void H5_ATTR_UNUSED *params)
 {
     int16_t  ei16 = TEST_INT16_VALUE; /* variables to hold the values to encode */
     uint16_t eu16 = TEST_UINT16_VALUE;
diff --git a/test/tmisc.c b/test/tmisc.c
index 6a0674d41bc..c614696dffc 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -7125,7 +7125,7 @@ test_misc41(void)
 **
 ****************************************************************/
 void
-test_misc(const void H5_ATTR_UNUSED *params)
+test_misc(void H5_ATTR_UNUSED *params)
 {
     bool default_driver = h5_using_default_driver(NULL);
 
diff --git a/test/trefer.c b/test/trefer.c
index bc443b7b4be..a7cbcaa183f 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -3834,7 +3834,7 @@ test_reference_perf(void)
 **
 ****************************************************************/
 void
-test_reference(const void H5_ATTR_UNUSED *params)
+test_reference(void H5_ATTR_UNUSED *params)
 {
     H5F_libver_t low, high;   /* Low and high bounds */
     const char  *driver_name; /* File Driver value from environment */
diff --git a/test/trefer_deprec.c b/test/trefer_deprec.c
index d06f5e39ef1..2407b87b68e 100644
--- a/test/trefer_deprec.c
+++ b/test/trefer_deprec.c
@@ -1917,7 +1917,7 @@ test_reference_compat(void)
 **
 ****************************************************************/
 void
-test_reference_deprec(const void H5_ATTR_UNUSED *params)
+test_reference_deprec(void H5_ATTR_UNUSED *params)
 {
     H5F_libver_t low, high; /* Low and high bounds */
     bool         vol_is_native;
diff --git a/test/trefstr.c b/test/trefstr.c
index 93c0a14b3f6..849c4fcf4f0 100644
--- a/test/trefstr.c
+++ b/test/trefstr.c
@@ -512,7 +512,7 @@ test_refstr_finalize(void)
 **
 ****************************************************************/
 void
-test_refstr(const void H5_ATTR_UNUSED *params)
+test_refstr(void H5_ATTR_UNUSED *params)
 {
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Reference Counted Strings\n"));
diff --git a/test/tselect.c b/test/tselect.c
index 21c3648d587..03477d16919 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -16060,7 +16060,7 @@ test_h5s_set_extent_none(void)
 **
 ****************************************************************/
 void
-test_select(const void H5_ATTR_UNUSED *params)
+test_select(void H5_ATTR_UNUSED *params)
 {
     hid_t       plist_id;                     /* Property list for reading random hyperslabs */
     hid_t       fapl;                         /* Property list accessing the file */
diff --git a/test/tskiplist.c b/test/tskiplist.c
index d9a765aafb1..ba3a2d971b8 100644
--- a/test/tskiplist.c
+++ b/test/tskiplist.c
@@ -1555,7 +1555,7 @@ test_skiplist_term(void)
 **
 ****************************************************************/
 void
-test_skiplist(const void H5_ATTR_UNUSED *params)
+test_skiplist(void H5_ATTR_UNUSED *params)
 {
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Skip Lists\n"));
diff --git a/test/tsohm.c b/test/tsohm.c
index 71d3578bcbb..4ce224bfc00 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -3708,7 +3708,7 @@ test_sohm_external_dtype(void)
 **
 ****************************************************************/
 void
-test_sohm(const void H5_ATTR_UNUSED *params)
+test_sohm(void H5_ATTR_UNUSED *params)
 {
     const char *driver_name;
     bool        vol_is_native;
diff --git a/test/ttime.c b/test/ttime.c
index 1218e262694..43e4e08c946 100644
--- a/test/ttime.c
+++ b/test/ttime.c
@@ -198,7 +198,7 @@ test_time_io(void)
 **
 ****************************************************************/
 void
-test_time(const void H5_ATTR_UNUSED *params)
+test_time(void H5_ATTR_UNUSED *params)
 {
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Time Datatypes\n"));
diff --git a/test/ttsafe.c b/test/ttsafe.c
index 2a172ee8a30..fde42220eb5 100644
--- a/test/ttsafe.c
+++ b/test/ttsafe.c
@@ -51,7 +51,7 @@ num_digits(int num)
 
 /* Test the H5is_library_threadsafe() function */
 void
-tts_is_threadsafe(const void H5_ATTR_UNUSED *params)
+tts_is_threadsafe(void H5_ATTR_UNUSED *params)
 {
     bool is_ts;
     bool should_be;
diff --git a/test/ttsafe.h b/test/ttsafe.h
index 3d81c5fc063..6739f89bfcf 100644
--- a/test/ttsafe.h
+++ b/test/ttsafe.h
@@ -34,30 +34,30 @@
 extern char *gen_name(int);
 
 /* Prototypes for the test routines */
-void tts_is_threadsafe(const void *);
+void tts_is_threadsafe(void *);
 #ifdef H5_HAVE_THREADS
-void tts_thread_pool(const void *);
+void tts_thread_pool(void *);
 #ifndef H5_HAVE_STDATOMIC_H
 /* C11 atomics only tested when emulated */
-void tts_atomics(const void *);
+void tts_atomics(void *);
 #endif /* H5_HAVE_STDATOMIC_H */
-void tts_rwlock(const void *);
-void tts_semaphore(const void *);
+void tts_rwlock(void *);
+void tts_semaphore(void *);
 #ifndef H5_HAVE_WIN_THREADS
-void tts_rec_rwlock_smoke_check_1(const void *);
-void tts_rec_rwlock_smoke_check_2(const void *);
-void tts_rec_rwlock_smoke_check_3(const void *);
-void tts_rec_rwlock_smoke_check_4(const void *);
+void tts_rec_rwlock_smoke_check_1(void *);
+void tts_rec_rwlock_smoke_check_2(void *);
+void tts_rec_rwlock_smoke_check_3(void *);
+void tts_rec_rwlock_smoke_check_4(void *);
 #endif /* !H5_HAVE_WIN_THREADS */
 #ifdef H5_HAVE_THREADSAFE_API
-void tts_dcreate(const void *);
-void tts_error(const void *);
-void tts_cancel(const void *);
-void tts_acreate(const void *);
-void tts_attr_vlen(const void *);
-void tts_thread_id(const void *);
-void tts_develop_api(const void *);
-void tts_error_stacks(const void *);
+void tts_dcreate(void *);
+void tts_error(void *);
+void tts_cancel(void *);
+void tts_acreate(void *);
+void tts_attr_vlen(void *);
+void tts_thread_id(void *);
+void tts_develop_api(void *);
+void tts_error_stacks(void *);
 
 /* Prototypes for the cleanup routines */
 void cleanup_dcreate(void *);
diff --git a/test/ttsafe_acreate.c b/test/ttsafe_acreate.c
index 4f667f12f7f..51074d5419d 100644
--- a/test/ttsafe_acreate.c
+++ b/test/ttsafe_acreate.c
@@ -45,7 +45,7 @@ typedef struct acreate_data_struct {
 } ttsafe_name_data_t;
 
 void
-tts_acreate(const void H5_ATTR_UNUSED *params)
+tts_acreate(void H5_ATTR_UNUSED *params)
 {
     /* Thread declarations */
     H5TS_thread_t threads[NUM_THREADS];
diff --git a/test/ttsafe_atomic.c b/test/ttsafe_atomic.c
index 49879e4c959..00c5fdf4f34 100644
--- a/test/ttsafe_atomic.c
+++ b/test/ttsafe_atomic.c
@@ -64,7 +64,7 @@ decr_task(void *_counter)
  **********************************************************************
  */
 void
-tts_atomics(const void H5_ATTR_UNUSED *params)
+tts_atomics(void H5_ATTR_UNUSED *params)
 {
     H5TS_pool_t *pool = NULL;
     herr_t       result;
diff --git a/test/ttsafe_attr_vlen.c b/test/ttsafe_attr_vlen.c
index d537c49fecb..0f1b3aefeb6 100644
--- a/test/ttsafe_attr_vlen.c
+++ b/test/ttsafe_attr_vlen.c
@@ -51,7 +51,7 @@
 H5TS_THREAD_RETURN_TYPE tts_attr_vlen_thread(void *);
 
 void
-tts_attr_vlen(const void H5_ATTR_UNUSED *params)
+tts_attr_vlen(void H5_ATTR_UNUSED *params)
 {
     H5TS_thread_t threads[NUM_THREADS] = {0};             /* Thread declaration */
     hid_t         fid                  = H5I_INVALID_HID; /* File ID */
diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c
index 54e671ab8c0..680080c8984 100644
--- a/test/ttsafe_cancel.c
+++ b/test/ttsafe_cancel.c
@@ -54,7 +54,7 @@ pthread_t             childthread;
 static H5TS_barrier_t barrier;
 
 void
-tts_cancel(const void H5_ATTR_UNUSED *params)
+tts_cancel(void H5_ATTR_UNUSED *params)
 {
     hid_t dataset;
     int   buffer;
diff --git a/test/ttsafe_dcreate.c b/test/ttsafe_dcreate.c
index ebea5be03d5..e2b693bc96d 100644
--- a/test/ttsafe_dcreate.c
+++ b/test/ttsafe_dcreate.c
@@ -54,7 +54,7 @@ thr_info thread_out[NUM_THREAD];
  **********************************************************************
  */
 void
-tts_dcreate(const void H5_ATTR_UNUSED *params)
+tts_dcreate(void H5_ATTR_UNUSED *params)
 {
     /* thread definitions */
     H5TS_thread_t threads[NUM_THREAD];
diff --git a/test/ttsafe_develop.c b/test/ttsafe_develop.c
index 3f9c023b2ff..aec6f291922 100644
--- a/test/ttsafe_develop.c
+++ b/test/ttsafe_develop.c
@@ -101,7 +101,7 @@ tts_develop_api_thr_2(void *_udata)
  **********************************************************************
  */
 void
-tts_develop_api(const void H5_ATTR_UNUSED *params)
+tts_develop_api(void H5_ATTR_UNUSED *params)
 {
     hid_t                   def_fapl = H5I_INVALID_HID;
     hid_t                   vol_id   = H5I_INVALID_HID;
diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c
index 87320d63461..fc0920fde6b 100644
--- a/test/ttsafe_error.c
+++ b/test/ttsafe_error.c
@@ -59,7 +59,7 @@ static herr_t                  walk_error_callback(unsigned, const H5E_error2_t
 static H5TS_THREAD_RETURN_TYPE tts_error_thread(void *);
 
 void
-tts_error(const void H5_ATTR_UNUSED *params)
+tts_error(void H5_ATTR_UNUSED *params)
 {
     hid_t         def_fapl = H5I_INVALID_HID;
     hid_t         vol_id   = H5I_INVALID_HID;
diff --git a/test/ttsafe_error_stacks.c b/test/ttsafe_error_stacks.c
index 96dae962ff7..a062628ef0b 100644
--- a/test/ttsafe_error_stacks.c
+++ b/test/ttsafe_error_stacks.c
@@ -77,7 +77,7 @@ generate_user_error(void H5_ATTR_UNUSED *arg)
 **********************************************************************
 */
 void
-tts_error_stacks(const void H5_ATTR_UNUSED *params)
+tts_error_stacks(void H5_ATTR_UNUSED *params)
 {
     H5TS_thread_t threads[2];
     herr_t        status = FAIL;
diff --git a/test/ttsafe_rec_rwlock.c b/test/ttsafe_rec_rwlock.c
index 37bf094fb80..ba9c8aeb0ce 100644
--- a/test/ttsafe_rec_rwlock.c
+++ b/test/ttsafe_rec_rwlock.c
@@ -263,7 +263,7 @@ tts_rec_rwlock_smoke_check_test_thread(void *_udata)
  **********************************************************************
  */
 void
-tts_rec_rwlock_smoke_check_1(const void H5_ATTR_UNUSED *params)
+tts_rec_rwlock_smoke_check_1(void H5_ATTR_UNUSED *params)
 {
     herr_t result;
 #if H5TS_ENABLE_REC_RWLOCK_STATS
@@ -546,7 +546,7 @@ tts_rec_rwlock_smoke_check_1(const void H5_ATTR_UNUSED *params)
  **********************************************************************
  */
 void
-tts_rec_rwlock_smoke_check_2(const void H5_ATTR_UNUSED *params)
+tts_rec_rwlock_smoke_check_2(void H5_ATTR_UNUSED *params)
 {
     herr_t                   result;
     int                      express_test;
@@ -752,7 +752,7 @@ tts_rec_rwlock_smoke_check_2(const void H5_ATTR_UNUSED *params)
  **********************************************************************
  */
 void
-tts_rec_rwlock_smoke_check_3(const void H5_ATTR_UNUSED *params)
+tts_rec_rwlock_smoke_check_3(void H5_ATTR_UNUSED *params)
 {
     herr_t                   result;
     int                      i;
@@ -958,7 +958,7 @@ tts_rec_rwlock_smoke_check_3(const void H5_ATTR_UNUSED *params)
  **********************************************************************
  */
 void
-tts_rec_rwlock_smoke_check_4(const void H5_ATTR_UNUSED *params)
+tts_rec_rwlock_smoke_check_4(void H5_ATTR_UNUSED *params)
 {
     herr_t                   result;
     int                      i;
diff --git a/test/ttsafe_rwlock.c b/test/ttsafe_rwlock.c
index b8f6b24b546..de2ab79bad0 100644
--- a/test/ttsafe_rwlock.c
+++ b/test/ttsafe_rwlock.c
@@ -182,7 +182,7 @@ verify_counting(void *_counter)
  **********************************************************************
  */
 void
-tts_rwlock(const void H5_ATTR_UNUSED *params)
+tts_rwlock(void H5_ATTR_UNUSED *params)
 {
     H5TS_thread_t    threads[NUM_THREADS];
     H5TS_pool_t     *pool = NULL;
diff --git a/test/ttsafe_semaphore.c b/test/ttsafe_semaphore.c
index 26802ad96a2..6da69b4a387 100644
--- a/test/ttsafe_semaphore.c
+++ b/test/ttsafe_semaphore.c
@@ -229,7 +229,7 @@ tts_semaphore_clientserver(void)
  **********************************************************************
  */
 void
-tts_semaphore(const void H5_ATTR_UNUSED *params)
+tts_semaphore(void H5_ATTR_UNUSED *params)
 {
     H5TS_semaphore_t sem;
     herr_t           result;
diff --git a/test/ttsafe_thread_id.c b/test/ttsafe_thread_id.c
index f75c6cde8a7..9509a391f40 100644
--- a/test/ttsafe_thread_id.c
+++ b/test/ttsafe_thread_id.c
@@ -93,7 +93,7 @@ thread_main(void H5_ATTR_UNUSED *arg)
  **********************************************************************
  */
 void
-tts_thread_id(const void H5_ATTR_UNUSED *params)
+tts_thread_id(void H5_ATTR_UNUSED *params)
 {
     H5TS_thread_t threads[NTHREADS];
     uint64_t      tid;
diff --git a/test/ttsafe_thread_pool.c b/test/ttsafe_thread_pool.c
index 2229fa9b40e..7a6f0abe16c 100644
--- a/test/ttsafe_thread_pool.c
+++ b/test/ttsafe_thread_pool.c
@@ -92,7 +92,7 @@ decr_task(void *_counter)
  **********************************************************************
  */
 void
-tts_thread_pool(const void H5_ATTR_UNUSED *params)
+tts_thread_pool(void H5_ATTR_UNUSED *params)
 {
     H5TS_pool_t *pool = NULL;
     herr_t       result;
diff --git a/test/tunicode.c b/test/tunicode.c
index 78a3381dcfc..2349f99ae9c 100644
--- a/test/tunicode.c
+++ b/test/tunicode.c
@@ -802,7 +802,7 @@ dump_string(const char *string)
  * that string.
  */
 void
-test_unicode(const void H5_ATTR_UNUSED *params)
+test_unicode(void H5_ATTR_UNUSED *params)
 {
     char         test_string[MAX_STRING_LENGTH];
     unsigned int cur_pos = 0;   /* Current position in test_string */
diff --git a/test/tvlstr.c b/test/tvlstr.c
index e6f33e7f94c..68e29ee731d 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -968,7 +968,7 @@ test_write_same_element(void)
 **
 ****************************************************************/
 void
-test_vlstrings(const void H5_ATTR_UNUSED *params)
+test_vlstrings(void H5_ATTR_UNUSED *params)
 {
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Variable-Length Strings\n"));
diff --git a/test/tvltypes.c b/test/tvltypes.c
index fd367ebde66..0f559e77f1a 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -3233,7 +3233,7 @@ test_vltypes_fill_value(void)
 **
 ****************************************************************/
 void
-test_vltypes(const void H5_ATTR_UNUSED *params)
+test_vltypes(void H5_ATTR_UNUSED *params)
 {
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Variable-Length Datatypes\n"));
diff --git a/testpar/API/H5_api_async_test_parallel.c b/testpar/API/H5_api_async_test_parallel.c
index 450b69f1464..0a390e076d4 100644
--- a/testpar/API/H5_api_async_test_parallel.c
+++ b/testpar/API/H5_api_async_test_parallel.c
@@ -12,10 +12,10 @@
 
 #include "H5_api_async_test_parallel.h"
 
-static void print_async_test_header(const void *params);
+static void print_async_test_header(void *params);
 
 static void
-print_async_test_header(const void *params)
+print_async_test_header(void *params)
 {
     bool coll_md_read = true;
 
@@ -50,19 +50,19 @@ print_async_test_header(const void *params)
 
 #ifdef H5_API_TEST_HAVE_ASYNC
 
-static void test_async_one_dataset_io(const void *params);
-static void test_async_multi_dataset_io(const void *params);
-static void test_async_multi_file_dataset_io(const void *params);
-static void test_async_multi_file_grp_dset_io(const void *params);
-static void test_async_set_extent(const void *params);
-static void test_async_attribute_exists(const void *params);
-static void test_async_attribute_io(const void *params);
-static void test_async_attribute_io_tconv(const void *params);
-static void test_async_attribute_io_compound(const void *params);
-static void test_async_group(const void *params);
-static void test_async_link(const void *params);
-static void test_async_ocopy_orefresh(const void *params);
-static void test_async_file_reopen(const void *params);
+static void test_async_one_dataset_io(void *params);
+static void test_async_multi_dataset_io(void *params);
+static void test_async_multi_file_dataset_io(void *params);
+static void test_async_multi_file_grp_dset_io(void *params);
+static void test_async_set_extent(void *params);
+static void test_async_attribute_exists(void *params);
+static void test_async_attribute_io(void *params);
+static void test_async_attribute_io_tconv(void *params);
+static void test_async_attribute_io_compound(void *params);
+static void test_async_group(void *params);
+static void test_async_link(void *params);
+static void test_async_ocopy_orefresh(void *params);
+static void test_async_file_reopen(void *params);
 
 /* Highest "printf" file created (starting at 0) */
 int max_printf_file = -1;
@@ -73,7 +73,7 @@ int max_printf_file = -1;
  */
 #define ONE_DATASET_IO_TEST_SPACE_RANK 2
 static void
-test_async_one_dataset_io(const void *params)
+test_async_one_dataset_io(void *params)
 {
     hsize_t *dims = NULL;
     hsize_t  start[ONE_DATASET_IO_TEST_SPACE_RANK];
@@ -438,7 +438,7 @@ test_async_one_dataset_io(const void *params)
 #define MULTI_DATASET_IO_TEST_SPACE_RANK 2
 #define MULTI_DATASET_IO_TEST_NDSETS     5
 static void
-test_async_multi_dataset_io(const void *params)
+test_async_multi_dataset_io(void *params)
 {
     hsize_t *dims = NULL;
     hsize_t  start[MULTI_DATASET_IO_TEST_SPACE_RANK];
@@ -763,7 +763,7 @@ test_async_multi_dataset_io(const void *params)
 #define MULTI_FILE_DATASET_IO_TEST_SPACE_RANK 2
 #define MULTI_FILE_DATASET_IO_TEST_NFILES     5
 static void
-test_async_multi_file_dataset_io(const void *params)
+test_async_multi_file_dataset_io(void *params)
 {
     hsize_t *dims = NULL;
     hsize_t  start[MULTI_FILE_DATASET_IO_TEST_SPACE_RANK];
@@ -1189,7 +1189,7 @@ test_async_multi_file_dataset_io(const void *params)
 #define MULTI_FILE_GRP_DSET_IO_TEST_SPACE_RANK 2
 #define MULTI_FILE_GRP_DSET_IO_TEST_NFILES     5
 static void
-test_async_multi_file_grp_dset_io(const void *params)
+test_async_multi_file_grp_dset_io(void *params)
 {
     hsize_t *dims = NULL;
     hsize_t  start[MULTI_FILE_GRP_DSET_IO_TEST_SPACE_RANK];
@@ -1606,7 +1606,7 @@ test_async_multi_file_grp_dset_io(const void *params)
 #define SET_EXTENT_TEST_SPACE_RANK  2
 #define SET_EXTENT_TEST_NUM_EXTENDS 6
 static void
-test_async_set_extent(const void *params)
+test_async_set_extent(void *params)
 {
     hsize_t *dims    = NULL;
     hsize_t *maxdims = NULL;
@@ -1949,7 +1949,7 @@ test_async_set_extent(const void *params)
  */
 #define ATTRIBUTE_EXISTS_TEST_SPACE_RANK 2
 static void
-test_async_attribute_exists(const void *params)
+test_async_attribute_exists(void *params)
 {
     hsize_t *dims          = NULL;
     bool     op_failed     = false;
@@ -2102,7 +2102,7 @@ test_async_attribute_exists(const void *params)
  */
 #define ATTRIBUTE_IO_TEST_SPACE_RANK 2
 static void
-test_async_attribute_io(const void *params)
+test_async_attribute_io(void *params)
 {
     hsize_t *dims          = NULL;
     bool     op_failed     = false;
@@ -2311,7 +2311,7 @@ test_async_attribute_io(const void *params)
  */
 #define ATTRIBUTE_IO_TCONV_TEST_SPACE_RANK 2
 static void
-test_async_attribute_io_tconv(const void *params)
+test_async_attribute_io_tconv(void *params)
 {
     hsize_t *dims = NULL;
     bool     op_failed;
@@ -2511,7 +2511,7 @@ typedef struct tattr_cmpd_t {
 
 #define ATTRIBUTE_IO_COMPOUND_TEST_SPACE_RANK 2
 static void
-test_async_attribute_io_compound(const void *params)
+test_async_attribute_io_compound(void *params)
 {
     hsize_t      *dims = NULL;
     bool          op_failed;
@@ -2915,7 +2915,7 @@ test_async_attribute_io_compound(const void *params)
  * Tests async group interfaces in parallel
  */
 static void
-test_async_group(const void *params)
+test_async_group(void *params)
 {
     hid_t      file_id         = H5I_INVALID_HID;
     hid_t      fapl_id         = H5I_INVALID_HID;
@@ -3093,7 +3093,7 @@ test_async_group(const void *params)
  * Tests async link interfaces in parallel
  */
 static void
-test_async_link(const void *params)
+test_async_link(void *params)
 {
     hid_t  file_id         = H5I_INVALID_HID;
     hid_t  fapl_id         = H5I_INVALID_HID;
@@ -3354,7 +3354,7 @@ test_async_link(const void *params)
  */
 #define OCOPY_REFRESH_TEST_SPACE_RANK 2
 static void
-test_async_ocopy_orefresh(const void *params)
+test_async_ocopy_orefresh(void *params)
 {
     hsize_t *dims            = NULL;
     hid_t    file_id         = H5I_INVALID_HID;
@@ -3518,7 +3518,7 @@ test_async_ocopy_orefresh(const void *params)
  * Tests H5Freopen_async in parallel
  */
 static void
-test_async_file_reopen(const void *params)
+test_async_file_reopen(void *params)
 {
     hid_t  file_id          = H5I_INVALID_HID;
     hid_t  fapl_id          = H5I_INVALID_HID;
@@ -3600,7 +3600,7 @@ test_async_file_reopen(const void *params)
  * Cleanup temporary test files
  */
 static void
-test_async_file_cleanup(const void H5_ATTR_UNUSED *params)
+test_async_file_cleanup(void H5_ATTR_UNUSED *params)
 {
     char file_name[64];
     int  i;
diff --git a/testpar/API/H5_api_attribute_test_parallel.c b/testpar/API/H5_api_attribute_test_parallel.c
index c06ac918147..7bc94d0d212 100644
--- a/testpar/API/H5_api_attribute_test_parallel.c
+++ b/testpar/API/H5_api_attribute_test_parallel.c
@@ -12,10 +12,10 @@
 
 #include "H5_api_attribute_test_parallel.h"
 
-static void print_attribute_test_header(const void *params);
+static void print_attribute_test_header(void *params);
 
 static void
-print_attribute_test_header(const void H5_ATTR_UNUSED *params)
+print_attribute_test_header(void H5_ATTR_UNUSED *params)
 {
     if (MAINPROCESS) {
         printf("\n");
diff --git a/testpar/API/H5_api_dataset_test_parallel.c b/testpar/API/H5_api_dataset_test_parallel.c
index d4e208aaee9..edc57771ed1 100644
--- a/testpar/API/H5_api_dataset_test_parallel.c
+++ b/testpar/API/H5_api_dataset_test_parallel.c
@@ -16,38 +16,38 @@
  */
 #include "H5_api_dataset_test_parallel.h"
 
-static void print_dataset_test_header(const void *params);
-static void test_write_dataset_data_verification(const void *params);
-static void test_write_dataset_independent(const void *params);
-static void test_write_dataset_one_proc_0_selection(const void *params);
-static void test_write_dataset_one_proc_none_selection(const void *params);
-static void test_write_dataset_one_proc_all_selection(const void *params);
-static void test_write_dataset_hyper_file_all_mem(const void *params);
-static void test_write_dataset_all_file_hyper_mem(const void *params);
-static void test_write_dataset_point_file_all_mem(const void *params);
-static void test_write_dataset_all_file_point_mem(const void *params);
-static void test_write_dataset_hyper_file_point_mem(const void *params);
-static void test_write_dataset_point_file_hyper_mem(const void *params);
-static void test_read_dataset_one_proc_0_selection(const void *params);
-static void test_read_dataset_one_proc_none_selection(const void *params);
-static void test_read_dataset_one_proc_all_selection(const void *params);
-static void test_read_dataset_hyper_file_all_mem(const void *params);
-static void test_read_dataset_all_file_hyper_mem(const void *params);
-static void test_read_dataset_point_file_all_mem(const void *params);
-static void test_read_dataset_all_file_point_mem(const void *params);
-static void test_read_dataset_hyper_file_point_mem(const void *params);
-static void test_read_dataset_point_file_hyper_mem(const void *params);
+static void print_dataset_test_header(void *params);
+static void test_write_dataset_data_verification(void *params);
+static void test_write_dataset_independent(void *params);
+static void test_write_dataset_one_proc_0_selection(void *params);
+static void test_write_dataset_one_proc_none_selection(void *params);
+static void test_write_dataset_one_proc_all_selection(void *params);
+static void test_write_dataset_hyper_file_all_mem(void *params);
+static void test_write_dataset_all_file_hyper_mem(void *params);
+static void test_write_dataset_point_file_all_mem(void *params);
+static void test_write_dataset_all_file_point_mem(void *params);
+static void test_write_dataset_hyper_file_point_mem(void *params);
+static void test_write_dataset_point_file_hyper_mem(void *params);
+static void test_read_dataset_one_proc_0_selection(void *params);
+static void test_read_dataset_one_proc_none_selection(void *params);
+static void test_read_dataset_one_proc_all_selection(void *params);
+static void test_read_dataset_hyper_file_all_mem(void *params);
+static void test_read_dataset_all_file_hyper_mem(void *params);
+static void test_read_dataset_point_file_all_mem(void *params);
+static void test_read_dataset_all_file_point_mem(void *params);
+static void test_read_dataset_hyper_file_point_mem(void *params);
+static void test_read_dataset_point_file_hyper_mem(void *params);
 
 /*
  * Chunking tests
  */
-static void test_write_multi_chunk_dataset_same_shape_read(const void *params);
-static void test_write_multi_chunk_dataset_diff_shape_read(const void *params);
-static void test_overwrite_multi_chunk_dataset_same_shape_read(const void *params);
-static void test_overwrite_multi_chunk_dataset_diff_shape_read(const void *params);
+static void test_write_multi_chunk_dataset_same_shape_read(void *params);
+static void test_write_multi_chunk_dataset_diff_shape_read(void *params);
+static void test_overwrite_multi_chunk_dataset_same_shape_read(void *params);
+static void test_overwrite_multi_chunk_dataset_diff_shape_read(void *params);
 
 static void
-print_dataset_test_header(const void H5_ATTR_UNUSED *params)
+print_dataset_test_header(void H5_ATTR_UNUSED *params)
 {
     if (MAINPROCESS) {
         printf("\n");
@@ -73,7 +73,7 @@ print_dataset_test_header(const void H5_ATTR_UNUSED *params)
 #define DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME2 "dataset_write_data_verification_hyperslab"
 #define DATASET_WRITE_DATA_VERIFY_TEST_DSET_NAME3 "dataset_write_data_verification_points"
 static void
-test_write_dataset_data_verification(const void H5_ATTR_UNUSED *params)
+test_write_dataset_data_verification(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims = NULL;
@@ -891,7 +891,7 @@ test_write_dataset_data_verification(const void H5_ATTR_UNUSED *params)
 #define DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME1 "dset1"
 #define DATASET_INDEPENDENT_WRITE_TEST_DSET_NAME2 "dset2"
 static void
-test_write_dataset_independent(const void H5_ATTR_UNUSED *params)
+test_write_dataset_independent(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims = NULL;
@@ -1230,7 +1230,7 @@ test_write_dataset_independent(const void H5_ATTR_UNUSED *params)
 #define DATASET_WRITE_ONE_PROC_0_SEL_TEST_GROUP_NAME "one_rank_0_sel_write_test"
 #define DATASET_WRITE_ONE_PROC_0_SEL_TEST_DSET_NAME  "one_rank_0_sel_dset"
 static void
-test_write_dataset_one_proc_0_selection(const void H5_ATTR_UNUSED *params)
+test_write_dataset_one_proc_0_selection(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims = NULL;
@@ -1527,7 +1527,7 @@ test_write_dataset_one_proc_0_selection(const void H5_ATTR_UNUSED *params)
 #define DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_GROUP_NAME "one_rank_none_sel_write_test"
 #define DATASET_WRITE_ONE_PROC_NONE_SEL_TEST_DSET_NAME  "one_rank_none_sel_dset"
 static void
-test_write_dataset_one_proc_none_selection(const void H5_ATTR_UNUSED *params)
+test_write_dataset_one_proc_none_selection(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims = NULL;
@@ -1841,7 +1841,7 @@ test_write_dataset_one_proc_none_selection(const void H5_ATTR_UNUSED *params)
 #define DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_GROUP_NAME "one_rank_all_sel_write_test"
 #define DATASET_WRITE_ONE_PROC_ALL_SEL_TEST_DSET_NAME  "one_rank_all_sel_dset"
 static void
-test_write_dataset_one_proc_all_selection(const void H5_ATTR_UNUSED *params)
+test_write_dataset_one_proc_all_selection(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims = NULL;
@@ -2133,7 +2133,7 @@ test_write_dataset_one_proc_all_selection(const void H5_ATTR_UNUSED *params)
 #define DATASET_WRITE_HYPER_FILE_ALL_MEM_TEST_DSET_NAME  "hyper_sel_file_all_sel_mem_dset"
 #endif
 static void
-test_write_dataset_hyper_file_all_mem(const void H5_ATTR_UNUSED *params)
+test_write_dataset_hyper_file_all_mem(void H5_ATTR_UNUSED *params)
 {
 #ifdef BROKEN
     hssize_t space_npoints;
@@ -2408,7 +2408,7 @@ test_write_dataset_hyper_file_all_mem(const void H5_ATTR_UNUSED *params)
 #define DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME "all_sel_file_hyper_sel_mem_write_test"
 #define DATASET_WRITE_ALL_FILE_HYPER_MEM_TEST_DSET_NAME  "all_sel_file_hyper_sel_mem_dset"
 static void
-test_write_dataset_all_file_hyper_mem(const void H5_ATTR_UNUSED *params)
+test_write_dataset_all_file_hyper_mem(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims = NULL;
@@ -2695,7 +2695,7 @@ test_write_dataset_all_file_hyper_mem(const void H5_ATTR_UNUSED *params)
  * in the memory dataspace.
  */
 static void
-test_write_dataset_point_file_all_mem(const void H5_ATTR_UNUSED *params)
+test_write_dataset_point_file_all_mem(void H5_ATTR_UNUSED *params)
 {
     TESTING("write to dataset with point sel. for file space; all sel. for memory");
 
@@ -2715,7 +2715,7 @@ test_write_dataset_point_file_all_mem(const void H5_ATTR_UNUSED *params)
 #define DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_GROUP_NAME "all_sel_file_point_sel_mem_write_test"
 #define DATASET_WRITE_ALL_FILE_POINT_MEM_TEST_DSET_NAME  "all_sel_file_point_sel_mem_dset"
 static void
-test_write_dataset_all_file_point_mem(const void H5_ATTR_UNUSED *params)
+test_write_dataset_all_file_point_mem(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *points = NULL;
@@ -3026,7 +3026,7 @@ test_write_dataset_all_file_point_mem(const void H5_ATTR_UNUSED *params)
 #define DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME "hyper_sel_file_point_sel_mem_write_test"
 #define DATASET_WRITE_HYPER_FILE_POINT_MEM_TEST_DSET_NAME  "hyper_sel_file_point_sel_mem_dset"
 static void
-test_write_dataset_hyper_file_point_mem(const void H5_ATTR_UNUSED *params)
+test_write_dataset_hyper_file_point_mem(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims   = NULL;
@@ -3350,7 +3350,7 @@ test_write_dataset_hyper_file_point_mem(const void H5_ATTR_UNUSED *params)
 #define DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME "point_sel_file_hyper_sel_mem_write_test"
 #define DATASET_WRITE_POINT_FILE_HYPER_MEM_TEST_DSET_NAME  "point_sel_file_hyper_sel_mem_dset"
 static void
-test_write_dataset_point_file_hyper_mem(const void H5_ATTR_UNUSED *params)
+test_write_dataset_point_file_hyper_mem(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims   = NULL;
@@ -3667,7 +3667,7 @@ test_write_dataset_point_file_hyper_mem(const void H5_ATTR_UNUSED *params)
 #define DATASET_READ_ONE_PROC_0_SEL_TEST_GROUP_NAME "one_rank_0_sel_read_test"
 #define DATASET_READ_ONE_PROC_0_SEL_TEST_DSET_NAME  "one_rank_0_sel_dset"
 static void
-test_read_dataset_one_proc_0_selection(const void H5_ATTR_UNUSED *params)
+test_read_dataset_one_proc_0_selection(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims = NULL;
@@ -4001,7 +4001,7 @@ test_read_dataset_one_proc_0_selection(const void H5_ATTR_UNUSED *params)
 #define DATASET_READ_ONE_PROC_NONE_SEL_TEST_GROUP_NAME "one_rank_none_sel_read_test"
 #define DATASET_READ_ONE_PROC_NONE_SEL_TEST_DSET_NAME  "one_rank_none_sel_dset"
 static void
-test_read_dataset_one_proc_none_selection(const void H5_ATTR_UNUSED *params)
+test_read_dataset_one_proc_none_selection(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims = NULL;
@@ -4351,7 +4351,7 @@ test_read_dataset_one_proc_none_selection(const void H5_ATTR_UNUSED *params)
 #define DATASET_READ_ONE_PROC_ALL_SEL_TEST_GROUP_NAME "one_rank_all_sel_read_test"
 #define DATASET_READ_ONE_PROC_ALL_SEL_TEST_DSET_NAME  "one_rank_all_sel_dset"
 static void
-test_read_dataset_one_proc_all_selection(const void H5_ATTR_UNUSED *params)
+test_read_dataset_one_proc_all_selection(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims = NULL;
@@ -4683,7 +4683,7 @@ test_read_dataset_one_proc_all_selection(const void H5_ATTR_UNUSED *params)
  * selection in the memory dataspace.
  */
 static void
-test_read_dataset_hyper_file_all_mem(const void H5_ATTR_UNUSED *params)
+test_read_dataset_hyper_file_all_mem(void H5_ATTR_UNUSED *params)
 {
     TESTING("read from dataset with hyperslab sel. for file space; all sel. for memory");
 
@@ -4703,7 +4703,7 @@ test_read_dataset_hyper_file_all_mem(const void H5_ATTR_UNUSED *params)
 #define DATASET_READ_ALL_FILE_HYPER_MEM_TEST_GROUP_NAME "all_sel_file_hyper_sel_mem_read_test"
 #define DATASET_READ_ALL_FILE_HYPER_MEM_TEST_DSET_NAME  "all_sel_file_hyper_sel_mem_dset"
 static void
-test_read_dataset_all_file_hyper_mem(const void H5_ATTR_UNUSED *params)
+test_read_dataset_all_file_hyper_mem(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims = NULL;
@@ -5030,7 +5030,7 @@ test_read_dataset_all_file_hyper_mem(const void H5_ATTR_UNUSED *params)
  * in the memory dataspace.
  */
 static void
-test_read_dataset_point_file_all_mem(const void H5_ATTR_UNUSED *params)
+test_read_dataset_point_file_all_mem(void H5_ATTR_UNUSED *params)
 {
     TESTING("read from dataset with point sel. for file space; all sel. for memory");
 
@@ -5050,7 +5050,7 @@ test_read_dataset_point_file_all_mem(const void H5_ATTR_UNUSED *params)
 #define DATASET_READ_ALL_FILE_POINT_MEM_TEST_GROUP_NAME "all_sel_file_point_sel_mem_read_test"
 #define DATASET_READ_ALL_FILE_POINT_MEM_TEST_DSET_NAME  "all_sel_file_point_sel_mem_dset"
 static void
-test_read_dataset_all_file_point_mem(const void H5_ATTR_UNUSED *params)
+test_read_dataset_all_file_point_mem(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *points = NULL;
@@ -5398,7 +5398,7 @@ test_read_dataset_all_file_point_mem(const void H5_ATTR_UNUSED *params)
 #define DATASET_READ_HYPER_FILE_POINT_MEM_TEST_GROUP_NAME "hyper_sel_file_point_sel_mem_read_test"
 #define DATASET_READ_HYPER_FILE_POINT_MEM_TEST_DSET_NAME  "hyper_sel_file_point_sel_mem_dset"
 static void
-test_read_dataset_hyper_file_point_mem(const void H5_ATTR_UNUSED *params)
+test_read_dataset_hyper_file_point_mem(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims   = NULL;
@@ -5756,7 +5756,7 @@ test_read_dataset_hyper_file_point_mem(const void H5_ATTR_UNUSED *params)
 #define DATASET_READ_POINT_FILE_HYPER_MEM_TEST_GROUP_NAME "point_sel_file_hyper_sel_mem_read_test"
 #define DATASET_READ_POINT_FILE_HYPER_MEM_TEST_DSET_NAME  "point_sel_file_hyper_sel_mem_dset"
 static void
-test_read_dataset_point_file_hyper_mem(const void H5_ATTR_UNUSED *params)
+test_read_dataset_point_file_hyper_mem(void H5_ATTR_UNUSED *params)
 {
     hssize_t space_npoints;
     hsize_t *dims   = NULL;
@@ -6119,7 +6119,7 @@ test_read_dataset_point_file_hyper_mem(const void H5_ATTR_UNUSED *params)
     "multi_chunk_dataset_write_same_space_read_test"
 #define DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME "multi_chunk_dataset"
 static void
-test_write_multi_chunk_dataset_same_shape_read(const void H5_ATTR_UNUSED *params)
+test_write_multi_chunk_dataset_same_shape_read(void H5_ATTR_UNUSED *params)
 {
     hsize_t *dims       = NULL;
     hsize_t *chunk_dims = NULL;
@@ -6581,7 +6581,7 @@ test_write_multi_chunk_dataset_same_shape_read(const void H5_ATTR_UNUSED *params
     "multi_chunk_dataset_write_diff_space_read_test"
 #define DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME "multi_chunk_dataset"
 static void
-test_write_multi_chunk_dataset_diff_shape_read(const void H5_ATTR_UNUSED *params)
+test_write_multi_chunk_dataset_diff_shape_read(void H5_ATTR_UNUSED *params)
 {
     hsize_t *dims       = NULL;
     hsize_t *chunk_dims = NULL;
@@ -7046,7 +7046,7 @@ test_write_multi_chunk_dataset_diff_shape_read(const void H5_ATTR_UNUSED *params
 #define DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME "multi_chunk_dataset"
 #define DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_NITERS    10
 static void
-test_overwrite_multi_chunk_dataset_same_shape_read(const void H5_ATTR_UNUSED *params)
+test_overwrite_multi_chunk_dataset_same_shape_read(void H5_ATTR_UNUSED *params)
 {
     hsize_t *dims       = NULL;
     hsize_t *chunk_dims = NULL;
@@ -7571,7 +7571,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(const void H5_ATTR_UNUSED *pa
 #define DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME "multi_chunk_dataset"
 #define DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_NITERS    10
 static void
-test_overwrite_multi_chunk_dataset_diff_shape_read(const void H5_ATTR_UNUSED *params)
+test_overwrite_multi_chunk_dataset_diff_shape_read(void H5_ATTR_UNUSED *params)
 {
     hsize_t *dims       = NULL;
     hsize_t *chunk_dims = NULL;
diff --git a/testpar/API/H5_api_datatype_test_parallel.c b/testpar/API/H5_api_datatype_test_parallel.c
index 6b5faf2d04e..ea927b47286 100644
--- a/testpar/API/H5_api_datatype_test_parallel.c
+++ b/testpar/API/H5_api_datatype_test_parallel.c
@@ -12,10 +12,10 @@
 
 #include "H5_api_datatype_test_parallel.h"
 
-static void print_datatype_test_header(const void *params);
+static void print_datatype_test_header(void *params);
 
 static void
-print_datatype_test_header(const void H5_ATTR_UNUSED *params)
+print_datatype_test_header(void H5_ATTR_UNUSED *params)
 {
     if (MAINPROCESS) {
         printf("\n");
diff --git a/testpar/API/H5_api_file_test_parallel.c b/testpar/API/H5_api_file_test_parallel.c
index c86517c7347..74b72157cd0 100644
--- a/testpar/API/H5_api_file_test_parallel.c
+++ b/testpar/API/H5_api_file_test_parallel.c
@@ -12,13 +12,13 @@
 
 #include "H5_api_file_test_parallel.h"
 
-static void print_file_test_header(const void *params);
-static void test_create_file(const void *params);
-static void test_open_file(const void *params);
-static void test_split_comm_file_access(const void *params);
+static void print_file_test_header(void *params);
+static void test_create_file(void *params);
+static void test_open_file(void *params);
+static void test_split_comm_file_access(void *params);
 
 static void
-print_file_test_header(const void H5_ATTR_UNUSED *params)
+print_file_test_header(void H5_ATTR_UNUSED *params)
 {
     if (MAINPROCESS) {
         printf("\n");
@@ -35,7 +35,7 @@ print_file_test_header(const void H5_ATTR_UNUSED *params)
  */
 #define FILE_CREATE_TEST_FILENAME "test_file_parallel.h5"
 static void
-test_create_file(const void H5_ATTR_UNUSED *params)
+test_create_file(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id = H5I_INVALID_HID;
     hid_t fapl_id = H5I_INVALID_HID;
@@ -86,7 +86,7 @@ test_create_file(const void H5_ATTR_UNUSED *params)
  * A test to ensure that a file can be opened in parallel.
  */
 static void
-test_open_file(const void H5_ATTR_UNUSED *params)
+test_open_file(void H5_ATTR_UNUSED *params)
 {
     hid_t file_id = H5I_INVALID_HID;
     hid_t fapl_id = H5I_INVALID_HID;
@@ -195,7 +195,7 @@ test_open_file(const void H5_ATTR_UNUSED *params)
  */
 #define SPLIT_FILE_COMM_TEST_FILE_NAME "split_comm_file.h5"
 static void
-test_split_comm_file_access(const void H5_ATTR_UNUSED *params)
+test_split_comm_file_access(void H5_ATTR_UNUSED *params)
 {
     MPI_Comm comm;
     MPI_Info info    = MPI_INFO_NULL;
diff --git a/testpar/API/H5_api_group_test_parallel.c b/testpar/API/H5_api_group_test_parallel.c
index ffacc870ac0..9826a157cda 100644
--- a/testpar/API/H5_api_group_test_parallel.c
+++ b/testpar/API/H5_api_group_test_parallel.c
@@ -12,10 +12,10 @@
 
 #include "H5_api_group_test_parallel.h"
 
-static void print_group_test_header(const void *params);
+static void print_group_test_header(void *params);
 
 static void
-print_group_test_header(const void H5_ATTR_UNUSED *params)
+print_group_test_header(void H5_ATTR_UNUSED *params)
 {
     if (MAINPROCESS) {
         printf("\n");
diff --git a/testpar/API/H5_api_link_test_parallel.c b/testpar/API/H5_api_link_test_parallel.c
index 8df1d74ba24..cb751cc4128 100644
--- a/testpar/API/H5_api_link_test_parallel.c
+++ b/testpar/API/H5_api_link_test_parallel.c
@@ -12,10 +12,10 @@
 
 #include "H5_api_link_test_parallel.h"
 
-static void print_link_test_header(const void *params);
+static void print_link_test_header(void *params);
 
 static void
-print_link_test_header(const void H5_ATTR_UNUSED *params)
+print_link_test_header(void H5_ATTR_UNUSED *params)
 {
     if (MAINPROCESS) {
         printf("\n");
diff --git a/testpar/API/H5_api_misc_test_parallel.c b/testpar/API/H5_api_misc_test_parallel.c
index 37ce0374bba..6413c59e46f 100644
--- a/testpar/API/H5_api_misc_test_parallel.c
+++ b/testpar/API/H5_api_misc_test_parallel.c
@@ -12,10 +12,10 @@
 
 #include "H5_api_misc_test_parallel.h"
 
-static void print_misc_test_header(const void *params);
+static void print_misc_test_header(void *params);
 
 static void
-print_misc_test_header(const void H5_ATTR_UNUSED *params)
+print_misc_test_header(void H5_ATTR_UNUSED *params)
 {
     if (MAINPROCESS) {
         printf("\n");
diff --git a/testpar/API/H5_api_object_test_parallel.c b/testpar/API/H5_api_object_test_parallel.c
index e7b3804281a..8f1df90726a 100644
--- a/testpar/API/H5_api_object_test_parallel.c
+++ b/testpar/API/H5_api_object_test_parallel.c
@@ -12,10 +12,10 @@
 
 #include "H5_api_object_test_parallel.h"
 
-static void print_object_test_header(const void *params);
+static void print_object_test_header(void *params);
 
 static void
-print_object_test_header(const void H5_ATTR_UNUSED *params)
+print_object_test_header(void H5_ATTR_UNUSED *params)
 {
     if (MAINPROCESS) {
         printf("\n");
diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c
index 258601d1776..440d52e2bc3 100644
--- a/testpar/t_2Gio.c
+++ b/testpar/t_2Gio.c
@@ -619,7 +619,7 @@ MpioTest2G(MPI_Comm comm)
  */
 
 static void
-dataset_writeInd(const void *params)
+dataset_writeInd(void *params)
 {
     hid_t   fid;                /* HDF5 file ID */
     hid_t   acc_tpl;            /* File access templates */
@@ -764,7 +764,7 @@ dataset_writeInd(const void *params)
 
 /* Example of using the parallel HDF5 library to read a dataset */
 static void
-dataset_readInd(const void *params)
+dataset_readInd(void *params)
 {
     hid_t       fid;                 /* HDF5 file ID */
     hid_t       acc_tpl;             /* File access templates */
@@ -886,7 +886,7 @@ dataset_readInd(const void *params)
  */
 
 static void
-dataset_writeAll(const void *params)
+dataset_writeAll(void *params)
 {
     hid_t   fid;                                    /* HDF5 file ID */
     hid_t   acc_tpl;                                /* File access templates */
@@ -1472,7 +1472,7 @@ dataset_writeAll(const void *params)
  */
 
 static void
-dataset_readAll(const void *params)
+dataset_readAll(void *params)
 {
     hid_t       fid;                                              /* HDF5 file ID */
     hid_t       acc_tpl;                                          /* File access templates */
@@ -1928,7 +1928,7 @@ dataset_readAll(const void *params)
  */
 
 static void
-extend_writeInd2(const void *params)
+extend_writeInd2(void *params)
 {
     const char *filename;
     hid_t       fid;             /* HDF5 file ID */
@@ -2091,7 +2091,7 @@ extend_writeInd2(const void *params)
  */
 #ifdef H5_HAVE_FILTER_DEFLATE
 static void
-compress_readAll(const void *params)
+compress_readAll(void *params)
 {
     hid_t       fid;                           /* HDF5 file ID */
     hid_t       acc_tpl;                       /* File access templates */
@@ -2276,7 +2276,7 @@ compress_readAll(const void *params)
  */
 
 static void
-none_selection_chunk(const void *params)
+none_selection_chunk(void *params)
 {
     hid_t       fid;                /* HDF5 file ID */
     hid_t       acc_tpl;            /* File access templates */
diff --git a/testpar/t_chunk_alloc.c b/testpar/t_chunk_alloc.c
index c9896a48508..9ffcab09336 100644
--- a/testpar/t_chunk_alloc.c
+++ b/testpar/t_chunk_alloc.c
@@ -456,7 +456,7 @@ verify_data(const char *filename, int chunk_factor, write_type write_pattern, in
  * it, read to verify all data are as written.
  */
 void
-test_chunk_alloc(const void *params)
+test_chunk_alloc(void *params)
 {
     const char *filename;
     hid_t       file_id, dataset;
@@ -542,7 +542,7 @@ test_chunk_alloc(const void *params)
  *     fashion.
  */
 void
-test_chunk_alloc_incr_ser_to_par(const void *params)
+test_chunk_alloc_incr_ser_to_par(void *params)
 {
     H5D_space_status_t space_status;
     const char        *filename;
diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c
index 2569cdd9e8e..9c4c36b2c18 100644
--- a/testpar/t_coll_chunk.c
+++ b/testpar/t_coll_chunk.c
@@ -64,7 +64,7 @@ static void coll_chunktest(const char *filename, int chunk_factor, int select_fa
  */
 
 void
-coll_chunk1(const void *params)
+coll_chunk1(void *params)
 {
     const char *filename = ((const H5Ptest_param_t *)params)->name;
     int         mpi_rank;
@@ -126,7 +126,7 @@ coll_chunk1(const void *params)
  * ------------------------------------------------------------------------
  */
 void
-coll_chunk2(const void *params)
+coll_chunk2(void *params)
 {
     const char *filename = ((const H5Ptest_param_t *)params)->name;
     int         mpi_rank;
@@ -189,7 +189,7 @@ coll_chunk2(const void *params)
  */
 
 void
-coll_chunk3(const void *params)
+coll_chunk3(void *params)
 {
     const char *filename = ((const H5Ptest_param_t *)params)->name;
     int         mpi_size;
@@ -254,7 +254,7 @@ coll_chunk3(const void *params)
  */
 
 void
-coll_chunk4(const void *params)
+coll_chunk4(void *params)
 {
     const char *filename = ((const H5Ptest_param_t *)params)->name;
     int         mpi_rank;
@@ -317,7 +317,7 @@ coll_chunk4(const void *params)
  */
 
 void
-coll_chunk5(const void *params)
+coll_chunk5(void *params)
 {
     const char *filename = ((const H5Ptest_param_t *)params)->name;
     int         mpi_rank;
@@ -382,7 +382,7 @@ coll_chunk5(const void *params)
  */
 
 void
-coll_chunk6(const void *params)
+coll_chunk6(void *params)
 {
     const char *filename = ((const H5Ptest_param_t *)params)->name;
     int         mpi_rank;
@@ -445,7 +445,7 @@ coll_chunk6(const void *params)
  */
 
 void
-coll_chunk7(const void *params)
+coll_chunk7(void *params)
 {
     const char *filename = ((const H5Ptest_param_t *)params)->name;
     int         mpi_rank;
@@ -508,7 +508,7 @@ coll_chunk7(const void *params)
  */
 
 void
-coll_chunk8(const void *params)
+coll_chunk8(void *params)
 {
     const char *filename = ((const H5Ptest_param_t *)params)->name;
     int         mpi_rank;
@@ -571,7 +571,7 @@ coll_chunk8(const void *params)
  */
 
 void
-coll_chunk9(const void *params)
+coll_chunk9(void *params)
 {
     const char *filename = ((const H5Ptest_param_t *)params)->name;
     int         mpi_rank;
@@ -634,7 +634,7 @@ coll_chunk9(const void *params)
  */
 
 void
-coll_chunk10(const void *params)
+coll_chunk10(void *params)
 {
     const char *filename = ((const H5Ptest_param_t *)params)->name;
     int         mpi_rank;
diff --git a/testpar/t_coll_md.c b/testpar/t_coll_md.c
index 461c2a8febe..e1113ca9f82 100644
--- a/testpar/t_coll_md.c
+++ b/testpar/t_coll_md.c
@@ -63,7 +63,7 @@
  * arbitrary number (0 was chosen).
  */
 void
-test_partial_no_selection_coll_md_read(const void *params)
+test_partial_no_selection_coll_md_read(void *params)
 {
     const char *filename;
     hsize_t    *dataset_dims = NULL;
@@ -262,7 +262,7 @@ test_partial_no_selection_coll_md_read(const void *params)
  *
  */
 void
-test_multi_chunk_io_addrmap_issue(const void *params)
+test_multi_chunk_io_addrmap_issue(void *params)
 {
     const char *filename;
     hsize_t     start[MULTI_CHUNK_IO_ADDRMAP_ISSUE_DIMS];
@@ -390,7 +390,7 @@ test_multi_chunk_io_addrmap_issue(const void *params)
  *2096 but expected 320000 major: Internal error (too specific to document in detail) minor: MPI Error String
  */
 void
-test_link_chunk_io_sort_chunk_issue(const void *params)
+test_link_chunk_io_sort_chunk_issue(void *params)
 {
     const char *filename;
     hsize_t     dataset_dims[LINK_CHUNK_IO_SORT_CHUNK_ISSUE_DIMS];
@@ -554,7 +554,7 @@ test_link_chunk_io_sort_chunk_issue(const void *params)
  * heap data is not correctly mapped as raw data.
  */
 void
-test_collective_global_heap_write(const void *params)
+test_collective_global_heap_write(void *params)
 {
     const char *filename;
     hsize_t     attr_dims[COLL_GHEAP_WRITE_ATTR_DIMS];
@@ -634,7 +634,7 @@ test_collective_global_heap_write(const void *params)
  * collective metadata writes are NOT requested.
  */
 void
-test_coll_io_ind_md_write(const void *params)
+test_coll_io_ind_md_write(void *params)
 {
     const char *filename;
     long long  *data = NULL;
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 92884c5b270..fa9d97d490c 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -224,7 +224,7 @@ dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[]
  */
 
 void
-dataset_writeInd(const void *params)
+dataset_writeInd(void *params)
 {
     hid_t       fid;                /* HDF5 file ID */
     hid_t       acc_tpl;            /* File access templates */
@@ -376,7 +376,7 @@ dataset_writeInd(const void *params)
 
 /* Example of using the parallel HDF5 library to read a dataset */
 void
-dataset_readInd(const void *params)
+dataset_readInd(void *params)
 {
     hid_t       fid;                 /* HDF5 file ID */
     hid_t       acc_tpl;             /* File access templates */
@@ -511,7 +511,7 @@ dataset_readInd(const void *params)
  */
 
 void
-dataset_writeAll(const void *params)
+dataset_writeAll(void *params)
 {
     hid_t       fid;                                    /* HDF5 file ID */
     hid_t       acc_tpl;                                /* File access templates */
@@ -1107,7 +1107,7 @@ dataset_writeAll(const void *params)
  */
 
 void
-dataset_readAll(const void *params)
+dataset_readAll(void *params)
 {
     hid_t       fid;                                              /* HDF5 file ID */
     hid_t       acc_tpl;                                          /* File access templates */
@@ -1582,7 +1582,7 @@ dataset_readAll(const void *params)
  */
 
 void
-extend_writeInd(const void *params)
+extend_writeInd(void *params)
 {
     hid_t       fid;                /* HDF5 file ID */
     hid_t       acc_tpl;            /* File access templates */
@@ -1816,7 +1816,7 @@ extend_writeInd(const void *params)
  */
 
 void
-extend_writeInd2(const void *params)
+extend_writeInd2(void *params)
 {
     const char *filename;
     hid_t       fid;             /* HDF5 file ID */
@@ -1989,7 +1989,7 @@ extend_writeInd2(const void *params)
 
 /* Example of using the parallel HDF5 library to read an extendible dataset */
 void
-extend_readInd(const void *params)
+extend_readInd(void *params)
 {
     hid_t       fid;                 /* HDF5 file ID */
     hid_t       acc_tpl;             /* File access templates */
@@ -2179,7 +2179,7 @@ extend_readInd(const void *params)
  */
 
 void
-extend_writeAll(const void *params)
+extend_writeAll(void *params)
 {
     hid_t       fid;                /* HDF5 file ID */
     hid_t       acc_tpl;            /* File access templates */
@@ -2432,7 +2432,7 @@ extend_writeAll(const void *params)
 
 /* Example of using the parallel HDF5 library to read an extendible dataset */
 void
-extend_readAll(const void *params)
+extend_readAll(void *params)
 {
     hid_t       fid;                /* HDF5 file ID */
     hid_t       acc_tpl;            /* File access templates */
@@ -2638,7 +2638,7 @@ extend_readAll(const void *params)
  */
 #ifdef H5_HAVE_FILTER_DEFLATE
 void
-compress_readAll(const void *params)
+compress_readAll(void *params)
 {
     hid_t       fid;                           /* HDF5 file ID */
     hid_t       acc_tpl;                       /* File access templates */
@@ -2834,7 +2834,7 @@ compress_readAll(const void *params)
  */
 
 void
-none_selection_chunk(const void *params)
+none_selection_chunk(void *params)
 {
     hid_t       fid;                /* HDF5 file ID */
     hid_t       acc_tpl;            /* File access templates */
@@ -3549,7 +3549,7 @@ test_actual_io_mode(const void *params, int selection_mode)
  *
  */
 void
-actual_io_mode_tests(const void *params)
+actual_io_mode_tests(void *params)
 {
     H5D_selection_io_mode_t selection_io_mode;
     hid_t                   dxpl_id = H5I_INVALID_HID;
@@ -3999,7 +3999,7 @@ test_no_collective_cause_mode(const void *params, int selection_mode)
  *
  */
 void
-no_collective_cause_tests(const void *params)
+no_collective_cause_tests(void *params)
 {
     /*
      * Test individual cause
@@ -4036,7 +4036,7 @@ no_collective_cause_tests(const void *params)
  */
 
 void
-dataset_atomicity(const void *params)
+dataset_atomicity(void *params)
 {
     hid_t       fid;              /* HDF5 file ID */
     hid_t       acc_tpl;          /* File access templates */
@@ -4384,7 +4384,7 @@ dataset_atomicity(const void *params)
  *
  */
 void
-test_dense_attr(const void *params)
+test_dense_attr(void *params)
 {
     int         mpi_size, mpi_rank;
     hid_t       fpid, fid;
diff --git a/testpar/t_file.c b/testpar/t_file.c
index 51b244e99d8..b4d9f2c74c7 100644
--- a/testpar/t_file.c
+++ b/testpar/t_file.c
@@ -57,7 +57,7 @@ static int open_file(const char *filename, hid_t fapl, int metadata_write_strate
  * sooner or later due to barrier mixed up.
  */
 void
-test_split_comm_access(const void *params)
+test_split_comm_access(void *params)
 {
     MPI_Comm    comm;
     MPI_Info    info = MPI_INFO_NULL;
@@ -134,7 +134,7 @@ test_split_comm_access(const void *params)
 }
 
 void
-test_page_buffer_access(const void *params)
+test_page_buffer_access(void *params)
 {
     const char *filename;
     hid_t       file_id = H5I_INVALID_HID; /* File ID */
@@ -793,7 +793,7 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t
  *        multiple opens of the same file.
  */
 void
-test_file_properties(const void *params)
+test_file_properties(void *params)
 {
     hid_t       fid          = H5I_INVALID_HID; /* HDF5 file ID */
     hid_t       fapl_id      = H5I_INVALID_HID; /* File access plist */
@@ -998,7 +998,7 @@ test_file_properties(const void *params)
 } /* end test_file_properties() */
 
 void
-test_delete(const void *params)
+test_delete(void *params)
 {
     hid_t       fid           = H5I_INVALID_HID; /* HDF5 file ID */
     hid_t       fapl_id       = H5I_INVALID_HID; /* File access plist */
@@ -1078,7 +1078,7 @@ test_delete(const void *params)
  * due to an invalid library version bounds setting
  */
 void
-test_invalid_libver_bounds_file_close_assert(const void *params)
+test_invalid_libver_bounds_file_close_assert(void *params)
 {
     const char *filename = NULL;
     MPI_Comm    comm     = MPI_COMM_WORLD;
@@ -1128,7 +1128,7 @@ test_invalid_libver_bounds_file_close_assert(const void *params)
  * called by multiple ranks.
  */
 void
-test_evict_on_close_parallel_unsupp(const void *params)
+test_evict_on_close_parallel_unsupp(void *params)
 {
     const char *filename = NULL;
     MPI_Comm    comm     = MPI_COMM_WORLD;
@@ -1188,7 +1188,7 @@ test_evict_on_close_parallel_unsupp(const void *params)
  * This is a test program from the user.
  */
 void
-test_fapl_preserve_hints(const void *params)
+test_fapl_preserve_hints(void *params)
 {
     const char *filename;
     const char *key       = "hdf_info_fapl";
diff --git a/testpar/t_file_image.c b/testpar/t_file_image.c
index e8f064cae33..f60ef9c1ea6 100644
--- a/testpar/t_file_image.c
+++ b/testpar/t_file_image.c
@@ -58,7 +58,7 @@
  *                                               JRM -- 11/28/11
  */
 void
-file_image_daisy_chain_test(const void H5_ATTR_UNUSED *params)
+file_image_daisy_chain_test(void H5_ATTR_UNUSED *params)
 {
     char       file_name[1024] = "\0";
     int        mpi_size, mpi_rank;
diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c
index fc64680c732..6949ba4eb69 100644
--- a/testpar/t_filter_read.c
+++ b/testpar/t_filter_read.c
@@ -192,7 +192,7 @@ filter_read_internal(const char *filename, hid_t dcpl, hsize_t *dset_size)
  */
 
 void
-test_filter_read(const void *params)
+test_filter_read(void *params)
 {
     hid_t         dc;                                       /* HDF5 IDs */
     const hsize_t chunk_size[2] = {CHUNK_DIM1, CHUNK_DIM2}; /* Chunk dimensions */
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index d966bfb0f44..063c5ae1724 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -75,7 +75,7 @@ get_size(void)
  *
  */
 void
-zero_dim_dset(const void *params)
+zero_dim_dset(void *params)
 {
     int         mpi_size, mpi_rank;
     const char *filename;
@@ -144,7 +144,7 @@ zero_dim_dset(const void *params)
  * a slab of array to the file.
  */
 void
-multiple_dset_write(const void *params)
+multiple_dset_write(void *params)
 {
     int                    i, j, n, mpi_size, mpi_rank, size;
     hid_t                  iof, plist, dataset, memspace, filespace;
@@ -238,7 +238,7 @@ multiple_dset_write(const void *params)
 /* Example of using PHDF5 to create, write, and read compact dataset.
  */
 void
-compact_dataset(const void *params)
+compact_dataset(void *params)
 {
     int         i, j, mpi_size, mpi_rank, size, err_num = 0;
     hid_t       iof, plist, dcpl, dxpl, dataset, filespace;
@@ -378,7 +378,7 @@ compact_dataset(const void *params)
  * of Null dataspace.
  */
 void
-null_dataset(const void *params)
+null_dataset(void *params)
 {
     int         mpi_size, mpi_rank;
     hid_t       iof, plist, dxpl, dataset, attr, sid;
@@ -495,7 +495,7 @@ null_dataset(const void *params)
  * the boundary of interest.
  */
 void
-big_dataset(const void *params)
+big_dataset(void *params)
 {
     int   mpi_size, mpi_rank;        /* MPI info */
     hid_t iof,                       /* File ID */
@@ -637,7 +637,7 @@ big_dataset(const void *params)
  * default fill value of zeros to work correctly.
  */
 void
-dataset_fillvalue(const void *params)
+dataset_fillvalue(void *params)
 {
     int   mpi_size, mpi_rank;             /* MPI info */
     int   err_num;                        /* Number of errors */
@@ -891,7 +891,7 @@ dataset_fillvalue(const void *params)
 
 /* combined cngrpw and ingrpr tests because ingrpr reads file created by cngrpw. */
 void
-collective_group_write_independent_group_read(const void *params)
+collective_group_write_independent_group_read(void *params)
 {
     collective_group_write(params);
     independent_group_read(params);
@@ -901,7 +901,7 @@ collective_group_write_independent_group_read(const void *params)
  * These groups and datasets are for testing independent read later.
  */
 void
-collective_group_write(const void *params)
+collective_group_write(void *params)
 {
     int                    mpi_rank, mpi_size, size;
     int                    i, j, m;
@@ -1014,7 +1014,7 @@ collective_group_write(const void *params)
  * datasets independently.
  */
 void
-independent_group_read(const void *params)
+independent_group_read(void *params)
 {
     int                    mpi_rank, m;
     hid_t                  plist, fid;
@@ -1142,7 +1142,7 @@ group_dataset_read(hid_t fid, int mpi_rank, int m)
  *
  */
 void
-multiple_group_write(const void *params)
+multiple_group_write(void *params)
 {
     int                    mpi_rank, mpi_size, size;
     int                    m;
@@ -1311,7 +1311,7 @@ create_group_recursive(hid_t memspace, hid_t filespace, hid_t gid, int counter)
  * every dataset in every group and check their correctness.
  */
 void
-multiple_group_read(const void *params)
+multiple_group_read(void *params)
 {
     int                    mpi_rank, mpi_size, error_num, size;
     int                    m;
@@ -1620,7 +1620,7 @@ get_slab(hsize_t chunk_origin[], hsize_t chunk_dims[], hsize_t count[], hsize_t
 #define N 4
 
 void
-io_mode_confusion(const void *params)
+io_mode_confusion(void *params)
 {
     /*
      * HDF5 APIs definitions
@@ -1900,7 +1900,7 @@ const char *lg_att_name[NUM_DATA_SETS]  = {"large_attribute_0", "large_attribute
                                            "large_attribute_3"};
 
 void
-rr_obj_hdr_flush_confusion(const void *params)
+rr_obj_hdr_flush_confusion(void *params)
 {
     /* MPI variables */
     /* private communicator size and rank */
@@ -2705,7 +2705,7 @@ rr_obj_hdr_flush_confusion_reader(const void *params, MPI_Comm comm)
 #define EXTRA_ALIGN 100
 
 void
-chunk_align_bug_1(const void *params)
+chunk_align_bug_1(void *params)
 {
     int            mpi_rank;
     hid_t          file_id, dset_id, fapl_id, dcpl_id, space_id;
diff --git a/testpar/t_oflush.c b/testpar/t_oflush.c
index 4bca1fe1d43..7f00f2a5c78 100644
--- a/testpar/t_oflush.c
+++ b/testpar/t_oflush.c
@@ -25,7 +25,7 @@
 #define RANK        2
 
 void
-test_oflush(const void *params)
+test_oflush(void *params)
 {
     int         mpi_size, mpi_rank;
     hid_t       file, dataset;
diff --git a/testpar/t_ph5basic.c b/testpar/t_ph5basic.c
index 8cecffb4f72..47a23196859 100644
--- a/testpar/t_ph5basic.c
+++ b/testpar/t_ph5basic.c
@@ -28,7 +28,7 @@
  *-------------------------------------------------------------------------
  */
 void
-test_fapl_mpio_dup(const void H5_ATTR_UNUSED *params)
+test_fapl_mpio_dup(void H5_ATTR_UNUSED *params)
 {
     int      mpi_size, mpi_rank;
     MPI_Comm comm, comm_tmp;
@@ -190,7 +190,7 @@ test_fapl_mpio_dup(const void H5_ATTR_UNUSED *params)
  *-------------------------------------------------------------------------
  */
 void
-test_get_dxpl_mpio(const void *params)
+test_get_dxpl_mpio(void *params)
 {
     hid_t            fid  = H5I_INVALID_HID;
     hid_t            sid  = H5I_INVALID_HID;
diff --git a/testpar/t_prop.c b/testpar/t_prop.c
index 257c4330629..ee9b007b39e 100644
--- a/testpar/t_prop.c
+++ b/testpar/t_prop.c
@@ -88,7 +88,7 @@ test_encode_decode(hid_t orig_pl, int mpi_rank, int recv_proc)
 }
 
 void
-test_plist_ed(const void H5_ATTR_UNUSED *params)
+test_plist_ed(void H5_ATTR_UNUSED *params)
 {
     hid_t dcpl;   /* dataset create prop. list */
     hid_t dapl;   /* dataset access prop. list */
@@ -451,7 +451,7 @@ test_plist_ed(const void H5_ATTR_UNUSED *params)
 }
 
 void
-external_links(const void H5_ATTR_UNUSED *params)
+external_links(void H5_ATTR_UNUSED *params)
 {
     hid_t lcpl  = H5I_INVALID_HID; /* link create prop. list */
     hid_t lapl  = H5I_INVALID_HID; /* link access prop. list */
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index 56b460d7895..193f6e76bd9 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -4179,56 +4179,56 @@ parse_options(int argc, char **argv)
 
 /* Shape Same test using contiguous hyperslab using independent IO on contiguous datasets */
 static void
-sscontig1(const void *params)
+sscontig1(void *params)
 {
     contig_hs_dr_pio_test(params, IND_CONTIG);
 }
 
 /* Shape Same test using contiguous hyperslab using collective IO on contiguous datasets */
 static void
-sscontig2(const void *params)
+sscontig2(void *params)
 {
     contig_hs_dr_pio_test(params, COL_CONTIG);
 }
 
 /* Shape Same test using contiguous hyperslab using independent IO on chunked datasets */
 static void
-sscontig3(const void *params)
+sscontig3(void *params)
 {
     contig_hs_dr_pio_test(params, IND_CHUNKED);
 }
 
 /* Shape Same test using contiguous hyperslab using collective IO on chunked datasets */
 static void
-sscontig4(const void *params)
+sscontig4(void *params)
 {
     contig_hs_dr_pio_test(params, COL_CHUNKED);
 }
 
 /* Shape Same test using checker hyperslab using independent IO on contiguous datasets */
 static void
-sschecker1(const void *params)
+sschecker1(void *params)
 {
     ckrbrd_hs_dr_pio_test(params, IND_CONTIG);
 }
 
 /* Shape Same test using checker hyperslab using collective IO on contiguous datasets */
 static void
-sschecker2(const void *params)
+sschecker2(void *params)
 {
     ckrbrd_hs_dr_pio_test(params, COL_CONTIG);
 }
 
 /* Shape Same test using checker hyperslab using independent IO on chunked datasets */
 static void
-sschecker3(const void *params)
+sschecker3(void *params)
 {
     ckrbrd_hs_dr_pio_test(params, IND_CHUNKED);
 }
 
 /* Shape Same test using checker hyperslab using collective IO on chunked datasets */
 static void
-sschecker4(const void *params)
+sschecker4(void *params)
 {
     ckrbrd_hs_dr_pio_test(params, COL_CHUNKED);
 }
diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c
index 7619404e866..9aac650d729 100644
--- a/testpar/t_span_tree.c
+++ b/testpar/t_span_tree.c
@@ -52,7 +52,7 @@ static void coll_read_test(const void *params);
  *-------------------------------------------------------------------------
  */
 void
-coll_irregular_cont_write(const void *params)
+coll_irregular_cont_write(void *params)
 {
     int mpi_rank;
 
@@ -87,7 +87,7 @@ coll_irregular_cont_write(const void *params)
  *-------------------------------------------------------------------------
  */
 void
-coll_irregular_cont_read(const void *params)
+coll_irregular_cont_read(void *params)
 {
     int mpi_rank;
 
@@ -122,7 +122,7 @@ coll_irregular_cont_read(const void *params)
  *-------------------------------------------------------------------------
  */
 void
-coll_irregular_simple_chunk_write(const void *params)
+coll_irregular_simple_chunk_write(void *params)
 {
     int mpi_rank;
 
@@ -157,7 +157,7 @@ coll_irregular_simple_chunk_write(const void *params)
  *-------------------------------------------------------------------------
  */
 void
-coll_irregular_simple_chunk_read(const void *params)
+coll_irregular_simple_chunk_read(void *params)
 {
     int mpi_rank;
 
@@ -192,7 +192,7 @@ coll_irregular_simple_chunk_read(const void *params)
  *-------------------------------------------------------------------------
  */
 void
-coll_irregular_complex_chunk_write(const void *params)
+coll_irregular_complex_chunk_write(void *params)
 {
     int mpi_rank;
 
@@ -227,7 +227,7 @@ coll_irregular_complex_chunk_write(const void *params)
  *-------------------------------------------------------------------------
  */
 void
-coll_irregular_complex_chunk_read(const void *params)
+coll_irregular_complex_chunk_read(void *params)
 {
     int mpi_rank;
 
@@ -2349,7 +2349,7 @@ lower_dim_size_comp_test__run_test(const void *params, const int chunk_edge_size
  */
 
 void
-lower_dim_size_comp_test(const void *params)
+lower_dim_size_comp_test(void *params)
 {
     /* const char *fcnName = "lower_dim_size_comp_test()"; */
     int chunk_edge_size = 0;
@@ -2411,7 +2411,7 @@ lower_dim_size_comp_test(const void *params)
 #define LINK_CHUNK_COLLECTIVE_IO_TEST_CHUNK_SIZE 16
 
 void
-link_chunk_collective_io_test(const void *params)
+link_chunk_collective_io_test(void *params)
 {
     /* const char *fcnName = "link_chunk_collective_io_test()"; */
     const char *filename;
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h
index 2de49c39501..2d256b375ab 100644
--- a/testpar/testphdf5.h
+++ b/testpar/testphdf5.h
@@ -195,78 +195,76 @@ extern int facc_type;            /*Test file access type */
 extern int dxfer_coll_type;
 
 /* Test program prototypes */
-void test_plist_ed(const void *params);
-void external_links(const void *params);
-void zero_dim_dset(const void *params);
-void test_file_properties(const void *params);
-void test_delete(const void *params);
-void test_invalid_libver_bounds_file_close_assert(const void *params);
-void test_evict_on_close_parallel_unsupp(const void *params);
-void test_fapl_preserve_hints(const void *params);
-void multiple_dset_write(const void *params);
-void multiple_group_write(const void *params);
-void multiple_group_read(const void *params);
-void collective_group_write_independent_group_read(const void *params);
-void collective_group_write(const void *params);
-void independent_group_read(const void *params);
-void test_fapl_mpio_dup(const void *params);
-void test_get_dxpl_mpio(const void *params);
-void test_split_comm_access(const void *params);
-void test_page_buffer_access(const void *params);
-void dataset_atomicity(const void *params);
-void dataset_writeInd(const void *params);
-void dataset_writeAll(const void *params);
-void extend_writeInd(const void *params);
-void extend_writeInd2(const void *params);
-void extend_writeAll(const void *params);
-void dataset_readInd(const void *params);
-void dataset_readAll(const void *params);
-void extend_readInd(const void *params);
-void extend_readAll(const void *params);
-void none_selection_chunk(const void *params);
-void actual_io_mode_tests(const void *params);
-void no_collective_cause_tests(const void *params);
-void test_chunk_alloc(const void *params);
-void test_chunk_alloc_incr_ser_to_par(const void *params);
-void test_filter_read(const void *params);
-void compact_dataset(const void *params);
-void null_dataset(const void *params);
-void big_dataset(const void *params);
-void dataset_fillvalue(const void *params);
-void coll_chunk1(const void *params);
-void coll_chunk2(const void *params);
-void coll_chunk3(const void *params);
-void coll_chunk4(const void *params);
-void coll_chunk5(const void *params);
-void coll_chunk6(const void *params);
-void coll_chunk7(const void *params);
-void coll_chunk8(const void *params);
-void coll_chunk9(const void *params);
-void coll_chunk10(const void *params);
-void coll_irregular_cont_read(const void *params);
-void coll_irregular_cont_write(const void *params);
-void coll_irregular_simple_chunk_read(const void *params);
-void coll_irregular_simple_chunk_write(const void *params);
-void coll_irregular_complex_chunk_read(const void *params);
-void coll_irregular_complex_chunk_write(const void *params);
-void io_mode_confusion(const void *params);
-void rr_obj_hdr_flush_confusion(const void *params);
-void chunk_align_bug_1(const void *params);
-void lower_dim_size_comp_test(const void *params);
-void link_chunk_collective_io_test(const void *params);
-void contig_hyperslab_dr_pio_test(ShapeSameTestMethods sstest_type);
-void checker_board_hyperslab_dr_pio_test(ShapeSameTestMethods sstest_type);
-void file_image_daisy_chain_test(const void *params);
+void test_plist_ed(void *params);
+void external_links(void *params);
+void zero_dim_dset(void *params);
+void test_file_properties(void *params);
+void test_delete(void *params);
+void test_invalid_libver_bounds_file_close_assert(void *params);
+void test_evict_on_close_parallel_unsupp(void *params);
+void test_fapl_preserve_hints(void *params);
+void multiple_dset_write(void *params);
+void multiple_group_write(void *params);
+void multiple_group_read(void *params);
+void collective_group_write_independent_group_read(void *params);
+void collective_group_write(void *params);
+void independent_group_read(void *params);
+void test_fapl_mpio_dup(void *params);
+void test_get_dxpl_mpio(void *params);
+void test_split_comm_access(void *params);
+void test_page_buffer_access(void *params);
+void dataset_atomicity(void *params);
+void dataset_writeInd(void *params);
+void dataset_writeAll(void *params);
+void extend_writeInd(void *params);
+void extend_writeInd2(void *params);
+void extend_writeAll(void *params);
+void dataset_readInd(void *params);
+void dataset_readAll(void *params);
+void extend_readInd(void *params);
+void extend_readAll(void *params);
+void none_selection_chunk(void *params);
+void actual_io_mode_tests(void *params);
+void no_collective_cause_tests(void *params);
+void test_chunk_alloc(void *params);
+void test_chunk_alloc_incr_ser_to_par(void *params);
+void test_filter_read(void *params);
+void compact_dataset(void *params);
+void null_dataset(void *params);
+void big_dataset(void *params);
+void dataset_fillvalue(void *params);
+void coll_chunk1(void *params);
+void coll_chunk2(void *params);
+void coll_chunk3(void *params);
+void coll_chunk4(void *params);
+void coll_chunk5(void *params);
+void coll_chunk6(void *params);
+void coll_chunk7(void *params);
+void coll_chunk8(void *params);
+void coll_chunk9(void *params);
+void coll_chunk10(void *params);
+void coll_irregular_cont_read(void *params);
+void coll_irregular_cont_write(void *params);
+void coll_irregular_simple_chunk_read(void *params);
+void coll_irregular_simple_chunk_write(void *params);
+void coll_irregular_complex_chunk_read(void *params);
+void coll_irregular_complex_chunk_write(void *params);
+void io_mode_confusion(void *params);
+void rr_obj_hdr_flush_confusion(void *params);
+void chunk_align_bug_1(void *params);
+void lower_dim_size_comp_test(void *params);
+void link_chunk_collective_io_test(void *params);
+void file_image_daisy_chain_test(void *params);
 #ifdef H5_HAVE_FILTER_DEFLATE
-void compress_readAll(const void *params);
+void compress_readAll(void *params);
 #endif /* H5_HAVE_FILTER_DEFLATE */
-void test_dense_attr(const void *params);
-void test_partial_no_selection_coll_md_read(const void *params);
-void test_multi_chunk_io_addrmap_issue(const void *params);
-void test_link_chunk_io_sort_chunk_issue(const void *params);
-void test_collective_global_heap_write(const void *params);
-void test_coll_io_ind_md_write(const void *params);
-void test_oflush(const void *params);
+void test_dense_attr(void *params);
+void test_partial_no_selection_coll_md_read(void *params);
+void test_multi_chunk_io_addrmap_issue(void *params);
+void test_link_chunk_io_sort_chunk_issue(void *params);
+void test_collective_global_heap_write(void *params);
+void test_coll_io_ind_md_write(void *params);
+void test_oflush(void *params);
 
 /* commonly used prototypes */
 MPI_Offset h5_mpi_get_file_size(const char *filename, MPI_Comm comm, MPI_Info info);