diff --git a/src/ncint/ncintdispatch.c b/src/ncint/ncintdispatch.c
index 5c99ead5815..556ca077ee0 100644
--- a/src/ncint/ncintdispatch.c
+++ b/src/ncint/ncintdispatch.c
@@ -11,7 +11,7 @@
 
 /* This is the dispatch object that holds pointers to all the
  * functions that make up the NCINT dispatch interface. */
-static const NC_Dispatch NCINT_dispatcher = {
+NC_Dispatch NCINT_dispatcher = {
 
     NC_FORMATX_NC_HDF4,
 
@@ -130,38 +130,38 @@ NC_NCINT_finalize(void)
 
 #define TEST_VAL_42 42
 int
-tst_open(const char *path, int mode, int basepe, size_t *chunksizehintp,
+NC_NCINT_open(const char *path, int mode, int basepe, size_t *chunksizehintp,
              void *parameters, const NC_Dispatch *dispatch, NC *nc_file)
 {
    return NC_NOERR;
 }
 
 int
-tst_abort(int ncid)
+NC_NCINT_abort(int ncid)
 {
    return TEST_VAL_42;
 }
 
 int
-tst_close(int ncid, void *v)
+NC_NCINT_close(int ncid, void *v)
 {
    return NC_NOERR;
 }
 
 int
-tst_inq_format(int ncid, int *formatp)
+NC_NCINT_inq_format(int ncid, int *formatp)
 {
    return TEST_VAL_42;
 }
 
 int
-tst_inq_format_extended(int ncid, int *formatp, int *modep)
+NC_NCINT_inq_format_extended(int ncid, int *formatp, int *modep)
 {
    return TEST_VAL_42;
 }
 
 int
-tst_get_vara(int ncid, int varid, const size_t *start, const size_t *count,
+NC_NCINT_get_vara(int ncid, int varid, const size_t *start, const size_t *count,
              void *value, nc_type t)
 {
    return TEST_VAL_42;
diff --git a/tests/ncint/tst_pio_udf.c b/tests/ncint/tst_pio_udf.c
index 4427a25fdc4..a40a550b98a 100644
--- a/tests/ncint/tst_pio_udf.c
+++ b/tests/ncint/tst_pio_udf.c
@@ -11,6 +11,8 @@
 
 #define FILE_NAME "tst_pio_udf.nc"
 
+extern NC_Dispatch NCINT_dispatcher;
+
 /* int */
 /* tst_open(const char *path, int mode, int basepe, size_t *chunksizehintp, */
 /*              void *parameters, const NC_Dispatch *dispatch, NC *nc_file) */
@@ -51,95 +53,95 @@
 
 /* This is the dispatch object that holds pointers to all the
  * functions that make up the HDF4 dispatch interface. */
-static NC_Dispatch tst_dispatcher = {
-
-NC_FORMATX_UDF0,
-
-NC_RO_create,
-tst_open,
-
-NC_RO_redef,
-NC_RO__enddef,
-NC_RO_sync,
-tst_abort,
-tst_close,
-NC_RO_set_fill,
-NC_NOTNC3_inq_base_pe,
-NC_NOTNC3_set_base_pe,
-tst_inq_format,
-tst_inq_format_extended,
-
-NC4_inq,
-NC4_inq_type,
-
-NC_RO_def_dim,
-NC4_inq_dimid,
-NC4_inq_dim,
-NC4_inq_unlimdim,
-NC_RO_rename_dim,
-
-NC4_inq_att,
-NC4_inq_attid,
-NC4_inq_attname,
-NC_RO_rename_att,
-NC_RO_del_att,
-NC4_get_att,
-NC_RO_put_att,
-
-NC_RO_def_var,
-NC4_inq_varid,
-NC_RO_rename_var,
-tst_get_vara,
-NC_RO_put_vara,
-NCDEFAULT_get_vars,
-NCDEFAULT_put_vars,
-NCDEFAULT_get_varm,
-NCDEFAULT_put_varm,
-
-NC4_inq_var_all,
-
-NC_NOTNC4_var_par_access,
-NC_RO_def_var_fill,
-
-NC4_show_metadata,
-NC4_inq_unlimdims,
-
-NC4_inq_ncid,
-NC4_inq_grps,
-NC4_inq_grpname,
-NC4_inq_grpname_full,
-NC4_inq_grp_parent,
-NC4_inq_grp_full_ncid,
-NC4_inq_varids,
-NC4_inq_dimids,
-NC4_inq_typeids,
-NC4_inq_type_equal,
-NC_NOTNC4_def_grp,
-NC_NOTNC4_rename_grp,
-NC4_inq_user_type,
-NC4_inq_typeid,
-
-NC_NOTNC4_def_compound,
-NC_NOTNC4_insert_compound,
-NC_NOTNC4_insert_array_compound,
-NC_NOTNC4_inq_compound_field,
-NC_NOTNC4_inq_compound_fieldindex,
-NC_NOTNC4_def_vlen,
-NC_NOTNC4_put_vlen_element,
-NC_NOTNC4_get_vlen_element,
-NC_NOTNC4_def_enum,
-NC_NOTNC4_insert_enum,
-NC_NOTNC4_inq_enum_member,
-NC_NOTNC4_inq_enum_ident,
-NC_NOTNC4_def_opaque,
-NC_NOTNC4_def_var_deflate,
-NC_NOTNC4_def_var_fletcher32,
-NC_NOTNC4_def_var_chunking,
-NC_NOTNC4_def_var_endian,
-NC_NOTNC4_def_var_filter,
-NC_NOTNC4_set_var_chunk_cache,
-NC_NOTNC4_get_var_chunk_cache
-};
+/* static NC_Dispatch tst_dispatcher = { */
+
+/* NC_FORMATX_UDF0, */
+
+/* NC_RO_create, */
+/* tst_open, */
+
+/* NC_RO_redef, */
+/* NC_RO__enddef, */
+/* NC_RO_sync, */
+/* tst_abort, */
+/* tst_close, */
+/* NC_RO_set_fill, */
+/* NC_NOTNC3_inq_base_pe, */
+/* NC_NOTNC3_set_base_pe, */
+/* tst_inq_format, */
+/* tst_inq_format_extended, */
+
+/* NC4_inq, */
+/* NC4_inq_type, */
+
+/* NC_RO_def_dim, */
+/* NC4_inq_dimid, */
+/* NC4_inq_dim, */
+/* NC4_inq_unlimdim, */
+/* NC_RO_rename_dim, */
+
+/* NC4_inq_att, */
+/* NC4_inq_attid, */
+/* NC4_inq_attname, */
+/* NC_RO_rename_att, */
+/* NC_RO_del_att, */
+/* NC4_get_att, */
+/* NC_RO_put_att, */
+
+/* NC_RO_def_var, */
+/* NC4_inq_varid, */
+/* NC_RO_rename_var, */
+/* tst_get_vara, */
+/* NC_RO_put_vara, */
+/* NCDEFAULT_get_vars, */
+/* NCDEFAULT_put_vars, */
+/* NCDEFAULT_get_varm, */
+/* NCDEFAULT_put_varm, */
+
+/* NC4_inq_var_all, */
+
+/* NC_NOTNC4_var_par_access, */
+/* NC_RO_def_var_fill, */
+
+/* NC4_show_metadata, */
+/* NC4_inq_unlimdims, */
+
+/* NC4_inq_ncid, */
+/* NC4_inq_grps, */
+/* NC4_inq_grpname, */
+/* NC4_inq_grpname_full, */
+/* NC4_inq_grp_parent, */
+/* NC4_inq_grp_full_ncid, */
+/* NC4_inq_varids, */
+/* NC4_inq_dimids, */
+/* NC4_inq_typeids, */
+/* NC4_inq_type_equal, */
+/* NC_NOTNC4_def_grp, */
+/* NC_NOTNC4_rename_grp, */
+/* NC4_inq_user_type, */
+/* NC4_inq_typeid, */
+
+/* NC_NOTNC4_def_compound, */
+/* NC_NOTNC4_insert_compound, */
+/* NC_NOTNC4_insert_array_compound, */
+/* NC_NOTNC4_inq_compound_field, */
+/* NC_NOTNC4_inq_compound_fieldindex, */
+/* NC_NOTNC4_def_vlen, */
+/* NC_NOTNC4_put_vlen_element, */
+/* NC_NOTNC4_get_vlen_element, */
+/* NC_NOTNC4_def_enum, */
+/* NC_NOTNC4_insert_enum, */
+/* NC_NOTNC4_inq_enum_member, */
+/* NC_NOTNC4_inq_enum_ident, */
+/* NC_NOTNC4_def_opaque, */
+/* NC_NOTNC4_def_var_deflate, */
+/* NC_NOTNC4_def_var_fletcher32, */
+/* NC_NOTNC4_def_var_chunking, */
+/* NC_NOTNC4_def_var_endian, */
+/* NC_NOTNC4_def_var_filter, */
+/* NC_NOTNC4_set_var_chunk_cache, */
+/* NC_NOTNC4_get_var_chunk_cache */
+/* }; */
 
 int
 main(int argc, char **argv)
@@ -159,7 +161,7 @@ main(int argc, char **argv)
 
       /* Check that our user-defined format has been added. */
       if (nc_inq_user_format(NC_UDF0, &disp_in, NULL)) ERR;
-      if (disp_in != &tst_dispatcher) ERR;
+      if (disp_in != &NCINT_dispatcher) ERR;
 
       /* Open file with our defined functions. */
       if (nc_open(FILE_NAME, NC_UDF0, &ncid)) ERR;